55

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

@@ -154,7 +154,6 @@
     </div>
 
     <div v-if="taskType == 5">
-   
       <div class="card_box" v-for="(objData, index) in list" :key="index">
         <div class="rx-bc title_card">
           <div>{{ index + 1 }}</div>
@@ -162,15 +161,15 @@
         </div>
 
         <workOrderBom2
-            :item="objData"
-            v-if="objData"
-            :isDetails="true"
-          ></workOrderBom2>
+          :item="objData"
+          v-if="objData"
+          :isDetails="true"
+        ></workOrderBom2>
 
-        <!-- <detailsBom
+        <detailsBom
           v-if="objData.detailList.length != 0"
           :detailList="objData.detailList"
-        ></detailsBom> -->
+        ></detailsBom>
       </div>
     </div>
   </div>
@@ -201,12 +200,9 @@
 
   //   import packingBom from '../jobBooking/components/packingBomDetails.vue';
 
-
-
-
+  import detailsBom from '../warehousing/components/detailsBom.vue';
   import workOrderBom2 from '../warehousing/components/workOrderBom.vue';
 
-
   export default {
     components: {
       workOrderBom,
@@ -230,8 +226,8 @@
       packingTgBom,
       //   packingBom,
 
-      //   detailsBom,
-        workOrderBom2
+      detailsBom,
+      workOrderBom2
     },
     props: {
       routeObj: {
@@ -284,9 +280,9 @@
           workOrderId: this.routeObj.id,
           taskId: taskId
         };
-        console.log( this.taskType)
+        console.log(this.taskType);
         let URL = this.taskType == 5 ? listApplystorage : listWorkReport;
-        console.log(URL)
+        console.log(URL);
         URL(param).then((res) => {
           this.list = JSON.parse(JSON.stringify(res));
         });
@@ -328,15 +324,14 @@
     }
   }
 
-
   .title_card {
-	  height: 35px;
-		width: 100%;
-		background: #157A2C;
-		font-size: 16px;
-		color: #fff;
-		line-height:  35px;
-		padding: 0 20px;
-		box-sizing: border-box;
-	}
+    height: 35px;
+    width: 100%;
+    background: #157a2c;
+    font-size: 16px;
+    color: #fff;
+    line-height: 35px;
+    padding: 0 20px;
+    box-sizing: border-box;
+  }
 </style>

src/views/produce/components/warehousing/components/detailsBom.vue

@@ -0,0 +1,77 @@
+<template>
+    <div>
+      <div class="title_box rx-bc">
+        <div class="name"
+          >内包装
+        </div>
+  
+        <div class="rx-bc"  v-if="detailList.length">
+            {{ detailList[0].warehouseName}}
+        </div>
+      </div>
+  
+      <el-table
+        ref="oneJobQualityBom"
+        class="table_content"
+        :max-height="600"
+        :data="detailList"
+        tooltip-effect="dark"
+        style="width: 98%; margin: auto;"
+        stripe
+        border
+      >
+        <el-table-column label="序号" type="index" width="55">
+          <template slot-scope="{ row, $index }">
+            {{ $index + 1 }}
+          </template>
+        </el-table-column>
+  
+        <el-table-column label="数量" prop="code" minWidth="110">
+          <template slot-scope="{ row, $index }">
+           <div class="content_num">{{ row.quantity }} {{row.measuringUnit}}/ {{row.packingCount}} {{row.packingUnit}}</div>
+          </template>
+        </el-table-column>
+  
+        <el-table-column label="重量" prop="name" minWidth="110">
+          <template slot-scope="{ row, $index }">
+            {{row.packingWeight}} {{row.weightUnit}}
+          </template>
+        </el-table-column>
+  
+
+   
+      </el-table>
+    </div>
+  </template>
+  
+  <script>
+    export default {
+      props: {
+        detailList: {
+				type: Array,
+				default: () => []
+			},
+     
+      },
+  
+      data() {
+        return {};
+      },
+  
+      components: {},
+      methods: {}
+    };
+  </script>
+  
+  <style lang="scss" scoped>
+  .title_box{
+    padding: 10px 12px;
+  }
+  .content_num {
+      display: flex;
+      align-items: center;
+      padding: 2px;
+      --input-background-color: #f0f8f2;
+    }
+  </style>
+