1.添加放大镜带出币别

applications/money/money-server/src/main/resources/mapper/RecbalanceMapper.xml

@@ -110,7 +110,7 @@
     rb_rdamount, rb_rbdamount, rb_preamount, rb_discounts, rb_havebalance, rb_status, rb_statuscode, rb_remark,
     recbalance.companyId,
     recbalance.updaterId,recbalance.updatedate, rb_text1, rb_text2, rb_text3, rb_text4, rb_text5,
-    recbalance.creatorName, recbalance.createTime, rb_auditman, rb_auditdate, rb_amount
+    recbalance.creatorName, recbalance.createTime, rb_auditman, rb_auditdate, rb_amount,rb_rate,rb_currency
   </sql>
   <sql id="left_Column_List">
     cu_leftamount

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

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

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

@@ -85,10 +85,10 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
                 }, {
                     from: 'cr_rate', to: 'rb_rate'
                 }],
-                defaultValue: {
-                    rb_currency: 'RMB',
-                    rb_rate: 1
-                },
+                // defaultValue: {
+                //     rb_currency: 'RMB',
+                //     rb_rate: 1
+                // },
                 supFieldConfig: {
                     xtype: 'numberfield',
                     readOnly: false,

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

@@ -84,7 +84,12 @@ Ext.define('saas.view.money.recBalance.FormPanelController', {
                             from:'cu_name', to:'rb_custname'
                         },{
                             from:'cu_leftamount', to:'cu_leftamount'
-                        }],
+                        },{
+                            from:'cu_currency',to:'rb_currency'
+                        },{
+                            from:'cr_rate',to:'rb_rate'
+                        }
+                        ],
                     }) ;   
                 }
             },

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

@@ -526,6 +526,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: ',',
@@ -575,10 +596,10 @@ Ext.define('saas.view.money.verification.FormPanel', {
                         }, {
                             from: 'cr_rate', to: 'vc_rate'
                         }],
-                        defaultValue: {
-                            vc_currency: 'RMB',
-                            vc_rate: 1
-                        },
+                        // defaultValue: {
+                        //     vc_currency: 'RMB',
+                        //     vc_rate: 1
+                        // },
                         supFieldConfig: {
                             xtype: 'numberfield',
                             readOnly: false,
@@ -653,10 +674,10 @@ Ext.define('saas.view.money.verification.FormPanel', {
                             }, {
                                 from: 'cr_rate', to: 'vc_rate'
                             }],
-                            defaultValue: {
-                                vc_currency: 'RMB',
-                                vc_rate: 1
-                            },
+                            // defaultValue: {
+                            //     vc_currency: 'RMB',
+                            //     vc_rate: 1
+                            // },
                             supFieldConfig: {
                                 xtype: 'numberfield',
                                 readOnly: false,
@@ -730,10 +751,10 @@ Ext.define('saas.view.money.verification.FormPanel', {
                         }, {
                             from: 'cr_rate', to: 'vc_rate'
                         }],
-                        defaultValue: {
-                            vc_currency: 'RMB',
-                            vc_rate: 1
-                        },
+                        // defaultValue: {
+                        //     vc_currency: 'RMB',
+                        //     vc_rate: 1
+                        // },
                         supFieldConfig: {
                             xtype: 'numberfield',
                             readOnly: false,
@@ -807,10 +828,10 @@ Ext.define('saas.view.money.verification.FormPanel', {
                         }, {
                             from: 'cr_rate', to: 'vc_rate'
                         }],
-                        defaultValue: {
-                            vc_currency: 'RMB',
-                            vc_rate: 1
-                        },
+                        // defaultValue: {
+                        //     vc_currency: 'RMB',
+                        //     vc_rate: 1
+                        // },
                         supFieldConfig: {
                             xtype: 'numberfield',
                             readOnly: false,

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

@@ -82,7 +82,12 @@ Ext.define('saas.view.money.verification.FormPanelController', {
                             from:'cu_code', to:'vc_custcode'
                         },{
                             from:'cu_name', to:'vc_custname'
-                        }],
+                        },{
+                            from:'cu_currency',to:'vc_currency'
+                        },{
+                            from:'cr_rate',to:'vc_rate'
+                        }
+                        ],
                     }) ;   
 
                 }
@@ -239,7 +244,12 @@ Ext.define('saas.view.money.verification.FormPanelController', {
                         }, {
                             from: 've_name',
                             to: 'vc_vendname'
-                        }],
+                        },{
+                            from:'cu_currency',to:'vc_currency'
+                        },{
+                            from:'cr_rate',to:'vc_rate'
+                        }
+                        ],
                     });
 
                 }

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

@@ -29,7 +29,12 @@ Ext.define('saas.view.sale.sale.FormPanelController', {
                             to: 'sa_seller'
                         }, {
                             from:'cu_sellerid',to:'cu_sellerid'
-                        }],
+                        },{
+                            from:'cu_currency',to:'sa_currency'
+                        },{
+                            from:'cr_rate',to:'sa_rate'
+                        }
+                        ],
                     });
 
                 }