Merge branch 'master' of http://62.234.61.92:3000/wjm/mec-cloud_IntelligentManufacturing_CLIENT

zkqy-process-execution/src/main/java/com/zkqy/execution/produce/dispersed/service/impl/runbpm/mes/ExceptionEditTheFinishTimeAgain.java

@@ -0,0 +1,61 @@
+package com.zkqy.execution.produce.dispersed.service.impl.runbpm.mes;
+
+import com.zkqy.common.core.domain.AjaxResult;
+import com.zkqy.execution.produce.dispersed.entity.CommonEntity;
+import com.zkqy.execution.produce.dispersed.entity.runbpm.BpmRunNodeFormFilterConditionsVo;
+import com.zkqy.execution.produce.dispersed.entity.runbpm.BpmRunNodeFromVo;
+import com.zkqy.execution.produce.dispersed.entity.runbpm.IRunBPMEntity;
+import com.zkqy.execution.produce.dispersed.service.IRunBPMService;
+import com.zkqy.execution.produce.utils.EchoNodeFormData;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.PreDestroy;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 重新编辑完成时间-异常节点:有问题
+ */
+@Service("1af24b89-ce2f-4d1e-9b82-5158ebd708d0")
+@Scope("prototype")
+public class ExceptionEditTheFinishTimeAgain implements IRunBPMService {
+
+    @Autowired
+    private EchoNodeFormData echoNodeFormData;
+
+    @Override
+    public CommonEntity getNodeFormData(BpmRunNodeFromVo bpmRunNodeFromVo) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("id",Long.valueOf(bpmRunNodeFromVo.getTaskPlanKey()));
+        bpmRunNodeFromVo.getFormDataVoList().add(new BpmRunNodeFormFilterConditionsVo("master_task", map, true));
+        return echoNodeFormData.getEchoNodeFormData(bpmRunNodeFromVo);
+    }
+
+    @Override
+    public AjaxResult preValidation(IRunBPMEntity iRunBPMEntity) {
+        return AjaxResult.success();
+    }
+
+    @Override
+    public AjaxResult executeNode(IRunBPMEntity iRunBPMEntity) {
+        return AjaxResult.success();
+    }
+
+    @Override
+    public AjaxResult afterValidation(IRunBPMEntity iRunBPMEntity) {
+        return AjaxResult.success();
+    }
+
+    @Override
+    public boolean isVerificationMethod() {
+        return true;
+    }
+
+    @Override
+    @PreDestroy
+    public boolean preDestroy() {
+        return true;
+    }
+}

zkqy-process-execution/src/main/java/com/zkqy/execution/produce/dispersed/service/impl/runbpm/mes/ExceptionProductObsolescence.java

@@ -0,0 +1,60 @@
+package com.zkqy.execution.produce.dispersed.service.impl.runbpm.mes;
+
+import com.zkqy.common.core.domain.AjaxResult;
+import com.zkqy.execution.produce.dispersed.entity.CommonEntity;
+import com.zkqy.execution.produce.dispersed.entity.runbpm.BpmRunNodeFormFilterConditionsVo;
+import com.zkqy.execution.produce.dispersed.entity.runbpm.BpmRunNodeFromVo;
+import com.zkqy.execution.produce.dispersed.entity.runbpm.IRunBPMEntity;
+import com.zkqy.execution.produce.dispersed.service.IRunBPMService;
+import com.zkqy.execution.produce.utils.EchoNodeFormData;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.PreDestroy;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 产品报废-异常节点
+ */
+@Service("f4c35300-1627-47e5-b809-ed22a0c6a0bd")
+@Scope("prototype")
+public class ExceptionProductObsolescence implements IRunBPMService {
+
+    @Autowired
+    private EchoNodeFormData echoNodeFormData;
+
+    @Override
+    public CommonEntity getNodeFormData(BpmRunNodeFromVo bpmRunNodeFromVo) {
+        Map<String,Object> map1 = new HashMap<>();
+        bpmRunNodeFromVo.getFormDataVoList().add(new BpmRunNodeFormFilterConditionsVo("product_obsolescence", map1, true));
+        return echoNodeFormData.getEchoNodeFormData(bpmRunNodeFromVo);
+    }
+
+    @Override
+    public AjaxResult preValidation(IRunBPMEntity iRunBPMEntity) {
+        return AjaxResult.success();
+    }
+
+    @Override
+    public AjaxResult executeNode(IRunBPMEntity iRunBPMEntity) {
+        return AjaxResult.success();
+    }
+
+    @Override
+    public AjaxResult afterValidation(IRunBPMEntity iRunBPMEntity) {
+        return AjaxResult.success();
+    }
+
+    @Override
+    public boolean isVerificationMethod() {
+        return true;
+    }
+
+    @Override
+    @PreDestroy
+    public boolean preDestroy() {
+        return true;
+    }
+}

zkqy-process-execution/src/main/java/com/zkqy/execution/produce/dispersed/service/impl/runbpm/mes/ExceptionQualityControlCardEdit.java

@@ -0,0 +1,63 @@
+package com.zkqy.execution.produce.dispersed.service.impl.runbpm.mes;
+
+import com.zkqy.common.core.domain.AjaxResult;
+import com.zkqy.execution.produce.dispersed.entity.CommonEntity;
+import com.zkqy.execution.produce.dispersed.entity.runbpm.BpmRunNodeFormFilterConditionsVo;
+import com.zkqy.execution.produce.dispersed.entity.runbpm.BpmRunNodeFromVo;
+import com.zkqy.execution.produce.dispersed.entity.runbpm.IRunBPMEntity;
+import com.zkqy.execution.produce.dispersed.service.IRunBPMService;
+import com.zkqy.execution.produce.utils.EchoNodeFormData;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.PreDestroy;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 质控卡修改-异常节点
+ */
+
+@Service("f1aeb03c-9dd5-4a7c-820d-aaac458cda19")
+@Scope("prototype")
+public class ExceptionQualityControlCardEdit implements IRunBPMService {
+
+    @Autowired
+    private EchoNodeFormData echoNodeFormData;
+
+    @Override
+    public CommonEntity getNodeFormData(BpmRunNodeFromVo bpmRunNodeFromVo) {
+        //质控卡
+        Map<String,Object> map = new HashMap<>();
+//        map.put("task_process_key",bpmRunNodeFromVo.getTaskProcessKey());
+        bpmRunNodeFromVo.getFormDataVoList().add(new BpmRunNodeFormFilterConditionsVo("record_quality_control_card", map, true));
+        return echoNodeFormData.getEchoNodeFormData(bpmRunNodeFromVo);
+    }
+
+    @Override
+    public AjaxResult preValidation(IRunBPMEntity iRunBPMEntity) {
+        return AjaxResult.success();
+    }
+
+    @Override
+    public AjaxResult executeNode(IRunBPMEntity iRunBPMEntity) {
+        return AjaxResult.success();
+    }
+
+    @Override
+    public AjaxResult afterValidation(IRunBPMEntity iRunBPMEntity) {
+        return AjaxResult.success();
+    }
+
+    @Override
+    public boolean isVerificationMethod() {
+        return true;
+    }
+
+    @Override
+    @PreDestroy
+    public boolean preDestroy() {
+        return true;
+    }
+}

zkqy-process-execution/src/main/java/com/zkqy/execution/produce/dispersed/service/impl/runbpm/mes/ExceptionQualityControlCardSubCard.java

@@ -0,0 +1,65 @@
+package com.zkqy.execution.produce.dispersed.service.impl.runbpm.mes;
+
+import com.zkqy.common.core.domain.AjaxResult;
+import com.zkqy.execution.produce.dispersed.entity.CommonEntity;
+import com.zkqy.execution.produce.dispersed.entity.runbpm.BpmRunNodeFormFilterConditionsVo;
+import com.zkqy.execution.produce.dispersed.entity.runbpm.BpmRunNodeFromVo;
+import com.zkqy.execution.produce.dispersed.entity.runbpm.IRunBPMEntity;
+import com.zkqy.execution.produce.dispersed.service.IRunBPMService;
+import com.zkqy.execution.produce.utils.EchoNodeFormData;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.PreDestroy;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 质控卡分卡-异常节点
+ */
+@Service("baf71011-9517-4ddc-994e-d1a9add9a7d5")
+@Scope("prototype")
+public class ExceptionQualityControlCardSubCard implements IRunBPMService {
+
+    @Autowired
+    private EchoNodeFormData echoNodeFormData;
+
+    @Override
+    public CommonEntity getNodeFormData(BpmRunNodeFromVo bpmRunNodeFromVo) {
+        //质控卡
+        Map<String,Object> map = new HashMap<>();
+        map.put("task_process_key",bpmRunNodeFromVo.getTaskProcessKey());
+        bpmRunNodeFromVo.getFormDataVoList().add(new BpmRunNodeFormFilterConditionsVo("record_quality_control_card", map, false));
+        //质控卡分卡
+        Map<String,Object> map1 = new HashMap<>();
+        bpmRunNodeFromVo.getFormDataVoList().add(new BpmRunNodeFormFilterConditionsVo("quality_control_card_sub_card", map1, true));
+        return echoNodeFormData.getEchoNodeFormData(bpmRunNodeFromVo);
+    }
+
+    @Override
+    public AjaxResult preValidation(IRunBPMEntity iRunBPMEntity) {
+        return AjaxResult.success();
+    }
+
+    @Override
+    public AjaxResult executeNode(IRunBPMEntity iRunBPMEntity) {
+        return AjaxResult.success();
+    }
+
+    @Override
+    public AjaxResult afterValidation(IRunBPMEntity iRunBPMEntity) {
+        return AjaxResult.success();
+    }
+
+    @Override
+    public boolean isVerificationMethod() {
+        return true;
+    }
+
+    @Override
+    @PreDestroy
+    public boolean preDestroy() {
+        return true;
+    }
+}

zkqy-process-execution/src/main/java/com/zkqy/execution/produce/dispersed/service/impl/runbpm/mes/ExceptionTaskTermination.java

@@ -0,0 +1,60 @@
+package com.zkqy.execution.produce.dispersed.service.impl.runbpm.mes;
+
+import com.zkqy.common.core.domain.AjaxResult;
+import com.zkqy.execution.produce.dispersed.entity.CommonEntity;
+import com.zkqy.execution.produce.dispersed.entity.runbpm.BpmRunNodeFormFilterConditionsVo;
+import com.zkqy.execution.produce.dispersed.entity.runbpm.BpmRunNodeFromVo;
+import com.zkqy.execution.produce.dispersed.entity.runbpm.IRunBPMEntity;
+import com.zkqy.execution.produce.dispersed.service.IRunBPMService;
+import com.zkqy.execution.produce.utils.EchoNodeFormData;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.PreDestroy;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 任务结束-异常节点
+ */
+@Service("bd2cc2f3-5dec-4aec-aeea-2c0aee6b3750")
+@Scope("prototype")
+public class ExceptionTaskTermination implements IRunBPMService {
+
+    @Autowired
+    private EchoNodeFormData echoNodeFormData;
+
+    @Override
+    public CommonEntity getNodeFormData(BpmRunNodeFromVo bpmRunNodeFromVo) {
+        Map<String,Object> map1 = new HashMap<>();
+        bpmRunNodeFromVo.getFormDataVoList().add(new BpmRunNodeFormFilterConditionsVo("task_termination", map1, true));
+        return echoNodeFormData.getEchoNodeFormData(bpmRunNodeFromVo);
+    }
+
+    @Override
+    public AjaxResult preValidation(IRunBPMEntity iRunBPMEntity) {
+        return AjaxResult.success();
+    }
+
+    @Override
+    public AjaxResult executeNode(IRunBPMEntity iRunBPMEntity) {
+        return AjaxResult.success();
+    }
+
+    @Override
+    public AjaxResult afterValidation(IRunBPMEntity iRunBPMEntity) {
+        return AjaxResult.success();
+    }
+
+    @Override
+    public boolean isVerificationMethod() {
+        return true;
+    }
+
+    @Override
+    @PreDestroy
+    public boolean preDestroy() {
+        return true;
+    }
+}

zkqy-system/src/main/java/com/zkqy/system/service/impl/SysMenuServiceImpl.java

@@ -85,13 +85,13 @@ public class SysMenuServiceImpl implements ISysMenuService {
             menuList = menuMapper.selectMenuListByUserId(menu);
         }
         //临时代码2
-        List<SysMenu> collect = menuList.stream().map(item -> {
-            if (item.getMenuName().equals("门户引擎")) {
-                 item.setMenuName("系统管理");
-            }
-            return item;
-        }).collect(Collectors.toList());
-        return collect;
+        //List<SysMenu> collect = menuList.stream().map(item -> {
+        //    if (item.getMenuName().equals("门户引擎")) {
+        //         item.setMenuName("系统管理");
+        //    }
+        //    return item;
+        //}).collect(Collectors.toList());
+        return menuList;
     }
 
     /**
@@ -174,10 +174,10 @@ public class SysMenuServiceImpl implements ISysMenuService {
     public List<RouterVo> buildMenus(List<SysMenu> menus) {
         List<RouterVo> routers = new LinkedList<RouterVo>();
         for (SysMenu menu : menus) {
-            //临时代码1
-            if(menu.getMenuName().equals("门户引擎")){
-                menu.setMenuName("系统管理");
-            }
+            ////临时代码1
+            //if(menu.getMenuName().equals("门户引擎")){
+            //    menu.setMenuName("系统管理");
+            //}
             RouterVo router = new RouterVo();
             router.setHidden("1".equals(menu.getVisible()));
             router.setName(getRouteName(menu));
@@ -264,10 +264,10 @@ public class SysMenuServiceImpl implements ISysMenuService {
     @Override
     public SysMenu selectMenuById(Long menuId) {
         SysMenu sysMenu = menuMapper.selectMenuById(menuId);
-        //临时代码3
-        if(sysMenu.getMenuName().equals("门户引擎")){
-            sysMenu.setMenuName("系统管理");
-        }
+        ////临时代码3
+        //if(sysMenu.getMenuName().equals("门户引擎")){
+        //    sysMenu.setMenuName("系统管理");
+        //}
         //return menuMapper.selectMenuById(menuId);
         return sysMenu;
     }

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

@@ -0,0 +1,145 @@
+<template>
+  <div class="app-container">
+    <el-form :model="form" ref="form" label-position="left" label-width="80px"  align="left"  size="normal">
+      <el-form-item label="完成时间:" prop="timeToFinish">
+          <el-date-picker
+            v-model="form.timeToFinish"
+            type="date"
+            placeholder="选择日期" style="width: 100%;">
+          </el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <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: "FinishTask",
+    props: ["formData", "row"],
+    data() {
+      return {
+        //是否编辑
+        isEdit:false,
+        //表单数据
+        form: {
+          timeToFinish: '', //完成时间
+          id:""
+        },
+      };
+    },
+    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,
+      },
+    },
+    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) {
+            //准备更新节点的数据
+            payLoad.updateCommonEntityList = [
+              {
+                basicMap: {
+                  tableName: "master_task",
+                },
+                conditionMap: {
+                  id:this.form.id,
+                },
+                commMap: {
+                  accomplish_time: this.timeToFinish
+                },
+              },
+            ];
+          } else {
+            //插入节点数据总不能被数据
+            payLoad.insertCommonEntityList = [
+              {
+                basicMap: {
+                  tableName: "master_task",
+                },
+                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;
+          } else {
+            formData.msg = "表单校验异常,请规范填写表单数据";
+            return formData;
+          }
+        } catch (error) {
+          formData.msg = "表单校验异常,请规范填写表单数据";
+          return formData;
+        }
+      },
+    },
+  }
+</script>
+
+<style scoped>
+  ::v-deep .el-button{
+    background: rgb(123,213,195);
+    border:  rgb(123,213,195);
+    float: right;
+  }
+</style>

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

@@ -0,0 +1,130 @@
+<template>
+  <div class="app-containeteamIdr">
+    <el-form :model="form" ref="form" label-position="top" label-width="100px" align="left" :inline="false" 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-form-item>
+    </el-form>
+  </div>
+</template>
+
+<script>
+  import { submitNodeForm } from "@/api/bpmprocess/runDialogApi/index";
+  export default {
+    name: 'EditQualityCard',
+    props: ["formData", "row"],
+    data() {
+      return {
+        isEdit:false,
+        form: {
+          remark: ''
+        },
+      };
+    },
+    computed: {
+      myFormData() {
+        return this.formData;
+      },
+    },
+    watch: {
+      myFormData: {
+        handler(nval) {
+          this.form = nval.resultMap;
+          // this.form.hp = this.form.goodId
+          console.log(this.form);
+          // this.isEdit = this.form.id ? true : false;
+          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) {
+            let { taskProcessKey, taskNodeKey } = this.myFormData.resultMap;
+            payLoad.updateCommonEntityList = [
+              {
+                basicMap: {
+                  tableName: "record_quality_control_card",
+                },
+                conditionMap: {
+                  task_process_key: taskProcessKey,
+                  task_node_key: taskNodeKey,
+                },
+                commMap: {
+                  task_id: this.row.bepTaskPlanKey,
+                  remark: remark
+                },
+              },
+            ];
+          } else {
+            payLoad.insertCommonEntityList = [
+              {
+                basicMap: {
+                  tableName: "record_quality_control_card",
+                },
+                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;
+          } else {
+            formData.msg = "表单校验异常,请规范填写表单数据";
+            return formData;
+          }
+        } catch (error) {
+          // console.log(error);
+          formData.msg = "表单校验异常,请规范填写表单数据";
+          return formData;
+        }
+      },
+    },
+
+  };
+</script>
+
+<style lang="scss" scoped>
+  ::v-deep .el-button{
+    background: rgb(123,213,195);
+    border:  rgb(123,213,195);
+    float: right;
+  }
+</style>

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

@@ -0,0 +1,144 @@
+<template>
+  <div class="app-container">
+    <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-form-item>
+    </el-form>
+  </div>
+</template>
+
+<script>
+  import {submitNodeForm} from "@/api/bpmprocess/runDialogApi";
+  export default {
+    name: "FinishTask",
+    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,
+      },
+    },
+    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: "task_termination",
+            //    },
+            //    conditionMap: {
+            //      task_process_key: taskProcessKey,
+            //      task_node_key: taskNodeKey,
+            //    },
+            //    commMap: {
+            //      task_id: this.row.bepTaskPlanKey,
+            //      remark: remark,
+            //    },
+            //  },
+            //];
+          } else {
+            //插入节点数据总不能被数据
+            payLoad.insertCommonEntityList = [
+              {
+                basicMap: {
+                  tableName: "task_termination",
+                },
+                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;
+          } else {
+            formData.msg = "表单校验异常,请规范填写表单数据";
+            return formData;
+          }
+        } catch (error) {
+          formData.msg = "表单校验异常,请规范填写表单数据";
+          return formData;
+        }
+      },
+    },
+  }
+</script>
+
+<style scoped>
+  ::v-deep .el-button{
+    background: rgb(123,213,195);
+    border:  rgb(123,213,195);
+    float: right;
+  }
+</style>

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

@@ -0,0 +1,190 @@
+<template>
+  <div class="app-container">
+    <el-form :model="form" ref="form" label-width="80px"  align="left"  size="normal">
+      <el-row>
+        <!-- 左侧 -->
+        <el-col :span="12">
+          <el-form-item>
+            <span>质控卡号</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item>
+            <span>数量</span>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item >
+            <span>{{this.recordQualityControlCard.qualityControlCard}}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item>
+            <el-form-item>
+              <span>{{this.recordQualityControlCard.number}}</span>
+            </el-form-item>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+              <el-form-item >
+                <el-input v-model="form.qualityControlCard" placeholder="请输入质控卡号" type="text"></el-input>
+              </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item>
+                <el-form-item  >
+                  <el-input v-model="form.cardNum" placeholder="请输入数量" type="number"></el-input>
+                </el-form-item>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <!--按钮-->
+      <el-form-item>
+        <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: "QualityControlCardSubCardProcessing",
+    props: ["formData", "row"],
+    data() {
+      return {
+        //是否编辑
+        isEdit:false,
+        //表单数据
+        recordQualityControlCard:{
+          qualityControlCard:"",
+          number:"1"
+        },
+        form: {
+          qualityControlCard: '',
+          cardNum: '',
+        },
+      };
+    },
+    computed: {
+      //计算属性值
+      myFormData() {
+        //父组件传递过来的值
+        return this.formData;
+      },
+    },
+    watch: {
+      //监听
+      myFormData: {
+        handler(nval) {
+          console.log(nval)
+          this.form = nval.resultMap;
+          if(nval.resultMap.recordQualityControlCard!=undefined){
+            this.recordQualityControlCard=nval.resultMap.recordQualityControlCard;
+          }
+          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 { taskProcessKey, taskNodeKey } = this.myFormData.resultMap;
+          //判断是否编辑
+          if (this.isEdit) {
+            //准备更新节点的数据
+            payLoad.updateCommonEntityList = [
+              {
+                basicMap: {
+                  tableName: "quality_control_card_sub_card",
+                },
+                conditionMap: {
+                  task_process_key: taskProcessKey,
+                  task_node_key: taskNodeKey,
+                },
+                commMap: {
+                  qualityControlCard:this.form.qualityControlCard,
+                  cardNum:this.form.cardNum
+                },
+              },
+            ];
+          } else {
+            //插入节点数据总不能被数据
+            payLoad.insertCommonEntityList = [
+              {
+                basicMap: {
+                  tableName: "quality_control_card_sub_card",
+                },
+                addListMap: [
+                  {
+                    task_id: this.row.bepTaskPlanKey,
+                    qualityControlCard:this.form.qualityControlCard,
+                    cardNum:this.form.cardNum,
+                    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;
+          } else {
+            formData.msg = "表单校验异常,请规范填写表单数据";
+            return formData;
+          }
+        } catch (error) {
+          formData.msg = "表单校验异常,请规范填写表单数据";
+          return formData;
+        }
+      },
+    },
+  }
+</script>
+
+<style scoped>
+  ::v-deep .el-button{
+    background: rgb(123,213,195);
+    border:  rgb(123,213,195);
+    float: right;
+  }
+</style>

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

@@ -0,0 +1,144 @@
+<template>
+  <div class="app-container">
+    <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-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;
+      },
+    },
+    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: {
+                  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,
+                  },
+                ],
+              },
+            ];
+          }
+          //提交请求
+          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;
+          } else {
+            formData.msg = "表单校验异常,请规范填写表单数据";
+            return formData;
+          }
+        } catch (error) {
+          formData.msg = "表单校验异常,请规范填写表单数据";
+          return formData;
+        }
+      },
+    },
+  }
+</script>
+
+<style scoped>
+  ::v-deep .el-button{
+    background: rgb(123,213,195);
+    border:  rgb(123,213,195);
+    float: right;
+  }
+</style>