diff --git a/pages/issue/job/issueDetail.vue b/pages/issue/job/issueDetail.vue index 3c68e8e1..8d868daa 100644 --- a/pages/issue/job/issueDetail.vue +++ b/pages/issue/job/issueDetail.vue @@ -44,10 +44,6 @@ issueJobSubmit } from '@/api/request2.js'; - import { - calc - } from '@/common/calc.js'; - import { goHome, updateTitle, @@ -283,7 +279,7 @@ }, setParams() { - var commitSubList = [] + var subList = [] var createTime = getCurrDateTime(); var creator = this.$store.state.user.id this.detailSource.forEach(toLocationCode => { @@ -292,8 +288,8 @@ fromLocation.Batchs.forEach(batch => { let subItem = batch.detail; if (subItem != undefined) { + subItem.recordList = []; if (batch.Records.length > 0) { - subItem.recordList = []; batch.Records.forEach(r => { let record = {}; record.handleQty = r.qty; @@ -312,6 +308,14 @@ .toLocationCode; record.supplierCode = r.supplierCode; + let single_price = r.balance + .singlePrice == null ? 0 : r + .balance + .singlePrice; + + record.singlePrice = single_price; + record.amount = single_price * r.qty; + //使用在途库不改变管理模式 if (this.jobContent .useOnTheWayLocation == @@ -332,14 +336,15 @@ } subItem.recordList.push(record); }) - commitSubList.push(subItem); + subList.push(subItem); } } }) }) }) }) - this.jobContent.subList = commitSubList + + this.jobContent.subList = subList this.jobContent.createTime = createTime; this.jobContent.creator = creator; return this.jobContent; @@ -387,10 +392,10 @@ let handleQty = 0; if (batch != undefined) { batch.Records.forEach(res => { - handleQty = calc.add(handleQty,res.qty) + handleQty += Number(res.qty) }) batch.handleQty = handleQty; - itemHandleQty = calc.add(itemHandleQty,handleQty) + itemHandleQty += handleQty; } }) } diff --git a/pages/productionReturn/record/returnToHold.vue b/pages/productionReturn/record/returnToHold.vue index 90382c73..e92aff05 100644 --- a/pages/productionReturn/record/returnToHold.vue +++ b/pages/productionReturn/record/returnToHold.vue @@ -53,7 +53,8 @@