BUG修改

src/views/mes/pro/productionMake/components/ProogingBom.vue

@@ -29,7 +29,6 @@
         label="物料名称"
         align="center"
         prop="itemName"
-        width="120"
       />
       <el-table-column
         label="组件数量"
@@ -43,48 +42,12 @@
         prop="unitOfMeasure"
         width="120"
       />
-      <el-table-column
-        label="报废百分比"
-        align="center"
-        prop="scrapPercentage"
-        width="120"
-      />
       <el-table-column
         label="替代组"
         align="center"
         prop="alternativeGroup"
         width="120"
       />
-      <el-table-column
-        label="替代优先级"
-        align="center"
-        prop="alternativePriorities"
-        width="120"
-      />
-      <el-table-column
-        label="策略"
-        align="center"
-        prop="alternativeStrategy"
-        width="120"
-      />
-      <el-table-column
-        label="使用概率"
-        align="center"
-        prop="alternativeProbability"
-        width="120"
-      />
-      <el-table-column
-        label="BOM行备注"
-        align="center"
-        prop="bomItemRemark"
-        min-width="120"
-      />
-      <el-table-column
-        label="物料备注"
-        align="center"
-        prop="itemRemark"
-        min-width="120"
-      />
       <el-table-column
         v-if="mode != 'info'"
         label="操作"

src/views/mes/pro/productionMake/productionMakeApply.vue

@@ -79,7 +79,11 @@
       row-key="productionMakeId"
       default-expand-all
     >
-      <el-table-column label="量产制作单编码" width="180" prop="productionMakeCode">
+      <el-table-column
+        label="量产制作单编码"
+        width="180"
+        prop="productionMakeCode"
+      >
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -107,10 +111,19 @@
         align="center"
         prop="identifyingDate"
       />
-      <el-table-column label="印刷正面颜色" width="120" align="center" prop="printingFrontcolorName" />
-      <el-table-column label="印刷背面颜色" width="120" align="center" prop="printingBackcolorName" />
+      <el-table-column
+        label="印刷正面颜色"
+        width="120"
+        align="center"
+        prop="printingFrontcolorName"
+      />
+      <el-table-column
+        label="印刷背面颜色"
+        width="120"
+        align="center"
+        prop="printingBackcolorName"
+      />
       <el-table-column label="测试标准" align="center" prop="testStandard" />
-      <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column
         label="制作单状态"
         align="center"
@@ -166,7 +179,6 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
-
   </div>
 </template>
 
@@ -177,14 +189,20 @@ import VendorSelect from "@/components/vendorSelect/single.vue";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 // 新增js
-import { listProductionMake, getProductionMake, delProductionMake, addProductionMake, dofinish } from "@/api/mes/pro/productionMake";
+import {
+  listProductionMake,
+  getProductionMake,
+  delProductionMake,
+  addProductionMake,
+  dofinish,
+} from "@/api/mes/pro/productionMake";
 export default {
   name: "ProductionMake",
   dicts: [
     "mes_order_status",
     "mes_productionMake_sourcetype",
     "mes_productionMake_type",
-    "mes_productionMake_status"
+    "mes_productionMake_status",
   ],
   components: {
     Treeselect,
@@ -221,7 +239,7 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        itemName: null,// 可以查简称与英文名
+        itemName: null, // 可以查简称与英文名
         productionMakeStatus: null,
       },
       options: [
@@ -298,7 +316,7 @@ export default {
         shoeImg: null,
         prototype: null,
         productionMakeStatus: null,
-        remark: null
+        remark: null,
       };
       this.resetForm("form");
     },
@@ -323,7 +341,7 @@ export default {
       this.reset();
       const productionMakeId = row.productionMakeId || this.ids;
       this.$router.push(
-        "/mes/pro/productionMake/info?productionMakeId="+productionMakeId
+        "/mes/pro/productionMake/info?productionMakeId=" + productionMakeId
       );
     },
     /** 修改按钮操作 */
@@ -331,13 +349,15 @@ export default {
       this.reset();
       const productionMakeId = row.productionMakeId || this.ids;
       this.$router.push(
-        "/mes/pro/productionMake/edit?productionMakeId="+productionMakeId
+        "/mes/pro/productionMake/edit?productionMakeId=" + productionMakeId
       );
     },
     /** 删除按钮操作 */
     handleDelete(row) {
       this.$modal
-        .confirm('是否确认删除编号为"' + row.productionMakeCode + '"的量产制作单？')
+        .confirm(
+          '是否确认删除编号为"' + row.productionMakeCode + '"的量产制作单？'
+        )
         .then(function () {
           return delProductionMake(row.productionMakeId);
         })
@@ -391,7 +411,6 @@ export default {
         })
         .catch(() => {});
     },
-
   },
 };
 </script>

src/views/mes/pro/productionSolution/components/ProogingBom.vue

@@ -29,7 +29,6 @@
         label="物料名称"
         align="center"
         prop="itemName"
-        width="120"
       />
       <el-table-column
         label="组件数量"
@@ -43,48 +42,12 @@
         prop="unitOfMeasure"
         width="120"
       />
-      <el-table-column
-        label="报废百分比"
-        align="center"
-        prop="scrapPercentage"
-        width="120"
-      />
       <el-table-column
         label="替代组"
         align="center"
         prop="alternativeGroup"
         width="120"
       />
-      <el-table-column
-        label="替代优先级"
-        align="center"
-        prop="alternativePriorities"
-        width="120"
-      />
-      <el-table-column
-        label="策略"
-        align="center"
-        prop="alternativeStrategy"
-        width="120"
-      />
-      <el-table-column
-        label="使用概率"
-        align="center"
-        prop="alternativeProbability"
-        width="120"
-      />
-      <el-table-column
-        label="BOM行备注"
-        align="center"
-        prop="bomItemRemark"
-        min-width="120"
-      />
-      <el-table-column
-        label="物料备注"
-        align="center"
-        prop="itemRemark"
-        min-width="120"
-      />
       <el-table-column
         v-if="mode != 'info'"
         label="操作"

src/views/mes/pro/productionSolution/proofingApply.vue

@@ -140,34 +140,6 @@
       />
       <el-table-column label="工艺路线名称" align="center" prop="routeName">
       </el-table-column>
-      <el-table-column label="简称" align="center" prop="abbreviation">
-      </el-table-column>
-      <el-table-column
-        label="样品英文名称"
-        width="140"
-        align="center"
-        prop="enName"
-      />
-      <el-table-column label="样品数量" width="120" align="center" prop="num" />
-      <el-table-column
-        label="打样形式"
-        width="200"
-        align="center"
-        prop="type"
-        :show-overflow-tooltip="true"
-      />
-      <el-table-column
-        label="分配方式"
-        align="center"
-        prop="modality"
-        :show-overflow-tooltip="true"
-      />
-      <el-table-column
-        label="表面处理"
-        align="center"
-        prop="surfaceTreatment"
-      />
-      <el-table-column label="NG原因" align="center" prop="ngReason" />
       <el-table-column
         label="计划完成日期"
         align="center"
@@ -204,7 +176,6 @@
           />
         </template>
       </el-table-column>
-      <el-table-column label="测试标准" align="center" prop="testStandard" />
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column
         label="操作"

src/views/mes/pro/productiorequest/components/ProogingBom.vue

@@ -29,7 +29,6 @@
         label="物料名称"
         align="center"
         prop="itemName"
-        width="120"
       />
       <el-table-column
         label="组件数量"
@@ -43,48 +42,12 @@
         prop="unitOfMeasure"
         width="120"
       />
-      <el-table-column
-        label="报废百分比"
-        align="center"
-        prop="scrapPercentage"
-        width="120"
-      />
       <el-table-column
         label="替代组"
         align="center"
         prop="alternativeGroup"
         width="120"
       />
-      <el-table-column
-        label="替代优先级"
-        align="center"
-        prop="alternativePriorities"
-        width="120"
-      />
-      <el-table-column
-        label="策略"
-        align="center"
-        prop="alternativeStrategy"
-        width="120"
-      />
-      <el-table-column
-        label="使用概率"
-        align="center"
-        prop="alternativeProbability"
-        width="120"
-      />
-      <el-table-column
-        label="BOM行备注"
-        align="center"
-        prop="bomItemRemark"
-        min-width="120"
-      />
-      <el-table-column
-        label="物料备注"
-        align="center"
-        prop="itemRemark"
-        min-width="120"
-      />
       <el-table-column
         v-if="mode != 'info'"
         label="操作"

src/views/mes/pro/prototypeMake/components/ProogingBom.vue

@@ -29,7 +29,6 @@
         label="物料名称"
         align="center"
         prop="itemName"
-        width="120"
       />
       <el-table-column
         label="组件数量"
@@ -43,48 +42,12 @@
         prop="unitOfMeasure"
         width="120"
       />
-      <el-table-column
-        label="报废百分比"
-        align="center"
-        prop="scrapPercentage"
-        width="120"
-      />
       <el-table-column
         label="替代组"
         align="center"
         prop="alternativeGroup"
         width="120"
       />
-      <el-table-column
-        label="替代优先级"
-        align="center"
-        prop="alternativePriorities"
-        width="120"
-      />
-      <el-table-column
-        label="策略"
-        align="center"
-        prop="alternativeStrategy"
-        width="120"
-      />
-      <el-table-column
-        label="使用概率"
-        align="center"
-        prop="alternativeProbability"
-        width="120"
-      />
-      <el-table-column
-        label="BOM行备注"
-        align="center"
-        prop="bomItemRemark"
-        min-width="120"
-      />
-      <el-table-column
-        label="物料备注"
-        align="center"
-        prop="itemRemark"
-        min-width="120"
-      />
       <el-table-column
         v-if="mode != 'info'"
         label="操作"

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

@@ -462,10 +462,8 @@ export default {
             this.$refs["ProogingBomRef"].tableData = data.bomList;
             this.$refs["ProogingProcessRef"].tableData = data.processList;
             this.prototypeRequestId = data.prototypeRequestId;
-            getPrototypeRequest(id).then(({ data }) => {
+            getPrototypeRequest(prototypeRequestId).then(({ data }) => {
               Object.assign(this.form, data);
-              // this.bomList = data.bomList;
-              // this.itemId = data.itemId;
             });
           })
           .finally(() => {

src/views/mes/pro/workorder/components/ProogingBom.vue

@@ -29,7 +29,6 @@
         label="物料名称"
         align="center"
         prop="itemName"
-        width="120"
       />
       <el-table-column
         label="组件数量"
@@ -43,48 +42,12 @@
         prop="unitOfMeasure"
         width="120"
       />
-      <el-table-column
-        label="报废百分比"
-        align="center"
-        prop="scrapPercentage"
-        width="120"
-      />
       <el-table-column
         label="替代组"
         align="center"
         prop="alternativeGroup"
         width="120"
       />
-      <el-table-column
-        label="替代优先级"
-        align="center"
-        prop="alternativePriorities"
-        width="120"
-      />
-      <el-table-column
-        label="策略"
-        align="center"
-        prop="alternativeStrategy"
-        width="120"
-      />
-      <el-table-column
-        label="使用概率"
-        align="center"
-        prop="alternativeProbability"
-        width="120"
-      />
-      <el-table-column
-        label="BOM行备注"
-        align="center"
-        prop="bomItemRemark"
-        min-width="120"
-      />
-      <el-table-column
-        label="物料备注"
-        align="center"
-        prop="itemRemark"
-        min-width="120"
-      />
       <el-table-column
         v-if="mode != 'info'"
         label="操作"

src/views/mes/proofing/components/ProogingBom.vue

@@ -29,7 +29,6 @@
         label="物料名称"
         align="center"
         prop="itemName"
-        width="500"
       />
       <el-table-column
         label="组件数量"