Răsfoiți Sursa

补充提交

ZYZ 1 an în urmă
părinte
comite
c3bac44a4b

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

@@ -59,7 +59,7 @@ export default {
     myFormData: {
       handler(nval) {
         this.form = nval.resultMap;
-        this.isEdit = this.form.taskKey && this.form.taskNodeKey;
+        this.isEdit = this.form.taskProcessKey && this.form.taskNodeKey;
       },
       deep: true,
       immediate: true,
@@ -74,14 +74,14 @@ export default {
         let payLoad = {};
         let { teamId } = this.form;
         if (this.isEdit) {
-          let { taskKey, taskNodeKey } = this.myFormData.resultMap;
+          let { taskProcessKey, taskNodeKey } = this.myFormData.resultMap;
           payLoad.updateCommonEntityList = [
             {
               basicMap: {
                 tableName: "task_team_relevance",
               },
               conditionMap: {
-                task_key: taskKey,
+                task_process_key: taskProcessKey,
                 task_node_key: taskNodeKey,
               },
               commMap: {
@@ -100,7 +100,7 @@ export default {
                 {
                   team_id: teamId,
                   task_id: this.row.bepTaskPlanKey,
-                  taskKey: this.row.benTaskProcessKey,
+                  taskProcessKey: this.row.benTaskProcessKey,
                   taskNodeKey: this.row.benTaskNodeKey,
                 },
               ],

+ 6 - 6
zkqy-ui/src/views/bussiness/dialogCompments/Mec/Notes.vue

@@ -36,7 +36,7 @@ export default {
                 // this.form.hp = this.form.goodId
                 console.log(this.form);
                 // this.isEdit = this.form.id ? true : false;
-                this.isEdit = this.form.taskKey && this.form.taskNodeKey
+                this.isEdit = this.form.taskProcessKey && this.form.taskNodeKey
             },
             deep: true,
             immediate: true,
@@ -53,14 +53,14 @@ export default {
                 let payLoad = {};
                 let { remark } = this.form;
                 if (this.isEdit) {
-                let { taskKey, taskNodeKey } = this.myFormData.resultMap;
+                let { taskProcessKey, taskNodeKey } = this.myFormData.resultMap;
                 payLoad.updateCommonEntityList = [
                     {
                     basicMap: {
-                        tableName: "delivery_slip",
+                        tableName: "material_matching",
                     },
                     conditionMap: {
-                        task_key: taskKey,
+                        task_process_key: taskProcessKey,
                         task_node_key: taskNodeKey,
                     },
                     commMap: {
@@ -73,13 +73,13 @@ export default {
                 payLoad.insertCommonEntityList = [
                     {
                     basicMap: {
-                        tableName: "delivery_slip",
+                        tableName: "material_matching",
                     },
                     addListMap: [
                         {
                         task_id: this.row.bepTaskPlanKey,
                         remark: remark,
-                        taskKey: this.row.benTaskProcessKey,
+                        taskProcessKey: this.row.benTaskProcessKey,
                         taskNodeKey: this.row.benTaskNodeKey,
                         },
                     ],

+ 130 - 0
zkqy-ui/src/views/bussiness/dialogCompments/Mec/Print.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: 'Print',
+    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: "delivery_slip",
+                    },
+                    conditionMap: {
+                        task_process_key: taskProcessKey,
+                        task_node_key: taskNodeKey,
+                    },
+                    commMap: {
+                        task_id: this.row.bepTaskPlanKey,
+                        remark: remark
+                    },
+                    },
+                ];
+                } else {
+                payLoad.insertCommonEntityList = [
+                    {
+                    basicMap: {
+                        tableName: "delivery_slip",
+                    },
+                    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>

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

@@ -83,7 +83,7 @@ export default {
       handler(nval) {
         this.form = JSON.parse(JSON.stringify(nval.resultMap));
         this.$set(this.form, 'card', nval.resultMap.qualityControlCard);
-        this.isEdit = this.form.taskKey && this.form.taskNodeKey;
+        this.isEdit = this.form.taskProcessKey && this.form.taskNodeKey;
       },
       deep: true,
       immediate: true,
@@ -100,14 +100,14 @@ export default {
         let { card } = this.form;
         console.log(this.form);
         if (this.isEdit) {
-          let { taskKey, taskNodeKey } = this.myFormData.resultMap;
+          let { taskProcessKey, taskNodeKey } = this.myFormData.resultMap;
           payLoad.updateCommonEntityList = [
             {
               basicMap: {
                 tableName: "record_quality_control_card",
               },
               conditionMap: {
-                task_key: taskKey,
+                task_process_key: taskProcessKey,
                 task_node_key: taskNodeKey,
               },
               commMap: {
@@ -126,7 +126,7 @@ export default {
                 {
                   quality_control_card: card,
                   task_id: this.row.bepTaskPlanKey,
-                  taskKey: this.row.benTaskProcessKey,
+                  taskProcessKey: this.row.benTaskProcessKey,
                   taskNodeKey: this.row.benTaskNodeKey,
                 },
               ],

+ 6 - 0
zkqy-ui/src/views/bussiness/processMange.vue

@@ -193,6 +193,8 @@
             ref="myFormRef"
             v-if="myForm"
           ></component>
+          <!-- <AssignEmployees :formData="formData"
+          :row="row"></AssignEmployees> -->
           <!-- <NodeShow ref="myFormRef" :formData="formData" :row="row"></NodeShow>
           -->
 
@@ -243,6 +245,7 @@ import SC01 from "./dialogCompments/ShengChan/SC01.vue";
 //Mec组件
 import AssignEmployees from "./dialogCompments/Mec/AssignEmployees.vue";
 import Notes from "./dialogCompments/Mec/Notes.vue";
+import Print from "./dialogCompments/Mec/Print.vue";
 import NodeShow from "./dialogCompments/Mec/NodeShow.vue";
 import RecordQuality from "./dialogCompments/Mec/RecordQuality.vue";
 import ProductionProcesses from "./dialogCompments/Mec/ProductionProcesses.vue";
@@ -266,6 +269,7 @@ export default {
     NodeShow,
     AssignEmployees,
     Notes,
+    Print,
     RecordQuality,
     ProductionProcesses,
   },
@@ -388,7 +392,9 @@ export default {
       //   default:
       //     break;
       // }
+      console.log(this.$refs.myFormRef);
       let temp = await this.$refs.myFormRef?.getFormData();
+      console.log('temp',temp);
       if (!temp?.flag) {
         this.$message.error(temp.msg);
         return false;