Merge remote-tracking branch 'origin/dev' into dev

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

@@ -103,7 +103,7 @@ Ext.define('saas.view.money.report.CustomerCheckCheck', {
         }
     }, {
         text: '含税单价(元)',
-        dataIndex: 'pd_orderprice',
+        dataIndex: 'pd_sendprice',
         exportFormat: 'Price',
         xtype: 'numbercolumn',
         width: 120,

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

@@ -190,7 +190,7 @@ Ext.define('saas.view.stock.make.FormPanel', {
                     return v;
                 }
             }, {
-                text : "名称", 
+                text : "物料名称", 
                 width : 200.0, 
                 dataIndex : "pr_detail",
                 ignore:true,

frontend/saas-web/app/view/stock/otherOut/QueryPanel.js

@@ -141,7 +141,7 @@ Ext.define('saas.view.stock.otherOut.QueryPanel', {
             width: 110
         }, {
             text: '客户名称',
-            dataIndex: 'pi_vendname',
+            dataIndex: 'pi_custname',
             width: 200
         }, {
             text: '审核状态',