Merge remote-tracking branch 'origin/master'

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

@@ -189,6 +189,7 @@ export default {
         taskProcessKey: this.row.bepTaskKey,
         taskNodeKey: this.currentNodeKey,
         taskBackNodeKey: item.nodeId,
+        // taskNodeType: this.row.benTaskNodeType,
       };
       this.currentNodeKey = item.nodeId;
       // try {

zkqy-ui/src/views/bussiness/progressShow.vue

@@ -101,7 +101,6 @@ export default {
             this.tableData = this.getTableData(
               res.rows.map((item) => item.resultMap)
             );
-            console.log(this.tableData);
             this.total = res.total;
           } else {
             this.$message.error("网络异常,请稍后再试");
@@ -133,6 +132,7 @@ export default {
           currentNodeKey: item.taskNodeNextKey, //当前节点key
           cardList: [],
           doneNodeList: item.nodeLogList,
+          taskProcessState: item.taskProcessState,
         };
         let xmlObj = xmlStr2XmlObj(item.taskProcessXmlContent);
         baseObj.cardList = getNodeSequence(xmlObj);
@@ -221,9 +221,13 @@ export default {
         } else {
           item.cardList.splice(0, currentIndex);
         }
-        console.log(JSON.parse(JSON.stringify(item.cardList)));
-        item.cardList.unshift(...item.doneNodeList);
-        console.log(item.cardList);
+        console.log(JSON.parse(JSON.stringify(item)));
+        if (item.taskProcessState == 3) {
+          item.cardList = item.doneNodeList;
+        } else {
+          item.cardList.unshift(...item.doneNodeList);
+        }
+
         item.cardList.forEach((node, index) => {
           node.num = index + 1;
         });