销售列表标准化

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

@@ -108,16 +108,23 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
             dataIndex: 'sa_date',
             xtype: 'datecolumn',
             width: 110
-        }, {
-            text: '客户编号',
-            dataIndex: 'sa_custcode',
-            hidden :true
         }, {
             text: '客户名称',
             dataIndex: 'sa_custname',
-            width: 250
+            width: 200
         }, {
-            text: '总金额',
+            text: '金额(元)',
+            dataIndex: 'sa_nettotal',
+            width: 110,
+            xtype: 'numbercolumn',
+            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: 'sa_total',
             width: 110,
             xtype: 'numbercolumn',
@@ -131,20 +138,16 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
             text: '审核状态',
             align: 'center',
             dataIndex: 'sa_status',
-            width: 90
+            width: 80
         }, {
             text: '业务状态',
             align: 'center',
             dataIndex: 'sa_sendstatus',
-            width: 100
+            width: 80
         }, {
             text: '业务员',
             dataIndex: 'sa_seller',
-            width: 110
-        }, {
-            text: '收货地址',
-            dataIndex: 'sa_toplace',
-            hidden :true
+            width: 80
         }, {
             text: '备注',
             dataIndex: 'sa_remark',
@@ -157,48 +160,39 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
             hidden:true,
             xtype: 'numbercolumn'
         }, {
-            text: '单据编号',
+            text: '销售单号',
             dataIndex: 'sa_code',
-            width: 200
-        }, {
-            text: '单据状态',
-            align: 'center',
-            dataIndex: 'sa_status',
-            width: 120
+            width: 150
         }, {
             text: '单据日期',
             dataIndex: 'sa_date',
             xtype: 'datecolumn',
-            width: 200
+            width: 110
         }, {
             text: '客户名称',
             dataIndex: 'sa_custname',
-            width: 120
-        },  {
-            text: '业务状态',
+            width: 200
+        }, {
+            text: '审核状态',
             align: 'center',
-            dataIndex: 'sa_sendstatus',
-            width: 90
+            dataIndex: 'sa_status',
+            width: 80
         }, {
-            text: '明细序号',
-            dataIndex: 'sd_detno',
-            xtype: 'numbercolumn',
-            width: 120,
-            renderer : function(v) {
-                return Ext.util.Format.number(v, '0');
-            }
+            text: '业务员',
+            dataIndex: 'sa_seller',
+            width: 80
         }, {
             text: '物料编号',
             dataIndex: 'sd_prodcode',
-            width: 120
+            width: 150
         },{
             text: '品牌',
             dataIndex: 'pr_brand',
-            width: 150
+            width: 100
         },{
-            text: '名称',
+            text: '物料名称',
             dataIndex: 'pr_detail',
-            width: 200
+            width: 150
         },{
             text: '型号',
             dataIndex: 'pr_orispeccode',
@@ -206,12 +200,12 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
         },{
             text: '规格',
             dataIndex: 'pr_spec',
-            width: 150
+            width: 200
         },{
             text: '数量',
             dataIndex: 'sd_qty',
             xtype: 'numbercolumn',
-            width: 120,
+            width: 110,
             renderer : function(v) {
                 var arr = (v + '.').split('.');
                 var xr = (new Array(arr[1].length > 3 ? 3 : arr[1].length)).fill('0');
@@ -221,12 +215,12 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
         }, {
             text: '单位',
             dataIndex: 'pr_unit',
-            width: 80
+            width: 65
         }, {
             text: '单价(元)',
-            dataIndex: 'sd_price',
+            dataIndex: 'sd_netprice',
             xtype: 'numbercolumn',
-            width: 120,
+            width: 110,
             renderer : function(v) {
                 var arr = (v + '.').split('.');
                 var xr = (new Array(arr[1].length > 4 ? 4 : arr[1].length)).fill('0');
@@ -234,16 +228,39 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
                 return Ext.util.Format.number(v, format);
             },
         }, {
-            text: '已出货数',
-            dataIndex: 'sd_sendqty',
+            text: '金额(元)',
+            dataIndex: 'sd_nettotal',
             xtype: 'numbercolumn',
-            width: 120,
+            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('');
+                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: 'sd_taxamount',
+            xtype: 'numbercolumn',
+            width: 110,
+            renderer : function(v,g,r) {
+                v = (r.data["sd_total"]||0.0) - (r.data["sd_nettotal"]||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: '价税合计(元)',
+            dataIndex: 'sd_total',
+            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: 'sd_remark',