Merge remote-tracking branch 'origin/dev' into test

base-servers/account/account-server/src/main/java/com/usoftchina/saas/account/controller/AccountCenterController.java

@@ -59,6 +59,17 @@ public class AccountCenterController {
         return Result.success();
     }
 
+    /**
+     * 解绑默认企业
+     * @param bindCompanyDTO
+     * @return
+     */
+    @PostMapping("/unBind/defaultCompany")
+    public Result unBindDefaultCompany(@RequestBody BindCompanyDTO bindCompanyDTO){
+        accountCenterService.unBindDefaultCompany(bindCompanyDTO.getCompanyId(), bindCompanyDTO.getAccountId());
+        return Result.success();
+    }
+
     /**
      * 校验企业名称时候已在账户中心注册过
      * @param spaceName

base-servers/account/account-server/src/main/java/com/usoftchina/saas/account/service/AccountCenterService.java

@@ -39,4 +39,12 @@ public interface AccountCenterService {
      * @return
      */
     boolean bindDefaultCompany(Long companyId, Long accountId);
+
+    /**
+     * 解绑默认企业
+     * @param companyId
+     * @param accountId
+     * @return
+     */
+    boolean unBindDefaultCompany(Long companyId, Long accountId);
 }

base-servers/account/account-server/src/main/java/com/usoftchina/saas/account/service/impl/AccountCenterServiceImpl.java

@@ -186,4 +186,9 @@ public class AccountCenterServiceImpl implements AccountCenterService {
         return true;
     }
 
+    @Override
+    public boolean unBindDefaultCompany(Long companyId, Long accountId) {
+        accountCompanyMapper.unBindDefault(accountId);
+        return true;
+    }
 }

base-servers/auth/auth-server/src/main/java/com/usoftchina/saas/auth/controller/AuthController.java

@@ -279,7 +279,7 @@ public class AuthController {
         copyDTO.setUsername(info.getMobile());
         copyDTO.setPassword(info.getPassword());
         copyDTO.setSalt(info.getSalt());
-        copyDTO.setEmail(info.getEmail());
+        copyDTO.setEmail(StringUtils.isEmpty(info.getEmail()) ? null : info.getEmail());
         copyDTO.setMobile(info.getMobile());
         copyDTO.setRealname(info.getVipName());
         copyDTO.setType(AccountType.ADMIN.getType());

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

@@ -34,6 +34,7 @@ Ext.define('saas.view.core.form.FormPanel', {
     closeConfirm: true, // 关闭确认
     invalidText: '表单校验有误，请检查', // 校验未通过提示内容
     dirtyAuditText: '表单数据有修改，是否先保存修改？', // 有修改时点击审核提示内容
+    noDirtySaveText: '表单数据无修改', // 无修改点击保存提示内容
 
     auditTexts: {
         auditCode: 'AUDITED',

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

@@ -148,6 +148,11 @@ Ext.define('saas.view.core.form.FormPanelController', {
             saas.util.BaseUtil.showErrorToast(form.invalidText);
             return false;
         }
+        var dirty = form.isDirty();
+        if(!dirty) {
+            saas.util.BaseUtil.showErrorToast(form.noDirtySaveText);
+            return false;
+        }
 
         if(!form.beforeSave()) {
             return false;
@@ -449,8 +454,7 @@ Ext.define('saas.view.core.form.FormPanelController', {
                 userName = data.userName,
                 whereCondition = data.whereCondition,
                 companyId = saas.util.BaseUtil.getCurrentUser().companyId;
-                var url = printurl + '?' + 'reportName=' + reportName + '&' + 'companyId=' + companyId + '&whereCondition=' + whereCondition +
-                userName ? '&userName=' + userName : "";
+                var url = printurl + '?' + 'reportName=' + reportName + '&' + 'companyId=' + companyId + '&whereCondition=' + whereCondition + (userName ? '&userName=' + userName : "");
     
                 window.open(url);
             }).catch(function(res) {

frontend/saas-web/app/view/main/Main.js

@@ -46,13 +46,12 @@ Ext.define('saas.view.main.Main', {
                 },{
                     padding: '0 0 0 0',
                     reference: 'mainprofile',
-                    arrowVisible: false,
                     cls:'x-main-master',
                     ui: 'header',
                     bind: {
-                        text: '{company.name}'
+                        text: '{company.name}',
+                        arrowVisible: '{hasManyCompany}',
                     },
-                    arrowVisible: true,
                     menu: {
                         items: []
                     }

frontend/saas-web/app/view/main/MainController.js

@@ -25,7 +25,12 @@ Ext.define('saas.view.main.MainController', {
                 }
             });
         }
-        companyMenu.insert(0, items);
+        if(items.length > 1) {
+            companyMenu.insert(0, items);
+            viewModel.set('hasManyCompany', true);
+        }else {
+            viewModel.set('hasManyCompany', false);
+        }
     },
 
     onToggleNavigationSize: function () {

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

@@ -406,7 +406,7 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
         if(flag != 0) {
             var t = flag > 0 ? '大' : '小';
 
-            saas.util.BaseUtil.showConfirm('提示', '付款金额' + t + '于本次折扣后核销金额，是否仍要保存并审核？')
+            saas.util.BaseUtil.showConfirm('提示', '付款金额' + t + '于本次核销金额，是否仍要保存并审核？')
             .then(function(y) {
                 if(y == 'yes') {
                     controller.audit();

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

@@ -389,7 +389,7 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
         if(flag != 0) {
             var t = flag > 0 ? '大' : '小';
 
-            saas.util.BaseUtil.showConfirm('提示', '付款金额' + t + '于本次折扣后核销金额，是否仍要保存并审核？')
+            saas.util.BaseUtil.showConfirm('提示', '付款金额' + t + '于本次核销金额，是否仍要保存并审核？')
             .then(function(y) {
                 if(y == 'yes') {
                     controller.audit();

frontend/saas-web/app/view/money/report/ProfitDetail.js

@@ -117,9 +117,12 @@ Ext.define('saas.view.money.report.ProfitDetail', {
         dataIndex: 'profitpresent',
         width: 130,
         xtype: 'numbercolumn',
-        renderer: function(v) {
-            return Ext.util.Format.number(v, '0');
-        }
+        renderer : function(v) {
+            var arr = (v + '.').split('.');
+            var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
+            var format = '0,000.' + xr.join('');
+            return Ext.util.Format.number(v * 100, format);
+        },
     },{
         flex: 1
     }]

frontend/saas-web/app/view/stock/report/ProdinoutCount.js

@@ -26,7 +26,7 @@ Ext.define('saas.view.stock.report.ProdinoutCount', {
     }, {
         xtype: 'monthdatefield',
         name: 'pwm_yearmonth',
-        fieldLabel: '单据日期',
+        fieldLabel: '期间',
         columnWidth: 0.2
     }],
     reportColumns: [{