695593266@qq.com 10 сар өмнө
parent
commit
f0980c9441

+ 26 - 2
src/views/produce/components/jobBooking/index.vue

@@ -328,13 +328,37 @@
             item.semiProductList &&
             item.semiProductList.length != 0 &&
             taskObj.type == 4 &&
-            clientEnvironmentId == 3
+            clientEnvironmentId == 3 &&
+            item.singleReport == 1
           "
           :list="item.semiProductList"
           :item="item"
         ></packingTgBom>
 
-        <div v-if="item && item.currentTaskDiagram.type == 4">
+        <div
+          v-if="
+            item &&
+            item.currentTaskDiagram.type == 4 &&
+            clientEnvironmentId == 3 &&
+            item.singleReport == 0
+          "
+        >
+          <batchPackagingGrouping
+            ref="packagingGroupingRef"
+            :objData="item"
+            :workOrderId="item.workOrderId"
+            :taskId="item.currentTaskDiagram.taskId"
+          >
+          </batchPackagingGrouping>
+        </div>
+
+        <div
+          v-if="
+            item &&
+            item.currentTaskDiagram.type == 4 &&
+            clientEnvironmentId != 3
+          "
+        >
           <!-- <packagingGrouping
             ref="packagingGroupingRef"
             :objData="item"