Merge branch 'develop-zhouyi' into 'develop'

feat(@gms/gms-plugin-billexpand): 路由模式下新建单据报错时关闭单据

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

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

@@ -2,9 +2,10 @@ import ImageViewModal from '../../../../@rbc/invoice/src/components/image-view-m
 export default {
   execute: function (bill, param) {
     const curbill = bill.dom || bill
-    GMS.$hideContainer.addComponent(ImageViewModal, {}, function (c) {
+    const name = GMS.$hideContainer.addComponent(ImageViewModal, {}, function (c) {
       c.imageTableName = param.param.tableName
       c.bill = curbill
+      c.componentName = name
     })
   }
 }
\ No newline at end of file

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

@@ -2,9 +2,10 @@
 import InvoiceModal from '../components-control/invoice-modal.vue'
 export default {
   execute: function (bill, param) {
-    GMS.$hideContainer.addComponent(InvoiceModal, {}, function (c) {
+    const name = GMS.$hideContainer.addComponent(InvoiceModal, {}, function (c) {
       c.bill = bill.dom
       c.invoiceName = param.param.invoiceName
+      c.componentName = name
     })
   }
 }
\ No newline at end of file

develop/@gms/gms-plugin-billexpand/src/components-control/invoice-modal.vue

@@ -16,6 +16,7 @@ export default {
       modalVisible: true,
       bill: null,
       invoiceName: '',
+      componentName: null,
     }
   },
   methods: {
@@ -54,6 +55,7 @@ export default {
             }
             this.bill.refreshSubDataRow(subBillName)
           })
+          this.componentName && GMS.$hideContainer.remove(this.componentName)
         })
       }
       

develop/@gms/gms-plugin-billexpand/src/components-control/typesBill.vue

@@ -79,8 +79,14 @@ export default {
         this.init = true;
       });
     },
-    loadFinishFun(bill) {
-      console.log('billState', bill.getMasterData().getValue('billState'))
+    loadFinishFun(bill, err) {
+      if (err) {
+        this.$Message.error(err)
+        setTimeout(() => {
+          this.close()
+        }, 0);
+        return
+      }
       const workflowState = bill.getMasterData().getValue('billState')
       let readArr = this.templateName.endsWith('_A')?[92]:[90,92];//如果是审批界面话，90能编辑
 			if (this.state != 'readOnly' && readArr.includes(workflowState)) {

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

@@ -8,9 +8,10 @@ export default {
     const imageId = context.selects[0][param.imageId]
     const yearFlag = context.selects[0][param.yearFlag]
     
-    GMS.$hideContainer.addComponent(ImageViewModal, {}, function (c) {
+    const name = GMS.$hideContainer.addComponent(ImageViewModal, {}, function (c) {
       c.yearFlag = yearFlag
       c.imageId = imageId
+      c.componentName = name
     })
   }
 }
\ No newline at end of file

develop/@rbc/invoice/src/components/image-view-modal/image-view-modal.vue

@@ -52,6 +52,7 @@ export default {
       currentImgIndex: 0,
       imgUrlSet: new Set(),
       imageTableName: null,
+      componentName: null,
     };
   },
   watch: {
@@ -64,6 +65,7 @@ export default {
         this.bill = null
         this.imageId = null
         this.yearFlags = []
+        this.componentName && GMS.$hideContainer.remove(this.componentName)
       }
     },
     imageId(id) {