回退节点组件

zkqy-ui/src/utils/bpmn/xml.js

@@ -43,4 +43,5 @@ export function xmlStr2XmlObj(xmlStr) {
     xmlObj = new DOMParser().parseFromString(xmlStr, "text/xml");
   }
   return xmlObj;
-}
+}
+

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

@@ -46,9 +46,17 @@
         <span><i class="el-icon-help mr5"></i>工序</span>
       </div>
       <div class="node-list">
-        <div class="node" v-for="i of 13" :key="i">
-          <span class="num">>{{ i }}</span>
-          <span class="title">领料</span>
+        <div
+          :class="{
+            node: true,
+            currentNode: item.nodeId == currentNodeKey,
+          }"
+          v-for="item of nodeList"
+          :key="item.num"
+          @click="shiftNode(item)"
+        >
+          <span class="num">>{{ item.num }}</span>
+          <span class="title">{{ item.nodeInfo.name }}</span>
           <span class="time">1分钟</span>
         </div>
       </div>
@@ -57,13 +65,18 @@
 </template>
 
 <script>
+import getNodeSequence from "@/utils/bpmn/getNodeSequence";
+import { xmlStr2XmlObj } from "@/utils/bpmn/xml";
 export default {
   name: "GY01",
-  props: [],
+  props: ["formData", "row"],
   components: {},
   data() {
     return {
       search: "",
+      nodeList: [],
+      currentNodeKey: "",
+      resFormData: {},
       columns: [
         {
           label: "编号",
@@ -102,28 +115,81 @@ export default {
       ],
     };
   },
-  computed: {},
+  watch: {
+    myFormData: {
+      handler(val) {},
+      deep: true,
+      immediate: true,
+    },
+    myRow: {
+      handler(val) {
+        this.currentNodeKey = val.benTaskNodeKey;
+        if (val?.bepTaskProcessXmlContent) {
+          this.nodeList = getNodeSequence(
+            xmlStr2XmlObj(val.bepTaskProcessXmlContent)
+          );
+        }
+      },
+      deep: true,
+      immediate: true,
+    },
+  },
+  computed: {
+    myFormData() {
+      return this.formData;
+    },
+    myRow() {
+      return this.row;
+    },
+  },
   methods: {
     async getFormData() {
       let formData = {
         flag: false,
         msg: "",
       };
-      try {
-        let valid = await this.$refs.form.validate();
-        if (valid) {
-          formData.flag = true;
-          formData.data = this.form;
-          return formData;
-        } else {
-          formData.msg = "表单校验异常,请规范填写表单数据";
-          return formData;
-        }
-      } catch (error) {
-        // console.log(error);
-        formData.msg = "表单校验异常,请规范填写表单数据";
-        return formData;
-      }
+      return {
+        flag: true,
+        data: this.resFormData,
+      };
+      // if(){}
+      // try {
+      //   let valid = await this.$refs.form.validate();
+      //   if (valid) {
+      //     formData.flag = true;
+      //     formData.data = this.form;
+      //     return formData;
+      //   } else {
+      //     formData.msg = "表单校验异常,请规范填写表单数据";
+      //     return formData;
+      //   }
+      // } catch (error) {
+      //   // console.log(error);
+      //   formData.msg = "表单校验异常,请规范填写表单数据";
+      //   return formData;
+      // }
+    },
+    async shiftNode(item) {
+      if (item.nodeId == this.currentNodeKey) return;
+      this.resFormData = {
+        taskProcessKey: this.row.bepTaskKey,
+        taskNodeKey: this.currentNodeKey,
+        taskBackNodeKey: item.nodeId,
+      };
+      this.currentNodeKey = item.nodeId;
+      // try {
+      //   let res = await this.$modal.confirm(
+      //     "是否确认切换流程至<" + item.nodeInfo.name + ">异常？"
+      //   );
+      //   console.log(res, item, this.row);
+      //   let payLoad = {
+      //     taskProcessKey: this.row.bepTaskKey,
+      //     taskNodeKey: this.currentNodeKey,
+      //     taskBackNodeKey: item.nodeId,
+      //   };
+      // } catch (error) {
+      //   this.$message.info("取消成功");
+      // }
     },
   },
 };
@@ -154,12 +220,18 @@ export default {
     .node-list {
       display: flex;
       flex-wrap: wrap;
+      padding-top: 10px;
       .node {
         width: 33.3333%;
         height: 50px;
         display: flex;
         align-items: center;
         border-bottom: 1px dotted gray;
+        padding: 0 5px;
+        &:hover {
+          border: 1px dotted rgb(0, 195, 255);
+          background-color: rgba(70, 194, 231, 0.63);
+        }
         .num {
           color: #40c3a8;
           font-size: 16px;
@@ -177,6 +249,9 @@ export default {
           margin-right: 10px;
         }
       }
+      .currentNode {
+        background-color: #7dec8f !important;
+      }
     }
   }
 }

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

@@ -192,7 +192,7 @@
           ></component>
           <!-- <CG1 ref="myFormRef"></CG1>
           <KC1 ref="myFormRef"></KC1> -->
-          <!-- <GY06 ref="myFormRef"></GY06> -->
+          <!-- <GY06 ref="myFormRef" :formData="formData" :row="row"></GY06> -->
           <span slot="footer" class="dialog-footer">
             <el-button @click="closeExecuteNode">取消</el-button>
             <el-button type="primary" @click="executeNode">运行</el-button>
@@ -327,27 +327,34 @@ export default {
     // 获取表单数据
     async getFormData() {
       let formData = {};
-      switch (this.formType) {
-        case "dragForm":
-          try {
-            formData = await this.$refs.addFromRef.getData();
-          } catch (error) {
-            console.log(error);
-            this.$message.error("表单校验异常,请稍后重试");
-            return {};
-          }
-          break;
-        case "designForm":
-          let temp = await this.$refs.myFormRef.getFormData();
-          if (!temp.flag) {
-            this.$message.error(temp.msg);
-            return {};
-          } else {
-            formData = temp.data;
-          }
-          break;
-        default:
-          break;
+      // switch (this.formType) {
+      //   case "dragForm":
+      //     try {
+      //       formData = await this.$refs.addFromRef.getData();
+      //     } catch (error) {
+      //       console.log(error);
+      //       this.$message.error("表单校验异常,请稍后重试");
+      //       return {};
+      //     }
+      //     break;
+      //   case "designForm":
+      //     let temp = await this.$refs.myFormRef.getFormData();
+      //     if (!temp.flag) {
+      //       this.$message.error(temp.msg);
+      //       return {};
+      //     } else {
+      //       formData = temp.data;
+      //     }
+      //     break;
+      //   default:
+      //     break;
+      // }
+      let temp = await this.$refs.myFormRef.getFormData();
+      if (!temp.flag) {
+        this.$message.error(temp.msg);
+        return {};
+      } else {
+        formData = temp.data;
       }
       return formData;
     },
@@ -457,7 +464,7 @@ export default {
         implementationName: this.row.benmTaskAutomaticScriptTriggerType, //当前节点绑定的脚本名
         // taskProcessXmlContent: this.row.bepTaskProcessXmlContent, //当前流程xml
         tableName: this.tableName,
-        // formDataMap: JSON.stringify(formData), //自定义表单组件收集的表单数据
+        formDataMap: JSON.stringify(formData), //自定义表单组件收集的表单数据
       };
       let fileXML = new File(
         [this.row.bepTaskProcessXmlContent],

zkqy-ui/src/views/tableMange/index.vue

@@ -1543,7 +1543,8 @@ export default {
           this.tableKey = uuidv4();
           // 表单
           let result;
-          if (this.tId && this.menuId) {
+          // if (this.tId && this.menuId) {
+          if (this.menuId) {
             let payLoad = {
               menuId: this.menuId,
               menuName: this.formData.menuName,
@@ -1637,8 +1638,9 @@ export default {
 
             let res;
             let res1;
-            if (this.tId && this.menuId) {
-              data.menuId = this.menuId;
+            // if (this.tId && this.menuId) {
+            if (this.tId) {
+              data.menuId = this.menuId || result.data;
               data.sqlKey = this.editData.sqlKey;
               data.tableKey = this.editData.tableKey;
               data.dragTableBtnRelevanceList = this.getBtnMapList(