Merge branch 'develop-zhouyi' into 'develop'

feat(@rbc/rbc-login): 已经登录的用户不能重复登录，需先注销

See merge request GFP/RBC/rbc-frontend!115

develop/@gms/gms-plugin-billexpand/src/formula/SetSubFieldsByBaseData.js

@@ -53,10 +53,6 @@ export default {
             }
             if (baseDataParamArrayList.length === targetSubTableFieldList.length && targetSubTableFieldList.length > 0) {
                 this.getCombBaseDataList(baseDataParamArrayList, (baseDataList) => {
-                    let newIndex = context.getSubFocus()
-                    if (oldIndex !== newIndex) {
-                        context.setSubFocus(oldIndex)
-                    }
                     focusData[sourceBaseDataField.FieldCode]._field_old_value_ = focusData[sourceBaseDataField.FieldCode].value
                     for (let i = 0; i < targetSubTableFieldList.length; i++) {
                         focusData[targetSubTableFieldList[i].FieldCode]._field_old_value_ = focusData[targetSubTableFieldList[i].FieldCode].value = baseDataList[i]

develop/@rbc/rbc-login/src/views/login/index.vue

@@ -117,6 +117,7 @@ export default {
       titleColor: 'black',
       Image: "",
       imgLoading: 0,
+      checkLogin: true, // 默认当作已经登录了，因为已经登录的时候不能再进登录页
       userData: {
         username: "",
         password: "",
@@ -160,6 +161,12 @@ export default {
     this.getLoginAssetsInfo();
   },
   mounted() {
+    window.GMS.util.nvwa.checkLogin().then(() => {
+      this.checkLogin = true
+      this.$Message.error('您已登录，请先注销')
+    }).catch(() => {
+      this.checkLogin = false
+    })
     document.addEventListener('keyup', this.onKeyUp)
     this.getVerificationCode();
   },
@@ -229,6 +236,10 @@ export default {
     },
 
     submit() {
+      if (this.checkLogin) {
+        this.$Message.error('您已登录，请先注销')
+        return
+      }
       this.$refs["userData"].validate((valid) => {
         if (valid) {
           this.loginLoading = true;
@@ -307,7 +318,7 @@ export default {
     width: 100%;
     height: 100%;
     background-color: white;
-    z-index: 2000;
+    z-index: 100;
   }
   
   .login-img-bg {