ysy 1 year ago
parent
commit
1792395d22

+ 3 - 2
src/views/produce/components/jobBooking/components/semiProductJobBomPL.vue

@@ -19,9 +19,10 @@
     >
     >
       <el-table-column type="expand">
       <el-table-column type="expand">
         <template slot-scope="{ row, $index }">
         <template slot-scope="{ row, $index }">
-          <div class="material" :key="$index">
+          <div class="material" :key="$index" v-if="isDetails && row.extInfo.batchReportInfo.length > 0">
             <div class="btn_end">
             <div class="btn_end">
               <el-button
               <el-button
+                v-if='!isDetails'
                 type="primary"
                 type="primary"
                 size="mini"
                 size="mini"
                 @click="handAddListPL($index)"
                 @click="handAddListPL($index)"
@@ -242,7 +243,7 @@
 
 
       <el-table-column label="操作" width="60px">
       <el-table-column label="操作" width="60px">
         <template slot-scope="{ $index, row }">
         <template slot-scope="{ $index, row }">
-          <el-link type="danger" @click="getDelete($index)">删除</el-link>
+          <el-link v-if='!isDetails' type="danger" @click="getDelete($index)">删除</el-link>
         </template>
         </template>
       </el-table-column>
       </el-table-column>
     </el-table>
     </el-table>

+ 15 - 2
src/views/produce/components/jobBooking/details.vue

@@ -71,7 +71,7 @@
           <semiProductJobBom
           <semiProductJobBom
             v-if="
             v-if="
               objData.semiProductList &&
               objData.semiProductList &&
-              (objData.semiProductList.length != 0) & (taskType != 6)
+              (objData.semiProductList.length != 0) & (taskType != 6) && objData.singleReport == 1
             "
             "
             :list="objData.semiProductList"
             :list="objData.semiProductList"
             :item="objData"
             :item="objData"
@@ -79,6 +79,17 @@
           >
           >
           </semiProductJobBom>
           </semiProductJobBom>
 
 
+          <semiProductJobBomPL
+            v-if="
+              objData.semiProductList &&
+              (objData.semiProductList.length != 0) & (taskType != 6) && objData.singleReport ==0
+            "
+            :list="objData.semiProductList"
+            :item="objData"
+            :isDetails="true"
+          >
+          </semiProductJobBomPL>
+
           <oneJobQualityBom
           <oneJobQualityBom
             v-if="
             v-if="
               objData.semiProductList &&
               objData.semiProductList &&
@@ -143,7 +154,8 @@
   import modelBom from '../feeding/components/modelBom.vue';
   import modelBom from '../feeding/components/modelBom.vue';
   import jobBom from '../jobBooking/components/jobBom.vue';
   import jobBom from '../jobBooking/components/jobBom.vue';
 
 
-  import semiProductJobBom from '../jobBooking/components/oneJobBom.vue';
+  import semiProductJobBom from '../jobBooking/components/semiProductJobBom.vue';
+  import semiProductJobBomPL from '../jobBooking/components/semiProductJobBomPL.vue';
   import oneJobQualityBom from '../jobBooking/components/oneJobQualityBom.vue';
   import oneJobQualityBom from '../jobBooking/components/oneJobQualityBom.vue';
 
 
   import byProductBom from '../jobBooking/components/byProductBom';
   import byProductBom from '../jobBooking/components/byProductBom';
@@ -167,6 +179,7 @@
       jobBom,
       jobBom,
 
 
       semiProductJobBom,
       semiProductJobBom,
+      semiProductJobBomPL,
       oneJobQualityBom,
       oneJobQualityBom,
       byProductBom,
       byProductBom,
       turnoverBom,
       turnoverBom,