From 855bda3c754e212685dbec5f659407ca5c5732df Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Thu, 1 Aug 2024 09:47:13 +0800
Subject: [PATCH] =?UTF-8?q?=E9=95=BF=E6=98=A5=E6=B5=B7=E6=8B=89=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E7=8E=AF=E5=A2=83PDA=E5=88=9B=E5=BB=BA=E5=8F=91?=
 =?UTF-8?q?=E6=96=99=E7=94=B3=E8=AF=B7=E9=A1=B5=E9=9D=A2=E4=B8=8D=E5=BA=94?=
 =?UTF-8?q?=E8=AF=A5=E6=9C=89=E4=BB=8E=E4=BB=93=E5=BA=93=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/issue/coms/comIssueRequestPopup.vue  | 14 +++++++-------
 src/pages/package/record/overPackageRecord.vue | 10 +++++++---
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/pages/issue/coms/comIssueRequestPopup.vue b/src/pages/issue/coms/comIssueRequestPopup.vue
index da1fea6f..a0218243 100644
--- a/src/pages/issue/coms/comIssueRequestPopup.vue
+++ b/src/pages/issue/coms/comIssueRequestPopup.vue
@@ -13,7 +13,7 @@
 					<view class='split_line'></view>
 					<view class="uni-flex uni-column" style="background-color: white; ">
 						<view class="uni-flex uni-column  ">
-							<view class="uni-flex uni-row padding title u-col-center">
+							<!-- <view class="uni-flex uni-row padding title u-col-center">
 								<text>从仓库代码：</text>
 								<view class="uni-flex u-col-center uni-row" @click="showWarseHouseSelect">
 									<view class="" style="margin-left: 20rpx;width: 100% ">
@@ -22,8 +22,8 @@
 									<u-select v-model="showWareHouse" mode="single-column" :list="wareHouseList"
 										@confirm="confirmWareHouse"></u-select>
 								</view>
-							</view>
-							<view class='split_line'></view>
+							</view> -->
+							<!-- <view class='split_line'></view> -->
 	<view class="uni-flex uni-row" style="align-items: center;
 								background-color: #fff; 
 								margin-right: 20rpx;
@@ -278,10 +278,10 @@
 					return
 				}
 
-				if (this.fromWarehouseCode == "请选择仓库代码") {
-					this.showErrorMessage("请选择仓库代码")
-					return
-				}
+				// if (this.fromWarehouseCode == "请选择仓库代码") {
+				// 	this.showErrorMessage("请选择仓库代码")
+				// 	return
+				// }
 
 
 				if (this.itemCode == "请扫描物料信息") {
diff --git a/src/pages/package/record/overPackageRecord.vue b/src/pages/package/record/overPackageRecord.vue
index a64f05c1..7286440b 100644
--- a/src/pages/package/record/overPackageRecord.vue
+++ b/src/pages/package/record/overPackageRecord.vue
@@ -168,9 +168,13 @@
 			this.getBusinessType();
 			
 			this.$nextTick(()=>{
-				const overPackageRecordPointParams = uni.getStorageSync('overPackageRecordPointParams')
-				console.log(233,uni.getStorageSync('overPackageRecordPointParams'))
-				this.$refs.printService.setDefaultData(overPackageRecordPointParams.printDeafult,overPackageRecordPointParams.templateDeafult)	
+				if(uni.getStorageSync('overPackageRecordPointParams')){
+					const overPackageRecordPointParams = uni.getStorageSync('overPackageRecordPointParams')
+					this.dataContent.printerUuid = overPackageRecordPointParams.printDeafult.value;
+					this.dataContent.modelCode = overPackageRecordPointParams.templateDeafult.value;
+					this.$refs.printService.setDefaultData(overPackageRecordPointParams.printDeafult,overPackageRecordPointParams.templateDeafult)	
+				}
+				
 			})
 		},
 		//返回首页