diff --git a/src/pages/purchaseReceipt/job/receiptDetail.vue b/src/pages/purchaseReceipt/job/receiptDetail.vue index 9f86cf61..7db13922 100644 --- a/src/pages/purchaseReceipt/job/receiptDetail.vue +++ b/src/pages/purchaseReceipt/job/receiptDetail.vue @@ -307,8 +307,6 @@ if (this.scanMessage) { this.$refs.scanPopup.simulateScan(this.scanMessage); } - - } else { that.showMessage('列表数据为0'); } @@ -319,11 +317,12 @@ }) }, getScanResult(result) { - if(this.managementType == 'BY_BATCH'){ - this.getScanResultAfterBatch(result) - }else{ - this.getScanResultAfter(result) - } + this.balanceInfo = result.balance + if(this.managementType == 'BY_BATCH'){ + this.getScanResultAfterBatch(result) + }else{ + this.getScanResultAfter(result) + } }, // 包装扫码之后逻辑 getScanResultAfter(result){ @@ -457,6 +456,7 @@ item.scaned = true; itemDetail.scanDate = new Date(); item.handleQty = calc.add(item.handleQty,result.label.qty) + item.balanceQty = balanceInfo.qty; item.toLocationCode = this.toLocationCode; }) // calcHandleQty(this.detailSource); @@ -507,6 +507,7 @@ pack.labelQty = Number(result.label.qty); } } + itemDetail.balanceQty = balanceInfo.qty; calcTreeHandleQty(this.detailSource); itemDetail.packList.sort(compareDesc('scanDate')); //按扫描信息排序 this.$forceUpdate() @@ -538,6 +539,7 @@ console.log(itemDetail.handleQty) itemDetail.toLocationCode = this.toLocationCode; itemDetail.labelQty = Number(result.label.qty); + itemDetail.balanceQty = balanceInfo.qty; itemDetail.packList.forEach(pac => { pac.scaned = true pac.scanDate = new Date(); @@ -568,7 +570,10 @@ }, updateData() { + if(this.managementType == 'BY_BATCH'){ + }else{ calcTreeHandleQty(this.detailSource) + } // calcHandleQty(this.detailSource); }, @@ -710,6 +715,7 @@ var params = this.setParams(); let that = this console.log(params) + return purchaseReceiptJobSubmit(params).then(res => { if (res.data) { let isCheckPrint = getSwitchInfoByCode(this.switchCode)//是否显示上架指引单 @@ -816,7 +822,7 @@ var subList = [] var createTime = getCurrDateTime(); var creator = this.$store.state.user.id - +console.log(8787,this.detailSource) this.detailSource.forEach(item => { item.subList.forEach(detail => { // if (!detail.scaned) { @@ -828,8 +834,7 @@ } }) detail.toLocationCode = this.toLocationCode ? this.toLocationCode :this.jobToLocationCode - var info = getPackingNumberAndBatch(this.managementList, detail.itemCode, - detail.packingNumber, detail.batch); + var info = getPackingNumberAndBatch(this.managementList, detail.itemCode,detail.packingNumber, detail.batch); detail.toPackingNumber = info.packingNumber; detail.packingNumber = info.packingNumber; detail.formPackingNumber = info.packingNumber;