zhangxiaomu il y a 2 ans
Parent
commit
bd36e2cec1

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

@@ -795,7 +795,7 @@ export default {
         this.nodeData.backGradeIds = null
       }
       // 回收时,结束工序,回收初始方式只能是后续流程
-      if (this.nodeData.flowKind === this.$config.flowKind.end) {
+      if (this.$config.nodeKind.recover===this.nodeData.nodeKind&&this.nodeData.flowKind === this.$config.flowKind.end) {
         this.recycledKindList = this.recycledKindListSocial.filter(it => it.kindCode === this.$config.recycledKind.after)
         this.$nextTick(() => {
           this.nodeData.recycledKind = this.$config.recycledKind.after

+ 2 - 2
src/view/process/process-flow/config/ProcessConfig.js

@@ -1129,11 +1129,11 @@ export default class Process {
     this.graph.on('view:mounted', ({ view }) => {
       if(view.cell.shape==='custom-image'){
         view.container.addEventListener("mouseenter",function () {
-          console.log('mouseenter')
+          // console.log('mouseenter')
           self.showPorts(view, true)
         },false)
         view.container.addEventListener("mouseleave",function () {
-          console.log('mouseleave')
+          // console.log('mouseleave')
           if(!self.graph.isSelected(view.cell)){
             self.showPorts(view, false)
           }