新增bom状态

src/views/material/BOMmanage/detailsPop.vue

@@ -173,12 +173,7 @@
               提交发布
             </el-button>
 
-            <el-button
-              type="primary"
-              size="mini"
-              @click="handleRefresh"
-              v-if="currentNodeData.approvalStatus != 1"
-            >
+            <el-button type="primary" size="mini" @click="handleRefresh">
               刷新
             </el-button>
           </div>

src/views/material/product/components/index-data.vue

@@ -474,7 +474,7 @@
           },
           {
             prop: 'bomStatus',
-            label: 'BOM状态',
+            label: 'MBOM状态',
             align: 'center',
             minWidth: 120,
             formatter: (row, column) => {
@@ -482,6 +482,26 @@
             },
             showOverflowTooltip: true
           },
+          {
+            prop: 'pBomStatus',
+            label: 'PBOM状态',
+            align: 'center',
+            minWidth: 120,
+            formatter: (row, column) => {
+              return row.pBomStatus == 1 ? '有' : '无';
+            },
+            showOverflowTooltip: true
+          },
+          {
+            prop: 'aBomStatus',
+            label: 'ABOM状态',
+            align: 'center',
+            minWidth: 120,
+            formatter: (row, column) => {
+              return row.aBomStatus == 1 ? '有' : '无';
+            },
+            showOverflowTooltip: true
+          },
           {
             prop: 'isUnpack',
             label: '是否允许拆包',

src/views/technology/production/index.vue

@@ -263,6 +263,10 @@
         controlList: [],
 
         typeList: [
+          {
+            value: 99,
+            label: '关键工序'
+          },
           {
             value: 1,
             label: '普通工序'