From c8e3fadca43851e1b0fcad20261191e6d37a7679 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Tue, 24 Dec 2024 17:00:04 +0800
Subject: [PATCH] =?UTF-8?q?YT-1792ASN=E6=B8=85=E7=A9=BA=E6=94=B6=E8=B4=A7?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=90=8E=E4=B8=8D=E5=BA=94=E8=AF=A5=E8=B7=B3?=
 =?UTF-8?q?=E5=9B=9E=E9=A6=96=E9=A1=B5=EF=BC=8C=E5=BA=94=E8=AF=A5=E8=BF=98?=
 =?UTF-8?q?=E7=95=99=E7=9D=80ASN=E6=94=B6=E8=B4=A7=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/pages/purchaseReceipt/job/purchaseReceiptAsn.vue b/src/pages/purchaseReceipt/job/purchaseReceiptAsn.vue
index e47c4763..e0d5606c 100644
--- a/src/pages/purchaseReceipt/job/purchaseReceiptAsn.vue
+++ b/src/pages/purchaseReceipt/job/purchaseReceiptAsn.vue
@@ -363,21 +363,26 @@
 							let masterIds = Array.from(new Set(this.jobList.map(item => item.masterId)))
 							let index = 0
 							//取消承接任务
-							await this.handleCancleTakePurchaseReceiptJob(index, masterIds)
+							await this.handleCancleTakePurchaseReceiptJob(index, masterIds,'clearBtn')
 						}
 					});
 			},
-			async handleCancleTakePurchaseReceiptJob(index, masterIds) {
+			async handleCancleTakePurchaseReceiptJob(index,masterIds ,from) {
+				console.log(33,from)
 				if (index <= masterIds.length - 1) {
 					await cancleTakePurchaseReceiptJob(masterIds[index]).then(res => {
 						this.jobList = []
 						index++
-						this.handleCancleTakePurchaseReceiptJob(index, masterIds)
+						this.handleCancleTakePurchaseReceiptJob(index, masterIds,from)
 					}).catch(error => {})
 				} else {
-					uni.navigateBack({
-						delta: 2
-					});
+					console.log(from)
+					if(!from){
+						uni.navigateBack({
+							delta: 1
+						});
+					}
+				
 				}
 			},
 			commit(){