66

src/api/produce/workOrder.js

@@ -164,7 +164,7 @@ export async function listApplystorage(data) {
     params: data
   });
   if (res.data.code == 0) {
-    return res.data;
+    return res.data.data;
   }
   return Promise.reject(new Error(res.data.message));
 }

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

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div class="feed_box">
+    <div class="" v-if="taskType != 5">
       <div v-for="(objData, index) in list" :key="index" class="card_box">
         <div class="rx-bc">
           <div class="item_box rx-bc">
@@ -63,7 +63,9 @@
           </palletBom>
 
           <revolvingDiskBom
-            v-if="objData.revolvingDiskList && objData.revolvingDiskList.length > 0"
+            v-if="
+              objData.revolvingDiskList && objData.revolvingDiskList.length > 0
+            "
             pattern="job"
             :revolvingDiskList="objData.revolvingDiskList"
           ></revolvingDiskBom>
@@ -71,7 +73,8 @@
           <semiProductJobBom
             v-if="
               objData.semiProductList &&
-              (objData.semiProductList.length != 0) & (taskType != 6) && objData.singleReport == 1
+              (objData.semiProductList.length != 0) & (taskType != 6) &&
+              objData.singleReport == 1
             "
             :list="objData.semiProductList"
             :item="objData"
@@ -82,7 +85,8 @@
           <semiProductJobBomPL
             v-if="
               objData.semiProductList &&
-              (objData.semiProductList.length != 0) & (taskType != 6) && objData.singleReport ==0
+              (objData.semiProductList.length != 0) & (taskType != 6) &&
+              objData.singleReport == 0
             "
             :list="objData.semiProductList"
             :item="objData"
@@ -101,7 +105,10 @@
           ></oneJobQualityBom>
 
           <byProductBom
-            v-if="objData.productRecycleList && objData.productRecycleList.length != 0"
+            v-if="
+              objData.productRecycleList &&
+              objData.productRecycleList.length != 0
+            "
             :list="objData.productRecycleList"
             :isDetails="true"
           >
@@ -134,7 +141,7 @@
             :list="objData.packInfo.pickOutInList"
             :isWarehousing="true"
             :isDetails="true"
-            :item='objData'
+            :item="objData"
           ></packingTgBom>
 
           <!-- <packingBom
@@ -145,6 +152,27 @@
         </div>
       </div>
     </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>
+          <div>报工时间: {{ objData.createTime }}</div>
+        </div>
+
+        <workOrderBom2
+            :item="objData"
+            v-if="objData"
+            :isDetails="true"
+          ></workOrderBom2>
+
+        <!-- <detailsBom
+          v-if="objData.detailList.length != 0"
+          :detailList="objData.detailList"
+        ></detailsBom> -->
+      </div>
+    </div>
   </div>
 </template>
 
@@ -170,7 +198,15 @@
 
   import revolvingDiskBom from '../feeding/components/revolvingDiskBom.vue';
   import packingTgBom from '../jobBooking/components/packingTgBom.vue';
+
   //   import packingBom from '../jobBooking/components/packingBomDetails.vue';
+
+
+
+
+  import workOrderBom2 from '../warehousing/components/workOrderBom.vue';
+
+
   export default {
     components: {
       workOrderBom,
@@ -191,11 +227,11 @@
       //   sampleBom,
       palletBom,
       revolvingDiskBom,
-      packingTgBom
+      packingTgBom,
       //   packingBom,
 
       //   detailsBom,
-      //   workOrderBom2
+        workOrderBom2
     },
     props: {
       routeObj: {
@@ -248,7 +284,9 @@
           workOrderId: this.routeObj.id,
           taskId: taskId
         };
+        console.log( this.taskType)
         let URL = this.taskType == 5 ? listApplystorage : listWorkReport;
+        console.log(URL)
         URL(param).then((res) => {
           this.list = JSON.parse(JSON.stringify(res));
         });
@@ -289,4 +327,16 @@
       margin-left: 8px;
     }
   }
+
+
+  .title_card {
+	  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/workOrderBom.vue

@@ -0,0 +1,73 @@
+<template>
+  <div>
+    <div class="material">
+      <div class="content_table">
+        <div class="item rx-sc">
+          <div class="rx ww50">
+            <div class="lable rx-cc">工单编号</div>
+            <div class="content">
+              {{ item.code }}
+            </div>
+          </div>
+
+          <div class="rx ww50">
+            <div class="lable rx-cc">产品编码</div>
+            <div class="content">{{ item.categoryName }}</div>
+          </div>
+        </div>
+
+        <div class="item rx-sc">
+          <div class="rx ww50">
+            <div class="lable rx-cc">产品名称</div>
+            <div class="content">{{ item.categoryCode }}</div>
+          </div>
+          <div class="rx ww50">
+            <div class="lable rx-cc">牌号</div>
+            <div class="content rx-sc">
+              <div>{{ item.brandNum }}</div>
+            </div>
+          </div>
+        </div>
+
+        <div class="item rx-sc">
+          <div class="rx">
+            <div class="lable rx-cc">型号</div>
+            <div class="content">
+              {{ item.modelType }}
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  export default {
+    name: 'workOrderBom',
+    props: {
+      item: {
+        type: Object,
+        default: () => {}
+      },
+      isDetails: {
+        type: Boolean,
+        default: false
+      }
+    },
+
+    computed: {},
+
+    data() {
+      return {};
+    },
+
+    methods: {}
+  };
+</script>
+
+<style scoped lang="scss">
+  .material {
+    margin-top: 6px;
+  }
+</style>