Explorar o código

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

lph hai 1 ano
pai
achega
dff53e635a

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

@@ -5,16 +5,16 @@
       :rules="rules"
       ref="form"
       label-width="100px"
-      align="left"
+      align="center"
       :inline="false"
       size="normal"
     >
-      <el-form-item prop="bz">
-        <el-select v-model="form.bz">
+      <el-form-item prop="teamId">
+        <el-select v-model="form.teamId">
           <el-option
-            v-for="item in form.goodsList"
+            v-for="item in form.masterTeam"
             :key="item.value"
-            :label="item.goodsname"
+            :label="item.name"
             :value="item.id"
           >
           </el-option>
@@ -43,10 +43,10 @@ export default {
     return {
       isEdit: false,
       form: {
-        bz: "",
+        teamId: "",
       },
       rules: {
-        bz: [{ required: true, trigger: "change" }],
+        teamId: [{ required: true, trigger: "change" }],
       },
     };
   },
@@ -59,9 +59,6 @@ export default {
     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,
@@ -75,20 +72,21 @@ export default {
       let res = await this.$refs.form?.validate();
       if (res) {
         let payLoad = {};
-        let { bz } = this.form;
+        let { teamId } = this.form;
         if (this.isEdit) {
           let { taskKey, taskNodeKey } = this.myFormData.resultMap;
           payLoad.updateCommonEntityList = [
             {
               basicMap: {
-                tableName: "plan",
+                tableName: "task_team_relevance",
               },
               conditionMap: {
                 task_key: taskKey,
                 task_node_key: taskNodeKey,
               },
               commMap: {
-                bz,
+                team_id: teamId,
+                task_id: this.row.bepTaskPlanKey,
               },
             },
           ];
@@ -96,11 +94,12 @@ export default {
           payLoad.insertCommonEntityList = [
             {
               basicMap: {
-                tableName: "plan",
+                tableName: "task_team_relevance",
               },
               addListMap: [
                 {
-                  bz,
+                  team_id: teamId,
+                  task_id: this.row.bepTaskPlanKey,
                   taskKey: this.row.benTaskProcessKey,
                   taskNodeKey: this.row.benTaskNodeKey,
                 },
@@ -117,28 +116,29 @@ export default {
         });
       }
     },
-  },
-  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 {
+    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;
       }
-    } catch (error) {
-      // console.log(error);
-      formData.msg = "表单校验异常,请规范填写表单数据";
-      return formData;
-    }
+    },
   },
+
 };
 </script>
 
@@ -147,7 +147,11 @@ export default {
   .btn {
     background: rgb(123, 213, 195);
     border: rgb(123, 213, 195);
-    text-align: right;
+    float: right;
   }
 }
+
+::v-deep .el-select {
+  width: 100%;
+}
 </style>

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

@@ -1,8 +1,8 @@
 <template>
-    <div class="app-container">
+    <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="bz">
-                <el-input v-model="form.bz"></el-input>
+            <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" class="btn" @click="submitHandler" icon="el-icon-success">记录</el-button>
@@ -20,7 +20,7 @@ export default {
         return {
             isEdit:false,
             form: {
-                bz: ''
+                remark: ''
             },
         };
     },
@@ -33,7 +33,7 @@ export default {
         myFormData: {
             handler(nval) {
                 this.form = nval.resultMap;
-                this.form.hp = this.form.goodId
+                // 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
@@ -51,20 +51,21 @@ export default {
             let res = await this.$refs.form?.validate();
             if (res) {
                 let payLoad = {};
-                let { bz } = this.form;
+                let { remark } = this.form;
                 if (this.isEdit) {
                 let { taskKey, taskNodeKey } = this.myFormData.resultMap;
                 payLoad.updateCommonEntityList = [
                     {
                     basicMap: {
-                        tableName: "plan",
+                        tableName: "material_matching",
                     },
                     conditionMap: {
                         task_key: taskKey,
                         task_node_key: taskNodeKey,
                     },
                     commMap: {
-                        bz,
+                        task_id: this.row.bepTaskPlanKey,
+                        remark: remark
                     },
                     },
                 ];
@@ -72,49 +73,51 @@ export default {
                 payLoad.insertCommonEntityList = [
                     {
                     basicMap: {
-                        tableName: "plan",
+                        tableName: "material_matching",
                     },
                     addListMap: [
                         {
-                        bz,
+                        task_id: this.row.bepTaskPlanKey,
+                        remark: remark,
                         taskKey: this.row.benTaskProcessKey,
                         taskNodeKey: this.row.benTaskNodeKey,
                         },
                     ],
-                },
+                    },
                 ];
+            }
+            submitNodeForm(payLoad).then((response) => {
+                if (response.code == 200) {
+                    this.$modal.msgSuccess("保存成功");
+                } else {
+                    this.$modal.error("保存失败,请稍后再试");
                 }
-        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;
             }
         },
     },
-    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>
 

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

@@ -6,10 +6,12 @@
         <span>工装信息</span>
       </div>
       <div class="message">
-        <div class="list" v-for="(item, index) in message" :key="index">
+        <div class="list" 
+          v-for="(item,index) in message"
+          :key="index">
           <div class="list-card">
             <p>{{ item.title }}</p>
-            <p class="content">{{ item.content }}</p>
+            <p class="content">{{ form.master_task[item.prop] }}</p>
           </div>
         </div>
       </div>
@@ -23,49 +25,142 @@
         <div class="list" v-for="(item, index) in message" :key="index">
           <div class="list-card">
             <p>{{ item.title }}</p>
-            <p class="content">{{ item.content }}</p>
+            <p class="content">{{ form.master_task[item.prop] }}</p>
           </div>
         </div>
       </div>
     </div>
     <div class="card">
-      <div class="title"><span>质控卡号</span></div>
-      <el-input v-model="input" placeholder="请输入内容"></el-input>
-    </div>
-    <div class="submit">
-      <el-button type="success" icon="el-icon-success">记录质控卡</el-button>
+      <el-form :rules="rules" :model="form" ref="form" label-position="top"  label-width="100px" :inline="false" size="normal">
+        <el-form-item label="质控卡号:" prop="card">
+          <el-input v-model="form.card"  placeholder="请输入内容"></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" class="btn" icon="el-icon-success" @click="submitHandler">记录质控卡</el-button>
+        </el-form-item>
+      </el-form>
     </div>
   </div>
 </template>
 
 <script>
+import { submitNodeForm } from "@/api/bpmprocess/runDialogApi/index";
 export default {
   name: "RecordQuality",
-
+  props: ["formData", "row"],
   data() {
     return {
+      isEdit: false,
+      form: {
+        card: '',
+      },
+       rules: {
+        card: [{ required: true, trigger: "change" }],
+      },
       message: [
-        { title: "任务编号", content: "task_50" },
-        { title: "图号", content: "drawinng_50" },
-        { title: "投产数量", content: "1" },
-        { title: "牌号", content: "1" },
-        { title: "状态", content: "1" },
-        { title: "标准", content: "1" },
-        { title: "物资名称", content: "1" },
-        { title: "材料/产品", content: "1" },
-        { title: "规格", content: "1" },
-        { title: "尺寸", content: "1" },
-        { title: "备注", content: "1" },
+        { title: "任务编号", prop: "taskNo" },
+        { title: "图号", prop: "mapNumber" },
+        { title: "投产数量", prop: "taskNumber" },
+        { title: "牌号", prop: "" },
+        { title: "状态", prop: "" },
+        { title: "标准", prop: "" },
+        { title: "物资名称", prop: "" },
+        { title: "材料/产品", prop: "" },
+        { title: "规格", prop: "" },
+        { title: "尺寸", prop: "" },
+        { title: "备注", prop: "" },
       ],
-      input: "",
+      quality_control_card: "",
     };
   },
-
+  computed: {
+    myFormData() {
+      return this.formData;
+    },
+  },
+  watch: {
+    myFormData: {
+      handler(nval) {
+        this.form = nval.resultMap;
+        this.isEdit = this.form.taskKey && this.form.taskNodeKey;
+      },
+      deep: true,
+      immediate: true,
+    },
+  },
   mounted() {},
 
   methods: {
-    recordValue() {
-      this.$emit("ZL1", this.message[0].content);
+    async submitHandler() {
+      console.log(this.row);
+      let res = await this.$refs.form?.validate();
+      if (res) {
+        let payLoad = {};
+        let { card } = this.form;
+        console.log(this.form);
+        if (this.isEdit) {
+          let { taskKey, taskNodeKey } = this.myFormData.resultMap;
+          payLoad.updateCommonEntityList = [
+            {
+              basicMap: {
+                tableName: "record_quality_control_card",
+              },
+              conditionMap: {
+                task_key: taskKey,
+                task_node_key: taskNodeKey,
+              },
+              commMap: {
+                quality_control_card: card,
+                task_id: this.row.bepTaskPlanKey,
+              },
+            },
+          ];
+        } else {
+          payLoad.insertCommonEntityList = [
+            {
+              basicMap: {
+                tableName: "record_quality_control_card",
+              },
+              addListMap: [
+                {
+                  quality_control_card: card,
+                  task_id: this.row.bepTaskPlanKey,
+                  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;
+      }
     },
   },
 };
@@ -134,15 +229,10 @@ export default {
     }
   }
 }
-.card {
-  .title {
-    padding: 10px 0px;
-  }
-}
-.submit {
-  display: flex;
-  flex-direction: row-reverse;
-  padding: 10px 0px;
+.btn {
+  background: rgb(123,213,195);
+  border:  rgb(123,213,195);
+  float: right;
   border-bottom: #e2e1e1 solid 1px;
 }
 </style>

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

@@ -127,7 +127,7 @@ export default {
         });
       }
     },
-      async getFormData() {
+        async getFormData() {
       let formData = {
         flag: false,
         msg: "",