From f937fc92b16ca7340c45570889a009e1752d21b5 Mon Sep 17 00:00:00 2001
From: aihe <961836564@qq.com>
Date: Mon, 2 Sep 2024 23:32:55 +0800
Subject: [PATCH] uu

---
 common/api/order.js                               | 8 ++++----
 common/api/url.js                                 | 2 +-
 components/buns-order-templates/bo-detail-tmp.vue | 3 ++-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/common/api/order.js b/common/api/order.js
index 9c5f24c..3a35c5a 100644
--- a/common/api/order.js
+++ b/common/api/order.js
@@ -1,4 +1,4 @@
-import { coreRequest } from '@/common/request'
+import { coreRequest, coreDownloadRequest } from '@/common/request'
 import url from "./url"
 
 export const createOrderNo = (data = {})=> {
@@ -208,10 +208,10 @@ export const getWarehouseInList = (data = {})=> {
 	return coreRequest(url.getWarehouseInList, data, {}, "GET")
 }
 
-// 进仓单PDF下载连接
+// 下载进仓单PDF
 export const exportWarehouseInTpl = (data = {})=> {
-	return coreRequest(url.exportWarehouseInTpl, data, {})
-} 
+	return coreDownloadRequest(url.exportWarehouseInTpl, data, {})
+}
 
 // 确认进仓单
 export const cusConfirmWsIn = (data = {})=> {
diff --git a/common/api/url.js b/common/api/url.js
index 362b3af..a525974 100644
--- a/common/api/url.js
+++ b/common/api/url.js
@@ -64,7 +64,7 @@ export default {
   getWarehouseInInfo: `/emis/emisWarehouseIn/getWarehouseInInfo`, // 获取进仓单详情
   registerWarehouseInInfo: `/emis/emisWarehouseInBatch/registerWarehouseInInfo`, // 收货入仓登记
   getWarehouseInList: `/emis/emisWarehouseIn/listSimple`, // 进仓单列表
-  exportWarehouseInTpl: `/emis/emisWarehouseIn/exportWarehouseInTpl`, // 进仓单PDF下载连接
+  exportWarehouseInTpl: `/emis/common/exportWarehouseInTpl`, // 进仓单PDF下载连接
   cusConfirmWsIn: `/emis/emisWarehouseIn/cusConfirmWsIn`, // 确认进仓单
 }
 
diff --git a/components/buns-order-templates/bo-detail-tmp.vue b/components/buns-order-templates/bo-detail-tmp.vue
index 7e2586a..27009ba 100644
--- a/components/buns-order-templates/bo-detail-tmp.vue
+++ b/components/buns-order-templates/bo-detail-tmp.vue
@@ -67,7 +67,8 @@
 			<u-row justify="end">
 				<view style="display: inline-block;white-space: nowrap;" class="mt-10">
 					<u-row>
-						<u-button v-if="modelInfo.pickupMethod == 1" @click="goto(`warehousing/detail?id=${211}`)" shape="circle" type="primary"
+						<u-button v-if="modelInfo.pickupMethod == 1 && modelInfo.intoWarehouseBillCode" 
+							@click="goto(`warehousing/detail?inNo=${modelInfo.intoWarehouseBillCode}`)" shape="circle" type="primary"
 							custom-style="height: 54rpx;margin-left: 20rpx;">入仓单</u-button>
 						<u-button shape="circle" type="primary" :plain="true"
 							custom-style="height: 54rpx;margin-left: 20rpx;">单证</u-button>