销售采购字段调整

frontend/saas-web/app/view/document/vendor/BasePanel.js

@@ -108,7 +108,7 @@ Ext.define('saas.view.document.vendor.BasePanel', {
                         return saas.util.BaseUtil.numberFormat(v, 2, false);
                     }
                 },{
-                    text: "应付金额(元)",
+                    text: "应付余额(元)",
                     xtype: 'numbercolumn',
                     dataIndex: "ve_leftamount",
                     width: 110.0,

frontend/saas-web/app/view/document/vendor/FormPanel.js

@@ -212,7 +212,7 @@ Ext.define('saas.view.document.vendor.FormPanel', {
                 xtype: "numberfield",
                 hideTrigger: true,
                 name: "ve_leftamount",
-                fieldLabel: "应付金额(元)",
+                fieldLabel: "应付余额(元)",
                 readOnly:true,
                 editable:false,
                 allowBlank: true,

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

@@ -289,6 +289,14 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
                     summaryRenderer: function (v, d, f, m) {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     }
+                },{
+                    text: '最新购价(元)',
+                    dataIndex: 'pd_lastprice',
+                    xtype: 'numbercolumn',
+                    width: 110,
+                    renderer: function(v, m, r) {
+                        return saas.util.BaseUtil.numberFormat(v, 4, true);
+                    }
                 }, {
                     text: "价税合计(元)",
                     xtype: 'numbercolumn',

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

@@ -64,7 +64,7 @@ Ext.define('saas.view.purchase.purchase.FormPanelController', {
                         },{
                             from: 'pr_unit', to: 'pr_unit'
                         }, {
-                            from:'pr_purcprice',to:'pd_taxprice'
+                            from:'pr_purcprice',to:'pd_lastprice'
                         },{
                             from:'pr_zxbzs',to:'pr_zxbzs'
                         }],

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

@@ -263,6 +263,14 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     }
                 }, {
+                    text: '最新购价(元)',
+                    dataIndex: 'pd_lastprice',
+                    xtype: 'numbercolumn',
+                    width: 110,
+                    renderer: function(v, m, r) {
+                        return saas.util.BaseUtil.numberFormat(v, 4, true);
+                    }
+                },{
                     text: '价税合计(元)',
                     dataIndex: 'pd_total',
                     xtype: 'numbercolumn',

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

@@ -309,6 +309,14 @@ Ext.define('saas.view.sale.sale.FormPanel', {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     }
                 }, {
+                    text: '最新售价(元)',
+                    dataIndex: 'sd_lastprice',
+                    xtype: 'numbercolumn',
+                    width: 120,
+                    renderer: function(v, m, r) {
+                        return saas.util.BaseUtil.numberFormat(v, 4, true);
+                    }
+                },{
                     text: "价税合计(元)",
                     xtype: 'numbercolumn',
                     dataIndex: "sd_total",

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

@@ -63,7 +63,7 @@ Ext.define('saas.view.sale.sale.FormPanelController', {
                         dbfinds: [{
                             from: 'pr_code', to: 'sd_prodcode'
                         }, {
-                            from: 'pr_saleprice', to: 'sd_netprice'
+                            from: 'pr_saleprice', to: 'sd_lastprice'
                         }, {
                             from: 'pr_detail', to: 'pr_detail'
                         }, {

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

@@ -255,6 +255,14 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
                     renderer : function(v,g,r) {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     }
+                },{
+                    text: '最新售价(元)',
+                    dataIndex: 'sd_lastprice',
+                    xtype: 'numbercolumn',
+                    width: 110,
+                    renderer: function(v, m, r) {
+                        return saas.util.BaseUtil.numberFormat(v, 4, true);
+                    }
                 },{
                     text: '价税合计(元)',
                     dataIndex: 'sd_total',