【多币别】【BUG】【供应商、客户资料税率字段；报表列设置兼容后台合计】

frontend/saas-web/app/view/core/report/ReportPanel.js

@@ -382,11 +382,11 @@ Ext.define('saas.view.core.report.ReportPanel', {
                     }
                 });
             }
-
+            
             if (c.summaryType) {
                 summarys.push({
                     field: c.dataIndex,
-                    operation: c.summaryType,
+                    operation: c._summaryType || c.summaryType,
                 });
                 me.initSummaryType(c);
             }

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

@@ -139,7 +139,7 @@ Ext.define('saas.view.document.customer.FormPanel', {
                 dbfinds: [{
                     from: 'cr_name', to: 'cu_currency'
                 }, {
-                    from: 'cr_rate', to: 'cu_taxrate'
+                    from: 'cr_rate', to: 'cr_rate'
                 }],
                 defaultValue: {
                     cu_currency: this.getViewModel().get('defaultCurrency'),
@@ -148,28 +148,22 @@ Ext.define('saas.view.document.customer.FormPanel', {
                 supFieldConfig: {
                     xtype: 'numberfield',
                     readOnly: false,
+                    ignore:true,
                     defaultReadOnly: false,
                     decimalPrecision: 6,
                     vtype: 'positiveNumber'
                 },
                 group: '交易信息',
-            // }, {
-            //     xtype: "currencyDbfindTrigger",
-            //     name: "cu_currency",
-            //     fieldLabel: "币别",
-            //     allowBlank: false,
-            //     columnWidth: 0.25,
-            //     group: '交易信息',
-            // }, {
-            //     xtype: "numberfield",
-            //     name: "cu_taxrate",
-            //     fieldLabel: "税率(%)",
-            //     allowBlank: false,
-            //     columnWidth: 0.25,
-            //     decimalPrecision: 6,
-            //     vtype: 'positiveNumber'
-            //     group: '交易信息',
-            },{
+            }, {
+                xtype: "numberfield",
+                name: "cu_taxrate",
+                fieldLabel: "税率(%)",
+                allowBlank: false,
+                columnWidth: 0.25,
+                minValue: 0,
+                maxValue: 100,
+                group: '交易信息',
+            }, {
                 xtype: "numberfield",
                 hideTrigger: true,
                 name: "cu_beginaramount",

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

@@ -145,7 +145,7 @@ Ext.define('saas.view.document.vendor.FormPanel', {
                 dbfinds: [{
                     from: 'cr_name', to: 've_currency'
                 }, {
-                    from: 'cr_rate', to: 've_taxrate'
+                    from: 'cr_rate', to: 'cr_rate'
                 }],
                 defaultValue: {
                     ve_currency: this.getViewModel().get('defaultCurrency'),
@@ -154,29 +154,23 @@ Ext.define('saas.view.document.vendor.FormPanel', {
                 supFieldConfig: {
                     xtype: 'numberfield',
                     readOnly: false,
+                    ignore:true,
                     defaultReadOnly: false,
                     decimalPrecision: 6,
                     vtype: 'positiveNumber'
                 },
                 group: '交易信息',
-            // },{
-            //     xtype: "currencyDbfindTrigger",
-            //     name: "ve_currency",
-            //     fieldLabel: "币别",
-            //     allowBlank: false,
-            //     columnWidth: 0.25,
-            //     group: '交易信息',
-            // }, {
-            //     xtype: "numberfield",
-            //     name: "ve_taxrate",
-            //     hideTrigger: true,
-            //     fieldLabel: "税率(%)",
-            //     allowBlank: false,
-            //     columnWidth: 0.25,
-            //     minValue: 0,
-            //     maxValue: 100,
-            //     group: '交易信息',
-            },{
+            }, {
+                xtype: "numberfield",
+                name: "ve_taxrate",
+                hideTrigger: true,
+                fieldLabel: "税率(%)",
+                allowBlank: false,
+                columnWidth: 0.25,
+                minValue: 0,
+                maxValue: 100,
+                group: '交易信息',
+            }, {
                 xtype: "numberfield",
                 hideTrigger: true,
                 name: "ve_beginapamount",