diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index d3ba15bc..128d1822 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -387,7 +387,7 @@ console.log("包装规格获取失败", res) }) - var switchCode="FgPutawayLocationCodeValidate,SemiPutawayLocationCodeValidate,PurchasePutawayToLocationCodeValidate,IssueToLocationCodeValidate,fgProductReceipCommitValidate,purchasereceiptPrintPDA"; + var switchCode="FgPutawayLocationCodeValidate,SemiPutawayLocationCodeValidate,PurchasePutawayToLocationCodeValidate,IssueToLocationCodeValidate,fgProductReceipCommitValidate,purchasereceiptPrintPDA,purchaseReceiptLocationCodeValidate"; getSwitchByCode(switchCode).then(res=>{ uni.setStorageSync("switch", res.data) diff --git a/src/pages/purchaseReceipt/job/receiptDetail.vue b/src/pages/purchaseReceipt/job/receiptDetail.vue index eb213c52..8da07968 100644 --- a/src/pages/purchaseReceipt/job/receiptDetail.vue +++ b/src/pages/purchaseReceipt/job/receiptDetail.vue @@ -44,7 +44,7 @@ @@ -143,8 +143,9 @@ operation: '', scanedPackingNumber: '', status: '', - switchCode: '', - reasonText: "" + switchCode:"", + isCheckLocation: 'purchaseReceiptLocationCodeValidate',//校验收货库位 + reasonText: "", }; }, @@ -154,7 +155,7 @@ this.scanedPackingNumber = option.scaned || ''; this.operation = option.operation; this.status = option.status; - this.switchCode = "purchasereceiptPrintPDA" + this.switchCode = "purchasereceiptPrintPDA"//pda打印 }, @@ -240,6 +241,12 @@ that.jobStatus = res.data.status that.jobToLocationCode = that.subList[0].toLocationCode that.detailSource = getTreeDataSource(that.subList) + that.isCheckLocation = getSwitchInfoByCode(that.isCheckLocation) + if (that.isCheckLocation) { + that.toLocationCode = "" + } else { + that.toLocationCode = that.jobToLocationCode; + } that.isAllReceived = false; nextTick(() => { that.detailSource.forEach(r => { @@ -494,10 +501,8 @@ getManagementPrecisions(itemCodes, this.toLocationCode, res => { if (res.success) { this.managementList = res.list; - var params = this.setParams() + var params = this.setParams(); purchaseReceiptJobSubmit(params).then(res => { - - if (res.data) { let isCheckPrint = getSwitchInfoByCode(this.switchCode) if (!isCheckPrint) { @@ -559,10 +564,8 @@ }) }, 2000) - } - } else { this.showErrorMessage("提交失败[" + res.msg + "]") }