优化

src/views/produce/components/jobBooking/components/packingBom.vue

@@ -1,3 +1,29 @@
 <template>
-    <div></div>
-</template>
+  <div>
+    <div class="title_box rx-bc mt6">
+      <div class="name">内包装 </div>
+
+      <div class="rx-bc">
+        <el-button size="mini" @click="handCancelPacking">重置打包</el-button>
+      </div>
+    </div>
+
+    
+
+
+
+  </div>
+</template>
+
+<script>
+  export default {
+    data() {
+      return {};
+    },
+
+    components: {},
+    methods: {
+      handCancelPacking() {}
+    }
+  };
+</script>

src/views/produce/components/jobBooking/components/packingTgBom.vue

@@ -0,0 +1,30 @@
+<template>
+    <div>
+      <div class="title_box rx-bc mt6">
+        <div class="name">打包信息 </div>
+  
+        <div class="rx-bc">
+       
+        </div>
+      </div>
+  
+      
+  
+  
+  
+    </div>
+  </template>
+  
+  <script>
+    export default {
+      data() {
+        return {};
+      },
+  
+      components: {},
+      methods: {
+
+      }
+    };
+  </script>
+  

src/views/produce/components/jobBooking/components/semiProductJobBom.vue

@@ -154,8 +154,8 @@
         </template>
       </el-table-column>
 
-      <!-- v-if="item.currentTaskDiagram.isFirstTask == 1 " -->
-      <el-table-column label="质检结果" width="80" type="">
+
+      <el-table-column label="质检结果" width="80" type=""  v-if="item.currentTaskDiagram.isFirstTask == 1 " >
         <template slot-scope="{ row, $index }">
           <div @click="openNumerate(row, $index)">
             <div class="numerate">点击计算</div>

src/views/produce/components/jobBooking/index.vue

@@ -79,8 +79,8 @@
           v-if="
             item.semiProductList &&
             item.semiProductList.length != 0 &&
-            taskObj.taskType != 4 &&
-            taskObj.taskType != 6
+            taskObj?.taskType != 4 &&
+            taskObj?.taskType != 6
           "
           :item="item"
           :list="item.semiProductList"
@@ -92,7 +92,7 @@
           v-if="
             item.semiProductList &&
             item.semiProductList.length != 0 &&
-            taskObj.taskType == 6 &&
+            taskObj?.taskType == 6 &&
             item.singleReport == 1
           "
           :item="item"
@@ -125,6 +125,19 @@
           :objData="item"
           ref="packRef"
         ></packingBom>
+
+
+
+        <packingTgBom
+          v-if="
+            item.pickOutInList &&
+            item.pickOutInList.length != 0 &&
+            taskObj?.taskType == 4 &&
+            clientEnvironmentId == 3
+          "
+          :list="item.pickOutInList"
+          :item="item"
+        ></packingTgBom>
       </div>
     </div>
 
@@ -155,6 +168,7 @@
   import turnoverBom from './components/turnoverBom.vue';
   import aridRegion from '../feeding/components/aridRegion.vue';
   import packingBom from './components/packingBom.vue';
+  import packingTgBom from './components/packingTgBom';
   export default {
     components: {
       pickingList,
@@ -171,7 +185,8 @@
       byProductBom,
       turnoverBom,
       aridRegion,
-      packingBom
+      packingBom,
+      packingTgBom
     },
     props: {
       workListIds: {