Sfoglia il codice sorgente

组件布局优化

ZYZ 1 anno fa
parent
commit
c2fc15bcf7

+ 16 - 42
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;
     });

+ 15 - 41
zkqy-ui/src/views/bussiness/dialogCompments/Mec/ProductionProcesses.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">
@@ -554,7 +527,8 @@ export default {
     },
     // 初始化数据
     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;
       });