From b847d241e5cba23bd380d661b76f38cedc58a3f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=BF=97=E5=9B=BD?= <854933521@qq.com>
Date: Mon, 28 Oct 2024 09:03:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=B9=E9=94=99=202024/8/6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/pointPutawayJob/index.vue             | 15 +++++++++------
 src/pages/purchaseReceipt/job/receiptDetail.vue |  1 +
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/pages/pointPutawayJob/index.vue b/src/pages/pointPutawayJob/index.vue
index 69b0101a..eb0a17a7 100644
--- a/src/pages/pointPutawayJob/index.vue
+++ b/src/pages/pointPutawayJob/index.vue
@@ -1,11 +1,11 @@
 <template>
   <!-- 采购上架对应的采购收货打印页面-->
   <view class="content" style="padding:0rpx 20rpx 100rpx;min-height: calc(100vh - 120rpx);">
-    <view class="tabs-box" v-if="isHave">
+    <view class="tabs-box" v-if="isHaveOn">
       <view @click="tabIndex = 1" :class="tabIndex == 1?'active1' :''"  style="padding: 10rpx 0px;">检验指引单</view>
       <view @click="tabIndex = 2" :class="tabIndex == 2?'active1' :''"  style="padding: 10rpx 0px;">上架指引单</view>
     </view>
-    <view class="" :style="{'paddingTop':isHave?'100rpx': '30rpx'}">
+    <view class="" :style="{'paddingTop':isHaveOn?'100rpx': '30rpx'}">
       <view class="box" style="page-break-before:always;" v-if="tabIndex == 1">
         <view class="">
           <table border='1'>
@@ -59,10 +59,10 @@
 
     </view>
     <view class="" style="position: fixed;width: 100%;bottom: 0rpx;left: 0px;">
-      <button @click="printImage" v-if="tabIndex == 1 && data1.inspectDTOList && data1.inspectDTOList.length>0"
+      <button @click="printImage" v-if="tabIndex == 1 && isHaveInspect && data1.inspectDTOList && data1.inspectDTOList.length>0"
               style='background:rgb(60, 156, 255) !important ;color: white;margin-top: 80rpx;'> 打印检验指引单
       </button>
-      <button @click="printImage" v-if="tabIndex == 2&&isHave && data.sublist && data.sublist.length>0"
+      <button @click="printImage" v-if="tabIndex == 2&&isHaveOn && data.sublist && data.sublist.length>0"
               style='background:rgb(60, 156, 255) !important ;color: white;margin-top: 80rpx;'> 打印上架指引单
       </button>
     </view>
@@ -110,7 +110,8 @@ export default {
       currentPage1: 1,
       pageSize1: 20,
       number:'',
-      isHave:false
+      isHaveOn: false,//显示上架指引单
+      isHaveInspect:false,//显示检验指引单
     }
   },
 
@@ -271,13 +272,14 @@ export default {
   onLoad(option) {
     if (option.data) {
       this.data = JSON.parse(decodeURIComponent(option.data));
-      this.isHave = true
+      this.isHaveOn = true
     }
     if (option.number) {
       this.number = option.number;
     }
   },
   async onShow() {
+    // 获取上架指引单
     await getJimuPutawayJobDetail({
       masterIds: this.data.ids
     }).then(res => {
@@ -290,6 +292,7 @@ export default {
     }).then(async res1 => {
       this.data1 = res1.data
       this.getTableInspectDTOList()
+      this.isHaveInspect = this.data1.inspectDTOList.some(item=>item.sampleQty>0)
     })
     this.getPointPutawayJobHtml()
     this.getPurchaseReceiptJobHtml()
diff --git a/src/pages/purchaseReceipt/job/receiptDetail.vue b/src/pages/purchaseReceipt/job/receiptDetail.vue
index 717c22fd..67fcd393 100644
--- a/src/pages/purchaseReceipt/job/receiptDetail.vue
+++ b/src/pages/purchaseReceipt/job/receiptDetail.vue
@@ -446,6 +446,7 @@ const submitJob = () => {
                       ids: res1.data.list.map((item) => item.masterId).join(',')
                     }
                     console.log(dataParams)
+                    uni.hideLoading()
                     uni.redirectTo({
                       uurl: '/pages/pointPutawayJob/index?number='+jobContent.value.number+'&data=' +
                           encodeURIComponent(JSON.stringify(dataParams))