From ce1bce880b492fcc99d6d769ece6c0cce809121b Mon Sep 17 00:00:00 2001
From: gengby <858962040@qq.com>
Date: Thu, 23 May 2024 17:42:28 +0800
Subject: [PATCH 1/2] =?UTF-8?q?rev:=E8=AE=BE=E8=AE=A1=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98=E5=90=8E=E5=88=B7=E6=96=B0=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?,=E8=A7=A6=E5=8F=91=E6=8C=89=E9=92=AE=E5=90=8E=E5=88=B7?=
 =?UTF-8?q?=E6=96=B0=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 wms_pro/qd/src/views/wms/flow_manage/act/execution/index.vue | 1 +
 wms_pro/qd/src/views/wms/flow_manage/act/model/index.vue     | 5 ++++-
 .../qd/src/views/wms/flow_manage/logicflow/FlowDesigner.vue  | 1 +
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/wms_pro/qd/src/views/wms/flow_manage/act/execution/index.vue b/wms_pro/qd/src/views/wms/flow_manage/act/execution/index.vue
index a92b2799..fdceb50e 100644
--- a/wms_pro/qd/src/views/wms/flow_manage/act/execution/index.vue
+++ b/wms_pro/qd/src/views/wms/flow_manage/act/execution/index.vue
@@ -256,6 +256,7 @@ export default {
         this.triggerLoading = false;
         this.popoverVisible = false;
       })
+      this.crud.toQuery()
     },
     onPopoverHide() {
       this.triggerLoading = false;
diff --git a/wms_pro/qd/src/views/wms/flow_manage/act/model/index.vue b/wms_pro/qd/src/views/wms/flow_manage/act/model/index.vue
index 8b9dd67b..6e49520a 100644
--- a/wms_pro/qd/src/views/wms/flow_manage/act/model/index.vue
+++ b/wms_pro/qd/src/views/wms/flow_manage/act/model/index.vue
@@ -135,7 +135,7 @@
       <!--分页组件-->
       <pagination/>
     </div>
-    <FlowDesigner ref="flowDesigner"/>
+    <FlowDesigner ref="flowDesigner"  @toQuery="toQuery"/>
     <ViewFlowDesigner ref="viewFlowDesigner"/>
   </div>
 </template>
@@ -238,6 +238,9 @@ export default {
         return true
       }
       return false
+    },
+    toQuery(){
+      this.crud.toQuery()
     }
   }
 }
diff --git a/wms_pro/qd/src/views/wms/flow_manage/logicflow/FlowDesigner.vue b/wms_pro/qd/src/views/wms/flow_manage/logicflow/FlowDesigner.vue
index e2556e56..08306ada 100644
--- a/wms_pro/qd/src/views/wms/flow_manage/logicflow/FlowDesigner.vue
+++ b/wms_pro/qd/src/views/wms/flow_manage/logicflow/FlowDesigner.vue
@@ -323,6 +323,7 @@ export default {
           type: 'success'
         });
       })
+      this.$emit('toQuery');
       console.log(this.$data.graphData)
     },
     $_deleteData() {

From 9f545e73ffb34ddf4444bad67e17a95a9255e766 Mon Sep 17 00:00:00 2001
From: gengby <858962040@qq.com>
Date: Thu, 23 May 2024 18:36:58 +0800
Subject: [PATCH 2/2] =?UTF-8?q?rev:=E8=A7=A6=E5=8F=91=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/flow_manage/act/execution/index.vue   | 31 +++++++------------
 1 file changed, 12 insertions(+), 19 deletions(-)

diff --git a/wms_pro/qd/src/views/wms/flow_manage/act/execution/index.vue b/wms_pro/qd/src/views/wms/flow_manage/act/execution/index.vue
index fdceb50e..e0cbf55a 100644
--- a/wms_pro/qd/src/views/wms/flow_manage/act/execution/index.vue
+++ b/wms_pro/qd/src/views/wms/flow_manage/act/execution/index.vue
@@ -138,20 +138,19 @@
               placement="top"
               width="180"
               trigger="click"
-              :value="popoverVisible"
-              @hide="onPopoverHide"
+              style="z-index: 9999;"
+              :ref="`popover-${scope.$index}`"
             >
               <p>{{ popoverMessage }}</p>
               <div style="text-align: right; margin: 0">
-                <el-button size="mini" type="text" @click="cancelFlow">取消</el-button>
-                <el-button :loading="triggerLoading" type="primary" size="mini"
-                           @click="confirmFlow(scope.row.proc_inst_id)">确定
+                <el-button size="mini" type="text" @click="cancelFlow(scope)">取消</el-button>
+                <el-button type="primary" size="mini"
+                           @click="confirmFlow(scope.row.proc_inst_id,scope)">确定
                 </el-button>
               </div>
               <el-button slot="reference" type="text" icon="el-icon-video-play" size="mini" @click="showPopover">触发
               </el-button>
             </el-popover>
-            <!--            <el-button slot="right" @click="flowConfirm(scope.row.proc_inst_id)" type="text" icon="el-icon-video-play" size="mini">触发</el-button>-->
             <el-button slot="right" @click="viewClick(scope.row)" type="text" icon="el-icon-thumb" size="mini">预览
             </el-button>
           </template>
@@ -213,8 +212,6 @@ export default {
       permission: {},
       modelJson: '',
       popoverMessage: "确定要触发流程吗？",
-      triggerLoading: false,
-      popoverVisible: false,
       statusList: [
         {
           value: "30",
@@ -244,23 +241,19 @@ export default {
       return true
     },
     showPopover() {
-      this.popoverVisible = true;
+      // this.popoverVisible = true;
     },
-    cancelFlow() {
-      this.popoverVisible = false;
+    cancelFlow(scope) {
+      scope._self.$refs[`popover-${scope.$index}`].doClose()
     },
-    confirmFlow(proc_inst_id) {
-      this.triggerLoading = true;
+    confirmFlow(proc_inst_id, scope) {
       curdExecution.flowConfirm(proc_inst_id).then(res => {
         this.crud.notify("触发成功", CRUD.NOTIFICATION_TYPE.SUCCESS)
-        this.triggerLoading = false;
-        this.popoverVisible = false;
+        this.crud.toQuery()
       })
-      this.crud.toQuery()
-    },
-    onPopoverHide() {
-      this.triggerLoading = false;
+      scope._self.$refs[`popover-${scope.$index}`].doClose()
     },
+
     jsonFormat(row, index) {
       if (row.form_data != null) {
         return JSON.stringify(row.form_data)