Merge branch 'develop-zhouyi' into 'develop'

Develop zhouyi

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

develop/@gms/gms-plugin-billexpand/src/query-actions/leafletGenerationTYAction.js

@@ -72,9 +72,10 @@ export default {
         })
     },
     searchBillObj(billDefine, billId, index) {
+        !billDefine.startsWith('bill.') && (billDefine = 'bill.' + billDefine)
         return new Promise((resolve, reject) => {
             GMS.$http.get(
-                `/gms/bill/bill.${billDefine}/${billId}?withSubs=true`
+                `/gms/bill/${billDefine}/${billId}?withSubs=true`
             ).then((data) => {
                 if (data.status == 200 && data.data.code == 0) {
                     let obj = data.data.content

develop/@gms/gms-plugin-billexpand/src/query-actions/summaryGenerationTYAction.js

@@ -72,9 +72,10 @@ export default {
         })
     },
     searchBillObj(billDefine, billId ,index) {
+        !billDefine.startsWith('bill.') && (billDefine = 'bill.' + billDefine)
         return new Promise((resolve, reject) => {
             GMS.$http.get(
-                `/gms/bill/bill.${billDefine}/${billId}?withSubs=true`
+                `/gms/bill/${billDefine}/${billId}?withSubs=true`
             ).then((data) => {
                 if (data.status == 200 && data.data.code == 0) {
                     let obj = data.data.content

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

@@ -117,7 +117,6 @@ export default {
       titleColor: 'black',
       Image: "",
       imgLoading: 0,
-      checkLogin: window.osConfig.isDevelop ? false : true, // 默认当作已经登录了，因为已经登录的时候不能再进登录页
       userData: {
         username: "",
         password: "",
@@ -163,12 +162,15 @@ export default {
   mounted() {
     if (!window.osConfig.isDevelop) {
       window.GMS.util.nvwa.checkLogin().then(() => {
-        this.checkLogin = true
-        this.$Message.error('您已登录，请先注销')
+        const url = new URL(window.location.href)
+        url.searchParams.delete('nvwasys')
+        sessionStorage.clear()
+        window.location.href = url.origin
+        return
       }).catch(() => {
-        this.checkLogin = false
       })
     }
+    
     document.addEventListener('keyup', this.onKeyUp)
     this.getVerificationCode();
   },
@@ -238,10 +240,6 @@ export default {
     },
 
     submit() {
-      if (this.checkLogin) {
-        this.$Message.error('您已登录，请先注销')
-        return
-      }
       this.$refs["userData"].validate((valid) => {
         if (valid) {
           this.loginLoading = true;

develop/@rbc/runner-bill-form/src/views/bill-form-runner.vue

@@ -33,7 +33,8 @@ export default {
       templateName: "",
       init:true,
       curTagId: null,
-      hideButtonGroup:false
+      hideButtonGroup:false,
+      forceClose: false,
     };
   },
   created() {
@@ -86,7 +87,7 @@ export default {
       });
     },
     checkBillChange(cb, id) {
-      if (id != this.curTagId) {
+      if (id != this.curTagId || this.forceClose) {
         cb(true)
         return
       }
@@ -108,7 +109,15 @@ export default {
         });
       }
     },
-    loadFinishFun(bill) {
+    loadFinishFun(bill, err) {
+      if (!GMS.oldBillDataMap) GMS.oldBillDataMap = {}
+      if (err) {
+        setTimeout(() => {
+          this.forceClose = true
+          GMS.$hideContainer.$portalAPI.emit('entry-tag-close', nros.getCurrTag())
+        }, 0);
+        return
+      }
       this.curBill = bill;
       const billState = bill.getMasterData().getValue('billState')
       let readArr = this.templateName.endsWith('_A')?[92]:[90,92];//如果是审批界面话，90能编辑
@@ -121,7 +130,6 @@ export default {
       }
       setTimeout(() => {
         GMS.oldBillData = bill.getBuillData();
-        if (!GMS.oldBillDataMap) GMS.oldBillDataMap = {}
         GMS.oldBillDataMap[this.curTagId] = bill.getBuillData()
       }, 100);
     },