Merge branch 'develop-zhouyi' into 'develop'

Develop zhouyi

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

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

@@ -142,6 +142,13 @@ export default {
         this.init = true;
       });
     });
+    GMS.vbus.$on("workflow-state-change", (val) => {
+      console.log('refresh', val)
+      this.init = false;
+      this.$nextTick(() => {
+        this.init = true;
+      })
+    })
     GMS.vbus.$on("submitSuccess", (res, param) => {
       GMS.vbus.$emit("custom-query-refresh");
       GMS.vbus.$emit("tab-count-refresh");
@@ -169,6 +176,7 @@ export default {
     GMS.vbus.$off("saveSuccess");
     GMS.vbus.$off("submitSuccess");
     GMS.vbus.$off("change-form-state");
+    GMS.vbus.$off("workflow-state-change")
   },
 };
 </script>

develop/@gms/gms-plugin-billexpand/src/control/buttonGrouop.vue

@@ -55,15 +55,16 @@ export default {
       } 
     }
     // 监听工作流状态改变
-    GMS.vbus.$on("workflow-state-change", (val) => {
-      this.workflowState = val
-      this.getBtnGroup()
-    })
+    GMS.vbus.$on("workflow-state-change", this.handleWorkflowStateChange)
   },
   beforeDestroy() {
-    GMS.vbus.$off("workflow-state-change");
+    GMS.vbus.$off("workflow-state-change", this.handleWorkflowStateChange);
   },
   methods: {
+    handleWorkflowStateChange(val) {
+      this.workflowState = val
+      this.getBtnGroup()
+    },
     checkParent() {
       let curNode = this.$refs.btnGroup
       while (curNode) {
@@ -130,7 +131,7 @@ export default {
         case 90:
           return disableState.includes('90')
         case 91:
-          return disableState.includes('91')
+          return disableState.includes('91') || getBillState()
         case 92:
           return disableState.includes('92')
         case 1:

develop/@gms/gms-plugin-billexpand/src/emcon.js

@@ -1372,7 +1372,7 @@ export default {
 			"description": "",
 			"title": "财务_保存[CW_saveAction]",
 			"value": "CW_saveAction",
-			"btnDisable": "billReadOnly;90;91;92"
+			"btnDisable": "billReadOnly;90;92"
 		},
 		{
 			"discard": false,
@@ -1482,7 +1482,7 @@ export default {
 			"description": "",
 			"title": "财务_提交[CW_submitAction]",
 			"value": "CW_submitAction",
-			"btnDisable": "billEdit;90;91;92"
+			"btnDisable": "billEdit;90;92"
 		},
 		{
 			"discard": false,

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

@@ -56,8 +56,16 @@ export default {
         // this.type = 'load'
       });
     });
+    GMS.vbus.$on("workflow-state-change", (val) => {
+      console.log('refresh', val)
+      this.init = false;
+      this.$nextTick(() => {
+        this.init = true;
+      })
+    })
   },
   beforeDestroy() {
+    GMS.vbus.$off("workflow-state-change")
     GMS.vbus.$off("change-form-state");
     this.$portalAPI.off('on-close-tag', this.checkBillChange)
   },