55

src/views/produce/components/feeding/components/instanceBom.vue

@@ -2,7 +2,7 @@
   <div>
     <div class="title_box rx-bc mt6">
       <div class="name"
-        >物料清单   ({{ list.length || 0 }})个
+        >物料清单 ({{ list.length || 0 }})个
       </div>
 
       <div class="rx-bc"> </div>
@@ -61,7 +61,7 @@
       </el-table-column>
 
       <el-table-column
-        v-if="clientEnvironmentId == 3 && workInfo.singleReport != 0"
+        v-if="clientEnvironmentId == 3 && workInfo.singleReport ==1"
         :label="currentTaskDiagram.isFirstTask == 1 ? '物料重量' : '上道重量'"
         type="weightUnit"
       >
@@ -77,7 +77,7 @@
       </el-table-column>
 
       <el-table-column
-        v-if="clientEnvironmentId == 3 && workInfo.singleReport != 0"
+        v-if="clientEnvironmentId == 3 && workInfo.singleReport == 1"
         label="刻码"
         type="engrave"
       >
@@ -87,7 +87,7 @@
       </el-table-column>
 
       <el-table-column
-        v-if="clientEnvironmentId == 3 && workInfo.singleReport != 0"
+        v-if="clientEnvironmentId == 3 && workInfo.singleReport == 1"
         label="物料代号"
         type="materielCode"
       >
@@ -162,7 +162,7 @@
       </el-table-column>
 
       <el-table-column
-        v-if="clientEnvironmentId == 3 && workInfo.singleReport != 0"
+        v-if="clientEnvironmentId == 3 && workInfo.singleReport ==1"
         label="位置"
         width="110"
         type="feedQuantity"

src/views/produce/components/feeding/components/semiProductBom.vue

@@ -69,7 +69,7 @@
       </el-table-column>
 
       <el-table-column
-        v-if="singleReport == 1"
+         v-if="clientEnvironmentId == 3 && workInfo.singleReport == 1"
         :label="currentTaskDiagram.isFirstTask == 1 ? '物料重量' : '上道重量'"
         type="weightUnit"
       >
@@ -84,14 +84,16 @@
         </template>
       </el-table-column>
 
-      <el-table-column v-if="singleReport == 1" label="刻码" type="engrave">
+      <el-table-column 
+        v-if="clientEnvironmentId == 3 && workInfo.singleReport == 1"
+       label="刻码" type="engrave">
         <template slot-scope="{ row, $index }">
           {{ row.extInfo.engrave }}
         </template>
       </el-table-column>
 
       <el-table-column
-        v-if="singleReport == 1"
+       v-if="clientEnvironmentId == 3 && workInfo.singleReport == 1"
         label="物料代号"
         type="materielCode"
       >
@@ -101,7 +103,7 @@
       </el-table-column>
 
       <el-table-column
-        v-if="singleReport == 1 && deviceList.length > 0"
+        v-if="deviceList.length > 0"
         width="140"
         label="设备"
         type="deviceId"
@@ -126,7 +128,7 @@
       </el-table-column>
 
       <el-table-column
-        v-if="singleReport == 1 && deviceList.length > 0"
+        v-if="deviceList.length > 0"
         label="炉次号"
         width="90"
         type="heatNumber"
@@ -152,7 +154,19 @@
       </el-table-column>
 
       <el-table-column
-        v-if="singleReport == 1"
+        v-if="clientEnvironmentId == 3 && workInfo.singleReport == 0"
+        label="投料类型"
+        type="materielCode"
+      >
+        <template slot-scope="{ row, $index }">
+          <span style="color: #157a2c">
+            {{ workInfo.singleReport == 0 ? '批量投料' : '' }}</span
+          >
+        </template>
+      </el-table-column>
+
+      <el-table-column
+        v-if="clientEnvironmentId == 3 && workInfo.singleReport ==1"
         label="位置"
         width="110"
         type="feedQuantity"
@@ -196,8 +210,15 @@
         default: false
       },
 
-      singleReport: {
-        default: null
+      workInfo: {
+        type: Object,
+        default: () => {}
+      }
+    },
+
+    computed: {
+      clientEnvironmentId() {
+        return this.$store.state.user.info.clientEnvironmentId;
       }
     },