修改管道展示抛出异常的接口/处理之前部分自定义表单组件问题

zkqy-ui/src/views/bussiness/components/TaskItem.vue

@@ -49,7 +49,7 @@ export default {
   watch: {
     myItemData: {
       handler(nval) {
-        console.log(nval);
+        // console.log(nval);
         this.cardData = nval;
       },
       deep: true,

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

@@ -156,11 +156,12 @@ export default {
   },
   methods: {
     async getFormData() {
-      let formData = {
-        flag: false,
-        msg: "",
-      };
-
+      if (Object.keys(this.resFormData).length == 0) {
+        return {
+          flag: false,
+          msg: "请选择要回溯的节点",
+        };
+      }
       return {
         flag: true,
         data: this.resFormData,

zkqy-ui/src/views/bussiness/dialogCompments/Mec/AssignEmployees.vue

@@ -47,7 +47,7 @@ export default {
         teamId: "",
       },
       rules: {
-        teamId: [{ required: true, message: '请选择班组', trigger: "change" }],
+        teamId: [{ required: true, message: "请选择班组", trigger: "change" }],
       },
     };
   },
@@ -61,6 +61,9 @@ export default {
       handler(nval) {
         this.form = nval.resultMap;
         this.isEdit = this.form.taskProcessKey && this.form.taskNodeKey;
+        this.$nextTick(() => {
+          this.$refs.form?.clearValidate();
+        });
       },
       deep: true,
       immediate: true,
@@ -139,7 +142,6 @@ export default {
       }
     },
   },
-
 };
 </script>
 

zkqy-ui/src/views/bussiness/dialogCompments/Mec/ScrapDisposition.vue

@@ -1,144 +1,156 @@
 <template>
   <div class="app-container">
-    <el-form :model="form" ref="form" label-position="left" label-width="80px"  align="left"  size="normal">
+    <el-form
+      :model="form"
+      ref="form"
+      label-position="left"
+      label-width="80px"
+      align="left"
+      size="normal"
+    >
       <el-form-item label="备注:" prop="remark">
         <el-input v-model="form.remark"></el-input>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" size="small" @click="submitHandler" icon="el-icon-success">记录数据</el-button>
+        <el-button
+          type="primary"
+          size="small"
+          @click="submitHandler"
+          icon="el-icon-success"
+          >记录数据</el-button
+        >
       </el-form-item>
     </el-form>
   </div>
 </template>
 
 <script>
-  import {submitNodeForm} from "@/api/bpmprocess/runDialogApi";
-  export default {
-    name: "ScrapDisposition",
-    props: ["formData", "row"],
-    data() {
-      return {
-        //是否编辑
-        isEdit:false,
-        //表单数据
-        form: {
-          remark: '' //备注
-        },
-      };
-    },
-    computed: {
-      //计算属性值
-      myFormData() {
-        //父组件传递过来的值
-        return this.formData;
+import { submitNodeForm } from "@/api/bpmprocess/runDialogApi";
+export default {
+  name: "ScrapDisposition",
+  props: ["formData", "row"],
+  data() {
+    return {
+      //是否编辑
+      isEdit: false,
+      //表单数据
+      form: {
+        remark: "", //备注
       },
+    };
+  },
+  computed: {
+    //计算属性值
+    myFormData() {
+      //父组件传递过来的值
+      return this.formData;
     },
-    watch: {
-      //监听
-      myFormData: {
-        handler(nval) {
-          console.log(nval)
-          this.form = nval.resultMap;
-          console.log(this.form);
-          // 都不为空的话就是编辑
-          this.isEdit = this.form.taskProcessKey && this.form.taskNodeKey
-        },
-        deep: true,
-        immediate: true,
+  },
+  watch: {
+    //监听
+    myFormData: {
+      handler(nval) {
+        console.log(nval);
+        this.form = nval.resultMap;
+        console.log(this.form);
+        // 都不为空的话就是编辑
+        this.isEdit = this.form.taskProcessKey && this.form.taskNodeKey;
       },
+      deep: true,
+      immediate: true,
     },
-    mounted() {
-
-    },
-    methods: {
-      //处理请求
-      async submitHandler() {
-        //获取父组件传递过来的数据
-        console.log(this.row);
-        //校验表单数据
-        let res = await this.$refs.form?.validate();
-        //校验通过
-        if (res) {
-          //放准备发给后端的数据
-          let payLoad = {};
-          let { remark } = this.form;
-          //判断是否编辑
-          if (this.isEdit) {
-            //解析出我需要的那两个参数流程key 和节点key
-            let { taskProcessKey, taskNodeKey } = this.myFormData.resultMap;
-            //准备更新节点的数据
-            payLoad.updateCommonEntityList = [
-              {
-                basicMap: {
-                  tableName: "product_obsolescence",
-                },
-                conditionMap: {
-                  task_process_key: taskProcessKey,
-                  task_node_key: taskNodeKey,
-                },
-                commMap: {
+  },
+  mounted() {},
+  methods: {
+    //处理请求
+    async submitHandler() {
+      //获取父组件传递过来的数据
+      console.log(this.row);
+      //校验表单数据
+      let res = await this.$refs.form?.validate();
+      //校验通过
+      if (res) {
+        //放准备发给后端的数据
+        let payLoad = {};
+        let { remark } = this.form;
+        //判断是否编辑
+        if (this.isEdit) {
+          //解析出我需要的那两个参数流程key 和节点key
+          let { taskProcessKey, taskNodeKey } = this.myFormData.resultMap;
+          //准备更新节点的数据
+          payLoad.updateCommonEntityList = [
+            {
+              basicMap: {
+                tableName: "product_obsolescence",
+              },
+              conditionMap: {
+                task_process_key: taskProcessKey,
+                task_node_key: taskNodeKey,
+              },
+              commMap: {
+                task_id: this.row.bepTaskPlanKey,
+                remark: remark,
+              },
+            },
+          ];
+        } else {
+          //插入节点数据总不能被数据
+          payLoad.insertCommonEntityList = [
+            {
+              basicMap: {
+                tableName: "product_obsolescence",
+              },
+              addListMap: [
+                {
                   task_id: this.row.bepTaskPlanKey,
                   remark: remark,
+                  taskProcessKey: this.row.benTaskProcessKey,
+                  taskNodeKey: this.row.benTaskNodeKey,
                 },
-              },
-            ];
-          } else {
-            //插入节点数据总不能被数据
-            payLoad.insertCommonEntityList = [
-              {
-                basicMap: {
-                  tableName: "product_obsolescence",
-                },
-                addListMap: [
-                  {
-                    task_id: this.row.bepTaskPlanKey,
-                    remark: remark,
-                    taskProcessKey: this.row.benTaskProcessKey,
-                    taskNodeKey: this.row.benTaskNodeKey,
-                  },
-                ],
-              },
-            ];
-          }
-          //提交请求
-          submitNodeForm(payLoad).then((response) => {
-            if (response.code == 200) {
-              this.$modal.msgSuccess("保存成功");
-            } else {
-              this.$modal.error("保存失败,请稍后再试");
-            }
-          });
+              ],
+            },
+          ];
         }
-      },
-      //得到这个表单数据
-      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;
+        //提交请求
+        submitNodeForm(payLoad).then((response) => {
+          if (response.code == 200) {
+            this.$modal.msgSuccess("保存成功");
           } else {
-            formData.msg = "表单校验异常,请规范填写表单数据";
-            return formData;
+            this.$modal.error("保存失败,请稍后再试");
           }
-        } catch (error) {
+        });
+      }
+    },
+    //得到这个表单数据
+    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) {
+        formData.msg = "表单校验异常,请规范填写表单数据";
+        return formData;
+      }
     },
-  }
+    resetForm() {},
+  },
+};
 </script>
 
 <style scoped>
-  ::v-deep .el-button{
-    background: rgb(123,213,195);
-    border:  rgb(123,213,195);
-    float: right;
-  }
+::v-deep .el-button {
+  background: rgb(123, 213, 195);
+  border: rgb(123, 213, 195);
+  float: right;
+}
 </style>

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

@@ -200,7 +200,7 @@
           <!-- <RecordSplitData /> -->
           <span slot="footer" class="dialog-footer">
             <el-button @click="closeExecuteNode">取消</el-button>
-            <el-button type="primary" @click="executeNode">运行</el-button>
+            <el-button type="primary" @click="executeNode">确认运行</el-button>
           </span>
         </el-dialog>
       </div>
@@ -247,6 +247,7 @@ import EditFinishTime from "./dialogCompments/Mec/EditFinishTime.vue";
 import EditQualityCard from "./dialogCompments/Mec/EditQualityCard.vue";
 import FinishTask from "./dialogCompments/Mec/FinishTask.vue";
 import QualityControlCardSubCardProcessing from "./dialogCompments/Mec/QualityControlCardSubCardProcessing.vue";
+import ScrapDisposition from "./dialogCompments/Mec/ScrapDisposition.vue";
 
 export default {
   name: "processMange",
@@ -276,6 +277,7 @@ export default {
     EditQualityCard,
     FinishTask,
     QualityControlCardSubCardProcessing,
+    ScrapDisposition,
   },
   dicts: ["bpm_type", "task_process_state"],
   data() {
@@ -463,7 +465,6 @@ export default {
       //   default:
       //     break;
       // }
-      console.log(this.$refs.myFormRef);
       let temp = await this.$refs.myFormRef?.getFormData();
       console.log("temp", temp);
       if (!temp?.flag) {
@@ -551,7 +552,7 @@ export default {
       // if (!this.formType) return; //没有表单,直接掉运行逻辑
       this.open = true; // 打开弹窗
       this.$nextTick(() => {
-        this.$refs.myFormRef?.resetForm();
+        // this.$refs.myFormRef?.resetForm();
       });
       // 根据当前节点绑定的表单信息查询对应的表单进行展示
     },
@@ -656,6 +657,7 @@ export default {
     },
     // 触发异常回调
     exceptionTrigger(row, scriptData) {
+      // console.log(taskNodeType);
       let _this = this;
       this.$modal
         .confirm("是否确认触发<" + scriptData.scriptName + ">异常？")
@@ -666,7 +668,17 @@ export default {
             taskProcessKey: row.bepTaskKey,
             taskNodeKey: row.benTaskNodeKey,
             sysBpmNodeScriptVO: scriptData,
+            taskNodeType: row.benTaskNodeType,
           };
+          // 异常节点抛异常  需要下一个节点key
+          if (row.benTaskNodeType == "exceptionTask") {
+            let { nodeId, nextNodeId } = _this.getNextNodeKey(
+              row.benTaskNodeKey,
+              row.bepTaskProcessXmlContent
+            );
+
+            payLoad.taskNextNodeKey = nextNodeId;
+          }
           triggerExceptionNode(payLoad).then((res) => {
             console.log(res);
             if (res.code == 200) {
@@ -678,7 +690,8 @@ export default {
             }
           });
         })
-        .catch(() => {
+        .catch((err) => {
+          console.log(err);
           _this.open = false;
           _this.$message.info("取消成功");
         });

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

@@ -122,6 +122,7 @@ export default {
     // 获取表格展示数据
     getTableData(dataList) {
       let res = [];
+      console.log(3333333);
       res = dataList.map((item) => {
         let baseObj = {
           benTaskProcessKey: item.taskKey, //任务编号
@@ -220,7 +221,7 @@ 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);
         item.cardList.forEach((node, index) => {