From e5db860c41ea57c9b2261d6051812002b47415a7 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Fri, 21 Jun 2024 10:05:16 +0800
Subject: [PATCH] =?UTF-8?q?bug=20=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mycomponents/job/jobFilter.vue           | 2 +-
 src/pages/purchaseReceipt/job/receiptJob.vue | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/mycomponents/job/jobFilter.vue b/src/mycomponents/job/jobFilter.vue
index 2ef38ac8..8ebbfc81 100644
--- a/src/mycomponents/job/jobFilter.vue
+++ b/src/mycomponents/job/jobFilter.vue
@@ -28,7 +28,7 @@
 				<view class="" style="font-size: 32rpx;">
 					来源库位
 				</view>
-				<u-input style="margin-left: 20rpx;" v-model="fromLocationCode" :border="true"
+				<u-input type="textarea" style="margin-left: 20rpx;" v-model="fromLocationCode" :border="true"
 					placeholder="请输入来源库位" @confirm="fromLocationCodeConfirm" />
 			</view>
 			
diff --git a/src/pages/purchaseReceipt/job/receiptJob.vue b/src/pages/purchaseReceipt/job/receiptJob.vue
index e79aa364..455dfe9f 100644
--- a/src/pages/purchaseReceipt/job/receiptJob.vue
+++ b/src/pages/purchaseReceipt/job/receiptJob.vue
@@ -348,7 +348,12 @@
 				this.$refs.scanPopup.closeScanPopup();
 				this.openJobDetail(item, item.packingNumber);
 			},
-			getScanResult(result) {
+			getScanResult(result) {
+					
+				if(result.scanMessage.indexOf('ASN')>-1){
+					this.showMessage('请扫描箱标签')
+					return
+				}
 
 				try {
 					let filters = []