bug-5285

src/components/business/process/node-modal/node-modal.vue

@@ -610,7 +610,7 @@ export default {
     },
   },
   methods: {
-    ...mapMutations(['setProcessNodeModalDisplay', 'setCurrentNodeId']),
+    ...mapMutations(['setProcessNodeModalDisplay', 'setProcessNodeModalIndexDisplay','setCurrentNodeId']),
     /**
      * @desc   : 处理可判定分级初始值
      * @author : 张潇木
@@ -807,7 +807,12 @@ export default {
       let cell = this.graph.getCellById(this.process.currentNodeId)
       cell.setData(this.nodeDataSocial, { overwrite: true })
       //设置显示隐藏状态以及清空当前工序id
-      this.setProcessNodeModalDisplay(null)
+      if(this.isFromIndex){
+        this.setProcessNodeModalIndexDisplay(null)
+      }else{
+        this.setProcessNodeModalDisplay(null)
+      }
+      //清空当前选中工序id
       this.setCurrentNodeId(undefined)
     },
     /**
@@ -839,7 +844,7 @@ export default {
             // 刷新一览明细
             this.$emit('node-modal-ok', { row: this.flowFormData })
             //关闭modal
-            this.setProcessNodeModalDisplay(null)
+            this.setProcessNodeModalIndexDisplay(null)
             //清空当前选中工序id
             this.setCurrentNodeId(undefined)
           } else {

src/view/process/process-flow/index.vue

@@ -136,7 +136,7 @@ import { indexMixin } from '@/mixins'
 import { mapState, mapMutations } from 'vuex'
 import NodeModal from '_c/business/process/node-modal/node-modal'
 import Process from '@/view/process/process-flow/config/ProcessConfig'
-
+import queryUtil from '@/view/process/process-flow/queryUtil'
 
 export default {
   name: 'process-flow',
@@ -382,6 +382,10 @@ export default {
   },
   mounted() {
     this.graph = Process.init(this.$refs.graph,false)
+    //注册监听事件
+    queryUtil.$on("process-setting-ok",(row)=>{
+      this.changeCurrentFlow(row)
+    })
   },
 }
 </script>

src/view/process/process-flow/process-setting.vue

@@ -141,6 +141,7 @@ import EdgeModal from '_c/business/process/edge-modal/edge-modal'
 const insertCss = require('insert-css')
 const zt1 = require('./data/zt1.json')
 import Process from '@/view/process/process-flow/config/ProcessConfig'
+import queryUtil from '@/view/process/process-flow/queryUtil'
 import { formMixin } from '@/mixins/form'
 import FileSaver from 'file-saver'
 
@@ -313,6 +314,8 @@ export default {
         if (res.code === this.$config.SUCCESS_CODE) {
           // 提示信息
           this.$Message.success(this.$t('I_001', { 'param': this.$v(this.type) }))
+          //触发首页查询
+          queryUtil.$emit('process-setting-ok', { row: this.formData })
           // 编辑关闭窗体
           this.close()
         } else {

src/view/process/process-flow/queryUtil.js

@@ -0,0 +1,2 @@
+import Vue from 'vue'
+export default new Vue;