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

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

@@ -0,0 +1,142 @@
+<template>
+    <div class="app-container">
+        <el-form :model="form" :rules="rules" ref="form" label-width="100px" align="left" :inline="false" size="normal">
+            <el-form-item prop="bz">
+              <el-select v-model="form.bz" >
+                <el-option
+                    v-for="item in form.goodsList"
+                    :key="item.value"
+                    :label="item.goodsname"
+                    :value="item.id"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item>
+                <el-button type="primary" size="small" class="btn" @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: 'AssignEmployees',
+    props: ["formData", "row"],
+    data() {
+        return {
+            isEdit:false,
+            form: {
+                bz: ''
+            },
+            rules: {
+                bz: [
+                    { required: true, trigger: 'change' },
+                ]
+            }
+        };
+    },
+    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.taskKey && 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 { bz } = this.form;
+                if (this.isEdit) {
+                let { taskKey, taskNodeKey } = this.myFormData.resultMap;
+                payLoad.updateCommonEntityList = [
+                    {
+                    basicMap: {
+                        tableName: "plan",
+                    },
+                    conditionMap: {
+                        task_key: taskKey,
+                        task_node_key: taskNodeKey,
+                    },
+                    commMap: {
+                       bz
+                    },
+                    },
+                ];
+                } else {
+                payLoad.insertCommonEntityList = [
+                    {
+                    basicMap: {
+                        tableName: "plan",
+                    },
+                    addListMap: [
+                        {
+                        bz,
+                        taskKey: 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>
+.app-container{
+    .btn{
+        background: rgb(123,213,195);
+        border:  rgb(123,213,195);
+        text-align: right; 
+    }
+}
+</style>

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

@@ -0,0 +1,129 @@
+<template>
+    <div class="app-container">
+        <el-form :model="form" ref="form" label-position="top" label-width="100px" align="left" :inline="false" size="normal">
+            <el-form-item label="备注:" prop="bz">
+                <el-input v-model="form.bz"></el-input>
+            </el-form-item>
+            <el-form-item>
+                <el-button type="primary" size="small" class="btn" @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: 'Notes',
+    props: ["formData", "row"],
+    data() {
+        return {
+            isEdit:false,
+            form: {
+                bz: ''
+            },
+        };
+    },
+    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.taskKey && 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 { bz } = this.form;
+                if (this.isEdit) {
+                let { taskKey, taskNodeKey } = this.myFormData.resultMap;
+                payLoad.updateCommonEntityList = [
+                    {
+                    basicMap: {
+                        tableName: "plan",
+                    },
+                    conditionMap: {
+                        task_key: taskKey,
+                        task_node_key: taskNodeKey,
+                    },
+                    commMap: {
+                        bz,
+                    },
+                    },
+                ];
+                } else {
+                payLoad.insertCommonEntityList = [
+                    {
+                    basicMap: {
+                        tableName: "plan",
+                    },
+                    addListMap: [
+                        {
+                        bz,
+                        taskKey: 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>
+.app-container{
+    .btn{
+        background: rgb(123,213,195);
+        border:  rgb(123,213,195);
+        float: right;
+    }
+}
+</style>

zkqy-ui/src/views/bussiness/dialogCompments/ShengChan/SC01.vue

@@ -26,16 +26,18 @@
 </template>
 
 <script>
+  import { submitNodeForm } from "@/api/bpmprocess/runDialogApi/index";
 export default {
     name: 'SC01',
     props: ["formData", "row"],
     data() {
         return {
-            form: {
-                hp: '',
-                zl: ''
-            },
-            rules: {
+          isEdit:false,
+          form: {
+              hp: '',
+              zl: ''
+          },
+          rules: {
                 hp: [
                     { required: true, message: '请选择货品', trigger: 'change' },
                 ],
@@ -56,9 +58,10 @@ export default {
         myFormData: {
             handler(nval) {
                 this.form = nval.resultMap;
-                this.form.hp = this.form.planInfo[0]?.goodId
+                this.form.hp = this.form.goodId
                 console.log(this.form);
-                this.isEdite = this.form.id ? true : false;
+                // this.isEdit = this.form.id ? true : false;
+                this.isEdit = this.form.taskKey && this.form.taskNodeKey
             },
             deep: true,
             immediate: true,
@@ -76,6 +79,7 @@ export default {
         }
       },
         async submitHandler() {
+          console.log(this.row);
             let res = await this.$refs.form?.validate();
             if (res) {
                 let payLoad = {};
@@ -85,7 +89,7 @@ export default {
                 payLoad.updateCommonEntityList = [
                     {
                     basicMap: {
-                        tableName: "kucun",
+                        tableName: "plan",
                     },
                     conditionMap: {
                         task_key: taskKey,
@@ -93,7 +97,7 @@ export default {
                     },
                     commMap: {
                         hp,
-                        zl,
+                        plan_now_weight:zl,
                     },
                     },
                 ];
@@ -101,12 +105,12 @@ export default {
                 payLoad.insertCommonEntityList = [
                     {
                     basicMap: {
-                        tableName: "kucun",
+                        tableName: "plan",
                     },
                     addListMap: [
                         {
                         hp,
-                        zl,
+                        plan_now_weight:zl,
                         taskKey: this.row.benTaskProcessKey,
                         taskNodeKey: this.row.benTaskNodeKey,
                         },
@@ -123,7 +127,7 @@ export default {
         });
       }
     },
-        async getFormData() {
+      async getFormData() {
       let formData = {
         flag: false,
         msg: "",

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

@@ -186,6 +186,7 @@
             @addList="() => {}"
           ></DialogTemplate> -->
           <!-- ></DialogTemplate> -->
+          <!-- <component
           <!-- <component
             :is="myForm"
             :formData="formData"
@@ -194,6 +195,14 @@
             v-if="myForm"
           ></component> -->
           <NodeShow ref="myFormRef" :formData="formData" :row="row"></NodeShow>
+          -->
+
+          <!-- <SC01 :formData="formData"
+          :row="row"></SC01> -->
+
+          <!-- <AssignEmployees></AssignEmployees> -->
+          <Notes></Notes>
+
           <!-- <CG1 ref="myFormRef"></CG1>
           <KC1 ref="myFormRef"></KC1> -->
           <!-- <GY06 ref="myFormRef" :formData="formData" :row="row"></GY06> -->
@@ -231,10 +240,9 @@ import KC01 from "./dialogCompments/test-component/KuCun/KC1.vue";
 import KC02 from "./dialogCompments/test-component/KuCun/KC02.vue";
 import GY06 from "./dialogCompments/GongYi/GY06.vue";
 import KB01 from "./dialogCompments/KongBai/KB01.vue"; //空白提示组件
-import SC01 from "./dialogCompments/ShengChan/SC01.vue"; //空白提示组件
-
-// Mec组件
-import NodeShow from "./dialogCompments/Mec/NodeShow.vue";
+import SC01 from "./dialogCompments/ShengChan/SC01.vue";
+import AssignEmployees from "./dialogCompments/Mec/AssignEmployees.vue";
+import Notes from "./dialogCompments/Mec/Notes.vue";
 
 export default {
   name: "processMange",
@@ -253,6 +261,8 @@ export default {
     SC01,
     ZL01,
     NodeShow,
+    AssignEmployees,
+    Notes,
   },
   dicts: ["bpm_type", "task_process_state"],
   data() {