瀏覽代碼

修改节点跳转组件的节点选择逻辑

lph 1 年之前
父節點
當前提交
76ac0f0641

+ 15 - 3
zkqy-ui/src/views/bussiness/dialogCompments/GongYi/GY06.vue

@@ -125,12 +125,20 @@ export default {
       handler(val) {
         this.currentNodeKey = val.benTaskNodeKey;
         if (val?.bepTaskProcessXmlContent) {
-          this.nodeList = getNodeSequence(
+          let nodeSequence = getNodeSequence(
             xmlStr2XmlObj(val.bepTaskProcessXmlContent)
-          )?.filter((item) => item.nodeInfo.localName != "exceptionTask");
+          );
+          this.nodeList = nodeSequence
+            .slice(0, this.getIndexByNodeId(nodeSequence, this.currentNodeKey))
+            ?.filter((item) => item.nodeInfo.localName != "exceptionTask");
           // this.nodeList = getNodeSequence(
           //   xmlStr2XmlObj(val.bepTaskProcessXmlContent)
-          // );
+          // )?.filter((item) => item.nodeInfo.localName != "exceptionTask");
+
+          //去掉开始和结束节点
+          this.nodeList.shift();
+          this.nodeList[this.nodeList.length - 1]?.nodeInfo.localName ==
+            "endEvent" && this.nodeList.pop();
           console.log(this.nodeList);
         }
       },
@@ -196,6 +204,10 @@ export default {
       //   this.$message.info("取消成功");
       // }
     },
+
+    getIndexByNodeId(nodeSequence, nodeId) {
+      return nodeSequence.findIndex((item) => item.nodeId == nodeId);
+    },
   },
 };
 </script>

+ 1 - 1
zkqy-ui/src/views/bussiness/dialogCompments/test-component/KuCun/KC02.vue

@@ -61,7 +61,7 @@ export default {
         quantitystock: 0,
       },
       rules: {
-        goodsno: [{ required: true, message: "请选择材料", trigger: "change" }],
+        // goodsno: [{ required: true, message: "请选择材料", trigger: "change" }],
         quantitystock: [
           { required: true, message: "请输入生产数量", trigger: "change" },
         ],

+ 2 - 1
zkqy-ui/src/views/bussiness/processMange.vue

@@ -100,6 +100,7 @@
                   plain
                   size="small"
                   class="mr10 mb5"
+                  v-show="scope.row.bepTaskProcessState == '0'"
                   @click="opneExecuteNode(scope.row)"
                 >
                   运行
@@ -250,7 +251,7 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        taskProcessState: "",
+        taskProcessState: "0",
       },
       total: 0,
       columns: [