From 1c5e3ad92cec86dbfd62469163985be7f8e0a9a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=BF=97=E5=9B=BD?= <854933521@qq.com>
Date: Fri, 25 Oct 2024 15:46:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=B0=202024/8/3?=
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 |  6 ++++--
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/pages/pointPutawayJob/index.vue b/src/pages/pointPutawayJob/index.vue
index 54c58b45..bdd730c7 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 @@ export default {
 
       currentPage1: 1,
       pageSize1: 20,
-      number:''
+      number:'',
+      isHave:false
     }
   },
 
@@ -266,6 +267,7 @@ export default {
   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 3448175b..717c22fd 100644
--- a/src/pages/purchaseReceipt/job/receiptDetail.vue
+++ b/src/pages/purchaseReceipt/job/receiptDetail.vue
@@ -406,8 +406,10 @@ const submitJob = () => {
             const isCheckPrint = getSwitchInfoByCode(switchCode.value)
             if (!isCheckPrint) {
               uni.hideLoading()
-
-              showCommitSuccessMessage(`提交成功<br>生成采购收货记录<br>${res.data.number}`)
+              // showCommitSuccessMessage(`提交成功<br>生成采购收货记录<br>${res.data.number}`)
+              uni.redirectTo({
+                url: '/pages/pointPutawayJob/index?number='+that.jobContent.number
+              })
             } else {
               uni.showLoading({
                 title: '提交成功,将跳转到打印页面',