采购列表标准化

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

@@ -113,22 +113,43 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
         },{
             text: '供应商名称',
             dataIndex: 'pu_vendname',
-            width:250
+            width:200
         }, {
-            text: '总金额',
+            text: '金额(元)',
+            dataIndex: 'pu_taxtotal',
+            xtype: 'numbercolumn',
+            width: 110,
+            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);
+            }
+        }, {
+            text: '价税合计(元)',
             dataIndex: 'pu_total',
             xtype: 'numbercolumn',
-            width: 110
+            width: 110,
+            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);
+            }
         }, {
             text: '审核状态',
             align: 'center',
             dataIndex: 'pu_status',
-            width: 90
+            width: 80
         },{
             text: '业务状态',
             align: 'center',
             dataIndex: 'pu_acceptstatus',
-            width: 90
+            width: 80
+        },{
+            text: '采购员',
+            dataIndex: 'pu_buyername',
+            width: 80
         },{
             text: '关联销售单',
             dataIndex: 'pu_sacode',
@@ -156,22 +177,17 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
         },{
             text: '供应商名称',
             dataIndex: 'pu_vendname',
-            width: 150
+            width: 200
         }, {
             text: '审核状态',
             align: 'center',
             dataIndex: 'pu_status',
-            width: 90
-        },{
-            text: '业务状态',
-            align: 'center',
-            dataIndex: 'pu_acceptstatus',
-            width: 90
+            width: 80
         }, {
             text: '序号',
             dataIndex: 'pd_detno',
             xtype: 'numbercolumn',
-            width: 80, 
+            width: 65, 
             renderer : function(v) {
                 return Ext.util.Format.number(v, '0');
             }
@@ -182,11 +198,11 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
         },{
             text: '品牌',
             dataIndex: 'pr_brand',
-            width: 150
+            width: 100
         },{
-            text: '名称',
+            text: '物料名称',
             dataIndex: 'pr_detail',
-            width: 200
+            width: 150
         },{
             text: '型号',
             dataIndex: 'pr_orispeccode',
@@ -194,7 +210,7 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
         },{
             text: '规格',
             dataIndex: 'pr_spec',
-            width: 150
+            width: 200
         },{
             text: '采购数量',
             dataIndex: 'pd_qty',
@@ -209,10 +225,10 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
         }, {
             text: '单位',
             dataIndex: 'pr_unit',
-            width: 80
+            width: 65
         }, {
             text: '单价(元)',
-            dataIndex: 'pd_price',
+            dataIndex: 'pd_taxprice',
             xtype: 'numbercolumn',
             width: 110,
             renderer : function(v) {
@@ -221,21 +237,31 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
                 var format = '0,000.' + xr.join('');
                 return Ext.util.Format.number(v, format);
             }
-        }, {
-            text: '需求日期',
-            dataIndex: 'pd_delivery',
-            xtype: 'datecolumn',
-            width: 110
-        }, {
-            text: '税率',
-            dataIndex: 'pd_taxrate',
+        },{
+            text: '金额(元)',
+            dataIndex: 'pd_taxtotal',
             xtype: 'numbercolumn',
-            width: 80,
+            width: 110,
             renderer : function(v) {
-                return Ext.util.Format.number(v, '0');
-            },
+                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);
+            }
+        },{
+            text: '税额',
+            dataIndex: 'pd_taxamount',
+            xtype: 'numbercolumn',
+            width: 110,
+            renderer : function(v,g,r) {
+                v = (r.data["pd_total"]||0.0) - (r.data["pd_taxtotal"]||0.0);
+                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);
+            }
         },{
-            text: '金额',
+            text: '价税合计(元)',
             dataIndex: 'pd_total',
             xtype: 'numbercolumn',
             width: 110,
@@ -245,7 +271,11 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
                 var format = '0,000.' + xr.join('');
                 return Ext.util.Format.number(v, format);
             }
-        },{
+        }, {
+            text: '关联销售单号',
+            dataIndex: 'pd_salecode',
+            width: 150
+        }, {
             text: '备注',
             dataIndex: 'pd_remark',
             width: 250