55

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

@@ -1,7 +1,7 @@
 <template>
   <div>
     <div class="title_box rx-bc mt6">
-      <div class="name">取样信息 </div>
+      <div class="name">产品信息 </div>
 
       <div class="rx-bc"> </div>
     </div>
@@ -160,7 +160,7 @@
     </div>
 
     <div class="title_box rx-bc mt6">
-      <div class="name">报工信息 </div>
+      <div class="name">样品列表 </div>
 
       <div class="rx-bc"> </div>
     </div>

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

@@ -73,7 +73,7 @@
           <semiProductJobBom
             v-if="
               objData.semiProductList &&
-              (objData.semiProductList.length != 0) & (taskType != 6) &&
+              (objData.semiProductList.length != 0) && (taskType != 6) &&
               objData.singleReport == 1
             "
             :list="objData.semiProductList"
@@ -86,7 +86,7 @@
           <semiProductJobBomPL
             v-if="
               objData.semiProductList &&
-              (objData.semiProductList.length != 0) & (taskType != 6) &&
+              (objData.semiProductList.length != 0) && (taskType != 6) &&
               objData.singleReport == 0
             "
             :list="objData.semiProductList"
@@ -99,13 +99,20 @@
           <oneJobQualityBom
             v-if="
               objData.semiProductList &&
-              (objData.semiProductList.length != 0) & (taskType == 6)
+              (objData.semiProductList.length != 0) && (taskType == 6)   &&  clientEnvironmentId == 3 &&  objData.singleReport == 1
             "
             :list="objData.semiProductList"
             :item="objData"
             :isDetails="true"
           ></oneJobQualityBom>
 
+          <oneJobQualityBomPL
+            v-if=" taskType == 6 &&  clientEnvironmentId == 3  &&  objData.singleReport == 0"
+            :list="objData.semiProductList"
+            :item="objData"
+            :isDetails="true"
+          ></oneJobQualityBomPL>
+
           <byProductBom
             v-if="
               objData.productRecycleList &&
@@ -187,6 +194,7 @@
   import semiProductJobBom from '../jobBooking/components/semiProductJobBom.vue';
   import semiProductJobBomPL from '../jobBooking/components/semiProductJobBomPL.vue';
   import oneJobQualityBom from '../jobBooking/components/oneJobQualityBom.vue';
+  import oneJobQualityBomPL from '../jobBooking/components/oneJobQualityBomPL.vue';
 
   import byProductBom from '../jobBooking/components/byProductBom';
   import turnoverBom from '../jobBooking/components/turnoverBom.vue';
@@ -216,6 +224,8 @@
       semiProductJobBom,
       semiProductJobBomPL,
       oneJobQualityBom,
+      oneJobQualityBomPL,
+
       byProductBom,
       turnoverBom,
       aridRegion,