Merge branch 'develop-zhouyi' into 'develop'

fix(@gms/gms-plugin-billexpand): 点同意按钮只有只读不校验公式

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

develop/@gms/gms-plugin-billexpand/src/actions/agreeAction.js

@@ -14,10 +14,25 @@ export default {
       } 
       let curTagId = window.nros.context.getCurrTag();
       let oldObj = curTagId && GMS.oldBillDataMap[curTagId]?GMS.oldBillDataMap[curTagId]:GMS.oldBillData;
-      let flag = compareData(oldObj, bill.getBuillData()) || bill.getGlobalParam("noRunTimeFormula");
-      if (flag) {
+      const dataChangeFlag = compareData(oldObj, bill.getBuillData())
+      const noRunTimeFormula = bill.getGlobalParam("noRunTimeFormula")
+      if (noRunTimeFormula) {
         this.approvalLogical(bill, param, this)
-      } else {
+      }
+      else if (!dataChangeFlag) {
+        bill.runFormulaCheckData(param, (msg) => {
+          if (msg.length == 0) {
+            this.approvalLogical(bill, param, this)
+          }
+          else {
+            GMS.vbus.$Modal.warning({
+              title: "信息错误",
+              content: msg,
+            });
+          }
+        })
+      }
+      else {
         bill.runFormulaCheckData(param, (msg) => {
           if (msg.length == 0) {
             GMS.$hideContainer.$Modal.confirm({

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

@@ -117,7 +117,7 @@ export default {
       titleColor: 'black',
       Image: "",
       imgLoading: 0,
-      checkLogin: true, // 默认当作已经登录了，因为已经登录的时候不能再进登录页
+      checkLogin: window.osConfig.isDevelop ? false : true, // 默认当作已经登录了，因为已经登录的时候不能再进登录页
       userData: {
         username: "",
         password: "",
@@ -161,12 +161,14 @@ export default {
     this.getLoginAssetsInfo();
   },
   mounted() {
-    window.GMS.util.nvwa.checkLogin().then(() => {
-      this.checkLogin = true
-      this.$Message.error('您已登录，请先注销')
-    }).catch(() => {
-      this.checkLogin = false
-    })
+    if (!window.osConfig.isDevelop) {
+      window.GMS.util.nvwa.checkLogin().then(() => {
+        this.checkLogin = true
+        this.$Message.error('您已登录，请先注销')
+      }).catch(() => {
+        this.checkLogin = false
+      })
+    }
     document.addEventListener('keyup', this.onKeyUp)
     this.getVerificationCode();
   },