【多币别BUG】【资金转存列表标准化；客户、供应商资料去掉汇率】

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

@@ -18,15 +18,15 @@ Ext.define('saas.view.document.customer.FormController', {
                     }) ;   
                 }
             },
-            // 'currencyDbfindTrigger[name=cu_currency]':{
-            //     beforerender:function(f){
-            //         Ext.apply(f,{
-            //             dbfinds:[{
-            //                 from:'cr_name',to:'cu_currency'
-            //             }],
-            //         }) ;   
-            //     }
-            // }
+             'currencyDbfindTrigger[name=cu_currency]':{
+                beforerender:function(f){
+                     Ext.apply(f,{
+                         dbfinds:[{
+                            from:'cr_name',to:'cu_currency'
+                         }],
+                    }) ;   
+                 }
+             }
         });
     },
 

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

@@ -132,33 +132,12 @@ Ext.define('saas.view.document.customer.FormPanel', {
                 columnWidth: 0.25,
                 group: '交易信息',
             }, {
-                xtype: 'condbfindtrigger',
-                fieldLabel: '币别汇率',
+                xtype: 'currencyDbfindTrigger',
+                name: "cu_currency",
+                fieldLabel: '币别',
                 allowBlank: false,
-                dbType: 'currencyDbfindTrigger',
-                dbfinds: [{
-                    from: 'cr_name', to: 'cu_currency'
-                }, {
-                    from: 'cr_rate', to: 'cr_rate'
-                }],
-                defaultValue: {
-                    cu_currency: this.getViewModel().get('defaultCurrency'),
-                    cu_taxrate: 1
-                },
-                supFieldConfig: {
-                    xtype: 'numberfield',
-                    readOnly: false,
-                    ignore:true,
-                    defaultReadOnly: false,
-                    decimalPrecision: 6,
-                    vtype: 'positiveNumber',
-                    listeners: {
-                        change: function(f, v) {
-                            var defaultCurrency = Ext.getCmp('mainView').getViewModel().get('defaultCurrency');
-                            f.setReadOnly(f.ownerCt.items.items[0].value == defaultCurrency);
-                        }
-                    }
-                },
+                columnWidth: 0.25,
+                defaultValue:  this.getViewModel().get('defaultCurrency') ,
                 group: '交易信息',
             }, {
                 xtype: "numberfield",

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

@@ -19,15 +19,15 @@ Ext.define('saas.view.document.vendor.FormController', {
 
                 }
             },
-            // 'currencyDbfindTrigger[name=ve_currency]':{
-            //     beforerender:function(f){
-            //         Ext.apply(f,{
-            //             dbfinds:[{
-            //                 from:'cr_name',to:'ve_currency'
-            //             }],
-            //         }) ;   
-            //     }
-            // }
+            'currencyDbfindTrigger[name=ve_currency]':{
+                 beforerender:function(f){
+                     Ext.apply(f,{
+                        dbfinds: [{
+                            from: 'cr_name', to: 've_currency'
+                        }]
+                     }) ;   
+                 }
+            }
         });
 
     },

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

@@ -138,33 +138,12 @@ Ext.define('saas.view.document.vendor.FormPanel', {
                 columnWidth: 0.25,
                 group: '交易信息',
             }, {
-                xtype: 'condbfindtrigger',
-                fieldLabel: '币别汇率',
+                xtype: 'currencyDbfindTrigger',
+                name: "ve_currency",
+                fieldLabel: '币别',
                 allowBlank: false,
-                dbType: 'currencyDbfindTrigger',
-                dbfinds: [{
-                    from: 'cr_name', to: 've_currency'
-                }, {
-                    from: 'cr_rate', to: 'cr_rate'
-                }],
-                defaultValue: {
-                    ve_currency: this.getViewModel().get('defaultCurrency'),
-                    ve_taxrate: 1
-                },
-                supFieldConfig: {
-                    xtype: 'numberfield',
-                    readOnly: false,
-                    ignore:true,
-                    defaultReadOnly: false,
-                    decimalPrecision: 6,
-                    vtype: 'positiveNumber',
-                    listeners: {
-                        change: function(f, v) {
-                            var defaultCurrency = Ext.getCmp('mainView').getViewModel().get('defaultCurrency');
-                            f.setReadOnly(f.ownerCt.items.items[0].value == defaultCurrency);
-                        }
-                    }
-                },
+                columnWidth: 0.25,
+                defaultValue:  this.getViewModel().get('defaultCurrency') ,
                 group: '交易信息',
             }, {
                 xtype: "numberfield",

frontend/saas-web/app/view/money/fundtransfer/QueryPanel.js

@@ -142,25 +142,6 @@ Ext.define('saas.view.money.fundtransfer.QueryPanel', {
                     summaryRenderer: function(v, d, f, m) {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     }
-                },{
-                    text: '转存汇率',
-                    xtype: 'numbercolumn',
-                    dataIndex: 'ftd_rate',
-                    width: 110,
-                    renderer: function(v, m, r) {
-                        return saas.util.BaseUtil.numberFormat(v, 6, true);
-                    },
-                }, {
-                    text: "结算号",
-                    dataIndex: "ftd_paycode",
-                    width: 150,
-                    editor: {
-                        xtype: ''
-                    }
-                },{
-                    text: '结算方式',
-                    dataIndex: 'ftd_paymethod',
-                    width: 150
                 },  {
                     text: '审核状态',
                     dataIndex: 'ft_status',