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(){