1.财务单据添加币别汇率

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

@@ -86,9 +86,8 @@ Ext.define('saas.view.money.fundtransfer.FormPanel', {
                         valueField: "value"
                     }
                 }, {
-                    text: "转出账户余额(元)",
-                    width: 200.0,
-                    dataIndex: "bk_outthisamount",
+                    text: "转出账户币别",
+                    dataIndex: "ftd_currency",
                     ignore: true
                 }, {
                     text: "转入账户ID",
@@ -119,8 +118,8 @@ Ext.define('saas.view.money.fundtransfer.FormPanel', {
                         xtype: "bandinfoDbfindTrigger"
                     }
                 }, {
-                    text: "转入账户余额(元)",
-                    dataIndex: "bk_inthisamount",
+                    text: "转入账户币别",
+                    dataIndex: "ftd_incurrency",
                     ignore: true,
                     width: 150.0
                 }, {
@@ -141,6 +140,11 @@ Ext.define('saas.view.money.fundtransfer.FormPanel', {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     }
                 }, {
+                        text: "转存汇率",
+                        dataIndex: "ftd_rate",
+                        ignore: true,
+                        width: 150.0
+                    }, {
                     text: "结算方式",
                     width: 110.0,
                     dataIndex: "ftd_paymethod",

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

@@ -67,6 +67,28 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
                 defaultValue: new Date(),
                 allowBlank: false
             }, {
+                xtype: 'condbfindtrigger',
+                fieldLabel: '币别汇率',
+                allowBlank: false,
+                dbType: 'currencyDbfindTrigger',
+                dbfinds: [{
+                    from: 'cr_name', to: 'pb_currency'
+                }, {
+                    from: 'cr_rate', to: 'pb_rate'
+                }],
+                defaultValue: {
+                    pb_currency: 'RMB',
+                    pb_rate: 1
+                },
+                supFieldConfig: {
+                    xtype: 'numberfield',
+                    readOnly: false,
+                    defaultReadOnly: false,
+                    decimalPrecision: 6,
+                    vtype: 'positiveNumber'
+                }
+            },
+                {
                 xtype: 'textfield',
                 name: 'pb_manname',
                 fieldLabel: '付款人',

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

@@ -76,6 +76,27 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
                 defaultValue: new Date(),
                 allowBlank: false
             }, {
+                xtype: 'condbfindtrigger',
+                fieldLabel: '币别汇率',
+                allowBlank: false,
+                dbType: 'currencyDbfindTrigger',
+                dbfinds: [{
+                    from: 'cr_name', to: 'rb_currency'
+                }, {
+                    from: 'cr_rate', to: 'rb_rate'
+                }],
+                defaultValue: {
+                    rb_currency: 'RMB',
+                    rb_rate: 1
+                },
+                supFieldConfig: {
+                    xtype: 'numberfield',
+                    readOnly: false,
+                    defaultReadOnly: false,
+                    decimalPrecision: 6,
+                    vtype: 'positiveNumber'
+                }
+                }, {
                 xtype: "textfield",
                 name: "rb_manname",
                 fieldLabel: "收款人",

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

@@ -565,7 +565,28 @@ Ext.define('saas.view.money.verification.FormPanel', {
                         defaultValue: new Date(),
                         allowBlank: false,
                         name: 'vc_date'
-                    }, {
+                    },  {
+                        xtype: 'condbfindtrigger',
+                        fieldLabel: '币别汇率',
+                        allowBlank: false,
+                        dbType: 'currencyDbfindTrigger',
+                        dbfinds: [{
+                            from: 'cr_name', to: 'vc_currency'
+                        }, {
+                            from: 'cr_rate', to: 'vc_rate'
+                        }],
+                        defaultValue: {
+                            vc_currency: 'RMB',
+                            vc_rate: 1
+                        },
+                        supFieldConfig: {
+                            xtype: 'numberfield',
+                            readOnly: false,
+                            defaultReadOnly: false,
+                            decimalPrecision: 6,
+                            vtype: 'positiveNumber'
+                        },
+                    },{
                         xtype: 'hidden',
                         name: 'vc_amount1',
                         thousandSeparator: ',',
@@ -623,6 +644,27 @@ Ext.define('saas.view.money.verification.FormPanel', {
                         allowBlank: false,
                         name: 'vc_date'
                     }, {
+                            xtype: 'condbfindtrigger',
+                            fieldLabel: '币别汇率',
+                            allowBlank: false,
+                            dbType: 'currencyDbfindTrigger',
+                            dbfinds: [{
+                                from: 'cr_name', to: 'vc_currency'
+                            }, {
+                                from: 'cr_rate', to: 'vc_rate'
+                            }],
+                            defaultValue: {
+                                vc_currency: 'RMB',
+                                vc_rate: 1
+                            },
+                            supFieldConfig: {
+                                xtype: 'numberfield',
+                                readOnly: false,
+                                defaultReadOnly: false,
+                                decimalPrecision: 6,
+                                vtype: 'positiveNumber'
+                            },
+                        },{
                         xtype: 'hidden',
                         name: 'vc_amount1',
                         thousandSeparator: ',',
@@ -678,7 +720,28 @@ Ext.define('saas.view.money.verification.FormPanel', {
                         defaultValue: new Date(),
                         allowBlank: false,
                         name: 'vc_date'
-                    }, {
+                    },  {
+                        xtype: 'condbfindtrigger',
+                        fieldLabel: '币别汇率',
+                        allowBlank: false,
+                        dbType: 'currencyDbfindTrigger',
+                        dbfinds: [{
+                            from: 'cr_name', to: 'vc_currency'
+                        }, {
+                            from: 'cr_rate', to: 'vc_rate'
+                        }],
+                        defaultValue: {
+                            vc_currency: 'RMB',
+                            vc_rate: 1
+                        },
+                        supFieldConfig: {
+                            xtype: 'numberfield',
+                            readOnly: false,
+                            defaultReadOnly: false,
+                            decimalPrecision: 6,
+                            vtype: 'positiveNumber'
+                        },
+                    },{
                         xtype: 'hidden',
                         name: 'vc_amount1',
                         thousandSeparator: ',',
@@ -734,7 +797,28 @@ Ext.define('saas.view.money.verification.FormPanel', {
                         defaultValue: new Date(),
                         allowBlank: false,
                         name: 'vc_date'
-                    }, {
+                    },  {
+                        xtype: 'condbfindtrigger',
+                        fieldLabel: '币别汇率',
+                        allowBlank: false,
+                        dbType: 'currencyDbfindTrigger',
+                        dbfinds: [{
+                            from: 'cr_name', to: 'vc_currency'
+                        }, {
+                            from: 'cr_rate', to: 'vc_rate'
+                        }],
+                        defaultValue: {
+                            vc_currency: 'RMB',
+                            vc_rate: 1
+                        },
+                        supFieldConfig: {
+                            xtype: 'numberfield',
+                            readOnly: false,
+                            defaultReadOnly: false,
+                            decimalPrecision: 6,
+                            vtype: 'positiveNumber'
+                        },
+                    },{
                         xtype: 'hidden',
                         name: 'vc_amount1',
                         thousandSeparator: ',',