From 1b8105506f142291398041577c2d8f83fbfec969 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Sat, 3 Aug 2024 17:53:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/pages/pointPutawayJob/index.vue b/src/pages/pointPutawayJob/index.vue
index 4d75c1a3..5eaa36a3 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">
+		<view class="tabs-box" v-if="isHave">
 			<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="padding-top: 100rpx;">
+		<view class="" :style="{'paddingTop':isHave?'100rpx': '30rpx'}">
 			<view class="box" style="page-break-before:always;" v-if="tabIndex == 1">
 				<view class="">
 					<table border='1'>
@@ -60,7 +60,7 @@
 		</view>
 		<view class="" style="position: fixed;width: 100%;bottom: 0rpx;left: 0px;">
 			<button @click="printImage"
-				style='background:rgb(60, 156, 255) !important ;color: white;margin-top: 80rpx;'> 打印<text v-if="tabIndex == 1">检验指引单</text><text v-if="tabIndex == 2">上架指引单</text></button>
+				style='background:rgb(60, 156, 255) !important ;color: white;margin-top: 80rpx;'> 打印<text v-if="tabIndex == 1">检验指引单</text><text v-if="tabIndex == 2&&isHave">上架指引单</text></button>
 		</view>
 
 	</view>
@@ -105,7 +105,8 @@
 				
 				currentPage1: 1,
 				pageSize1: 20,
-				number:''
+				number:'',
+				isHave:false
 			}
 		},
 
@@ -266,6 +267,7 @@
 		onLoad(option) {
 			if (option.data) {
 				this.data = JSON.parse(decodeURIComponent(option.data));
+				this.isHave = true
 			}
 			if (option.number) {
 				this.number = option.number;
diff --git a/src/pages/purchaseReceipt/job/receiptDetail.vue b/src/pages/purchaseReceipt/job/receiptDetail.vue
index ae21a024..566a091a 100644
--- a/src/pages/purchaseReceipt/job/receiptDetail.vue
+++ b/src/pages/purchaseReceipt/job/receiptDetail.vue
@@ -525,7 +525,10 @@
 								if (!isCheckPrint) {
 									uni.hideLoading()
 
-									this.showCommitSuccessMessage("提交成功<br>生成采购收货记录<br>" + res.data.number)
+									// this.showCommitSuccessMessage("提交成功<br>生成采购收货记录<br>" + res.data.number)
+									uni.redirectTo({
+										url: '/pages/pointPutawayJob/index?number='+that.jobContent.number)
+									})
 								} else {
 									// if (res.data == '打印任务已发送，等待打印机处理！') {
 									// 	this.showCommitSuccessMessage(res.data)