From b808232d61c4f9808a88ea4e76a419b00c8ca7d2 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Tue, 24 Dec 2024 16:51:56 +0800
Subject: [PATCH] =?UTF-8?q?YT-1788ASN=E6=94=B6=E8=B4=A7=E5=BD=93=E5=89=8D?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E4=BA=BA=E4=B8=8D=E6=98=AF=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E7=9A=84=E6=89=BF=E6=8E=A5=E4=BA=BA=EF=BC=8C=E6=89=AB=E6=8F=8F?=
 =?UTF-8?q?ASN/=E7=AE=B1=E7=A0=81=E6=97=B6=E6=8F=90=E7=A4=BA=E8=AF=AD?=
 =?UTF-8?q?=E4=B8=8D=E6=AD=A3=E7=A1=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchaseReceipt/job/purchaseReceiptAsn.vue  | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/pages/purchaseReceipt/job/purchaseReceiptAsn.vue b/src/pages/purchaseReceipt/job/purchaseReceiptAsn.vue
index 57de7078..e47c4763 100644
--- a/src/pages/purchaseReceipt/job/purchaseReceiptAsn.vue
+++ b/src/pages/purchaseReceipt/job/purchaseReceiptAsn.vue
@@ -140,11 +140,13 @@
 						column: "status",
 						action: "in",
 						value: '1,2',
-					}, {
-						column: "accept_user_id",
-						action: "==",
-						value: this.$store.state.user.id
-					}]
+					}
+					// , {
+					// 	column: "accept_user_id",
+					// 	action: "==",
+					// 	value: this.$store.state.user.id
+					// },
+					]
 					getPurchaseReceiptASNJobList({
 						filters: filters,
 						pageNo: 1,
@@ -156,10 +158,15 @@
 						if (resultList.length > 0) {
 							// 判断目前是否有已扫描的asn单号
 							const asnObj = this.jobList.find(item => item.asnNumber == asnNumber)
+							if (resultList[0].acceptUserId && resultList[0].acceptUserId != this.$store.state.user.id) {
+								this.showMessage(`ASN单号【${asnNumber}】已经被${resultList[0].acceptUserName}承接`)
+								return
+							}
 							// 如果扫描箱标签
 							if (!isAsn) {
 								result.label.lookNumber = result.package.number.substring(result.package.number
 									.length - 5);
+							
 								// 扫描的箱标签asn单号不在列表中给个提示
 								if (!asnObj) {
 									this.$refs.comMessage.showQuestionMessage(`ASN单号【${asnNumber}】不在列表中，是否要按此ASN收货？`, async res => {