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 => {