界面标准化

frontend/saas-web/app/view/home/infoCardList/Recment.js

@@ -108,7 +108,7 @@ Ext.define('saas.view.home.infoCardList.Recment', {
         dataIndex: 'pd_sendprice',
         xtype:'numbercolumn',
         hidden:true,
-        width: 110,
+        width: 140,
         renderer : function(v) {
             var arr = (v + '.').split('.');
             var xr = (new Array(arr[1].length > 4 ? 4 : arr[1].length)).fill('0');
@@ -140,7 +140,7 @@ Ext.define('saas.view.home.infoCardList.Recment', {
         text: '成本单价(元)',
         dataIndex: 'pd_price',
         xtype:'numbercolumn',
-        width: 110,
+        width: 140,
         hidden:true,
         renderer : function(v) {
             var arr = (v + '.').split('.');

frontend/saas-web/app/view/home/infoCardList/UnauditSaleOut.js

@@ -104,7 +104,7 @@ Ext.define('saas.view.home.infoCardList.UnauditSaleOut', {
         text: '销售单价(元)',
         dataIndex: 'pd_sendprice',
         xtype:'numbercolumn',
-        width: 110,
+        width: 140,
         hidden:true,
         renderer : function(v) {
             var arr = (v + '.').split('.');
@@ -137,7 +137,7 @@ Ext.define('saas.view.home.infoCardList.UnauditSaleOut', {
         text: '成本单价(元)',
         dataIndex: 'pd_price',
         xtype:'numbercolumn',
-        width: 110,
+        width: 140,
         hidden:true,
         renderer : function(v) {
             var arr = (v + '.').split('.');

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

@@ -61,17 +61,21 @@ Ext.define('saas.view.money.report.CustomerCheckCheck', {
         width: 150,
         dataIndex: 'pr_code'
     }, {
-        text: '物料名称',
+        text: '品牌',
         dataIndex: 'pr_detail',
         width: 200
     }, {
-        text: '物料规格',
+        text: '名称',
+        dataIndex: 'pr_detail',
+        width: 200
+    }, {
+        text: '型号',
+        dataIndex: 'pr_orispeccode',
+        width: 200
+    }, {
+        text: '规格',
         dataIndex: 'pr_spec',
         width: 150
-    }, {
-        text: '单位',
-        dataIndex: 'pd_unit',
-        width: 80
     }, {
         text: '数量',
         xtype: 'numbercolumn',
@@ -84,6 +88,10 @@ Ext.define('saas.view.money.report.CustomerCheckCheck', {
             var format = '0.' + xr.join('');
             return Ext.util.Format.number(v, format);
         }
+    }, {
+        text: '单位',
+        dataIndex: 'pd_unit',
+        width: 80
     }, {
         text: '单价(元)',
         dataIndex: 'pd_orderprice',

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

@@ -66,22 +66,26 @@ Ext.define('saas.view.money.report.VendorCheck', {
         dataIndex:'pi_vendname',
         width: 250,
         hidden:true
-    },{
+    }, {
         text: '物料编号',
-        dataIndex: 'pr_code',
-        width: 150
+        width: 150,
+        dataIndex: 'pr_code'
     }, {
-        text: '物料名称',
+        text: '品牌',
         dataIndex: 'pr_detail',
         width: 200
     }, {
-        text: '物料规格',
+        text: '名称',
+        dataIndex: 'pr_detail',
+        width: 200
+    }, {
+        text: '型号',
+        dataIndex: 'pr_orispeccode',
+        width: 200
+    }, {
+        text: '规格',
         dataIndex: 'pr_spec',
         width: 150
-    }, {
-        text: '单位',
-        dataIndex: 'pd_unit',
-        width: 80
     }, {
         text: '数量',
         dataIndex: 'qty',
@@ -94,6 +98,10 @@ Ext.define('saas.view.money.report.VendorCheck', {
             var format = '0.' + xr.join('');
             return Ext.util.Format.number(v, format);
         }
+    }, {
+        text: '单位',
+        dataIndex: 'pd_unit',
+        width: 80
     }, {
         text: '单价(元)',
         dataIndex: 'pd_orderprice',

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

@@ -77,24 +77,24 @@ Ext.define('saas.view.purchase.report.Purchase', {
         width: 80
     }, {
         text: '物料编号',
-        dataIndex: 'pd_prodcode',
-        width: 150
+        width: 150,
+        dataIndex: 'pr_code'
     }, {
-        text: '物料名称',
-        dataIndex: 'pr_detail', 
+        text: '品牌',
+        dataIndex: 'pr_detail',
         width: 200
     }, {
-        text: '物料规格',
-        dataIndex: 'pr_spec',
-        width: 150 
+        text: '名称',
+        dataIndex: 'pr_detail',
+        width: 200
     }, {
-        text: '品牌',
-        dataIndex: 'pr_brand',
-        width: 110 
+        text: '型号',
+        dataIndex: 'pr_orispeccode',
+        width: 200
     }, {
-        text: '单位',
-        dataIndex: 'pr_unit',
-        width: 80 
+        text: '规格',
+        dataIndex: 'pr_spec',
+        width: 150
     }, {
         text: '采购数量',
         dataIndex: 'pd_qty',
@@ -114,6 +114,10 @@ Ext.define('saas.view.purchase.report.Purchase', {
             var format = '0.' + xr.join('');
             return Ext.util.Format.number(v, format);
         }
+    }, {
+        text: '单位',
+        dataIndex: 'pd_unit',
+        width: 80
     }, {
         text: '单价(元)',
         dataIndex: 'pd_price',

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

@@ -77,35 +77,25 @@ Ext.define('saas.view.sale.report.Sale', {
         width: 80
     }, {
         text: '物料编号',
-        dataIndex: 'sd_prodcode',
-        width: 150
+        width: 150,
+        dataIndex: 'pr_code'
     }, {
-        text: '物料名称',
+        text: '品牌',
         dataIndex: 'pr_detail',
-        width: 200, 
-        renderer: function (v, m, r) {
-            return r.data["productDTO"]?r.data["productDTO"][m.column.dataIndex]:v;
-        }
+        width: 200
     }, {
-        text: '物料规格',
-        dataIndex: 'pr_spec',
-        width: 150, 
-        renderer: function (v, m, r) {
-            return r.data["productDTO"]?r.data["productDTO"][m.column.dataIndex]:v;
-        }
+        text: '名称',
+        dataIndex: 'pr_detail',
+        width: 200
     }, {
-        text: '品牌',
-        dataIndex: 'pr_brand', 
-        renderer: function (v, m, r) {
-            return r.data["productDTO"]?r.data["productDTO"][m.column.dataIndex]:v;
-        }
+        text: '型号',
+        dataIndex: 'pr_orispeccode',
+        width: 200
+    }, {
+        text: '规格',
+        dataIndex: 'pr_spec',
+        width: 150
     }, {
-        text: '单位',
-        dataIndex: 'pr_unit', 
-        renderer: function (v, m, r) {
-            return r.data["productDTO"]?r.data["productDTO"][m.column.dataIndex]:v;
-        }
-    }, {//∑数量
         text: '数量',
         dataIndex: 'sd_qty',
         exportFormat: 'Quantity',
@@ -116,6 +106,10 @@ Ext.define('saas.view.sale.report.Sale', {
             var format = '0.' + xr.join('');
             return Ext.util.Format.number(v, format);
         }
+    }, {
+        text: '单位',
+        dataIndex: 'pd_unit',
+        width: 80
     }, {
         text: '单价(元)',
         dataIndex: 'sd_price',

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

@@ -66,20 +66,24 @@ Ext.define('saas.view.sale.report.SaleProfit', {
         width: 110
     }, {
         text: '物料编号',
-        dataIndex: 'pr_code',
-        width: 150
+        width: 150,
+        dataIndex: 'pr_code'
+    }, {
+        text: '品牌',
+        dataIndex: 'pr_detail',
+        width: 200
     }, {
-        text: '物料名称',
+        text: '名称',
         dataIndex: 'pr_detail',
         width: 200
     }, {
-        text: '物料规格',
+        text: '型号',
+        dataIndex: 'pr_orispeccode',
+        width: 200
+    }, {
+        text: '规格',
         dataIndex: 'pr_spec',
         width: 150
-    }, {
-        text: '单位',
-        dataIndex: 'pr_unit',
-        width: 110
     }, {
         text: '数量',
         dataIndex: 'pd_outqty',
@@ -92,6 +96,10 @@ Ext.define('saas.view.sale.report.SaleProfit', {
             var format = '0.' + xr.join('');
             return Ext.util.Format.number(v, format);
         }
+    }, {
+        text: '单位',
+        dataIndex: 'pd_unit',
+        width: 80
     }, {
         text: '含税单价(元)',
         dataIndex: 'pd_sendprice',
@@ -128,6 +136,7 @@ Ext.define('saas.view.sale.report.SaleProfit', {
         exportFormat: 'Price',
         dataIndex: 'pd_netprice',
         xtype: 'numbercolumn',
+        width:150,
         renderer : function(v) {
             var arr = (v + '.').split('.');
             var xr = (new Array(arr[1].length > 4 ? 4 : arr[1].length)).fill('0');
@@ -139,6 +148,7 @@ Ext.define('saas.view.sale.report.SaleProfit', {
         dataIndex: 'pw_costprice',
         exportFormat: 'Price',
         xtype: 'numbercolumn',
+        width:140,
         renderer : function(v) {
             var arr = (v + '.').split('.');
             var xr = (new Array(arr[1].length > 4 ? 4 : arr[1].length)).fill('0');

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

@@ -246,7 +246,7 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
             text: '销售单价(元)',
             dataIndex: 'pd_sendprice',
             xtype:'numbercolumn',
-            width: 110,
+            width: 140,
             renderer : function(v) {
                 var arr = (v + '.').split('.');
                 var xr = (new Array(arr[1].length > 4 ? 4 : arr[1].length)).fill('0');
@@ -276,7 +276,7 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
             text: '成本单价(元)',
             dataIndex: 'pd_price',
             xtype:'numbercolumn',
-            width: 110,
+            width: 140,
             renderer : function(v) {
                 var arr = (v + '.').split('.');
                 var xr = (new Array(arr[1].length > 4 ? 4 : arr[1].length)).fill('0');

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

@@ -238,7 +238,7 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
             text: '销售单价(元)',
             dataIndex: 'pd_sendprice',
             xtype:'numbercolumn',
-            width: 110,
+            width: 140,
             renderer : function(v) {
                 var arr = (v + '.').split('.');
                 var xr = (new Array(arr[1].length > 4 ? 4 : arr[1].length)).fill('0');
@@ -268,7 +268,7 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
             text: '成本单价(元)',
             dataIndex: 'pd_price',
             xtype:'numbercolumn',
-            width: 110,
+            width: 140,
             renderer : function(v) {
                 var arr = (v + '.').split('.');
                 var xr = (new Array(arr[1].length > 4 ? 4 : arr[1].length)).fill('0');

frontend/saas-web/app/view/stock/make/FormPanel.js

@@ -259,7 +259,7 @@ Ext.define('saas.view.stock.make.FormPanel', {
                 text : "成本单价(元)", 
                 dataIndex : "mm_price", 
                 xtype: 'numbercolumn',
-                width : 110.0,
+                width : 140.0,
                 editor : {
                     xtype : "numberfield",
                     decimalPrecision: 4,

frontend/saas-web/app/view/stock/report/DataList.js

@@ -47,19 +47,26 @@ Ext.define('saas.view.stock.report.DataList', {
     }],
 
     reportColumns: [{
-        text: "物料编号",
-        width: 200,
-        dataIndex: "rc_prodCode",
-        xtype: "",
+        text: '物料编号',
+        width: 150,
+        dataIndex: 'rc_prodCode'
     }, {
-        text: "物料名称",
-        width: 200,
-        dataIndex: "rc_prodDetail",
+        text: '品牌',
+        dataIndex: 'rc_prodBrand',
+        width: 200
+    }, {
+        text: '名称',
+        dataIndex: 'rc_prodDetail',
+        width: 200
+    }, {
+        text: '型号',
+        dataIndex: 'rc_prodOrispec',
+        width: 200
+    }, {
+        text: '规格',
+        dataIndex: 'rc_prodSpec',
+        width: 150
     }, {
-        text: "物料规格",
-        dataIndex: "rc_prodSpec",
-        width: 200,
-    },  {
         text: "仓库编号",
         dataIndex: "rc_whCode",
         width: 200,

frontend/saas-web/app/view/stock/report/ProdinoutCount.js

@@ -30,25 +30,33 @@ Ext.define('saas.view.stock.report.ProdinoutCount', {
         columnWidth: 0.2
     }],
     reportColumns: [{
-        text: '物料类型',
-        dataIndex: 'pr_kind'
-    }, {
         text: '物料编号',
-        dataIndex: 'pr_code',
-        width: 150
+        width: 150,
+        dataIndex: 'pr_code'
+    }, {
+        text: '品牌',
+        dataIndex: 'pr_detail',
+        width: 200
     }, {
-        text: '物料名称',
+        text: '名称',
         dataIndex: 'pr_detail',
         width: 200
     }, {
-        text: '物料规格',
+        text: '型号',
+        dataIndex: 'pr_orispeccode',
+        width: 200
+    }, {
+        text: '规格',
         dataIndex: 'pr_spec',
         width: 150
     }, {
         text: '单位',
         dataIndex: 'pr_unit',
         width: 80
-    }, {
+    },{
+        text: '物料类型',
+        dataIndex: 'pr_kind'
+    },{
         text: '仓库',
         dataIndex:'wh_description',
         width: 150

frontend/saas-web/app/view/stock/report/Prodiodetail.js

@@ -73,26 +73,27 @@ Ext.define('saas.view.stock.report.Prodiodetail', {
         exportFormat: 'Integer',
         xtype: 'numbercolumn',
         width: 80
-    }, {
-        text: '物料类型',
-        dataIndex: 'pr_kind'
     }, {
         text: '物料编号',
-        dataIndex: 'pd_prodcode',
-        width: 150
+        width: 150,
+        dataIndex: 'pr_code'
     }, {
-        text: '物料名称',
+        text: '品牌',
         dataIndex: 'pr_detail',
         width: 200
     }, {
-        text: '物料规格',
-        dataIndex: 'pr_spec',
-        width: 150
+        text: '名称',
+        dataIndex: 'pr_detail',
+        width: 200
     }, {
-        text: '仓库',
-        dataIndex: 'pd_whname',
-        width: 150
+        text: '型号',
+        dataIndex: 'pr_orispeccode',
+        width: 200
     }, {
+        text: '规格',
+        dataIndex: 'pr_spec',
+        width: 150
+    },{
         text: '入库数量',
         xtype: 'numbercolumn',
         exportFormat: 'Quantity',
@@ -116,18 +117,30 @@ Ext.define('saas.view.stock.report.Prodiodetail', {
             var format = '0.' + xr.join('');
             return Ext.util.Format.number(v, format);
         }
+    }, {
+        text: '单位',
+        dataIndex: 'pd_unit',
+        width: 80
     }, {
         text: '成本单价(元)',
         xtype: 'numbercolumn',
         exportFormat: 'Price',
         dataIndex: 'pd_price',
+        width: 140,
         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);
         }
-    },{
+    }, {
+        text: '物料类型',
+        dataIndex: 'pr_kind'
+    }, {
+        text: '仓库',
+        dataIndex: 'pd_whname',
+        width: 150
+    }, {
         text: '订单号',
         dataIndex: 'pd_ordercode',
         width: 150