制作单BUG修改

src/views/mes/pro/prototypeMake/prototypeMakeApply.vue

@@ -207,13 +207,13 @@
         label="印刷正面颜色"
         width="120"
         align="center"
-        prop="front_color_id"
+        prop="frontColorName"
       />
       <el-table-column
         label="印刷反面颜色"
         width="120"
         align="center"
-        prop="opposite_color_id"
+        prop="oppositeColorName"
       />
       <el-table-column
         label="分配方式"
@@ -437,7 +437,9 @@ export default {
         printingPaperlenth: null,
         printPaperwidth: null,
         frontColorId: null,
+        frontColorName: null,
         oppositeColorId: null,
+        oppositeColorName: null,
         ngReason: null,
         remark: null,
         prototypeMakeStatus: null,

src/views/mes/pro/prototypeMake/prototypeMakeInfo.vue

@@ -443,6 +443,7 @@ export default {
           .then(({ data }) => {
             Object.assign(this.form, data);
             this.bomList = data.bomList;
+            this.itemId = data.itemId;
             // 设置组件数据
             this.$refs["ProogingBomRef"].tableData = data.bomList;
             this.$refs["ProogingProcessRef"].tableData = data.processList;
@@ -459,7 +460,13 @@ export default {
             this.bomList = data.bomList;
             // 设置组件数据
             this.$refs["ProogingBomRef"].tableData = data.bomList;
-            this.$refs["ProogingProcess"].tableData = data.processList;
+            this.$refs["ProogingProcessRef"].tableData = data.processList;
+            this.prototypeRequestId = data.prototypeRequestId;
+            getPrototypeRequest(id).then(({ data }) => {
+              Object.assign(this.form, data);
+              // this.bomList = data.bomList;
+              // this.itemId = data.itemId;
+            });
           })
           .finally(() => {
             this.loading = false;
@@ -584,11 +591,11 @@ export default {
           //this.form.itemId = element.itemId;
           this.form.frontColorId = element.colorId;
           this.form.frontColorName = element.colorName;
-          this.form.face = "front";
-          var retFlag = false;
-          const idx = this.faceColorList.findIndex(
-            (itm) => itm.colorId == element.colorId
-          );
+          // this.form.face = "front";
+          // var retFlag = false;
+          // const idx = this.faceColorList.findIndex(
+          //   (itm) => itm.colorId == element.colorId
+          // );
         });
       }
     },
@@ -599,11 +606,11 @@ export default {
           //this.form.itemId = element.itemId;
           this.form.oppositeColorId = element.colorId;
           this.form.oppositeColorName = element.colorName;
-          this.form.face = "front";
-          var retFlag = false;
-          const idx = this.faceColorList.findIndex(
-            (itm) => itm.colorId == element.colorId
-          );
+          // this.form.face = "front";
+          //   var retFlag = false;
+          //   const idx = this.faceColorList.findIndex(
+          //     (itm) => itm.colorId == element.colorId
+          //   );
         });
       }
     },