From 14952117a870e9442a65b107182edcdab56a846b Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Tue, 6 Aug 2024 10:22:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E6=8C=87=E5=BC=95=E5=8D=95?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
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 dda93048..a8d0c5e7 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 @@
 				currentPage1: 1,
 				pageSize1: 20,
 				number: '',
-				isHave: false
+				isHaveOn: false,//显示上架指引单
+				isHaveInspect:false,//显示检验指引单
 			}
 		},
 
@@ -271,13 +272,14 @@
 		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 @@
 			}).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 535442ba..8fc65ab4 100644
--- a/src/pages/purchaseReceipt/job/receiptDetail.vue
+++ b/src/pages/purchaseReceipt/job/receiptDetail.vue
@@ -584,6 +584,7 @@
 														',')
 												}
 												console.log(dataParams)
+												uni.hideLoading()
 												uni.redirectTo({
 													url: '/pages/pointPutawayJob/index?number='+that.jobContent.number+'&data=' +
 														encodeURIComponent(JSON.stringify(dataParams))