【BUG】【采购验退单物料编号、供应商对账税额、采购关联列表去掉序号】

frontend/saas-web/app/model/report/VendorCheck.js

@@ -16,7 +16,7 @@ Ext.define('saas.model.report.VendorCheck', {
         { name: 'pd_netprice', type: 'float' }, // 单价
         { name: 'pd_nettotal', type: 'float' }, // 金额
         { name: 'pd_taxrate', type: 'float' }, // 税率
-        { name: 'pd_ordertotal-pi_nettotal', type: 'float', // 税额
+        { name: 'pd_ordertotal-pd_nettotal', type: 'float', // 税额
             convert: function(v, rec) {
                 var t = (rec.get('pd_ordertotal') || 0.0) - (rec.get('pd_nettotal') || 0.0);
                 return Number(saas.util.BaseUtil.numberFormat(t, 2, false));

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

@@ -85,10 +85,7 @@ Ext.define('saas.view.money.report.VendorCheck', {
         xtype: 'numbercolumn',
         width: 110,
         renderer: function(v) {
-            var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length > 3 ? 3 : arr[1].length)).fill('0');
-            var format = '0.' + xr.join('');
-            return Ext.util.Format.number(v, format);
+            return saas.util.BaseUtil.numberFormat(v, 3, true);
         }
     }, {
         text: '单位',
@@ -101,10 +98,7 @@ Ext.define('saas.view.money.report.VendorCheck', {
         xtype: 'numbercolumn',
         width: 120,
         renderer: function(v) {
-            var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length > 4 ? 4 : arr[1].length)).fill('0');
-            var format = '0,000.' + xr.join('');
-            return Ext.util.Format.number(v, format);
+            return saas.util.BaseUtil.numberFormat(v, 4, true);
         }
     }, {
         text: '含税单价(元)',
@@ -113,10 +107,7 @@ Ext.define('saas.view.money.report.VendorCheck', {
         xtype: 'numbercolumn',
         width: 120,
         renderer: function(v) {
-            var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length > 4 ? 4 : arr[1].length)).fill('0');
-            var format = '0,000.' + xr.join('');
-            return Ext.util.Format.number(v, format);
+            return saas.util.BaseUtil.numberFormat(v, 4, true);
         }
     }, {
         text: '金额(元)',
@@ -125,10 +116,7 @@ Ext.define('saas.view.money.report.VendorCheck', {
         xtype: 'numbercolumn',
         width: 120,
         renderer : function(v) {
-            var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
-            var format = '0,000.' + xr.join('');
-            return Ext.util.Format.number(v, format);
+            return saas.util.BaseUtil.numberFormat(v, 2, true);
         },
     }, {
         text: '税率(%)',
@@ -137,10 +125,7 @@ Ext.define('saas.view.money.report.VendorCheck', {
         xtype: 'numbercolumn',
         width: 80,
         renderer : function(v) {
-            var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
-            var format = '0,000.' + xr.join('');
-            return Ext.util.Format.number(v, format);
+            return saas.util.BaseUtil.numberFormat(v, 2, true);
         },
     }, {
         text: '税额(元)',
@@ -149,10 +134,7 @@ Ext.define('saas.view.money.report.VendorCheck', {
         dataIndex: 'pd_ordertotal-pd_nettotal',
         width: 120,
         renderer : function(v) {
-            var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
-            var format = '0,000.' + xr.join('');
-            return Ext.util.Format.number(v, format);
+            return saas.util.BaseUtil.numberFormat(v, 2, true);
         },
     }, {
         text: '价税合计(元)',
@@ -161,10 +143,7 @@ Ext.define('saas.view.money.report.VendorCheck', {
         dataIndex: 'pd_ordertotal',
         width: 120,
         renderer : function(v) {
-            var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
-            var format = '0,000.' + xr.join('');
-            return Ext.util.Format.number(v, format);
+            return saas.util.BaseUtil.numberFormat(v, 2, true);
         },
     }],
 

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

@@ -183,14 +183,6 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
             align: 'center',
             dataIndex: 'pu_status',
             width: 80
-        }, {
-            text: '序号',
-            dataIndex: 'pd_detno',
-            xtype: 'numbercolumn',
-            width: 65, 
-            renderer : function(v) {
-                return Ext.util.Format.number(v, '0');
-            }
         }, {
             text: '物料编号',
             dataIndex: 'pd_prodcode',

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

@@ -174,14 +174,14 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanel', {
             width: 80
         },{
             text: '物料编号',
-            dataIndex: 'pd_prodcode',
+            dataIndex: 'pr_code',
             width: 150
         },{
             text: '品牌',
             dataIndex: 'pr_brand',
             width: 100
         },{
-            text: '名称',
+            text: '物料名称',
             dataIndex: 'pr_detail',
             width: 150
         },{