销售订单 生产计划 生产类型字段改完bom类型 生产订单增加机型跟颜色字段

src/views/productionPlan/components/disassemblePlanPop.vue

@@ -194,8 +194,11 @@
         jhList: [],
         rules: {},
         producedList: [
-          { code: 2, name: '加工(MBOM)' },
-          { code: 3, name: '装配(ABOM)' }
+          // { code: 2, name: '加工(MBOM)' },
+          // { code: 3, name: '装配(ABOM)' }
+          { code: 1, name: 'PBOM' },
+          { code: 2, name: 'MBOM' },
+          { code: 3, name: 'ABOM' }
         ],
         routingList: [],
         columns: [

src/views/productionPlan/index.vue

@@ -561,10 +561,13 @@
           },
           {
             prop: 'productType',
-            label: '生产类型',
+            label: 'BOM类型',
             align: 'center',
             width: 120,
             formatter: (row) => {
+              if (row.produceType == 1) {
+                return 'PBOM';
+              }
               if (row.produceType == 2) {
                 return 'MBOM';
               }

src/views/saleOrder/components/create-order.vue

@@ -319,14 +319,14 @@
           </el-table-column>
 
           <el-table-column
-            label="生产类型"
+            label="BOM类型"
             width="140"
             align="center"
             prop="productType"
           >
             <template slot="header" slot-scope="scope">
               <div :class="isRequired ? 'header_required' : ''"
-                ><span class="is-required">生产类型</span></div
+                ><span class="is-required">BOM类型</span></div
               >
             </template>
             <template slot-scope="scope">

src/views/saleOrder/components/order-search.vue

@@ -584,7 +584,6 @@
         const bomCategoryId = this.selection[0].bomCategoryId;
         const saleType = this.selection[0].saleType;
         let produceType = this.selection[0].produceType[0];
-
         // if(!factoriesId){
         //   this.$message.warning('工厂未选择！');
         //   return;
@@ -656,6 +655,10 @@
           let obj = arr.find((el) => el.code == produceType);
           produceType = obj ? produceType : arr[0].code;
         }
+        if(arr.length == 0){
+          produceType = '';
+        }
+        console.log(produceType,'produceType')
         console.log(arr, 'arr 222');
         // const res = await findBomCategoryByCategoryId(categoryId);
         // let arr = [];

src/views/saleOrder/salesToProductionNew.vue

@@ -34,7 +34,7 @@
           <el-col :span="6">
             <el-form-item
               :class="isRequired ? 'header_required' : ''"
-              label="生产类型:"
+              label="BOM类型:"
               prop="produceType"
             >
               <el-select

src/views/saleOrder/salesToProductionNewTwo.vue

@@ -34,7 +34,7 @@
 
           <el-col v-bind="styleResponsive ? { lg: 5, md: 8 } : { span: 4 }">
             <el-form-item
-              label="生产类型:"
+              label="BOM类型:"
               :class="isRequired ? 'header_required' : ''"
             >
               <el-select

src/views/workOrder/index.vue

@@ -424,17 +424,27 @@
           },
           {
             prop: 'productType',
-            label: '生产类型',
+            label: 'BOM类型',
             align: 'center',
             width: 120,
             formatter: (row) => {
+              if (row.produceType == 1) {
+                return 'PBOM';
+              }
               if (row.produceType == 2) {
-                return '加工(MBOM)';
+                return 'MBOM';
               }
               if (row.produceType == 3) {
-                return '装配(ABOM)';
+                return 'ABOM';
               }
-              return '';
+              // return '';
+              // if (row.produceType == 2) {
+              //   return '加工(MBOM)';
+              // }
+              // if (row.produceType == 3) {
+              //   return '装配(ABOM)';
+              // }
+              // return '';
             }
           },
           {
@@ -457,6 +467,32 @@
             minWidth: 170,
             showOverflowTooltip: true
           },
+          {
+            prop: 'modelKey',
+            label: '机型',
+            align: 'center',
+            minWidth: 120,
+            showOverflowTooltip: true,
+            formatter: (row) => {
+              if (row.modelKey) {
+                return row.modelKey.toString();
+              }
+              return '';
+            }
+          },
+          {
+            prop: 'colorKey',
+            label: '颜色',
+            align: 'center',
+            minWidth: 120,
+            showOverflowTooltip: true,
+            formatter: (row) => {
+              if (row.colorKey) {
+                return row.colorKey.toString();
+              }
+              return '';
+            }
+          },
           {
             prop: 'productCode',
             label: '编码',
@@ -482,7 +518,7 @@
             prop: 'brandNo',
             label: '牌号',
             align: 'center',
-            showOverflowTooltip: true,
+            showOverflowTooltip: true
           },
 
           {