币别调整

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

@@ -65,7 +65,10 @@ Ext.define('saas.view.core.dbfind.types.CustomerDbfindTrigger', {
         text: "汇率",
         xtype:'numbercolumn',
         dataIndex: "cr_rate",
-        width:80
+        width:110,
+        renderer: function (v, m, r) {
+            return saas.util.BaseUtil.numberFormat(v, 6, false);
+        }
     }, {
         text: "业务员编号",
         dataIndex: "cu_sellercode",

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

@@ -67,7 +67,10 @@ Ext.define('saas.view.core.dbfind.types.VendorDbfindTrigger', {
         text: "汇率",
         xtype:'numbercolumn',
         dataIndex: "cr_rate",
-        width:80
+        width:110,
+        renderer: function (v, m, r) {
+            return saas.util.BaseUtil.numberFormat(v, 6, false);
+        }
     }, {
         text: "采购员编号",
         dataIndex: "ve_buyercode",

frontend/saas-web/app/view/document/currencys/AddWindow.js

@@ -37,6 +37,8 @@ Ext.define('saas.view.document.currencys.AddWindow', {
                 allowBlank:false,
                 fieldLabel:'汇率',
                 maxLength: 20,
+                minValue:0,
+                maxValue:99999999,
                 defaultValue: 1,
                 decimalPrecision: 6,
                 vtype: 'positiveNumber'

frontend/saas-web/app/view/document/currencys/Window.js

@@ -29,6 +29,8 @@ Ext.define('saas.view.document.currencys.Window', {
                 allowBlank:false,
                 fieldLabel:'汇率',
                 maxLength: 20,
+                minValue:0,
+                maxValue:99999999,
                 defaultValue: 1,
                 decimalPrecision: 6,
                 vtype: 'positiveNumber'

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

@@ -54,10 +54,10 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
                 }, {
                     from: 'cr_rate', to: 'pu_rate'
                 }],
-                defaultValue: {
-                    pu_currency: 'RMB',
-                    pu_rate: 1
-                },
+                // defaultValue: {
+                //     pu_currency: 'RMB',
+                //     pu_rate: 1
+                // },
                 supFieldConfig: {
                     xtype: 'numberfield',
                     readOnly: false,
@@ -96,40 +96,6 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
                     });
                     this.dialog.show();
                 }
-            }, {
-                xtype: 'condbfindtrigger',
-                fieldLabel: '币别汇率',
-                allowBlank: false,
-                dbType: 'currencyDbfindTrigger',
-                dbfinds: [{
-                    from: 'cr_name', to: 'pu_currency'
-                }, {
-                    from: 'cr_rate', to: 'pu_rate'
-                }],
-                // defaultValue: {
-                //     pu_currency: this.getViewModel().get('defaultCurrency'),
-                //     pu_rate: 1
-                // },
-                supFieldConfig: {
-                    xtype: 'numberfield',
-                    readOnly: false,
-                    defaultReadOnly: false,
-                    defaultValue: 1,
-                    decimalPrecision: 6,
-                    vtype: 'positiveNumber'
-                }
-            // }, {
-            //     xtype: "currencyDbfindTrigger",
-            //     name: "pu_currency",
-            //     fieldLabel: "币别",
-            //     defaultValue: 'RMB'
-            // }, {
-            //     xtype: "numberfield",
-            //     name: "pu_rate",
-            //     fieldLabel: "汇率",
-            //     defaultValue: 1,
-            //     decimalPrecision: 6,
-            //     vtype: 'positiveNumber'
             }, {
                 name: "detailGridField",
                 xtype: "detailGridField",