Merge branch 'dev' of ssh://10.10.100.21/source/saas-platform into dev

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/document/customer/FormPanel.js

@@ -142,7 +142,7 @@ Ext.define('saas.view.document.customer.FormPanel', {
                     from: 'cr_rate', to: 'cu_taxrate'
                 }],
                 defaultValue: {
-                    cu_currency: 'RMB',
+                    cu_currency: this.getViewModel().get('defaultCurrency'),
                     cu_taxrate: 1
                 },
                 supFieldConfig: {

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

@@ -148,7 +148,7 @@ Ext.define('saas.view.document.vendor.FormPanel', {
                     from: 'cr_rate', to: 've_taxrate'
                 }],
                 defaultValue: {
-                    ve_currency: 'RMB',
+                    ve_currency: this.getViewModel().get('defaultCurrency'),
                     ve_taxrate: 1
                 },
                 supFieldConfig: {

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,

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

@@ -75,10 +75,10 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
                 }, {
                     from: 'cr_rate', to: 'pi_rate'
                 }],
-                defaultValue: {
-                    pi_currency: 'RMB',
-                    pi_rate: 1
-                },
+                // defaultValue: {
+                //     pi_currency: this.getViewModel().get('defaultCurrency'),
+                //     pi_rate: 1
+                // },
                 supFieldConfig: {
                     xtype: 'numberfield',
                     readOnly: false,

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

@@ -71,10 +71,10 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
                 }, {
                     from: 'cr_rate', to: 'pi_rate'
                 }],
-                defaultValue: {
-                    pi_currency: 'RMB',
-                    pi_rate: 1
-                },
+                // defaultValue: {
+                //     pi_currency: this.getViewModel().get('defaultCurrency'),
+                //     pi_rate: 1
+                // },
                 supFieldConfig: {
                     xtype: 'numberfield',
                     readOnly: false,

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

@@ -90,10 +90,10 @@ Ext.define('saas.view.sale.sale.FormPanel', {
                 }, {
                     from: 'cr_rate', to: 'sa_rate'
                 }],
-                defaultValue: {
-                    sa_currency: 'RMB',
-                    sa_rate: 1
-                },
+                // defaultValue: {
+                //     sa_currency: this.getViewModel().get('defaultCurrency'),
+                //     sa_rate: 1
+                // },
                 supFieldConfig: {
                     xtype: 'numberfield',
                     readOnly: false,

frontend/saas-web/app/view/sale/saleIn/FormPanel.js

@@ -98,10 +98,10 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
                 }, {
                     from: 'cr_rate', to: 'pi_rate'
                 }],
-                defaultValue: {
-                    pi_currency: 'RMB',
-                    pi_rate: 1
-                },
+                // defaultValue: {
+                //     pi_currency: this.getViewModel().get('defaultCurrency'),
+                //     pi_rate: 1
+                // },
                 supFieldConfig: {
                     xtype: 'numberfield',
                     readOnly: false,

frontend/saas-web/app/view/sale/saleOut/FormPanel.js

@@ -107,10 +107,10 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
                 }, {
                     from: 'cr_rate', to: 'pi_rate'
                 }],
-                defaultValue: {
-                    pi_currency: 'RMB',
-                    pi_rate: 1
-                },
+                // defaultValue: {
+                //     pi_currency: this.getViewModel().get('defaultCurrency'),
+                //     pi_rate: 1
+                // },
                 supFieldConfig: {
                     xtype: 'numberfield',
                     readOnly: false,