自定义表单接口对接

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

@@ -1,145 +1,164 @@
 <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
+      :model="form"
+      ref="form"
+      label-position="left"
+      label-width="80px"
+      align="left"
+      size="normal"
+    >
+      <el-form-item label="完成时间:" prop="accomplishTime">
+        <el-date-picker
+          v-model="form.accomplishTime"
+          type="date"
+          placeholder="选择日期"
+          style="width: 100%"
+          value-format="yyyy-MM-dd"
+        >
+        </el-date-picker>
       </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: "FinishTask",
-    props: ["formData", "row"],
-    data() {
-      return {
-        //是否编辑
-        isEdit:false,
-        //表单数据
-        form: {
-          timeToFinish: '', //完成时间
-          id:""
-        },
-      };
-    },
-    computed: {
-      //计算属性值
-      myFormData() {
-        //父组件传递过来的值
-        return this.formData;
+import { submitNodeForm } from "@/api/bpmprocess/runDialogApi";
+export default {
+  name: "EditFinishTime",
+  props: ["formData", "row"],
+  data() {
+    return {
+      //是否编辑
+      isEdit: false,
+      //表单数据
+      form: {
+        accomplishTime: "", //完成时间
+        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,
+  },
+  watch: {
+    //监听
+    myFormData: {
+      handler(nval) {
+        this.form = nval.resultMap;
+        // 都不为空的话就是编辑
+        this.isEdit = this.form.id;
       },
+      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
-                },
+  },
+  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",
               },
-            ];
-          } else {
-            //插入节点数据总不能被数据
-            payLoad.insertCommonEntityList = [
-              {
-                basicMap: {
-                  tableName: "master_task",
-                },
-                addListMap: [
-                  {
-                    task_id: this.row.bepTaskPlanKey,
-                    remark: remark,
-                    taskProcessKey: this.row.benTaskProcessKey,
-                    taskNodeKey: this.row.benTaskNodeKey,
-                  },
-                ],
+              conditionMap: {
+                id: this.form.id,
               },
-            ];
-          }
-          //提交请求
-          submitNodeForm(payLoad).then((response) => {
-            if (response.code == 200) {
-              this.$modal.msgSuccess("保存成功");
-            } else {
-              this.$modal.error("保存失败,请稍后再试");
-            }
-          });
+              commMap: {
+                accomplish_time: this.form.accomplishTime,
+              },
+            },
+          ];
+        } else {
+          //插入节点数据总不能被数据
+          payLoad.insertCommonEntityList = [
+            {
+              basicMap: {
+                tableName: "master_task",
+              },
+              addListMap: [
+                {
+                  task_id: this.row.bepTaskPlanKey,
+                  remark: remark,
+                  taskProcessKey: this.row.benTaskProcessKey,
+                  taskNodeKey: this.row.benTaskNodeKey,
+                },
+              ],
+            },
+          ];
         }
-      },
-      //得到这个表单数据
-      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() {
+      // this.$refs.form.resetFields();
+      // Object.assign(this.form, {
+      //   accomplishTime: "",
+      //   id: "",
+      // });
     },
-  }
+  },
+};
 </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/dialogCompments/Mec/EditQualityCard.vue

@@ -1,130 +1,142 @@
 <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>
+  <div class="container">
+    <el-form
+      :model="form"
+      ref="form"
+      label-position="top"
+      label-width="100px"
+      align="left"
+      :inline="false"
+      size="normal"
+    >
+      <el-form-item label="质控卡号:" prop="qualityControlCard">
+        <el-input v-model="form.qualityControlCard"></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/index";
-  export default {
-    name: 'EditQualityCard',
-    props: ["formData", "row"],
-    data() {
-      return {
-        isEdit:false,
-        form: {
-          remark: ''
-        },
-      };
-    },
-    computed: {
-      myFormData() {
-        return this.formData;
+import { submitNodeForm } from "@/api/bpmprocess/runDialogApi/index";
+export default {
+  name: "EditQualityCard",
+  props: ["formData", "row"],
+  data() {
+    return {
+      isEdit: false,
+      form: {
+        qualityControlCard: "",
       },
+    };
+  },
+  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,
+  },
+  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
-                },
+  },
+  mounted() {},
+  methods: {
+    async submitHandler() {
+      console.log(this.row);
+      let res = await this.$refs.form?.validate();
+      if (res) {
+        let payLoad = {};
+        let { qualityControlCard } = this.form;
+        if (this.isEdit) {
+          let { taskProcessKey, taskNodeKey } = this.myFormData.resultMap;
+          payLoad.updateCommonEntityList = [
+            {
+              basicMap: {
+                tableName: "record_quality_control_card",
               },
-            ];
-          } 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,
-                  },
-                ],
+              conditionMap: {
+                // task_process_key: taskProcessKey,
+                // task_node_key: taskNodeKey,
+                id: this.form.id,
               },
-            ];
-          }
-          submitNodeForm(payLoad).then((response) => {
-            if (response.code == 200) {
-              this.$modal.msgSuccess("保存成功");
-            } else {
-              this.$modal.error("保存失败,请稍后再试");
-            }
-          });
+              commMap: {
+                // task_id: this.row.bepTaskPlanKey,
+                qualityControlCard: qualityControlCard,
+              },
+            },
+          ];
+        } else {
+          payLoad.insertCommonEntityList = [
+            {
+              basicMap: {
+                tableName: "record_quality_control_card",
+              },
+              addListMap: [
+                {
+                  // task_id: this.row.bepTaskPlanKey,
+                  qualityControlCard: qualityControlCard,
+                  taskProcessKey: this.row.benTaskProcessKey,
+                  taskNodeKey: this.row.benTaskNodeKey,
+                },
+              ],
+            },
+          ];
         }
-      },
-      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) {
-          // console.log(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;
-  }
+::v-deep .el-button {
+  background: rgb(123, 213, 195);
+  border: rgb(123, 213, 195);
+  float: right;
+}
 </style>

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

@@ -57,6 +57,7 @@
 
 <script>
 import { submitNodeForm } from "@/api/bpmprocess/runDialogApi/index";
+import { hasValue } from "@/utils/index";
 export default {
   name: "RecordQuality",
   props: ["formData", "row"],
@@ -97,12 +98,11 @@ export default {
   watch: {
     myFormData: {
       handler(nval) {
-        // this.form = JSON.parse(JSON.stringify(nval.resultMap));
         Object.assign(this.form, nval.resultMap);
         this.$set(this.form, "card", nval.resultMap.qualityControlCard);
         this.isEdit =
-          typeof this.form.taskProcessKey !== "undefined" &&
-          typeof this.form.taskNodeKey !== "undefined";
+          hasValue(nval.resultMap.taskProcessKey) &&
+          hasValue(nval.resultMap.taskNodeKey);
       },
       deep: true,
       immediate: true,
@@ -118,6 +118,7 @@ export default {
         let payLoad = {};
         let { card } = this.form;
         console.log(this.form);
+        console.log(typeof this.isEdit, this.isEdit);
         if (this.isEdit) {
           let { taskProcessKey, taskNodeKey } = this.myFormData.resultMap;
           payLoad.updateCommonEntityList = [

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

@@ -0,0 +1,153 @@
+<template>
+  <div class="app-containeteamIdr">
+    <el-form
+      :model="form"
+      ref="form"
+      label-position="top"
+      label-width="100px"
+      align="left"
+      :inline="false"
+      size="normal"
+    >
+      <el-col :span="12">
+        <span>质控卡号</span>
+      </el-col>
+      <el-col :span="12">
+        <span>数量</span>
+      </el-col>
+      <el-col :span="12">
+        <span>ZL</span>
+      </el-col>
+      <el-col :span="12">
+        <span>1</span>
+      </el-col>
+      <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: "RecordSplitData",
+  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: "material_matching",
+              },
+              conditionMap: {
+                task_process_key: taskProcessKey,
+                task_node_key: taskNodeKey,
+              },
+              commMap: {
+                task_id: this.row.bepTaskPlanKey,
+                remark: remark,
+              },
+            },
+          ];
+        } else {
+          payLoad.insertCommonEntityList = [
+            {
+              basicMap: {
+                tableName: "material_matching",
+              },
+              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/processMange.vue

@@ -243,6 +243,10 @@ import RecordQuality from "./dialogCompments/Mec/RecordQuality.vue";
 import ProductionProcesses from "./dialogCompments/Mec/ProductionProcesses.vue";
 import PersonalDistribution from "./dialogCompments/Mec/PersonalDistribution.vue";
 import RecordSplitData from "./dialogCompments/Mec/RecordSplitData.vue";
+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";
 
 export default {
   name: "processMange",
@@ -268,6 +272,10 @@ export default {
     ProductionProcesses,
     PersonalDistribution,
     RecordSplitData,
+    EditFinishTime,
+    EditQualityCard,
+    FinishTask,
+    QualityControlCardSubCardProcessing,
   },
   dicts: ["bpm_type", "task_process_state"],
   data() {