【多币别BUG】【采购、销售模块业务关联列表加税率列与金额后；销售退货单明细单位赋值问题】

frontend/saas-web/app/model/sale/SaleInDetail.js

@@ -10,7 +10,7 @@ Ext.define('saas.model.sale.SaleInDetail', {
         { name: 'pr_orispeccode', type: 'string' }, // 型号
         { name: 'pr_spec', type: 'string' }, // 规格
         { name: 'pd_inqty', type: 'float' }, // 数量
-        { name: 'pr_unit', type: 'float' }, // 单位
+        { name: 'pr_unit', type: 'string' }, // 单位
         { name: 'pd_netprice', type: 'float', // 单价
         },
         { name: 'pd_sendprice', type: 'float', // 含税单价

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

@@ -235,6 +235,14 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
                     renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     }
+                }, {
+                    text: '税率(%)',
+                    dataIndex: 'pd_taxrate',
+                    xtype: 'numbercolumn',
+                    width: 110,
+                    renderer : function(v, m, r) {
+                        return saas.util.BaseUtil.numberFormat(v, 0, true);
+                    }
                 }, {
                     text: '税额(元)',
                     dataIndex: 'pd_taxamount',

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

@@ -246,6 +246,14 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanel', {
                     renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     },
+                }, {
+                    text: '税率(%)',
+                    dataIndex: 'pd_taxrate',
+                    xtype: 'numbercolumn',
+                    width: 110,
+                    renderer : function(v, m, r) {
+                        return saas.util.BaseUtil.numberFormat(v, 0, true);
+                    }
                 }, {
                     text: '税额(元)',
                     dataIndex: 'pd_taxamount',

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

@@ -252,6 +252,14 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
                     renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     },
+                }, {
+                    text: '税率(%)',
+                    dataIndex: 'pd_taxrate',
+                    xtype: 'numbercolumn',
+                    width: 110,
+                    renderer : function(v, m, r) {
+                        return saas.util.BaseUtil.numberFormat(v, 0, true);
+                    }
                 }, {
                     text: '税额(元)',
                     dataIndex: 'pd_taxamount',

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

@@ -174,11 +174,6 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
                     text: '客户名称',
                     dataIndex: 'sa_custname',
                     width: 200
-                }, {
-                    text: '币别',
-                    dataIndex: "sa_currency",
-                    align:'center',
-                    width: 65
                 },{
                     text: '审核状态',
                     align: 'center',
@@ -244,6 +239,14 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
                     renderer : function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     }
+                }, {
+                    text: '税率(%)',
+                    dataIndex: 'sd_taxrate',
+                    xtype: 'numbercolumn',
+                    width: 110,
+                    renderer : function(v, m, r) {
+                        return saas.util.BaseUtil.numberFormat(v, 0, true);
+                    }
                 }, {
                     text: '税额(元)',
                     dataIndex: 'sd_taxamount',

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

@@ -25,7 +25,7 @@ Ext.define('saas.view.sale.saleIn.FormPanelController', {
                     });
                 }
             },
-            'multidbfindtrigger[name=pd_prodcode]': {
+            'productMultiDbfindTrigger[name=pd_prodcode]': {
                 beforerender: function (f) {
                     Ext.apply(f, {
                         dbfinds: [{

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

@@ -246,6 +246,14 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
                     renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     }
+                }, {
+                    text: '税率(%)',
+                    dataIndex: 'pd_taxrate',
+                    xtype: 'numbercolumn',
+                    width: 110,
+                    renderer : function(v, m, r) {
+                        return saas.util.BaseUtil.numberFormat(v, 0, true);
+                    }
                 }, {
                     text: '税额(元)',
                     dataIndex: 'pd_taxamount',

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

@@ -246,6 +246,14 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
                     renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     }
+                }, {
+                    text: '税率(%)',
+                    dataIndex: 'pd_taxrate',
+                    xtype: 'numbercolumn',
+                    width: 110,
+                    renderer : function(v, m, r) {
+                        return saas.util.BaseUtil.numberFormat(v, 0, true);
+                    }
                 }, {
                     text: '税额(元)',
                     dataIndex: 'pd_taxamount',