【界面标准化】【销售模块】

frontend/saas-web/app/view/core/dbfind/types/CustomerDbfindTrigger.js

@@ -63,7 +63,7 @@ Ext.define('saas.view.core.dbfind.types.CustomerDbfindTrigger', {
     }, {
         text: "业务员",
         dataIndex: "cu_sellername",
-        width:110
+        width:100
     }, {
         text: "备注",
         dataIndex: "cu_remark",

frontend/saas-web/app/view/core/dbfind/types/VendorDbfindTrigger.js

@@ -58,6 +58,18 @@ Ext.define('saas.view.core.dbfind.types.VendorDbfindTrigger', {
         renderer : function(v) {
             return saas.util.BaseUtil.numberFormat(v, 2, false);
         }
+    }, {
+        text: "采购员编号",
+        dataIndex: "ve_buyercode",
+        width:150
+    }, {
+        text: "采购员",
+        dataIndex: "ve_buyername",
+        width:100
+    }, {
+        text: "采购员ID",
+        dataIndex: "ve_buyerid",
+        hidden:true
     }, {
         text: "备注",
         dataIndex: "ve_remark",

frontend/saas-web/app/view/purchase/purchaseIn/FormPanelController.js

@@ -21,6 +21,12 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanelController', {
                             from:'ve_code',to:'pi_vendcode'
                         },{
                             from:'ve_name',to:'pi_vendname'
+                        },{
+                            from:'ve_buyerid',to:'pi_buyerid'
+                        },{
+                            from:'ve_buyercode',to:'pi_buyercode'
+                        },{
+                            from:'ve_buyername',to:'pi_buyername'
                         }],
                     }) ;   
 

frontend/saas-web/app/view/purchase/purchaseOut/FormPanelController.js

@@ -21,6 +21,12 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanelController', {
                             from:'ve_code',to:'pi_vendcode'
                         },{
                             from:'ve_name',to:'pi_vendname'
+                        },{
+                            from:'ve_buyerid',to:'pi_buyerid'
+                        },{
+                            from:'ve_buyercode',to:'pi_buyercode'
+                        },{
+                            from:'ve_buyername',to:'pi_buyername'
                         }],
                     }) ;   
 

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

@@ -19,7 +19,7 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
         xtype: 'productDbfindTrigger',
         name: 'pr_detail',
         showDetail: true,
-        emptyText:'输入物料编号或名称'
+        emptyText:'输入物料编号、名称或型号'
     }, {
         xtype: 'condatefield',
         name: 'sa_date',

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

@@ -12,6 +12,8 @@ Ext.define('saas.view.sale.sale.QueryPanelController', {
                             from:'pr_code',to:'sd_prodcode'
                         },{
                             from:'pr_detail',to:'pr_detail'
+                        }, {
+                            from:'pr_orispeccode',to:'pr_orispeccode'
                         }],
                     }) ;   
 

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

@@ -85,6 +85,13 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
             }
             return me;
         }
+    }, {
+        xtype : "datefield", 
+        name : "pi_date", 
+        fieldLabel : "单据日期", 
+        allowBlank : false, 
+        columnWidth : 0.25,
+        defaultValue: new Date()
     }, {
         columnWidth : 0.5,
         name : "pi_address", 
@@ -94,13 +101,6 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
         allowBlank : false, 
         storeUrl:'/api/document/customer/getAddressCombo',
         hiddenBtn:true,//true 则会关闭新增按钮功能
-    }, {
-        xtype : "datefield", 
-        name : "pi_date", 
-        fieldLabel : "单据日期", 
-        allowBlank : false, 
-        columnWidth : 0.25,
-        defaultValue: new Date()
     }, {
         name : "detailGridField", 
         xtype : "detailGridField", 

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

@@ -19,7 +19,7 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
         xtype: 'productDbfindTrigger',
         name: 'pr_detail',
         showDetail: true,
-        emptyText:'输入物料编号或名称',
+        emptyText:'输入物料编号、名称或型号'
     },{
         xtype: 'condatefield',
         name: 'pi_date',

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

@@ -12,6 +12,8 @@ Ext.define('saas.view.sale.saleIn.QueryPanelController', {
                             from:'pr_code',to:'pd_prodcode'
                         }, {
                             from:'pr_detail',to:'pr_detail'
+                        }, {
+                            from:'pr_orispeccode',to:'pr_orispeccode'
                         }],
                     }) ;   
 

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

@@ -94,6 +94,13 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
             }
             return me;
         }
+    }, {
+        xtype: "datefield",
+        name: "pi_date",
+        fieldLabel: "单据日期",
+        allowBlank: false,
+        columnWidth: 0.25,
+        defaultValue: new Date()
     }, {
         columnWidth: 0.5,
         name: "pi_address",
@@ -103,13 +110,6 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
         allowBlank: false,
         storeUrl: '/api/document/customer/getAddressCombo',
         hiddenBtn: true, //true 则会关闭新增按钮功能
-    }, {
-        xtype: "datefield",
-        name: "pi_date",
-        fieldLabel: "单据日期",
-        allowBlank: false,
-        columnWidth: 0.25,
-        defaultValue: new Date()
     }, {
         name: "detailGridField",
         xtype: "detailGridField",

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

@@ -19,7 +19,7 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
         xtype: 'productDbfindTrigger',
         name: 'pr_detail',
         showDetail: true,
-        emptyText:'输入物料编号或名称',
+        emptyText:'输入物料编号、名称或型号'
     }, {
         xtype: 'condatefield',
         name: 'pi_date',

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

@@ -13,6 +13,8 @@ Ext.define('saas.view.sale.saleout.QueryPanelController', {
                             from:'pr_code',to:'pd_prodcode'
                         }, {
                             from:'pr_detail',to:'pr_detail'
+                        }, {
+                            from:'pr_orispeccode',to:'pr_orispeccode'
                         }],
                     }) ;