销售出货退货界面调整：放大镜模糊查询，主表备注字段，关联查询id字段宽度优化

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

@@ -14,7 +14,7 @@ Ext.define('saas.view.sale.sale.FormPanelController', {
                         defaultCondition:"cu_statuscode='OPEN'",
                         dbfinds:[
                             {
-                                from:'id',to:'sa_custid'
+                                from:'id',to:'sa_custid',ignore:true
                             },{
                                 from:'cu_code',to:'sa_custcode'
                             },{
@@ -113,7 +113,7 @@ Ext.define('saas.view.sale.sale.FormPanelController', {
                         addTitle: '物料资料',
                         dbfinds:[
                         {
-                            from:'pr_code',to:'sd_prodcode'
+                            from:'pr_code',to:'sd_prodcode',ignore:true
                         }, {
                             from:'pr_detail',to:'pr_detail'
                         }, {

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

@@ -16,6 +16,11 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
         xtype: 'textfield',
         name: 'sa_code',
         fieldLabel: '销售编号'
+    }, {
+        xtype: 'condatefield',
+        name: 'sa_recorddate',
+        fieldLabel: '单据日期',
+        columnWidth: 0.5
     }, {
         xtype: 'hidden',
         name: 'sa_custcode',

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

@@ -11,8 +11,9 @@ Ext.define('saas.view.sale.sale.QueryPanelController', {
                         dataUrl:'/api/document/customer/dbfind',
                         addXtype: 'document-customer-formpanel',
                         addTitle: '客户资料',
+                        defaultCondition:"cu_statuscode='OPEN'",
                         dbfinds:[{
-                            from:'cu_id',to:'sa_custid'
+                            from:'cu_id',to:'sa_custid',ignore:true
                         },{
                             from:'cu_code',to:'sa_custcode'
                         },{
@@ -23,38 +24,79 @@ Ext.define('saas.view.sale.sale.QueryPanelController', {
                         },{
                             field:'cu_name',width:100
                         }],
-                        dbColumns:[{
-                            conditionCode:'cu_id',
-                            "text": "客户ID",
-                            "flex": 0,
-                            "dataIndex": "cu_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": 0,
-                            "dataIndex": "cu_type",
-                            "width": 200,
-                            "xtype": "",
-                            "items": null
-                        }]
+                        dbSearchFields:[{
+                            emptyText:'输入客户编号或客户名称',
+                            xtype : "textfield", 
+                            name : "search", 
+                            getCondition: function(v) {
+                                return "(upper(cu_code) like '%"+v.toUpperCase()+"%' or upper(cu_name) like '%"+v.toUpperCase()+"%')";
+                            },
+                            allowBlank : true, 
+                            columnWidth : 0.25
+                        }],
+                        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
+                            }]
                     }) ;   
 
                 }

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

@@ -239,8 +239,13 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
     }, {
         xtype : "textfield", 
         name : "pi_total", 
-        fieldLabel : "总额", 
+        fieldLabel : "单据金额", 
         readOnly: true
+    }, {
+        xtype : "textfield", 
+        name : "pi_remark", 
+        fieldLabel : "备注", 
+        columnWidth : 0.75
     }, {
         xtype : "textfield", 
         name : "pi_recordman", 

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

@@ -14,7 +14,7 @@ Ext.define('saas.view.sale.saleIn.FormPanelController', {
                         defaultCondition:"cu_statuscode='OPEN'",
                         dbfinds:[
                             {
-                                from:'id',to:'pi_custid'
+                                from:'id',to:'pi_custid',ignore:true
                             },{
                                 from:'cu_code',to:'pi_custcode'
                             },{
@@ -112,7 +112,7 @@ Ext.define('saas.view.sale.saleIn.FormPanelController', {
                         addTitle: '物料资料',
                         dbfinds:[
                         {
-                            from:'id',to:'pd_prodid'
+                            from:'id',to:'pd_prodid',ignore:true
                         },
                         {
                             from:'pr_code',to:'pd_prodcode'
@@ -210,7 +210,7 @@ Ext.define('saas.view.sale.saleIn.FormPanelController', {
                         addXtype: 'other-storeinformation',
                         addTitle: '仓库资料',
                         dbfinds:[{
-                            from:'id',to:'pd_whid',
+                            from:'id',to:'pd_whid',ignore:true
                         }, { 
                             from:'wh_code',to:'pd_whcode'
                         }, {
@@ -221,6 +221,18 @@ Ext.define('saas.view.sale.saleIn.FormPanelController', {
                         },{
                             field:'wh_description',width:100
                         }],
+                        defaultCondition: "wh_statuscode='OPEN'",
+                        dbSearchFields:[{
+                            emptyText:'输入物料编号、名称或规格',
+                            xtype : "textfield", 
+                            name : "search", 
+                            width: 200,
+                            getCondition: function(v) {
+                                return "(upper(wh_code) like '%" + v.toUpperCase()+"%' or upper(wh_description) like '%"+v.toUpperCase()+"%')";
+                            },
+                            allowBlank : true, 
+                            columnWidth : 0.25
+                        }],
                         dbColumns:[{
                             "text": "仓库ID",
                             "flex": 0,

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

@@ -81,7 +81,7 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
             dataIndex: 'pi_inoutno',
             width: 200
         }, {
-            text: '单据状态',
+            text: '审核状态',
             dataIndex: 'pi_status',
             width: 120
         }, {
@@ -110,8 +110,12 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
             text: '未税金额',
             dataIndex: 'pi_nettotal',
             xtype:'numbercolumn',
-            width: 120,
-            flex: 1
+            width: 120
+        }, {
+            text: '备注',
+            dataIndex: 'pi_remark',
+            width: 250,
+            flex:1
         }],
         relativeColumn: [{
             text: 'id',
@@ -172,8 +176,12 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
             text: '成本单价',
             dataIndex: 'pd_price',
             xtype:'numbercolumn',
-            width: 120,
-            flex: 1
+            width: 120
+        }, {
+            text: '备注',
+            dataIndex: 'pd_remark',
+            width: 250,
+            flex:1
         }]
     }
 });

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

@@ -11,53 +11,84 @@ Ext.define('saas.view.sale.saleIn.QueryPanelController', {
                         dataUrl:'/api/document/customer/dbfind',
                         addXtype: 'document-customer-formpanel',
                         addTitle: '客户资料',
+                        defaultCondition:"cu_statuscode='OPEN'",
                         dbfinds:[
                         {
-                            from:'id',to:'pi_custid'
+                            from:'id',to:'pi_custid',ignore:true
                         },{
                             from:'cu_code',to:'pi_custcode'
                         },{
                             from:'cu_name',to:'pi_custname'
                         }],
-                        dbtpls:[
-                        {
-                            field:'cu_code',width:100
-                        },{
-                            field:'cu_name',width:100
+                        dbSearchFields:[{
+                            emptyText:'输入客户编号或客户名称',
+                            xtype : "textfield", 
+                            name : "search", 
+                            getCondition: function(v) {
+                                return "(upper(cu_code) like '%"+v.toUpperCase()+"%' or upper(cu_name) like '%"+v.toUpperCase()+"%')";
+                            },
+                            allowBlank : true, 
+                            columnWidth : 0.25
                         }],
                         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
+                            }]
                     }) ;   
 
                 }
@@ -71,7 +102,7 @@ Ext.define('saas.view.sale.saleIn.QueryPanelController', {
                         addXtype: 'document-product-formpanel',
                         addTitle: '物料资料',
                         dbfinds:[{
-                            from:'pr_code',to:'pd_prodcode'
+                            from:'pr_code',to:'pd_prodcode',ignore:true
                         }, {
                             from:'pr_detail',to:'pr_detail'
                         }],

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

@@ -244,8 +244,13 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
     }, {
         xtype : "textfield", 
         name : "pi_total", 
-        fieldLabel : "总额", 
+        fieldLabel : "单据金额", 
         readOnly: true
+    }, {
+        xtype : "textfield", 
+        name : "pi_remark", 
+        fieldLabel : "备注", 
+        columnWidth : 0.75
     }, {
         xtype : "textfield", 
         name : "pi_recordman", 

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

@@ -15,7 +15,7 @@ Ext.define('saas.view.sale.saleout.FormPanelController', {
                         defaultCondition:"cu_statuscode='OPEN'",
                         dbfinds:[
                         {
-                            from:'id',to:'pi_custid'
+                            from:'id',to:'pi_custid',ignore:true 
                         },{
                             from:'cu_code',to:'pi_custcode'
                         },{
@@ -108,9 +108,8 @@ Ext.define('saas.view.sale.saleout.FormPanelController', {
                         dataUrl:'/api/document/product/list',
                         addXtype: 'document-product-formpanel',
                         addTitle: '物料资料',
-                        dbfinds:[
-                        {
-                            from:'id',to:'pd_prodid'
+                        dbfinds:[{
+                            from:'id',to:'pd_prodid',ignore:true 
                         },
                         {
                             from:'pr_code',to:'pd_prodcode'
@@ -209,7 +208,7 @@ Ext.define('saas.view.sale.saleout.FormPanelController', {
                         addXtype: 'other-storeinformation',
                         addTitle: '仓库资料',
                         dbfinds:[{
-                            from:'id',to:'pd_whid',
+                            from:'id',to:'pd_whid',ignore:true 
                         }, { 
                             from:'wh_code',to:'pd_whcode'
                         }, {
@@ -220,6 +219,18 @@ Ext.define('saas.view.sale.saleout.FormPanelController', {
                         },{
                             field:'wh_description',width:100
                         }],
+                        defaultCondition: "wh_statuscode='OPEN'",
+                        dbSearchFields:[{
+                            emptyText:'输入物料编号、名称或规格',
+                            xtype : "textfield", 
+                            name : "search", 
+                            width: 200,
+                            getCondition: function(v) {
+                                return "(upper(wh_code) like '%" + v.toUpperCase()+"%' or upper(wh_description) like '%"+v.toUpperCase()+"%')";
+                            },
+                            allowBlank : true, 
+                            columnWidth : 0.25
+                        }],
                         dbColumns:[{
                             "text": "仓库ID",
                             "flex": 0,

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

@@ -31,12 +31,12 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
         name: 'pi_custname',
         fieldLabel: '客户名称'
     }, {
-        xtype: 'hidden',
+        xtype: 'dbfindtrigger',
         name: 'pd_prodcode',
         fieldLabel: '物料编号',
         showDetail: true
     }, {
-        xtype: 'dbfindtrigger',
+        xtype: 'textfield',
         name: 'pr_detail',
         fieldLabel: '物料名称',
         showDetail: true
@@ -81,7 +81,7 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
             dataIndex: 'pi_inoutno',
             width: 200
         }, {
-            text: '单据状态',
+            text: '审核状态',
             dataIndex: 'pi_status',
             width: 120
         },{
@@ -111,10 +111,15 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
             dataIndex: 'pi_nettotal',
             xtype:'numbercolumn',
             width: 120
+        }, {
+            text: '备注',
+            dataIndex: 'pi_remark',
+            width: 250,
+            flex:1
         }],
         relativeColumn: [{
             text: 'id',
-            dataIndex: 'pi_id',
+            dataIndex: 'id',
             width: 100,
             xtype: 'numbercolumn'
         }, {
@@ -176,8 +181,12 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
             text: '成本单价',
             dataIndex: 'pd_price',
             xtype:'numbercolumn',
-            width: 120,
-            flex: 1
+            width: 120
+        }, {
+            text: '备注',
+            dataIndex: 'pd_remark',
+            width: 250,
+            flex:1
         }]
     }
 });

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

@@ -12,15 +12,16 @@ Ext.define('saas.view.sale.saleout.QueryPanelController', {
                         dataUrl:'/api/document/customer/dbfind',
                         addXtype: 'document-customer-formpanel',
                         addTitle: '客户资料',
+                        defaultCondition:"cu_statuscode='OPEN'",
                         dbfinds:[
                         {
-                            from:'id',to:'pi_custid'
+                            from:'id',to:'pi_custid',ignore:true
                         },{
                             from:'cu_code',to:'pi_custcode'
                         },{
                             from:'cu_name',to:'pi_custname'
                         },{
-                            from:'ca_address',to:'pi_address'
+                            from:'ca_address',to:'ca_address'
                         }],
                         dbtpls:[
                         {
@@ -28,9 +29,18 @@ Ext.define('saas.view.sale.saleout.QueryPanelController', {
                         },{
                             field:'cu_name',width:100
                         }],
+                        dbSearchFields:[{
+                            emptyText:'输入客户编号或客户名称',
+                            xtype : "textfield", 
+                            name : "search", 
+                            getCondition: function(v) {
+                                return "(upper(cu_code) like '%"+v.toUpperCase()+"%' or upper(cu_name) like '%"+v.toUpperCase()+"%')";
+                            },
+                            allowBlank : true, 
+                            columnWidth : 0.25
+                        }],
                         dbColumns:[
                             {
-                                conditionCode:'id',
                                 "text": "客户ID",
                                 "flex": 0,
                                 "dataIndex": "id",
@@ -38,7 +48,6 @@ Ext.define('saas.view.sale.saleout.QueryPanelController', {
                                 "xtype": "",
                                 "items": null
                             },{
-                                conditionCode:'cu_code',
                                 "text": "客户编号",
                                 "flex": 1,
                                 "dataIndex": "cu_code",
@@ -46,14 +55,12 @@ Ext.define('saas.view.sale.saleout.QueryPanelController', {
                                 "xtype": "",
                                 "items": null
                             }, {
-                                conditionCode:'cu_name',
                                 "text": "客户名称",
                                 "flex": 1,
                                 "dataIndex": "cu_name",
                                 "xtype": "",
                                 "items": null
                             }, {
-                                conditionCode:'cu_type',
                                 "text": "客户类型",
                                 "flex": 1,
                                 "dataIndex": "cu_type",
@@ -95,10 +102,10 @@ Ext.define('saas.view.sale.saleout.QueryPanelController', {
 
                 }
             },
+            // 物料编号
             'dbfindtrigger[name=pd_prodcode]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        conditionCode:'pr_code',
                         dataUrl:'/api/document/product/list',
                         addXtype: 'document-product-formpanel',
                         addTitle: '物料资料',