【界面标准化】【处理盘点单、采购单、销售订单、收款单、盘点单】

frontend/saas-web/app/view/document/product/FormPanel.js

@@ -244,7 +244,7 @@ Ext.define('saas.view.document.product.FormPanel', {
                 xtype : "detailGridField", 
                 storeModel:'saas.model.document.ProductDetail',
                 detnoColumn: 'pd_detno',
-                emptyRows: 1,
+                emptyRows: 3,
                 showCount: true,
                 allowEmpty:true,
                 // hidden: true,

frontend/saas-web/app/view/document/vendor/FormPanel.js

@@ -220,7 +220,7 @@ Ext.define('saas.view.document.vendor.FormPanel', {
             },{
                 xtype : "textfield", 
                 name : "ve_address", 
-                fieldLabel : "地址", 
+                fieldLabel : "公司地址", 
                 allowBlank : true, 
                 columnWidth : 0.75
             },{

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

@@ -56,16 +56,19 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
                 xtype: "numberfield",
                 name: "cu_leftamount",
                 fieldLabel: "总欠款",
+                thousandSeparator: ',',
                 ignore: true,
                 readOnly: true
             }, {
                 xtype: 'hidden',
                 name: 'rb_rbdamount',
-                fieldLabel: '本次核销金额(元)'
+                fieldLabel: '本次核销金额(元)',
+                thousandSeparator: ','
             }, {
                 xtype: 'hidden',
                 name: 'rb_rdamount',
                 fieldLabel: '本次付款金额(元)',
+                thousandSeparator: ','
             }, {
                 xtype: "datefield",
                 name: "rb_date",

frontend/saas-web/app/view/money/report/ProfitDetail.js

@@ -29,7 +29,7 @@ Ext.define('saas.view.money.report.ProfitDetail', {
         xtype : "remotecombo", 
         storeUrl:'/api/document/customerkind/getCombo',
         name : "cu_type", 
-        emptyText : "客户类型", 
+        emptyText : "请选择客户类型", 
         columnWidth: 0.15,
         hiddenBtn:true
     }, {

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

@@ -219,6 +219,14 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
             renderer : function(v) {
                 return saas.util.BaseUtil.numberFormat(v, 4, true);
             }
+        }, {
+            text: '含税单价(元)',
+            dataIndex: 'pd_price',
+            xtype: 'numbercolumn',
+            width: 110,
+            renderer : function(v) {
+                return saas.util.BaseUtil.numberFormat(v, 4, true);
+            }
         },{
             text: '金额(元)',
             dataIndex: 'pd_taxtotal',

frontend/saas-web/app/view/purchase/report/Purchase.js

@@ -93,19 +93,6 @@ Ext.define('saas.view.purchase.report.Purchase', {
         text: '规格',
         dataIndex: 'pr_spec',
         width: 200
-    }, {
-        text: '采购数量',
-        dataIndex: 'pd_qty',
-        xtype: 'numbercolumn',
-        exportFormat: 'Quantity',
-        width: 110,
-        summaryType: 'sum',
-        renderer: function (v) {
-            return saas.util.BaseUtil.numberFormat(v, 3, false);
-        },
-        summaryRenderer: function (v) {
-            return saas.util.BaseUtil.numberFormat(v, 3, false);
-        }
     }, {
         text: '收货数量',
         dataIndex: 'pd_pdacceptqty',
@@ -120,6 +107,19 @@ Ext.define('saas.view.purchase.report.Purchase', {
         summaryRenderer: function (v) {
             return saas.util.BaseUtil.numberFormat(v, 3, true);
         }
+    }, {
+        text: '采购数量',
+        dataIndex: 'pd_qty',
+        xtype: 'numbercolumn',
+        exportFormat: 'Quantity',
+        width: 110,
+        summaryType: 'sum',
+        renderer: function (v) {
+            return saas.util.BaseUtil.numberFormat(v, 3, false);
+        },
+        summaryRenderer: function (v) {
+            return saas.util.BaseUtil.numberFormat(v, 3, false);
+        }
     }, {
         text: '单位',
         dataIndex: 'pr_unit',

frontend/saas-web/app/view/sale/report/Sale.js

@@ -18,11 +18,6 @@ Ext.define('saas.view.sale.report.Sale', {
         name: 'sa_custname',
         emptyText:'请输入客户名称',
         columnWidth: 0.2
-    }, {
-        xtype: 'condatefield',
-        name: 'sa_date',
-        fieldLabel: '日期',
-        columnWidth: 0.4
     }, {
         xtype: 'multicombo',
         name: 'sa_sendstatuscode',
@@ -35,6 +30,11 @@ Ext.define('saas.view.sale.report.Sale', {
             ["PARTOUT", "部分出库"],
             ["CLOSE", "已关闭"]
         ]
+    }, {
+        xtype: 'condatefield',
+        name: 'sa_date',
+        fieldLabel: '日期',
+        columnWidth: 0.4
     }],
     reportModel: 'saas.model.report.Sale',
     reportColumns: [
@@ -94,9 +94,9 @@ Ext.define('saas.view.sale.report.Sale', {
         text: '规格',
         dataIndex: 'pr_spec',
         width: 200
-    }, {
-        text: '销售数量',
-        dataIndex: 'sd_qty',
+    },{
+        text: '出货数量',
+        dataIndex: 'sd_pdsendqty',
         exportFormat: 'Quantity',
         xtype: 'numbercolumn',
         width: 110,
@@ -104,13 +104,13 @@ Ext.define('saas.view.sale.report.Sale', {
             return saas.util.BaseUtil.numberFormat(v, 3, false);
         },
         summaryType: 'sum',
-        summaryLabel: '销售数量',
+        summaryLabel: '出货数量',
         summaryRenderer: function(v) {
             return saas.util.BaseUtil.numberFormat(v, 3, false);
         }
-    },{
-        text: '出货数量',
-        dataIndex: 'sd_pdsendqty',
+    }, {
+        text: '销售数量',
+        dataIndex: 'sd_qty',
         exportFormat: 'Quantity',
         xtype: 'numbercolumn',
         width: 110,
@@ -118,7 +118,7 @@ Ext.define('saas.view.sale.report.Sale', {
             return saas.util.BaseUtil.numberFormat(v, 3, false);
         },
         summaryType: 'sum',
-        summaryLabel: '出货数量',
+        summaryLabel: '销售数量',
         summaryRenderer: function(v) {
             return saas.util.BaseUtil.numberFormat(v, 3, false);
         }

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

@@ -227,6 +227,14 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
             renderer : function(v) {
                 return saas.util.BaseUtil.numberFormat(v, 4, true);
             },
+        }, {
+            text: '含税单价(元)',
+            dataIndex: 'sd_price',
+            xtype: 'numbercolumn',
+            width: 110,
+            renderer : function(v) {
+                return saas.util.BaseUtil.numberFormat(v, 4, true);
+            }
         }, {
             text: '金额(元)',
             dataIndex: 'sd_nettotal',

frontend/saas-web/app/view/stock/inventory/EditDataList.js

@@ -57,7 +57,7 @@ Ext.define('saas.view.stock.inventory.EditDataList', {
         storeUrl:'/api/document/producttype/getCombo',
         name : "pr_kind",
         bind: '{form.pr_kind}',
-        emptyText : "物料类型",
+        emptyText : "请选择物料类型",
         hiddenBtn:true,
         //width:150
     },{