Эх сурвалжийг харах

【界面标准化】【采购验退单】【界面标准化处理】【前端处理】

rainco 7 жил өмнө
parent
commit
c5819b8798

+ 4 - 0
frontend/saas-web/app/view/purchase/purchaseIn/QueryPanel.js

@@ -137,6 +137,10 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanel', {
             renderer : function(v) {
                 return saas.util.BaseUtil.numberFormat(v, 2, true);
             }
+        },{
+            text: '币别',
+            dataIndex: 'pi_currency',
+            width: 65
         },{
             text: '审核状态',
             align: 'center',

+ 33 - 7
frontend/saas-web/app/view/purchase/purchaseOut/FormPanel.js

@@ -64,13 +64,6 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
         allowBlank: false,
         columnWidth: 0.25,
         defaultValue: new Date()
-    }, {
-        xtype: "textfield",
-        name: "pi_total",
-        fieldLabel: "价税合计(元)",
-        allowBlank: true,
-        readOnly: true,
-        columnWidth: 0.25
     }, {
         xtype: "hidden",
         name: "pi_puid",
@@ -330,6 +323,39 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
         name: "pi_remark",
         fieldLabel: "备注",
         columnWidth: 1
+    }, {
+        xtype: "textfield",
+        name: "pu_currency",
+        fieldLabel: "币别",
+        readOnly: true,
+        defaultValue: 'RMB'
+    }, {
+        xtype: "textfield",
+        name: "pi_nettotal",
+        fieldLabel: "金额(元)",
+        allowBlank: true,
+        readOnly: true,
+        columnWidth: 0.25
+    }, {
+        xtype: "textfield",
+        name: "pi_total",
+        fieldLabel: "价税合计(元)",
+        allowBlank: true,
+        readOnly: true,
+        columnWidth: 0.25
+    }, {
+        xtype: "hidden",
+        name: "pi_buyercode",
+        fieldLabel: "采购员编号"
+    }, {
+        xtype: "employeeDbfindTrigger",
+        name: "pi_buyername",
+        fieldLabel: "采购员",
+        columnWidth: 0.25
+    }, {
+        xtype: "hidden",
+        name: "pi_buyerid",
+        fieldLabel: "采购员ID"
     }, {
         xtype: "hidden",
         name: "creatorId",

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

@@ -74,6 +74,20 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanelController', {
                     }) ;   
 
                 }
+            } , // 主表-采购员名称
+            'dbfindtrigger[name=pi_buyername]':{
+                beforerender:function(f){
+                    Ext.apply(f,{
+                        //赋值 
+                        dbfinds:[{
+                            from:'id',to:'pi_buyerid',ignore:true
+                        },{
+                            from:'em_code',to:'pi_buyercode'
+                        },{
+                            from:'em_name',to:'pi_buyername'
+                        }]
+                    }) ;   
+                }
             }
         });
 

+ 6 - 2
frontend/saas-web/app/view/purchase/purchaseOut/QueryPanel.js

@@ -144,6 +144,10 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
             xtype: 'numbercolumn',
             dataIndex: 'pi_total',
             width: 110
+        },{
+            text: '币别',
+            dataIndex: 'pi_currency',
+            width: 65
         }, {
             text: '审核状态',
             align: 'center',
@@ -211,7 +215,7 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
             dataIndex: 'pd_whname',
             width: 80
         }, {
-            text: '验退数量',
+            text: '数量',
             dataIndex: 'pd_outqty',
             xtype: 'numbercolumn',
             width: 110,
@@ -287,7 +291,7 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
             width: 150
         }, {
             text: '备注',
-            dataIndex: 'iodetno',
+            dataIndex: 'pd_remark',
             width: 250
         }]
     }