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

applications/document/document-dto/src/main/java/com.usoftchina.saas.document.dto/CustomerDTO.java

@@ -63,4 +63,6 @@ public class CustomerDTO extends CommonBaseDTO implements Serializable {
     private String cu_remark;
 
     private String cu_currency;
+
+    private Double cr_rate;
 }

applications/document/document-dto/src/main/java/com/usoftchina/saas/document/entities/Customer.java

@@ -59,4 +59,6 @@ public class Customer extends CommonBaseEntity implements Serializable {
     private String cu_remark;
 
     private String cu_currency;
+
+    private Double cr_rate;
 }

applications/document/document-dto/src/main/java/com/usoftchina/saas/document/entities/Vendor.java

@@ -117,4 +117,6 @@ public class Vendor extends CommonBaseEntity implements Serializable{
 
     private String ve_currency;
 
+    private Double cr_rate;
+
 }

applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/impl/BankinformationServiceImpl.java

@@ -79,6 +79,16 @@ public class BankinformationServiceImpl extends CommonBaseServiceImpl<Bankinform
             docBaseDTO.setName(BillCodeSeq.BANKINFORMATION.getCaller());
             messageLogService.save(docBaseDTO);
             Banksubledger banksubledger = this.changBanksubledger(bankinformation);
+
+            //判断账户名称是否存在
+            if (bankinformationMapper.getBankNameSame(bankinformation.getBk_bankname(), BaseContextHolder.getCompanyId()) > 1){
+                throw new BizException(BIZ_SAME.getCode(),BIZ_SAME.getMessage());
+            }else if (bankinformationMapper.getBankNameSame(bankinformation.getBk_bankname(), BaseContextHolder.getCompanyId()) == 1){
+                if (bankinformationMapper.getBankNameSameById(bankinformation.getBk_bankname(), docBaseDTO.getId(),
+                        BaseContextHolder.getCompanyId()) == 1){
+                    throw new BizException(BIZ_SAME.getCode(),BIZ_SAME.getMessage());
+                }
+            }
             banksubledgerMapper.insertSelective(banksubledger);
         }else {
             docBaseDTO = this.getBaseDTOById(bid);

applications/document/document-server/src/main/resources/mapper/BankinformationMapper.xml

@@ -32,7 +32,7 @@
   <sql id="Base_Column_List" >
     bk_id, bk_bankcode, bk_bankname, bk_date, bk_type, bk_beginamount, bk_thisamount, 
     bk_status, bk_statuscode, bk_ym, bankinformation.companyid companyid,
-    bankinformation.updaterId updaterId, bankinformation.updateTime updateTime, bk_text1, bk_text2, bk_text3, bk_text4, bk_text5, bk_remark,bk_currency,cr_rate
+    bankinformation.updaterId updaterId, bankinformation.updateTime updateTime, bk_text1, bk_text2, bk_text3, bk_text4, bk_text5, bk_remark,bk_currency
   </sql>
   <sql id="Blob_Column_List" >
     bk_remark
@@ -319,7 +319,7 @@
 
   <select id="selectBankinformationBycondition" resultMap="BaseResultMap">
     select
-    <include refid="Base_Column_List" />
+    <include refid="Base_Column_List" /> ,cr_rate
     from bankinformation
     left join currencys on currencys.companyId = Bankinformation.companyid and cr_name = bk_currency
     <where>

applications/document/document-server/src/main/resources/mapper/CustomerMapper.xml

@@ -32,18 +32,19 @@
     <result column="cu_preamount" jdbcType="DOUBLE" property="cu_preamount" />
     <result column="cu_remark" jdbcType="VARCHAR" property="cu_remark" />
     <result column="cu_currency" jdbcType="VARCHAR" property="cu_currency" />
+    <result column="cr_rate" jdbcType="DOUBLE" property="cr_rate" />
   </resultMap>
   <sql id="Base_Column_List">
     cu_id, cu_code,cu_shortname, cu_name, cu_uu, cu_type, cu_begindate, cu_beginaramount, cu_beginprerecamount,
     cu_promisedays, cu_taxrate, cu_sellerid, cu_sellercode, cu_sellername, cu_credit, 
-    cu_status, cu_statuscode, companyid,
-    updaterid, updatetime, cu_text1, cu_text2, cu_text3, cu_text4, cu_text5, cu_leftamount, 
-    cu_recamount,cu_preamount,cu_remark,cu_currency
+    cu_status, cu_statuscode, customer.companyid companyid,
+    customer.updaterid updaterid, customer.updatetime updatetime, cu_text1, cu_text2, cu_text3, cu_text4, cu_text5, cu_leftamount,
+    cu_recamount,cu_preamount,cu_remark,cu_currency,cr_rate
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
     select
     <include refid="Base_Column_List" />
-    from customer
+    from customer left join currencys on cr_name = cu_currency and customer.companyId = currencys.companyId
     where cu_id = #{cu_id,jdbcType=INTEGER}
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">

applications/document/document-server/src/main/resources/mapper/VendorMapper.xml

@@ -118,14 +118,14 @@
     <sql id="Base_Column_List" >
         ve_id, ve_code, ve_shortname,ve_name, ve_uu, ve_type, ve_begindate, ve_beginapamount, ve_beginprepayamount,
         ve_promisedays, ve_taxrate, ve_nsrzh, ve_bankaccount, ve_bankcode, ve_status, ve_statuscode,
-        companyId, updaterId, updateTime, ve_text1,
+        vendor.companyId companyId, vendor.updaterId updaterId, vendor.updateTime updateTime, ve_text1,
         ve_text2, ve_text3, ve_text4, ve_text5, ve_payamount, ve_leftamount, ve_beginym, ve_preamount,ve_remark,
-        ve_buyerid,ve_buyercode,ve_buyername,ve_address,ve_currency
+        ve_buyerid,ve_buyercode,ve_buyername,ve_address,ve_currency,cr_rate
     </sql>
     <select id="selectByPrimaryKey" resultMap="VendorResultMapper" parameterType="java.lang.Long" >
         select
         <include refid="Base_Column_List" />
-        from vendor
+        from vendor left join currencys on cr_name = ve_currency and vendor.companyId = currencys.companyId
         where ve_id = #{id}
     </select>
     <delete id="deleteByPrimaryKey" parameterType="java.lang.Long" >

frontend/saas-web/app/view/core/base/BasePanel.js

@@ -50,7 +50,7 @@ Ext.define('saas.view.core.base.BasePanel', {
                 frame:false,
                 xtype: 'toolbar',
                 dock: 'top',
-                // layout: 'column',
+                layout: 'column',
                 style: {
                     margin: '0 0 12px 0',
                     padding: '10px 0 14px 8px',

frontend/saas-web/app/view/core/dbfind/ConDbfindTrigger.js

@@ -69,13 +69,18 @@ Ext.define('saas.view.core.form.field.ConDbfindTrigger', {
             });
             field1.on('change', function(f) {
                 let field1 = me.items.items[1];
+                
                 if(f.dbValues) {
+                    f.ownerCt.dbValues = f.dbValues;
                     let value = f.dbValues[f.dbfinds[1].from];
                     field1.setValue(value);
                     field1.publishState('value', value);
+                }else {
+                    f.ownerCt.dbValues = {};
                 }
             });
-            field1.on('blur', function() {
+            field1.on('blur', function(f) {
+                f.ownerCt.dbValues = f.dbValues;
                 me.fireEvent('change', this)
             });
 

frontend/saas-web/app/view/core/form/FormPanel.js

@@ -58,7 +58,7 @@ Ext.define('saas.view.core.form.FormPanel', {
             text: '新增',
             hidden: true,
             bind: {
-                hidden: '{!id}'
+                hidden: '{!showAddBtn || !id}'
             },
             handler: 'add'
         }, {
@@ -75,7 +75,7 @@ Ext.define('saas.view.core.form.FormPanel', {
             text: '保存',
             handler: 'onSave',
             bind: {
-                hidden: '{'+ me._statusCodeField + ' == "' + me.auditTexts.auditCode + '"}',
+                hidden: '{!showSaveBtn || '+ me._statusCodeField + ' == "' + me.auditTexts.auditCode + '"}',
                 // disabled: '{!base.valid || '+ me._statusCodeField + ' == "AUDITED" || ' + me._statusCodeField + ' == "OPEN"}'
                 disabled: '{!base.valid || '+ me._statusCodeField + ' == "' + me.auditTexts.auditCode + '"}'
             }
@@ -84,7 +84,7 @@ Ext.define('saas.view.core.form.FormPanel', {
             xtype: 'button',
             text: '删除',
             bind: {
-                hidden: '{deleteHidden || ' + me._statusCodeField + '=="' + me.auditTexts.auditCode + '"}'
+                hidden: '{!showDeleteBtn || deleteHidden || ' + me._statusCodeField + '=="' + me.auditTexts.auditCode + '"}'
             },
             handler: 'delete'
         }, {
@@ -127,7 +127,7 @@ Ext.define('saas.view.core.form.FormPanel', {
             target: 'main',
             handler: 'onSetting',
             bind: {
-                hidden: '{!isAdmin}'
+                hidden: '{!configurable || !isAdmin}'
             }
         }];
 

frontend/saas-web/app/view/core/form/FormPanelModel.js

@@ -11,13 +11,17 @@ Ext.define('saas.view.core.form.FormPanelModel', {
             codeEditable: false, // 单据编号是否可编辑
         },
         auditBtnText: '审核', // 审核按钮默认text
+        showAddBtn: true, // 显示新增按钮
+        showSaveBtn: true, // 显示保存按钮
+        showDeleteBtn: true, // 显示删除按钮
         showCopyBtn: true, // 显示复制按钮
-        showPrintBtn: false, // 显示打印按钮
         showAuditBtn: true, // 显示审核、反审核按钮
+        showPrintBtn: false, // 显示打印按钮
+        configurable: true, // 显示界面设置按钮
+
         detailBindeFields: [], // 从表绑定列
         detailStore: null, // 从表store
 
-        configurable: true
     },
 
     formulas:{

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

@@ -151,7 +151,13 @@ Ext.define('saas.view.document.customer.FormPanel', {
                     ignore:true,
                     defaultReadOnly: false,
                     decimalPrecision: 6,
-                    vtype: 'positiveNumber'
+                    vtype: 'positiveNumber',
+                    listeners: {
+                        change: function(f, v) {
+                            var defaultCurrency = Ext.getCmp('mainView').getViewModel().get('defaultCurrency');
+                            f.setReadOnly(f.ownerCt.items.items[0].value == defaultCurrency);
+                        }
+                    }
                 },
                 group: '交易信息',
             }, {

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

@@ -157,7 +157,13 @@ Ext.define('saas.view.document.vendor.FormPanel', {
                     ignore:true,
                     defaultReadOnly: false,
                     decimalPrecision: 6,
-                    vtype: 'positiveNumber'
+                    vtype: 'positiveNumber',
+                    listeners: {
+                        change: function(f, v) {
+                            var defaultCurrency = Ext.getCmp('mainView').getViewModel().get('defaultCurrency');
+                            f.setReadOnly(f.ownerCt.items.items[0].value == defaultCurrency);
+                        }
+                    }
                 },
                 group: '交易信息',
             }, {

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

@@ -79,7 +79,13 @@ Ext.define('saas.view.money.othreceipts.FormPanel', {
                     readOnly: false,
                     defaultReadOnly: false,
                     decimalPrecision: 6,
-                    vtype: 'positiveNumber'
+                    vtype: 'positiveNumber',
+                    listeners: {
+                        change: function(f, v) {
+                            var defaultCurrency = Ext.getCmp('mainView').getViewModel().get('defaultCurrency');
+                            f.setReadOnly(f.ownerCt.items.items[0].value == defaultCurrency);
+                        }
+                    }
                 },
                 // }, {
                 //     xtype: "currencyDbfindTrigger",

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

@@ -80,7 +80,13 @@ Ext.define('saas.view.money.othspendings.FormPanel', {
                     defaultReadOnly: false,
                     defaultValue: 1,
                     decimalPrecision: 6,
-                    vtype: 'positiveNumber'
+                    vtype: 'positiveNumber',
+                    listeners: {
+                        change: function(f, v) {
+                            var defaultCurrency = Ext.getCmp('mainView').getViewModel().get('defaultCurrency');
+                            f.setReadOnly(f.ownerCt.items.items[0].value == defaultCurrency);
+                        }
+                    }
                 }
             // },{
             //     xtype: "currencyDbfindTrigger",

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

@@ -72,7 +72,13 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
                     readOnly: false,
                     defaultReadOnly: false,
                     decimalPrecision: 6,
-                    vtype: 'positiveNumber'
+                    vtype: 'positiveNumber',
+                    listeners: {
+                        change: function(f, v) {
+                            var defaultCurrency = Ext.getCmp('mainView').getViewModel().get('defaultCurrency');
+                            f.setReadOnly(f.ownerCt.items.items[0].value == defaultCurrency);
+                        }
+                    }
                 }
             },{
                 xtype: "datefield",

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

@@ -71,7 +71,13 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
                     readOnly: false,
                     defaultReadOnly: false,
                     decimalPrecision: 6,
-                    vtype: 'positiveNumber'
+                    vtype: 'positiveNumber',
+                    listeners: {
+                        change: function(f, v) {
+                            var defaultCurrency = Ext.getCmp('mainView').getViewModel().get('defaultCurrency');
+                            f.setReadOnly(f.ownerCt.items.items[0].value == defaultCurrency);
+                        }
+                    }
                 }
             },{
                 xtype: "datefield",

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

@@ -539,7 +539,13 @@ Ext.define('saas.view.money.verification.FormPanel', {
                             readOnly: false,
                             defaultReadOnly: false,
                             decimalPrecision: 6,
-                            vtype: 'positiveNumber'
+                            vtype: 'positiveNumber',
+                            listeners: {
+                                change: function(f, v) {
+                                    var defaultCurrency = Ext.getCmp('mainView').getViewModel().get('defaultCurrency');
+                                    f.setReadOnly(f.ownerCt.items.items[0].value == defaultCurrency);
+                                }
+                            }
                         },
                     },  {
                         fieldLabel: '日期',
@@ -601,7 +607,13 @@ Ext.define('saas.view.money.verification.FormPanel', {
                             readOnly: false,
                             defaultReadOnly: false,
                             decimalPrecision: 6,
-                            vtype: 'positiveNumber'
+                            vtype: 'positiveNumber',
+                            listeners: {
+                                change: function(f, v) {
+                                    var defaultCurrency = Ext.getCmp('mainView').getViewModel().get('defaultCurrency');
+                                    f.setReadOnly(f.ownerCt.items.items[0].value == defaultCurrency);
+                                }
+                            }
                         },
                     }, {
                         fieldLabel: '日期',
@@ -691,7 +703,13 @@ Ext.define('saas.view.money.verification.FormPanel', {
                             readOnly: false,
                             defaultReadOnly: false,
                             decimalPrecision: 6,
-                            vtype: 'positiveNumber'
+                            vtype: 'positiveNumber',
+                            listeners: {
+                                change: function(f, v) {
+                                    var defaultCurrency = Ext.getCmp('mainView').getViewModel().get('defaultCurrency');
+                                    f.setReadOnly(f.ownerCt.items.items[0].value == defaultCurrency);
+                                }
+                            }
                         },
                     }, {
                         fieldLabel: '日期',
@@ -769,7 +787,13 @@ Ext.define('saas.view.money.verification.FormPanel', {
                             readOnly: false,
                             defaultReadOnly: false,
                             decimalPrecision: 6,
-                            vtype: 'positiveNumber'
+                            vtype: 'positiveNumber',
+                            listeners: {
+                                change: function(f, v) {
+                                    var defaultCurrency = Ext.getCmp('mainView').getViewModel().get('defaultCurrency');
+                                    f.setReadOnly(f.ownerCt.items.items[0].value == defaultCurrency);
+                                }
+                            }
                         },
                     }, {
                         fieldLabel: '日期',
@@ -847,7 +871,13 @@ Ext.define('saas.view.money.verification.FormPanel', {
                             readOnly: false,
                             defaultReadOnly: false,
                             decimalPrecision: 6,
-                            vtype: 'positiveNumber'
+                            vtype: 'positiveNumber',
+                            listeners: {
+                                change: function(f, v) {
+                                    var defaultCurrency = Ext.getCmp('mainView').getViewModel().get('defaultCurrency');
+                                    f.setReadOnly(f.ownerCt.items.items[0].value == defaultCurrency);
+                                }
+                            }
                         },
                     },{
                         fieldLabel: '日期',

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

@@ -64,7 +64,13 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
                     defaultReadOnly: false,
                     defaultValue: 1,
                     decimalPrecision: 6,
-                    vtype: 'positiveNumber'
+                    vtype: 'positiveNumber',
+                    listeners: {
+                        change: function(f, v) {
+                            var defaultCurrency = Ext.getCmp('mainView').getViewModel().get('defaultCurrency');
+                            f.setReadOnly(f.ownerCt.items.items[0].value == defaultCurrency);
+                        }
+                    }
                 }
             }, {
                 xtype: "datefield",

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

@@ -85,7 +85,13 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
                     defaultReadOnly: false,
                     defaultValue: 1,
                     decimalPrecision: 6,
-                    vtype: 'positiveNumber'
+                    vtype: 'positiveNumber',
+                    listeners: {
+                        change: function(f, v) {
+                            var defaultCurrency = Ext.getCmp('mainView').getViewModel().get('defaultCurrency');
+                            f.setReadOnly(f.ownerCt.items.items[0].value == defaultCurrency);
+                        }
+                    }
                 },
             }, {
                 xtype: "datefield",
@@ -94,7 +100,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
                 allowBlank: false,
                 columnWidth: 0.25,
                 defaultValue: new Date()
-            },{
+            }, {
                 xtype: "hidden",
                 name: "pi_puid",
                 fieldLabel: "采购单id",

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

@@ -81,7 +81,13 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
                     defaultReadOnly: false,
                     defaultValue: 1,
                     decimalPrecision: 6,
-                    vtype: 'positiveNumber'
+                    vtype: 'positiveNumber',
+                    listeners: {
+                        change: function(f, v) {
+                            var defaultCurrency = Ext.getCmp('mainView').getViewModel().get('defaultCurrency');
+                            f.setReadOnly(f.ownerCt.items.items[0].value == defaultCurrency);
+                        }
+                    }
                 }
             }, {
                 xtype: "datefield",

frontend/saas-web/app/view/sale/business/Business.js → frontend/saas-web/app/view/sale/b2b/Business.js

@@ -1,13 +1,13 @@
 /**
  * 商机-公司商机
  */
-Ext.define('saas.view.sale.business.Business', {
+Ext.define('saas.view.sale.b2b.Business', {
     extend: 'saas.view.core.base.BasePanel',
-    xtype: 'sale-business-business',
+    xtype: 'sale-b2b-business',
 
-    controller: 'sale-business-business',
-    viewModel: 'sale-business-business',
-    viewName: 'sale-business-business',
+    controller: 'sale-b2b-business',
+    viewModel: 'sale-b2b-business',
+    viewName: 'sale-b2b-business',
 
 
     // dataUrl: 'http://10.1.80.23:8560/api/sale/sale/enterprise/businessChance',

frontend/saas-web/app/view/sale/business/BusinessController.js → frontend/saas-web/app/view/sale/b2b/BusinessController.js

@@ -1,6 +1,6 @@
-Ext.define('saas.view.sale.business.BusinessController', {
+Ext.define('saas.view.sale.b2b.BusinessController', {
     extend: 'saas.view.core.base.BasePanelController',
-    alias: 'controller.sale-business-business',
+    alias: 'controller.sale-b2b-business',
 
     showQuoteWin: function(record) {
         var me = this,

frontend/saas-web/app/view/sale/b2b/BusinessModel.js

@@ -0,0 +1,8 @@
+Ext.define('saas.view.sale.b2b.BusinessModel', {
+    extend: 'saas.view.core.base.BasePanelModel',
+    alias: 'viewmodel.sale-b2b-business',
+
+    data: {
+        configurable: false
+    }
+});

frontend/saas-web/app/view/sale/b2b/MyBusiness.js

@@ -0,0 +1,12 @@
+/**
+ * 商机-我的商机
+ */
+Ext.define('saas.view.sale.b2b.MyBusiness', {
+    extend: 'saas.view.sale.b2b.Business',
+    xtype: 'sale-b2b-mybusiness',
+
+    viewName: 'sale-b2b-mybusiness',
+
+    // dataUrl: 'http://10.1.80.23:8560/api/sale/sale/personal/businessChance',
+    dataUrl: '/api/sale/sale/personal/businessChance',
+});

frontend/saas-web/app/view/sale/business/Product.js → frontend/saas-web/app/view/sale/b2b/Product.js

@@ -1,11 +1,11 @@
 /**
  * 产品库
  */
-Ext.define('saas.view.sale.business.Product', {
+Ext.define('saas.view.sale.b2b.Product', {
     extend: 'saas.view.core.base.BasePanel',
-    xtype: 'sale-business-product',
+    xtype: 'sale-b2b-product',
 
-    viewName: 'sale-business-Product',
+    viewName: 'sale-b2b-Product',
 
 
     // dataUrl: 'http://10.1.80.23:8560/api/document/product/prodStorage/list',
@@ -134,7 +134,8 @@ Ext.define('saas.view.sale.business.Product', {
                             };
                             grid.setLoading(true);
                             saas.util.BaseUtil.request({
-                                url: 'http://10.1.80.23:8560/api/document/product/prodStorage/saler',
+                                // url: 'http://10.1.80.23:8560/api/document/product/prodStorage/saler',
+                                url: '/api/document/product/prodStorage/saler',
                                 params: JSON.stringify(params),
                                 method: 'POST',
                             })

frontend/saas-web/app/view/sale/business/QuoteWin.js → frontend/saas-web/app/view/sale/b2b/QuoteWin.js

@@ -1,4 +1,4 @@
-Ext.define('saas.view.sale.business.QuoteWin', {
+Ext.define('saas.view.sale.b2b.QuoteWin', {
     extend: 'Ext.window.Window',
     xtype: 'quotewin',
 

frontend/saas-web/app/view/sale/business/BusinessModel.js

@@ -1,8 +0,0 @@
-Ext.define('saas.view.sale.business.BusinessModel', {
-    extend: 'saas.view.core.base.BasePanelModel',
-    alias: 'viewmodel.sale-business-business',
-
-    data: {
-        configurable: false
-    }
-});

frontend/saas-web/app/view/sale/business/MyBusiness.js

@@ -1,12 +0,0 @@
-/**
- * 商机-我的商机
- */
-Ext.define('saas.view.sale.business.MyBusiness', {
-    extend: 'saas.view.sale.business.Business',
-    xtype: 'sale-business-mybusiness',
-
-    viewName: 'sale-business-mybusiness',
-
-    // dataUrl: 'http://10.1.80.23:8560/api/sale/sale/personal/businessChance',
-    dataUrl: '/api/sale/sale/personal/businessChance',
-});

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

@@ -100,7 +100,13 @@ Ext.define('saas.view.sale.sale.FormPanel', {
                     defaultReadOnly: false,
                     defaultValue: 1,
                     decimalPrecision: 6,
-                    vtype: 'positiveNumber'
+                    vtype: 'positiveNumber',
+                    listeners: {
+                        change: function(f, v) {
+                            var defaultCurrency = Ext.getCmp('mainView').getViewModel().get('defaultCurrency');
+                            f.setReadOnly(f.ownerCt.items.items[0].value == defaultCurrency);
+                        }
+                    }
                 }
             }, {
                 xtype: "datefield",

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

@@ -108,7 +108,13 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
                     defaultReadOnly: false,
                     defaultValue: 1,
                     decimalPrecision: 6,
-                    vtype: 'positiveNumber'
+                    vtype: 'positiveNumber',
+                    listeners: {
+                        change: function(f, v) {
+                            var defaultCurrency = Ext.getCmp('mainView').getViewModel().get('defaultCurrency');
+                            f.setReadOnly(f.ownerCt.items.items[0].value == defaultCurrency);
+                        }
+                    }
                 }
             }, {
                 xtype: "datefield",

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

@@ -117,7 +117,13 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
                     defaultReadOnly: false,
                     defaultValue: 1,
                     decimalPrecision: 6,
-                    vtype: 'positiveNumber'
+                    vtype: 'positiveNumber',
+                    listeners: {
+                        change: function(f, v) {
+                            var defaultCurrency = Ext.getCmp('mainView').getViewModel().get('defaultCurrency');
+                            f.setReadOnly(f.ownerCt.items.items[0].value == defaultCurrency);
+                        }
+                    }
                 }
             }, {
                 xtype: "datefield",

frontend/saas-web/resources/json/navigation.json

@@ -72,19 +72,19 @@
             "viewType": "sale-salein-querypanel"
         }, {
             "b2b":true,
-            "id": "sale-business-product",
+            "id": "sale-b2b-product",
             "text": "产品库",
-            "viewType": "sale-business-product"
+            "viewType": "sale-b2b-product"
         }, {
             "b2b":true,
-            "id": "sale-business-business",
+            "id": "sale-b2b-business",
             "text": "公司商机",
-            "viewType": "sale-business-business"
+            "viewType": "sale-b2b-business"
         }, {
             "b2b":true,
-            "id": "sale-business-mybusiness",
+            "id": "sale-b2b-mybusiness",
             "text": "我的商机",
-            "viewType": "sale-business-mybusiness"
+            "viewType": "sale-b2b-mybusiness"
         }]
     }, {
         "text": "报表",