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

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

@@ -5,47 +5,20 @@
           <span class="title">
             {{ item.title }}
           </span>
-          <span v-if="item.prop == 'taskNo'" class="content">
-            {{ form.master_task[item.prop] }}
-          </span>
-          <span
-            v-else-if="item.prop == 'mapNumber'"
-            class="content"
-            style="background: rgb(235, 237, 242); color: rgb(232, 83, 152)"
-          >
-            {{ form.master_task[item.prop] }}
-          </span>
-          <span
-            v-else-if="item.prop == 'mapName'"
-            class="content"
-            style="background: rgb(235, 237, 242); color: rgb(232, 83, 152)"
-          >
-            {{ form.master_task[item.prop] }}
-          </span>
-          <span
-            v-else-if="item.prop == 'modelNumber'"
-            class="content"
-            style="background: rgb(235, 237, 242); color: rgb(232, 83, 152)"
-          >
-            {{ form.master_task[item.prop] }}
-          </span>
-          <span
-            v-else-if="item.prop == 'craftRoute'"
-            class="content"
-            style="background: rgb(235, 237, 242); color: rgb(232, 83, 152)"
-          >
-            {{ form.master_task[item.prop] }}
-          </span>
-          <span
-            v-else
-            class="content"
-            style="background: rgb(235, 237, 242); color: rgb(232, 83, 152)"
-          >
-            {{ form.record_quality_control_card[item.prop] }}
-          </span>
+          <template v-if="item.prop == 'qualityControlCard'">
+            <span
+              class="content"
+              style="background: rgb(235, 237, 242); color: rgb(232, 83, 152)"
+            >
+              {{ form.recordQualityControlCard[item.prop] }}
+            </span>
+          </template>
+          <template v-else>
+            <span class="content">
+              {{ form.masterTask[item.prop] }}
+            </span>
+          </template>
         </div>
-        <div></div>
-        <div class="content"></div>
       </div>
       <div class="rightMessage">
         <div class="top">
@@ -261,7 +234,7 @@ changeNodeState,
 } from "@/api/bpmprocess/runDialogApi/index";
 import { getProcessNodeFormInfoData } from "@/api/bpmprocess/run/executeProcess";
 export default {
-name: "ProductionProcesses",
+name: "PersonalDistribution",
 props: ["formData", "row"],
 data() {
     return {
@@ -554,7 +527,8 @@ methods: {
     },
     // 初始化数据
     initData(nval) {
-    this.form = JSON.parse(JSON.stringify(nval?.resultMap));
+    // this.form = JSON.parse(JSON.stringify(nval?.resultMap));
+    Object.assign(this.form, nval?.resultMap);
     this.form.personnelList.forEach((element) => {
         element.isEdit = false;
     });

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

@@ -19,8 +19,6 @@
           </span>
         </template>
       </div>
-      <div></div>
-      <div class="content"></div>
     </div>
     <div class="rightMessage">
       <div class="top">

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

@@ -249,6 +249,7 @@ 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";
+import PersonalDistribution from "./dialogCompments/Mec/PersonalDistribution.vue";
 
 export default {
   name: "processMange",
@@ -272,6 +273,7 @@ export default {
     Print,
     RecordQuality,
     ProductionProcesses,
+    PersonalDistribution
   },
   dicts: ["bpm_type", "task_process_state"],
   data() {