Merge remote-tracking branch 'origin/master'

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,22 +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()
       })
+      scope._self.$refs[`popover-${scope.$index}`].doClose()
     },
-    onPopoverHide() {
-      this.triggerLoading = false;
-    },
+
     jsonFormat(row, index) {
       if (row.form_data != null) {
         return JSON.stringify(row.form_data)

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()
     }
   }
 }

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() {