merge

frontend/saas-web/app/view/core/dbfind/types/BankInfoDbfindTrigger.js

@@ -46,6 +46,19 @@ Ext.define('saas.view.core.dbfind.types.BankInfoDbfindTrigger', {
         dataIndex: "bk_type",
         width: 110,
         xtype: ""
+    }, {
+        text: "币别",
+        dataIndex: "bk_currency",
+        align:'center',
+        width: 65
+    }, {
+        text: "汇率",
+        dataIndex: "cr_rate",
+        xtype: 'numbercolumn',
+        width: 80,
+        renderer: function(v, m, r) {
+            return saas.util.BaseUtil.numberFormat(v, 6, false);
+        }
     }, {
         text: "账户余额",
         dataIndex: "bk_thisamount",

frontend/saas-web/app/view/money/othreceipts/FormPanel.js

@@ -77,7 +77,7 @@ Ext.define('saas.view.money.othreceipts.FormPanel', {
                 //     or_rate: 1
                 // },
                 mainFieldConfig: {
-                    readOnly: false,
+                    readOnly: true,
                     defaultReadOnly: false,
                 },
                 supFieldConfig: {

frontend/saas-web/app/view/money/othreceipts/FormPanelController.js

@@ -99,8 +99,14 @@ Ext.define('saas.view.money.othreceipts.FormPanelController', {
                             from: 'bk_bankname',
                             to: 'or_bankname'
                         }, {
-                            from: 'id',
+                            from: 'id', 
                             to: 'or_bankid',ignore:true
+                        }, {
+                            from: 'bk_currency',
+                            to: 'or_currency'
+                        }, {
+                            from: 'cr_rate',
+                            to: 'or_rate'
                         }],
                     });
 

frontend/saas-web/app/view/money/othspendings/FormPanel.js

@@ -71,7 +71,7 @@ Ext.define('saas.view.money.othspendings.FormPanel', {
                 //     os_rate: 1
                 // },
                 mainFieldConfig: {
-                    readOnly: false,
+                    readOnly: true,
                     defaultReadOnly: false,
                 },
                 supFieldConfig: {

frontend/saas-web/app/view/money/othspendings/FormPanelController.js

@@ -92,6 +92,12 @@ Ext.define('saas.view.money.othspendings.FormPanelController', {
                         }, {
                             from: 'id',
                             to: 'os_bankid',ignore:true
+                        }, {
+                            from: 'bk_currency',
+                            to: 'os_currency'
+                        }, {
+                            from: 'cr_rate',
+                            to: 'os_rate'
                         }],
                     });
 

frontend/saas-web/app/view/money/payBalance/FormPanel.js

@@ -76,10 +76,6 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
                 }, {
                     from: 'cr_rate', to: 'pb_rate'
                 }],
-                // defaultValue: {
-                //     pb_currency: 'RMB',
-                //     pb_rate: 1
-                // },
                 supFieldConfig: {
                     xtype: 'numberfield',
                     readOnly: false,

frontend/saas-web/app/view/money/payBalance/FormPanelController.js

@@ -78,6 +78,10 @@ Ext.define('saas.view.money.payBalance.FormPanelController', {
                             from: 'id',
                             to: 'pb_vendid',
                             ignore:true
+                        },{
+                            from:'ve_currency',to:'pb_currency'
+                        },{
+                            from:'cr_rate',to:'pb_rate'
                         }],
                     });
 

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

@@ -21,6 +21,10 @@ Ext.define('saas.view.purchase.purchase.FormPanelController', {
                             from:'ve_buyercode',to:'pu_buyercode'
                         },{
                             from:'ve_buyername',to:'pu_buyername'
+                        },{
+                            from:'ve_currency',to:'pu_currency'
+                        },{
+                            from:'cr_rate',to:'pu_rate'
                         }],
                     }) ; 
                 }

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

@@ -27,6 +27,10 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanelController', {
                             from:'ve_buyercode',to:'pi_buyercode'
                         },{
                             from:'ve_buyername',to:'pi_buyername'
+                        },{
+                            from:'ve_currency',to:'pi_currency'
+                        },{
+                            from:'cr_rate',to:'pi_rate'
                         }],
                     }) ;   
 

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

@@ -27,6 +27,10 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanelController', {
                             from:'ve_buyercode',to:'pi_buyercode'
                         },{
                             from:'ve_buyername',to:'pi_buyername'
+                        },{
+                            from:'ve_currency',to:'pi_currency'
+                        },{
+                            from:'cr_rate',to:'pi_rate'
                         }],
                     }) ;