销售+资金放大镜调整

frontend/saas-web/app/view/money/fundtransfer/FormPanel.js

@@ -125,23 +125,29 @@ Ext.define('saas.view.money.fundtransfer.FormPanel', {
                 }
             }, {
                 text : "结算方式", 
-                width : 200.0, 
+                width : 150.0, 
                 dataIndex : "ftd_paymethod", 
                 xtype : "", 
                 items : null,
-                editor : {
-                    displayField : "display", 
-                    editable : true, 
-                    format : "", 
-                    hideTrigger : false, 
-                    maxLength : 100.0, 
-                    minValue : null, 
-                    positiveNum : false, 
-                    queryMode : "local", 
-                    store : null, 
-                    valueField : "value", 
-                    xtype : "dbfindtrigger"
+                editor:{
+                    xtype: 'combobox',
+                    name: 'ftd_paymethod',
+                    queryMode: 'local',
+                    displayField: 'ftd_paymethod_d',
+                    valueField: 'ftd_paymethod',
+                    editable:false,
+                    store: Ext.create('Ext.data.ArrayStore', {
+                        fields: ['ftd_paymethod', 'ftd_paymethod_d'],
+                        data: [
+                            ["无", "无"],
+                            ["支付宝转账", "支付宝转账"],
+                            ["微信转账", "微信转账"],
+                            ["现金", "现金"],
+                            ["银行转账", "银行转账"]
+                        ]
+                    })
                 }
+                
             }, {
                 text : "备注", 
                 dataIndex : "ftd_remark",

frontend/saas-web/app/view/money/fundtransfer/FormPanelController.js

@@ -32,19 +32,32 @@ Ext.define('saas.view.money.fundtransfer.FormPanelController', {
                             "text": "账户编号",
                             "flex": 1,
                             "dataIndex": "bk_bankcode",
-                            "width": 100,
+                            "width": 120,
                             "xtype": ""
                         }, {
                             "text": "账户名称",
                             "flex": 1,
                             "dataIndex": "bk_bankname",
+                            "width": 150,
                             "xtype": ""
                         }, {
                             "text": "账户类型",
-                            "flex": 0,
+                            "flex": 1,
                             "dataIndex": "bk_type",
-                            "width": 200,
+                            "width": 120,
                             "xtype": ""
+                        }, {
+                            "text": "账户余额",
+                            "flex": 1,
+                            "dataIndex": "bk_thisamount",
+                            "width": 120,
+                            "xtype": ""
+                        }, {
+                            "text": "建帐日期",
+                            "flex": 1,
+                            "dataIndex": "bk_date",
+                            "width": 120,
+                            "xtype": "datecolumn"
                         }]
                     }) ;   
 
@@ -77,19 +90,32 @@ Ext.define('saas.view.money.fundtransfer.FormPanelController', {
                             "text": "账户编号",
                             "flex": 1,
                             "dataIndex": "bk_bankcode",
-                            "width": 100,
+                            "width": 120,
                             "xtype": ""
                         }, {
                             "text": "账户名称",
                             "flex": 1,
                             "dataIndex": "bk_bankname",
+                            "width": 150,
                             "xtype": ""
                         }, {
                             "text": "账户类型",
-                            "flex": 0,
+                            "flex": 1,
                             "dataIndex": "bk_type",
-                            "width": 200,
+                            "width": 120,
                             "xtype": ""
+                        }, {
+                            "text": "账户余额",
+                            "flex": 1,
+                            "dataIndex": "bk_thisamount",
+                            "width": 120,
+                            "xtype": ""
+                        }, {
+                            "text": "建帐日期",
+                            "flex": 1,
+                            "dataIndex": "bk_date",
+                            "width": 120,
+                            "xtype": "datecolumn"
                         }]
                     }) ;   
 

frontend/saas-web/app/view/money/othreceipts/FormPanelController.js

@@ -8,7 +8,7 @@ Ext.define('saas.view.money.othreceipts.FormPanelController', {
             'dbfindtrigger[name=or_custname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'/api/document/customer/list',
+                        dataUrl:'/api/document/customer/dbfind',
                         addXtype: 'document-customer-formpanel',
                         addTitle: '客户资料',
                         dbfinds:[{
@@ -23,30 +23,69 @@ Ext.define('saas.view.money.othreceipts.FormPanelController', {
                         },{
                             field:'cu_name',width:100
                         }],
-                        dbColumns:[{
-                            "text": "客户ID",
-                            "flex": 0,
-                            "dataIndex": "id",
-                            "width": 100,
-                            "xtype": ""
-                        },{
-                            "text": "客户编号",
-                            "flex": 1,
-                            "dataIndex": "cu_code",
-                            "width": 100,
-                            "xtype": ""
-                        }, {
-                            "text": "客户名称",
-                            "flex": 1,
-                            "dataIndex": "cu_name",
-                            "xtype": ""
-                        }, {
-                            "text": "客户类型",
-                            "flex": 0,
-                            "dataIndex": "cu_type",
-                            "width": 200,
-                            "xtype": ""
-                        }]
+                        dbColumns:[
+                            {
+                                conditionCode:'id',
+                                "text": "客户ID",
+                                "flex": 0,
+                                "dataIndex": "id",
+                                "width": 0,
+                                "xtype": "",
+                                "items": null
+                            },{
+                                conditionCode:'cu_code',
+                                "text": "客户编号",
+                                "flex": 1,
+                                "dataIndex": "cu_code",
+                                "width": 100,
+                                "xtype": "",
+                                "items": null
+                            }, {
+                                conditionCode:'cu_name',
+                                "text": "客户名称",
+                                "flex": 1,
+                                "dataIndex": "cu_name",
+                                "xtype": "",
+                                "items": null
+                            }, {
+                                conditionCode:'cu_type',
+                                "text": "客户类型",
+                                "flex": 1,
+                                "dataIndex": "cu_type",
+                                "width": 200,
+                                "xtype": "",
+                                "items": null
+                            }, {
+                                "text": "业务员编号",
+                                "flex": 1,
+                                "dataIndex": "cu_sellercode",
+                                "width": 100
+                            }, {
+                                "text": "业务员",
+                                "flex": 1,
+                                "dataIndex": "cu_sellername",
+                                "width": 100
+                            }, {
+                                "text": "税率",
+                                "flex": 1,
+                                "dataIndex": "cu_taxrate",
+                                "width": 100
+                            }, {
+                                "text": "承付天数",
+                                "flex": 1,
+                                "dataIndex": "cu_promisedays",
+                                "width": 100
+                            }, {
+                                "text": "额度",
+                                "flex": 1,
+                                "dataIndex": "cu_credit",
+                                "width": 100
+                            }, {
+                                "text": "客户地址",
+                                "flex": 1,
+                                "dataIndex": "ca_address",
+                                "width": 250
+                            }]
                     }) ;   
 
                 }
@@ -78,19 +117,32 @@ Ext.define('saas.view.money.othreceipts.FormPanelController', {
                             "text": "账户编号",
                             "flex": 1,
                             "dataIndex": "bk_bankcode",
-                            "width": 100,
+                            "width": 120,
                             "xtype": ""
                         }, {
                             "text": "账户名称",
                             "flex": 1,
                             "dataIndex": "bk_bankname",
+                            "width": 150,
                             "xtype": ""
                         }, {
                             "text": "账户类型",
-                            "flex": 0,
+                            "flex": 1,
                             "dataIndex": "bk_type",
-                            "width": 200,
+                            "width": 120,
                             "xtype": ""
+                        }, {
+                            "text": "账户余额",
+                            "flex": 1,
+                            "dataIndex": "bk_thisamount",
+                            "width": 120,
+                            "xtype": ""
+                        }, {
+                            "text": "建帐日期",
+                            "flex": 1,
+                            "dataIndex": "bk_date",
+                            "width": 120,
+                            "xtype": "datecolumn"
                         }]
                     }) ;   
 

frontend/saas-web/app/view/money/othreceipts/QueryPanelController.js

@@ -8,7 +8,7 @@ Ext.define('saas.view.money.othreceipts.QueryPanelController', {
             'dbfindtrigger[name=or_custname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'/api/document/customer/list',
+                        dataUrl:'/api/document/customer/dbfind',
                         addXtype: 'document-customer-formpanel',
                         addTitle: '客户资料',
                         dbfinds:[{
@@ -23,30 +23,69 @@ Ext.define('saas.view.money.othreceipts.QueryPanelController', {
                         },{
                             field:'cu_name',width:100
                         }],
-                        dbColumns:[{
-                            "text": "客户ID",
-                            "flex": 0,
-                            "dataIndex": "id",
-                            "width": 100,
-                            "xtype": ""
-                        },{
-                            "text": "客户编号",
-                            "flex": 1,
-                            "dataIndex": "cu_code",
-                            "width": 100,
-                            "xtype": ""
-                        }, {
-                            "text": "客户名称",
-                            "flex": 1,
-                            "dataIndex": "cu_name",
-                            "xtype": ""
-                        }, {
-                            "text": "客户类型",
-                            "flex": 0,
-                            "dataIndex": "cu_type",
-                            "width": 200,
-                            "xtype": ""
-                        }]
+                        dbColumns:[
+                            {
+                                conditionCode:'id',
+                                "text": "客户ID",
+                                "flex": 0,
+                                "dataIndex": "id",
+                                "width": 0,
+                                "xtype": "",
+                                "items": null
+                            },{
+                                conditionCode:'cu_code',
+                                "text": "客户编号",
+                                "flex": 1,
+                                "dataIndex": "cu_code",
+                                "width": 100,
+                                "xtype": "",
+                                "items": null
+                            }, {
+                                conditionCode:'cu_name',
+                                "text": "客户名称",
+                                "flex": 1,
+                                "dataIndex": "cu_name",
+                                "xtype": "",
+                                "items": null
+                            }, {
+                                conditionCode:'cu_type',
+                                "text": "客户类型",
+                                "flex": 1,
+                                "dataIndex": "cu_type",
+                                "width": 200,
+                                "xtype": "",
+                                "items": null
+                            }, {
+                                "text": "业务员编号",
+                                "flex": 1,
+                                "dataIndex": "cu_sellercode",
+                                "width": 100
+                            }, {
+                                "text": "业务员",
+                                "flex": 1,
+                                "dataIndex": "cu_sellername",
+                                "width": 100
+                            }, {
+                                "text": "税率",
+                                "flex": 1,
+                                "dataIndex": "cu_taxrate",
+                                "width": 100
+                            }, {
+                                "text": "承付天数",
+                                "flex": 1,
+                                "dataIndex": "cu_promisedays",
+                                "width": 100
+                            }, {
+                                "text": "额度",
+                                "flex": 1,
+                                "dataIndex": "cu_credit",
+                                "width": 100
+                            }, {
+                                "text": "客户地址",
+                                "flex": 1,
+                                "dataIndex": "ca_address",
+                                "width": 250
+                            }]
                     }) ;   
 
                 }
@@ -78,19 +117,32 @@ Ext.define('saas.view.money.othreceipts.QueryPanelController', {
                             "text": "账户编号",
                             "flex": 1,
                             "dataIndex": "bk_bankcode",
-                            "width": 100,
+                            "width": 120,
                             "xtype": ""
                         }, {
                             "text": "账户名称",
                             "flex": 1,
                             "dataIndex": "bk_bankname",
+                            "width": 150,
                             "xtype": ""
                         }, {
                             "text": "账户类型",
-                            "flex": 0,
+                            "flex": 1,
                             "dataIndex": "bk_type",
-                            "width": 200,
+                            "width": 120,
                             "xtype": ""
+                        }, {
+                            "text": "账户余额",
+                            "flex": 1,
+                            "dataIndex": "bk_thisamount",
+                            "width": 120,
+                            "xtype": ""
+                        }, {
+                            "text": "建帐日期",
+                            "flex": 1,
+                            "dataIndex": "bk_date",
+                            "width": 120,
+                            "xtype": "datecolumn"
                         }]
                     }) ;   
 

frontend/saas-web/app/view/money/othspendings/FormPanelController.js

@@ -28,31 +28,53 @@ Ext.define('saas.view.money.othspendings.FormPanelController', {
                             field: 've_name',
                             width: 100
                         }],
-                        dbColumns: [{
+                        dbColumns:[{
                             "text": "供应商ID",
                             "flex": 0,
                             "dataIndex": "id",
                             "width": 100,
                             "xtype": "numbercolumn"
-                        }, {
-                            conditionCode: 've_code',
+                        },{
                             "text": "供应商编号",
                             "flex": 1,
                             "dataIndex": "ve_code",
                             "width": 100
                         }, {
-                            conditionCode: 've_name',
                             "text": "供应商名称",
                             "flex": 1,
                             "dataIndex": "ve_name",
                             "width": 100
                         }, {
-                            conditionCode: 'cu_type',
                             "text": "供应商类型",
                             "flex": 0,
                             "dataIndex": "ve_type",
                             "width": 200,
                             "items": null
+                        }, {
+                            "text": "税率",
+                            "flex": 1,
+                            "dataIndex": "ve_taxrate",
+                            "width": 100
+                        }, {
+                            "text": "承付天数",
+                            "flex": 1,
+                            "dataIndex": "ve_promisedays",
+                            "width": 100
+                        }, {
+                            "text": "纳税人识别号",
+                            "flex": 1,
+                            "dataIndex": "ve_bankaccount",
+                            "width": 100
+                        }, {
+                            "text": "开户银行",
+                            "flex": 1,
+                            "dataIndex": "ve_bankaccount",
+                            "width": 100
+                        }, {
+                            "text": "银行账户",
+                            "flex": 1,
+                            "dataIndex": "ve_bankcode",
+                            "width": 100
                         }]
                     });
 
@@ -80,33 +102,42 @@ Ext.define('saas.view.money.othspendings.FormPanelController', {
                             field: 'bk_bankname',
                             width: 100
                         }],
-                        dbColumns: [{
+                        dbColumns:[{
                             "text": "账户ID",
                             "flex": 0,
                             "dataIndex": "id",
                             "width": 0,
-                            "xtype": "",
-                            "items": null
-                        }, {
+                            "xtype": ""
+                        },{
                             "text": "账户编号",
                             "flex": 1,
                             "dataIndex": "bk_bankcode",
-                            "width": 100,
-                            "xtype": "",
-                            "items": null
+                            "width": 120,
+                            "xtype": ""
                         }, {
                             "text": "账户名称",
                             "flex": 1,
                             "dataIndex": "bk_bankname",
-                            "xtype": "",
-                            "items": null
+                            "width": 150,
+                            "xtype": ""
                         }, {
                             "text": "账户类型",
-                            "flex": 0,
+                            "flex": 1,
                             "dataIndex": "bk_type",
-                            "width": 200,
-                            "xtype": "",
-                            "items": null
+                            "width": 120,
+                            "xtype": ""
+                        }, {
+                            "text": "账户余额",
+                            "flex": 1,
+                            "dataIndex": "bk_thisamount",
+                            "width": 120,
+                            "xtype": ""
+                        }, {
+                            "text": "建帐日期",
+                            "flex": 1,
+                            "dataIndex": "bk_date",
+                            "width": 120,
+                            "xtype": "datecolumn"
                         }]
                     });
 

frontend/saas-web/app/view/money/othspendings/QueryPanelController.js

@@ -30,24 +30,46 @@ Ext.define('saas.view.money.othspendings.QueryPanelController', {
                             "width": 100,
                             "xtype": "numbercolumn"
                         },{
-                            conditionCode:'ve_code',
                             "text": "供应商编号",
                             "flex": 1,
                             "dataIndex": "ve_code",
                             "width": 100
                         }, {
-                            conditionCode:'ve_name',
                             "text": "供应商名称",
                             "flex": 1,
                             "dataIndex": "ve_name",
                             "width": 100
                         }, {
-                            conditionCode:'cu_type',
                             "text": "供应商类型",
                             "flex": 0,
                             "dataIndex": "ve_type",
                             "width": 200,
                             "items": null
+                        }, {
+                            "text": "税率",
+                            "flex": 1,
+                            "dataIndex": "ve_taxrate",
+                            "width": 100
+                        }, {
+                            "text": "承付天数",
+                            "flex": 1,
+                            "dataIndex": "ve_promisedays",
+                            "width": 100
+                        }, {
+                            "text": "纳税人识别号",
+                            "flex": 1,
+                            "dataIndex": "ve_bankaccount",
+                            "width": 100
+                        }, {
+                            "text": "开户银行",
+                            "flex": 1,
+                            "dataIndex": "ve_bankaccount",
+                            "width": 100
+                        }, {
+                            "text": "银行账户",
+                            "flex": 1,
+                            "dataIndex": "ve_bankcode",
+                            "width": 100
                         }]
                     }) ;   
 
@@ -76,28 +98,37 @@ Ext.define('saas.view.money.othspendings.QueryPanelController', {
                             "flex": 0,
                             "dataIndex": "id",
                             "width": 0,
-                            "xtype": "numbercolumn",
-                            "items": null
+                            "xtype": ""
                         },{
                             "text": "账户编号",
                             "flex": 1,
                             "dataIndex": "bk_bankcode",
-                            "width": 100,
-                            "xtype": "",
-                            "items": null
+                            "width": 120,
+                            "xtype": ""
                         }, {
                             "text": "账户名称",
                             "flex": 1,
                             "dataIndex": "bk_bankname",
-                            "xtype": "",
-                            "items": null
+                            "width": 150,
+                            "xtype": ""
                         }, {
                             "text": "账户类型",
-                            "flex": 0,
+                            "flex": 1,
                             "dataIndex": "bk_type",
-                            "width": 200,
-                            "xtype": "",
-                            "items": null
+                            "width": 120,
+                            "xtype": ""
+                        }, {
+                            "text": "账户余额",
+                            "flex": 1,
+                            "dataIndex": "bk_thisamount",
+                            "width": 120,
+                            "xtype": ""
+                        }, {
+                            "text": "建帐日期",
+                            "flex": 1,
+                            "dataIndex": "bk_date",
+                            "width": 120,
+                            "xtype": "datecolumn"
                         }]
                     }) ;   
 

frontend/saas-web/app/view/sale/sale/FormPanel.js

@@ -66,7 +66,7 @@ Ext.define('saas.view.sale.sale.FormPanel', {
                 width:0
             }, {
                 text : "物料id", 
-                dataIndex : "pd_prodid", 
+                dataIndex : "sd_prodid", 
                 width : 0
             }, {
                 text : "物料编号", 

frontend/saas-web/app/view/sale/sale/FormPanelController.js

@@ -8,53 +8,87 @@ Ext.define('saas.view.sale.sale.FormPanelController', {
             'dbfindtrigger[name=sa_custname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'/api/document/customer/list',
+                        dataUrl:'/api/document/customer/dbfind',
                         addXtype: 'document-customer-formpanel',
                         addTitle: '客户资料',
-                        dbfinds:[{
-                            from:'id',to:'sa_custid'
-                        },{
-                            from:'cu_code',to:'sa_custcode'
-                        },{
-                            from:'cu_name',to:'sa_custname'
+                        dbfinds:[
+                            {
+                                from:'id',to:'sa_custid'
+                            },{
+                                from:'cu_code',to:'sa_custcode'
+                            },{
+                                from:'cu_name',to:'sa_custname'
+                            },{
+                                from:'ca_address',to:'sa_address'
                         }],
                         dbtpls:[{
                             field:'cu_code',width:100
                         },{
                             field:'cu_name',width:100
                         }],
-                        dbColumns:[{
-                            conditionCode:'id',
-                            "text": "客户ID",
-                            "flex": 0,
-                            "dataIndex": "id",
-                            "width": 100,
-                            "xtype": "",
-                            "items": null
-                        },{
-                            conditionCode:'cu_code',
-                            "text": "客户编号",
-                            "flex": 1,
-                            "dataIndex": "cu_code",
-                            "width": 100,
-                            "xtype": "",
-                            "items": null
-                        }, {
-                            conditionCode:'cu_name',
-                            "text": "客户名称",
-                            "flex": 1,
-                            "dataIndex": "cu_name",
-                            "xtype": "",
-                            "items": null
-                        }, {
-                            conditionCode:'cu_type',
-                            "text": "客户类型",
-                            "flex": 0,
-                            "dataIndex": "cu_type",
-                            "width": 200,
-                            "xtype": "",
-                            "items": null
-                        }]
+                        dbColumns:[
+                            {
+                                conditionCode:'id',
+                                "text": "客户ID",
+                                "flex": 0,
+                                "dataIndex": "id",
+                                "width": 0,
+                                "xtype": "",
+                                "items": null
+                            },{
+                                conditionCode:'cu_code',
+                                "text": "客户编号",
+                                "flex": 1,
+                                "dataIndex": "cu_code",
+                                "width": 100,
+                                "xtype": "",
+                                "items": null
+                            }, {
+                                conditionCode:'cu_name',
+                                "text": "客户名称",
+                                "flex": 1,
+                                "dataIndex": "cu_name",
+                                "xtype": "",
+                                "items": null
+                            }, {
+                                conditionCode:'cu_type',
+                                "text": "客户类型",
+                                "flex": 1,
+                                "dataIndex": "cu_type",
+                                "width": 200,
+                                "xtype": "",
+                                "items": null
+                            }, {
+                                "text": "业务员编号",
+                                "flex": 1,
+                                "dataIndex": "cu_sellercode",
+                                "width": 100
+                            }, {
+                                "text": "业务员",
+                                "flex": 1,
+                                "dataIndex": "cu_sellername",
+                                "width": 100
+                            }, {
+                                "text": "税率",
+                                "flex": 1,
+                                "dataIndex": "cu_taxrate",
+                                "width": 100
+                            }, {
+                                "text": "承付天数",
+                                "flex": 1,
+                                "dataIndex": "cu_promisedays",
+                                "width": 100
+                            }, {
+                                "text": "额度",
+                                "flex": 1,
+                                "dataIndex": "cu_credit",
+                                "width": 100
+                            }, {
+                                "text": "客户地址",
+                                "flex": 1,
+                                "dataIndex": "ca_address",
+                                "width": 250
+                            }]
                     }) ;   
 
                 }
@@ -73,40 +107,85 @@ Ext.define('saas.view.sale.sale.FormPanelController', {
                             from:'pr_detail',to:'pr_detail'
                         }, {
                             from:'pr_spec',to:'pr_spec'
+                        }, {
+                            from:'id',to:'sd_prodid'
                         }],
                         dbtpls:[{
                             field:'pr_code',width:100
                         },{
                             field:'pr_detail',width:100
                         }],
-                        dbColumns:[{
-                            "text": "物料ID",
-                            "flex": 0,
-                            "dataIndex": "pr_id",
-                            "width": 0,
-                            "xtype": "",
-                            "items": null
-                        },{
-                            "text": "物料编号",
-                            "flex": 1,
-                            "dataIndex": "pr_code",
-                            "width": 100,
-                            "xtype": "",
-                            "items": null
-                        }, {
-                            "text": "物料名称",
-                            "flex": 1,
-                            "dataIndex": "pr_detail",
-                            "xtype": "",
-                            "items": null
-                        }, {
-                            "text": "物料规格",
-                            "flex": 0,
-                            "dataIndex": "pr_spec",
-                            "width": 200,
-                            "xtype": "",
-                            "items": null
-                        }]
+                        dbColumns:[
+                            {
+                                "text": "物料ID",
+                                "flex": 0,
+                                "dataIndex": "id",
+                                "width": 0,
+                                "xtype": "",
+                                "items": null
+                            },{
+                                "text": "物料编号",
+                                "flex": 1,
+                                "dataIndex": "pr_code",
+                                "width": 100,
+                                "xtype": "",
+                                "items": null
+                            }, {
+                                "text": "物料名称",
+                                "flex": 1,
+                                "dataIndex": "pr_detail",
+                                "xtype": "",
+                                "items": null
+                            }, {
+                                "text": "规格",
+                                "flex": 1,
+                                "dataIndex": "pr_spec",
+                                "width": 200,
+                                "xtype": "",
+                                "items": null
+                            }, {
+                                "text": "单位",
+                                "flex": 1,
+                                "dataIndex": "pr_unit",
+                                "width": 200,
+                                "xtype": "",
+                                "items": null
+                            }, {
+                                "text": "品牌",
+                                "flex": 1,
+                                "dataIndex": "pr_brand",
+                                "width": 200,
+                                "xtype": "",
+                                "items": null
+                            }, {
+                                "text": "供应商ID",
+                                "flex": 0,
+                                "dataIndex": "pr_vendid",
+                                "width": 0,
+                                "xtype": "",
+                                "items": null
+                            }, {
+                                "text": "供应商编号",
+                                "flex": 1,
+                                "dataIndex": "pr_vendcode",
+                                "width": 200,
+                                "xtype": "",
+                                "items": null
+                            }, {
+                                "text": "供应商名称",
+                                "flex": 1,
+                                "dataIndex": "pr_vendname",
+                                "width": 200,
+                                "xtype": "",
+                                "items": null
+                            }, {
+                                "text": "最小包装量",
+                                "flex": 1,
+                                "dataIndex": "pr_zxbzs",
+                                "width": 200,
+                                "xtype": "",
+                                "items": null
+                            }]
                     }) ;   
 
                 }

frontend/saas-web/app/view/sale/sale/QueryPanelController.js

@@ -8,7 +8,7 @@ Ext.define('saas.view.sale.sale.QueryPanelController', {
             'dbfindtrigger[name=sa_custname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'/api/document/customer/list',
+                        dataUrl:'/api/document/customer/dbfind',
                         addXtype: 'document-customer-formpanel',
                         addTitle: '客户资料',
                         dbfinds:[{
@@ -67,7 +67,8 @@ Ext.define('saas.view.sale.sale.QueryPanelController', {
                         addXtype: 'document-product-formpanel',
                         addTitle: '物料资料',
                         dbfinds:[{
-                            from:'pr_code',to:'sd_prodcode',
+                            from:'pr_code',to:'sd_prodcode'
+                        },{
                             from:'pr_detail',to:'pr_detail'
                         }],
                         dbtpls:[{
@@ -75,41 +76,77 @@ Ext.define('saas.view.sale.sale.QueryPanelController', {
                         },{
                             field:'pr_detail',width:100
                         }],
-                        dbColumns:[{
-                            "text": "物料ID",
-                            "flex": 0,
-                            "dataIndex": "pr_id",
-                            "width": 0,
-                            "xtype": "",
-                            "items": null
-                        },{
-                            "text": "物料编号",
-                            "flex": 1,
-                            "dataIndex": "pr_code",
-                            "width": 100,
-                            "xtype": "",
-                            "items": null
-                        }, {
-                            "text": "物料名称",
-                            "flex": 1,
-                            "dataIndex": "pr_detail",
-                            "xtype": "",
-                            "items": null
-                        }, {
-                            "text": "物料规格",
-                            "flex": 0,
-                            "dataIndex": "pr_spec",
-                            "width": 200,
-                            "xtype": "",
-                            "items": null
-                        }, {
-                            "text": "物料单位",
-                            "flex": 0,
-                            "dataIndex": "pr_unit",
-                            "width": 200,
-                            "xtype": "",
-                            "items": null
-                        }]
+                        dbColumns:[
+                            {
+                                "text": "物料ID",
+                                "flex": 0,
+                                "dataIndex": "id",
+                                "width": 0,
+                                "xtype": "",
+                                "items": null
+                            },{
+                                "text": "物料编号",
+                                "flex": 1,
+                                "dataIndex": "pr_code",
+                                "width": 100,
+                                "xtype": "",
+                                "items": null
+                            }, {
+                                "text": "物料名称",
+                                "flex": 1,
+                                "dataIndex": "pr_detail",
+                                "xtype": "",
+                                "items": null
+                            }, {
+                                "text": "规格",
+                                "flex": 1,
+                                "dataIndex": "pr_spec",
+                                "width": 200,
+                                "xtype": "",
+                                "items": null
+                            }, {
+                                "text": "单位",
+                                "flex": 1,
+                                "dataIndex": "pr_unit",
+                                "width": 200,
+                                "xtype": "",
+                                "items": null
+                            }, {
+                                "text": "品牌",
+                                "flex": 1,
+                                "dataIndex": "pr_brand",
+                                "width": 200,
+                                "xtype": "",
+                                "items": null
+                            }, {
+                                "text": "供应商ID",
+                                "flex": 0,
+                                "dataIndex": "pr_vendid",
+                                "width": 0,
+                                "xtype": "",
+                                "items": null
+                            }, {
+                                "text": "供应商编号",
+                                "flex": 1,
+                                "dataIndex": "pr_vendcode",
+                                "width": 200,
+                                "xtype": "",
+                                "items": null
+                            }, {
+                                "text": "供应商名称",
+                                "flex": 1,
+                                "dataIndex": "pr_vendname",
+                                "width": 200,
+                                "xtype": "",
+                                "items": null
+                            }, {
+                                "text": "最小包装量",
+                                "flex": 1,
+                                "dataIndex": "pr_zxbzs",
+                                "width": 200,
+                                "xtype": "",
+                                "items": null
+                            }]
                     }) ;   
 
                 }

frontend/saas-web/app/view/sale/saleIn/FormPanel.js

@@ -43,6 +43,10 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
         xtype : "hidden", 
         name : "pi_custcode",  
         fieldLabel : "客户编号"
+    }, {
+        xtype : "dbfindtrigger", 
+        name : "pi_custname", 
+        fieldLabel : "客户名称"
     }, {
         xtype : "textfield", 
         name : "pi_address", 
@@ -53,7 +57,7 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
         xtype : "detailGridField", 
         detnoColumn:  'pd_pdno',
         storeModel:'saas.model.sale.ProdIODetail',
-        deleteDetailUrl:'/api/prodinout/deleteDetail/',
+        deleteDetailUrl:'/api/sale/prodinout/deleteDetail/',
         columns : [
             {
                 text : "id", 

frontend/saas-web/app/view/sale/saleIn/FormPanelController.js

@@ -8,16 +8,18 @@ Ext.define('saas.view.sale.saleIn.FormPanelController', {
             'dbfindtrigger[name=pi_custname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'/api/document/customer/list',
+                        dataUrl:'/api/document/customer/dbfind',
                         addXtype: 'document-customer-formpanel',
                         addTitle: '客户资料',
                         dbfinds:[
-                        {
-                            from:'id',to:'pi_custid'
-                        },{
-                            from:'cu_code',to:'pi_custcode'
-                        },{
-                            from:'cu_name',to:'pi_custname'
+                            {
+                                from:'id',to:'pi_custid'
+                            },{
+                                from:'cu_code',to:'pi_custcode'
+                            },{
+                                from:'cu_name',to:'pi_custname'
+                            },{
+                                from:'ca_address',to:'pi_address'
                         }],
                         dbtpls:[
                         {
@@ -31,7 +33,7 @@ Ext.define('saas.view.sale.saleIn.FormPanelController', {
                             "text": "客户ID",
                             "flex": 0,
                             "dataIndex": "id",
-                            "width": 100,
+                            "width": 0,
                             "xtype": "",
                             "items": null
                         },{
@@ -52,11 +54,41 @@ Ext.define('saas.view.sale.saleIn.FormPanelController', {
                         }, {
                             conditionCode:'cu_type',
                             "text": "客户类型",
-                            "flex": 0,
+                            "flex": 1,
                             "dataIndex": "cu_type",
                             "width": 200,
                             "xtype": "",
                             "items": null
+                        }, {
+                            "text": "业务员编号",
+                            "flex": 1,
+                            "dataIndex": "cu_sellercode",
+                            "width": 100
+                        }, {
+                            "text": "业务员",
+                            "flex": 1,
+                            "dataIndex": "cu_sellername",
+                            "width": 100
+                        }, {
+                            "text": "税率",
+                            "flex": 1,
+                            "dataIndex": "cu_taxrate",
+                            "width": 100
+                        }, {
+                            "text": "承付天数",
+                            "flex": 1,
+                            "dataIndex": "cu_promisedays",
+                            "width": 100
+                        }, {
+                            "text": "额度",
+                            "flex": 1,
+                            "dataIndex": "cu_credit",
+                            "width": 100
+                        }, {
+                            "text": "客户地址",
+                            "flex": 1,
+                            "dataIndex": "ca_address",
+                            "width": 250
                         }]
                     }) ;   
                 }
@@ -83,41 +115,77 @@ Ext.define('saas.view.sale.saleIn.FormPanelController', {
                         },{
                             field:'pr_detail',width:100
                         }],
-                        dbColumns:[{
-                            "text": "物料ID",
-                            "flex": 0,
-                            "dataIndex": "id",
-                            "width": 0,
-                            "xtype": "",
-                            "items": null
-                        },{
-                            "text": "物料编号",
-                            "flex": 1,
-                            "dataIndex": "pr_code",
-                            "width": 100,
-                            "xtype": "",
-                            "items": null
-                        }, {
-                            "text": "物料名称",
-                            "flex": 1,
-                            "dataIndex": "pr_detail",
-                            "xtype": "",
-                            "items": null
-                        }, {
-                            "text": "物料规格",
-                            "flex": 0,
-                            "dataIndex": "pr_spec",
-                            "width": 200,
-                            "xtype": "",
-                            "items": null
-                        }, {
-                            "text": "物料单位",
-                            "flex": 0,
-                            "dataIndex": "pr_unit",
-                            "width": 200,
-                            "xtype": "",
-                            "items": null
-                        }]
+                        dbColumns:[
+                            {
+                                "text": "物料ID",
+                                "flex": 0,
+                                "dataIndex": "id",
+                                "width": 0,
+                                "xtype": "",
+                                "items": null
+                            },{
+                                "text": "物料编号",
+                                "flex": 1,
+                                "dataIndex": "pr_code",
+                                "width": 100,
+                                "xtype": "",
+                                "items": null
+                            }, {
+                                "text": "物料名称",
+                                "flex": 1,
+                                "dataIndex": "pr_detail",
+                                "xtype": "",
+                                "items": null
+                            }, {
+                                "text": "规格",
+                                "flex": 1,
+                                "dataIndex": "pr_spec",
+                                "width": 200,
+                                "xtype": "",
+                                "items": null
+                            }, {
+                                "text": "单位",
+                                "flex": 1,
+                                "dataIndex": "pr_unit",
+                                "width": 200,
+                                "xtype": "",
+                                "items": null
+                            }, {
+                                "text": "品牌",
+                                "flex": 1,
+                                "dataIndex": "pr_brand",
+                                "width": 200,
+                                "xtype": "",
+                                "items": null
+                            }, {
+                                "text": "供应商ID",
+                                "flex": 0,
+                                "dataIndex": "pr_vendid",
+                                "width": 0,
+                                "xtype": "",
+                                "items": null
+                            }, {
+                                "text": "供应商编号",
+                                "flex": 1,
+                                "dataIndex": "pr_vendcode",
+                                "width": 200,
+                                "xtype": "",
+                                "items": null
+                            }, {
+                                "text": "供应商名称",
+                                "flex": 1,
+                                "dataIndex": "pr_vendname",
+                                "width": 200,
+                                "xtype": "",
+                                "items": null
+                            }, {
+                                "text": "最小包装量",
+                                "flex": 1,
+                                "dataIndex": "pr_zxbzs",
+                                "width": 200,
+                                "xtype": "",
+                                "items": null
+                            }]
                     }) ;   
 
                 }

frontend/saas-web/app/view/sale/saleIn/QueryPanel.js

@@ -31,11 +31,13 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
     }, {
         xtype: 'dbfindtrigger',
         name: 'pd_prodcode',
-        fieldLabel: '物料编号'
+        fieldLabel: '物料编号',
+        showDetail: true
     }, {
         xtype: 'textfield',
         name: 'pr_detail',
-        fieldLabel: '物料名称'
+        fieldLabel: '物料名称',
+        showDetail: true
     }, {
         xtype: 'combobox',
         name: 'pi_statuscode',
@@ -68,7 +70,7 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
         addTitle:'销售退货单',
         addXtype:'sale-salein-formpanel',
         defaultCondition:' pi_class = \'销售退货单\'',
-        baseVastUrl: '/api/sale/prodinout/',
+        baseVastUrl: 'http://192.168.253.48:8820/prodinout/',
         baseColumn: [{
             text: 'id',
             dataIndex: 'id',

frontend/saas-web/app/view/sale/saleIn/QueryPanelController.js

@@ -8,7 +8,7 @@ Ext.define('saas.view.sale.saleIn.QueryPanelController', {
             'dbfindtrigger[name=pi_custname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'/api/document/customer/list',
+                        dataUrl:'/api/document/customer/dbfind',
                         addXtype: 'document-customer-formpanel',
                         addTitle: '客户资料',
                         dbfinds:[
@@ -82,41 +82,76 @@ Ext.define('saas.view.sale.saleIn.QueryPanelController', {
                             field:'pr_detail',width:100
                         }],
                         dbColumns:[
-                        {
-                            "text": "物料ID",
-                            "flex": 0,
-                            "dataIndex": "id",
-                            "width": 0,
-                            "xtype": "",
-                            "items": null
-                        },{
-                            "text": "物料编号",
-                            "flex": 1,
-                            "dataIndex": "pr_code",
-                            "width": 100,
-                            "xtype": "",
-                            "items": null
-                        }, {
-                            "text": "物料名称",
-                            "flex": 1,
-                            "dataIndex": "pr_detail",
-                            "xtype": "",
-                            "items": null
-                        }, {
-                            "text": "物料规格",
-                            "flex": 0,
-                            "dataIndex": "pr_spec",
-                            "width": 200,
-                            "xtype": "",
-                            "items": null
-                        }, {
-                            "text": "物料单位",
-                            "flex": 0,
-                            "dataIndex": "pr_unit",
-                            "width": 200,
-                            "xtype": "",
-                            "items": null
-                        }]
+                            {
+                                "text": "物料ID",
+                                "flex": 0,
+                                "dataIndex": "id",
+                                "width": 0,
+                                "xtype": "",
+                                "items": null
+                            },{
+                                "text": "物料编号",
+                                "flex": 1,
+                                "dataIndex": "pr_code",
+                                "width": 100,
+                                "xtype": "",
+                                "items": null
+                            }, {
+                                "text": "物料名称",
+                                "flex": 1,
+                                "dataIndex": "pr_detail",
+                                "xtype": "",
+                                "items": null
+                            }, {
+                                "text": "规格",
+                                "flex": 1,
+                                "dataIndex": "pr_spec",
+                                "width": 200,
+                                "xtype": "",
+                                "items": null
+                            }, {
+                                "text": "单位",
+                                "flex": 1,
+                                "dataIndex": "pr_unit",
+                                "width": 200,
+                                "xtype": "",
+                                "items": null
+                            }, {
+                                "text": "品牌",
+                                "flex": 1,
+                                "dataIndex": "pr_brand",
+                                "width": 200,
+                                "xtype": "",
+                                "items": null
+                            }, {
+                                "text": "供应商ID",
+                                "flex": 0,
+                                "dataIndex": "pr_vendid",
+                                "width": 0,
+                                "xtype": "",
+                                "items": null
+                            }, {
+                                "text": "供应商编号",
+                                "flex": 1,
+                                "dataIndex": "pr_vendcode",
+                                "width": 200,
+                                "xtype": "",
+                                "items": null
+                            }, {
+                                "text": "供应商名称",
+                                "flex": 1,
+                                "dataIndex": "pr_vendname",
+                                "width": 200,
+                                "xtype": "",
+                                "items": null
+                            }, {
+                                "text": "最小包装量",
+                                "flex": 1,
+                                "dataIndex": "pr_zxbzs",
+                                "width": 200,
+                                "xtype": "",
+                                "items": null
+                            }]
                     }) ;   
 
                 }

frontend/saas-web/app/view/sale/saleOut/FormPanelController.js

@@ -9,7 +9,7 @@ Ext.define('saas.view.sale.saleout.FormPanelController', {
             'dbfindtrigger[name=pi_custname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'/api/document/customer/list',
+                        dataUrl:'/api/document/customer/dbfind',
                         addXtype: 'document-customer-formpanel',
                         addTitle: '客户资料',
                         dbfinds:[
@@ -19,6 +19,8 @@ Ext.define('saas.view.sale.saleout.FormPanelController', {
                             from:'cu_code',to:'pi_custcode'
                         },{
                             from:'cu_name',to:'pi_custname'
+                        },{
+                            from:'ca_address',to:'pi_address'
                         }],
                         dbtpls:[
                         {
@@ -27,38 +29,64 @@ Ext.define('saas.view.sale.saleout.FormPanelController', {
                             field:'cu_name',width:100
                         }],
                         dbColumns:[
-                        {
-                            conditionCode:'id',
-                            "text": "客户ID",
-                            "flex": 0,
-                            "dataIndex": "id",
-                            "width": 100,
-                            "xtype": "",
-                            "items": null
-                        },{
-                            conditionCode:'cu_code',
-                            "text": "客户编号",
-                            "flex": 1,
-                            "dataIndex": "cu_code",
-                            "width": 100,
-                            "xtype": "",
-                            "items": null
-                        }, {
-                            conditionCode:'cu_name',
-                            "text": "客户名称",
-                            "flex": 1,
-                            "dataIndex": "cu_name",
-                            "xtype": "",
-                            "items": null
-                        }, {
-                            conditionCode:'cu_type',
-                            "text": "客户类型",
-                            "flex": 0,
-                            "dataIndex": "cu_type",
-                            "width": 200,
-                            "xtype": "",
-                            "items": null
-                        }]
+                            {
+                                "text": "客户ID",
+                                "flex": 0,
+                                "dataIndex": "id",
+                                "width": 0,
+                                "xtype": "",
+                                "items": null
+                            },{
+                                "text": "客户编号",
+                                "flex": 1,
+                                "dataIndex": "cu_code",
+                                "width": 100,
+                                "xtype": "",
+                                "items": null
+                            }, {
+                                "text": "客户名称",
+                                "flex": 1,
+                                "dataIndex": "cu_name",
+                                "xtype": "",
+                                "items": null
+                            }, {
+                                "text": "客户类型",
+                                "flex": 1,
+                                "dataIndex": "cu_type",
+                                "width": 200,
+                                "xtype": "",
+                                "items": null
+                            }, {
+                                "text": "业务员编号",
+                                "flex": 1,
+                                "dataIndex": "cu_sellercode",
+                                "width": 100
+                            }, {
+                                "text": "业务员",
+                                "flex": 1,
+                                "dataIndex": "cu_sellername",
+                                "width": 100
+                            }, {
+                                "text": "税率",
+                                "flex": 1,
+                                "dataIndex": "cu_taxrate",
+                                "width": 100
+                            }, {
+                                "text": "承付天数",
+                                "flex": 1,
+                                "dataIndex": "cu_promisedays",
+                                "width": 100
+                            }, {
+                                "text": "额度",
+                                "flex": 1,
+                                "dataIndex": "cu_credit",
+                                "width": 100
+                            }, {
+                                "text": "客户地址",
+                                "flex": 1,
+                                "dataIndex": "ca_address",
+                                "width": 250
+                            }]
                     }) ;   
                 }
             },
@@ -85,41 +113,77 @@ Ext.define('saas.view.sale.saleout.FormPanelController', {
                         },{
                             field:'pr_detail',width:100
                         }],
-                        dbColumns:[{
-                            "text": "物料ID",
-                            "flex": 0,
-                            "dataIndex": "id",
-                            "width": 0,
-                            "xtype": "",
-                            "items": null
-                        },{
-                            "text": "物料编号",
-                            "flex": 1,
-                            "dataIndex": "pr_code",
-                            "width": 100,
-                            "xtype": "",
-                            "items": null
-                        }, {
-                            "text": "物料名称",
-                            "flex": 1,
-                            "dataIndex": "pr_detail",
-                            "xtype": "",
-                            "items": null
-                        }, {
-                            "text": "物料规格",
-                            "flex": 0,
-                            "dataIndex": "pr_spec",
-                            "width": 200,
-                            "xtype": "",
-                            "items": null
-                        }, {
-                            "text": "物料单位",
-                            "flex": 0,
-                            "dataIndex": "pr_unit",
-                            "width": 200,
-                            "xtype": "",
-                            "items": null
-                        }]
+                        dbColumns:[
+                            {
+                                "text": "物料ID",
+                                "flex": 0,
+                                "dataIndex": "id",
+                                "width": 0,
+                                "xtype": "",
+                                "items": null
+                            },{
+                                "text": "物料编号",
+                                "flex": 1,
+                                "dataIndex": "pr_code",
+                                "width": 100,
+                                "xtype": "",
+                                "items": null
+                            }, {
+                                "text": "物料名称",
+                                "flex": 1,
+                                "dataIndex": "pr_detail",
+                                "xtype": "",
+                                "items": null
+                            }, {
+                                "text": "规格",
+                                "flex": 1,
+                                "dataIndex": "pr_spec",
+                                "width": 200,
+                                "xtype": "",
+                                "items": null
+                            }, {
+                                "text": "单位",
+                                "flex": 1,
+                                "dataIndex": "pr_unit",
+                                "width": 200,
+                                "xtype": "",
+                                "items": null
+                            }, {
+                                "text": "品牌",
+                                "flex": 1,
+                                "dataIndex": "pr_brand",
+                                "width": 200,
+                                "xtype": "",
+                                "items": null
+                            }, {
+                                "text": "供应商ID",
+                                "flex": 0,
+                                "dataIndex": "pr_vendid",
+                                "width": 0,
+                                "xtype": "",
+                                "items": null
+                            }, {
+                                "text": "供应商编号",
+                                "flex": 1,
+                                "dataIndex": "pr_vendcode",
+                                "width": 200,
+                                "xtype": "",
+                                "items": null
+                            }, {
+                                "text": "供应商名称",
+                                "flex": 1,
+                                "dataIndex": "pr_vendname",
+                                "width": 200,
+                                "xtype": "",
+                                "items": null
+                            }, {
+                                "text": "最小包装量",
+                                "flex": 1,
+                                "dataIndex": "pr_zxbzs",
+                                "width": 200,
+                                "xtype": "",
+                                "items": null
+                            }]
                     }) ;   
 
                 }

frontend/saas-web/app/view/sale/saleOut/QueryPanel.js

@@ -33,7 +33,8 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
     }, {
         xtype: 'hidden',
         name: 'pd_prodcode',
-        fieldLabel: '物料编号'
+        fieldLabel: '物料编号',
+        showDetail: true
     }, {
         xtype: 'dbfindtrigger',
         name: 'pr_detail',

frontend/saas-web/app/view/sale/saleOut/QueryPanelController.js

@@ -9,7 +9,7 @@ Ext.define('saas.view.sale.saleout.QueryPanelController', {
             'dbfindtrigger[name=pi_custname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dataUrl:'/api/document/customer/list',
+                        dataUrl:'/api/document/customer/dbfind',
                         addXtype: 'document-customer-formpanel',
                         addTitle: '客户资料',
                         dbfinds:[
@@ -19,6 +19,8 @@ Ext.define('saas.view.sale.saleout.QueryPanelController', {
                             from:'cu_code',to:'pi_custcode'
                         },{
                             from:'cu_name',to:'pi_custname'
+                        },{
+                            from:'ca_address',to:'pi_address'
                         }],
                         dbtpls:[
                         {
@@ -27,38 +29,68 @@ Ext.define('saas.view.sale.saleout.QueryPanelController', {
                             field:'cu_name',width:100
                         }],
                         dbColumns:[
-                        {
-                            conditionCode:'id',
-                            "text": "客户ID",
-                            "flex": 0,
-                            "dataIndex": "id",
-                            "width": 100,
-                            "xtype": "",
-                            "items": null
-                        },{
-                            conditionCode:'cu_code',
-                            "text": "客户编号",
-                            "flex": 1,
-                            "dataIndex": "cu_code",
-                            "width": 100,
-                            "xtype": "",
-                            "items": null
-                        }, {
-                            conditionCode:'cu_name',
-                            "text": "客户名称",
-                            "flex": 1,
-                            "dataIndex": "cu_name",
-                            "xtype": "",
-                            "items": null
-                        }, {
-                            conditionCode:'cu_type',
-                            "text": "客户类型",
-                            "flex": 0,
-                            "dataIndex": "cu_type",
-                            "width": 200,
-                            "xtype": "",
-                            "items": null
-                        }]
+                            {
+                                conditionCode:'id',
+                                "text": "客户ID",
+                                "flex": 0,
+                                "dataIndex": "id",
+                                "width": 0,
+                                "xtype": "",
+                                "items": null
+                            },{
+                                conditionCode:'cu_code',
+                                "text": "客户编号",
+                                "flex": 1,
+                                "dataIndex": "cu_code",
+                                "width": 100,
+                                "xtype": "",
+                                "items": null
+                            }, {
+                                conditionCode:'cu_name',
+                                "text": "客户名称",
+                                "flex": 1,
+                                "dataIndex": "cu_name",
+                                "xtype": "",
+                                "items": null
+                            }, {
+                                conditionCode:'cu_type',
+                                "text": "客户类型",
+                                "flex": 1,
+                                "dataIndex": "cu_type",
+                                "width": 200,
+                                "xtype": "",
+                                "items": null
+                            }, {
+                                "text": "业务员编号",
+                                "flex": 1,
+                                "dataIndex": "cu_sellercode",
+                                "width": 100
+                            }, {
+                                "text": "业务员",
+                                "flex": 1,
+                                "dataIndex": "cu_sellername",
+                                "width": 100
+                            }, {
+                                "text": "税率",
+                                "flex": 1,
+                                "dataIndex": "cu_taxrate",
+                                "width": 100
+                            }, {
+                                "text": "承付天数",
+                                "flex": 1,
+                                "dataIndex": "cu_promisedays",
+                                "width": 100
+                            }, {
+                                "text": "额度",
+                                "flex": 1,
+                                "dataIndex": "cu_credit",
+                                "width": 100
+                            }, {
+                                "text": "客户地址",
+                                "flex": 1,
+                                "dataIndex": "ca_address",
+                                "width": 250
+                            }]
                     }) ;   
 
                 }
@@ -103,19 +135,54 @@ Ext.define('saas.view.sale.saleout.QueryPanelController', {
                             "xtype": "",
                             "items": null
                         }, {
-                            "text": "物料规格",
-                            "flex": 0,
+                            "text": "规格",
+                            "flex": 1,
                             "dataIndex": "pr_spec",
                             "width": 200,
                             "xtype": "",
                             "items": null
                         }, {
-                            "text": "物料单位",
-                            "flex": 0,
+                            "text": "单位",
+                            "flex": 1,
                             "dataIndex": "pr_unit",
                             "width": 200,
                             "xtype": "",
                             "items": null
+                        }, {
+                            "text": "品牌",
+                            "flex": 1,
+                            "dataIndex": "pr_brand",
+                            "width": 200,
+                            "xtype": "",
+                            "items": null
+                        }, {
+                            "text": "供应商ID",
+                            "flex": 0,
+                            "dataIndex": "pr_vendid",
+                            "width": 0,
+                            "xtype": "",
+                            "items": null
+                        }, {
+                            "text": "供应商编号",
+                            "flex": 1,
+                            "dataIndex": "pr_vendcode",
+                            "width": 200,
+                            "xtype": "",
+                            "items": null
+                        }, {
+                            "text": "供应商名称",
+                            "flex": 1,
+                            "dataIndex": "pr_vendname",
+                            "width": 200,
+                            "xtype": "",
+                            "items": null
+                        }, {
+                            "text": "最小包装量",
+                            "flex": 1,
+                            "dataIndex": "pr_zxbzs",
+                            "width": 200,
+                            "xtype": "",
+                            "items": null
                         }]
                     }) ;