diff --git a/common/detail.js b/common/detail.js index c0d297ed..95ad376f 100644 --- a/common/detail.js +++ b/common/detail.js @@ -1,77 +1,79 @@ - import { calc } from '@/common/calc' -export function getDataSource(subList) { - let items = []; - subList.forEach(detail => { - var item = items.find(r => - r.itemCode == detail.itemCode) - if (item == undefined) { - item = createItemInfo(detail); - let newDetail = createDetailInfo(detail); // - item.subList.push(newDetail); - items.push(item) - } else { - item.qty = calc.add(item.qty,detail.qty) - let newDetail = createDetailInfo(detail); // - item.subList.push(newDetail); - } - }) - return items; -} +import { + calc + } from '@/common/calc' + export function getDataSource(subList) { + let items = []; + subList.forEach(detail => { + var item = items.find(r => + r.itemCode == detail.itemCode) + if (item == undefined) { + item = createItemInfo(detail); + let newDetail = createDetailInfo(detail); // + item.subList.push(newDetail); + items.push(item) + } else { + item.qty = calc.add(item.qty, detail.qty) + let newDetail = createDetailInfo(detail); // + item.subList.push(newDetail); + } + }) + return items; + } -export function createItemInfo(detail) { - let item = { - itemCode: detail.itemCode, - itemName: detail.itemName, - stdPackQty: Number(detail.stdPackQty)||undefined, - stdPackUnit: detail.stdPackUnit, - qty: Number(detail.qty), - handleQty: 0, - uom: detail.uom, - subList: [] + export function createItemInfo(detail) { + let item = { + itemCode: detail.itemCode, + itemName: detail.itemName, + stdPackQty: Number(detail.stdPackQty) || undefined, + stdPackUnit: detail.stdPackUnit, + qty: Number(detail.qty), + handleQty: 0, + uom: detail.uom, + subList: [] + } + return item; } - return item; -} -export function createDetailInfo(data) { - data.scaned = false; - // data.record = {}; - let detail = data; - return detail; -} + export function createDetailInfo(data) { + data.scaned = false; + // data.record = {}; + let detail = data; + return detail; + } -//根据明细创建记录 -export function createRecordInfo(detail, balance) { - var record = {} - // let record = JSON.parse(JSON.stringify(detail)); - //克隆对象,深度克隆,防止双向绑定同一个变量 - Object.assign(record, detail) - detail.scaned = true; - detail.balance = balance; - detail.recommendInventoryStatus = detail.inventoryStatus; - detail.inventoryStatus = balance.inventoryStatus; - record.qty = Number(balance.qty); - return record; -} + //根据明细创建记录 + export function createRecordInfo(detail, balance) { + var record = {} + // let record = JSON.parse(JSON.stringify(detail)); + //克隆对象,深度克隆,防止双向绑定同一个变量 + Object.assign(record, detail) + detail.scaned = true; + detail.balance = balance; + detail.recommendInventoryStatus = detail.inventoryStatus; + detail.inventoryStatus = balance.inventoryStatus; + record.qty = Number(balance.qty); + return record; + } -//计算实际数量 -export function calcHandleQty(detailSource) { - for (let item of detailSource) { - item.handleQty = 0; - for (let detail of item.subList) { - if (detail != undefined && detail.scaned) { - item.handleQty = calc.add(item.handleQty,detail.handleQty) + //计算实际数量 + export function calcHandleQty(detailSource) { + for (let item of detailSource) { + item.handleQty = 0; + for (let detail of item.subList) { + if (detail != undefined && detail.scaned) { + item.handleQty = calc.add(item.handleQty, detail.handleQty) + } } } } -} -export function getScanCount(subList) { - let items = subList.filter(r => { - if (r.scaned) { - return r; - } - }) - let scanCount = items != null ? items.length : 0; - return scanCount; -} + export function getScanCount(subList) { + let items = subList.filter(r => { + if (r.scaned) { + return r; + } + }) + let scanCount = items != null ? items.length : 0; + return scanCount; + } diff --git a/mycomponents/detail/comDetailCard.vue b/mycomponents/detail/comDetailCard.vue index ffbcc382..f709efe5 100644 --- a/mycomponents/detail/comDetailCard.vue +++ b/mycomponents/detail/comDetailCard.vue @@ -3,7 +3,7 @@ diff --git a/mycomponents/item/itemQty.vue b/mycomponents/item/itemQty.vue index 920026e9..6851b19e 100644 --- a/mycomponents/item/itemQty.vue +++ b/mycomponents/item/itemQty.vue @@ -18,6 +18,7 @@ + + diff --git a/pages/transfer/job/receiptDetail.vue b/pages/transfer/job/receiptDetail.vue index 327490b0..c137c692 100644 --- a/pages/transfer/job/receiptDetail.vue +++ b/pages/transfer/job/receiptDetail.vue @@ -17,10 +17,9 @@ - - + + @@ -32,7 +31,7 @@ + :locationTypeList="toLocationTypeList"> @@ -85,6 +84,7 @@ import comDetailCard from "@/mycomponents/detail/comDetailCard.vue" import detailInfoPopup from '@/pages/transfer/coms/detailInfoPopup.vue' import jobTop from '@/mycomponents/job/jobTop.vue' + import comReceiptDetailCard from '@/pages/transfer/coms/comReceiptDetailCard.vue' export default { name: 'returnDetail', @@ -95,7 +95,8 @@ winScanPack, comDetailCard, detailInfoPopup, - jobTop + jobTop, + comReceiptDetailCard }, data() { return { @@ -108,7 +109,7 @@ toLocationCode: "", businessTypeInfo: {}, managementList: [], - tolocationTypeList: [] + toLocationTypeList: [] }; }, onLoad(option) { @@ -195,7 +196,7 @@ that.detailSource = getDataSource(that.subList) that.fromLocationCode = that.subList[0].fromLocationCode that.toLocationCode = that.subList[0].toLocationCode - that.tolocationTypeList = getDirectoryItemArray(that.jobContent.toLocationTypes) + that.toLocationTypeList = getDirectoryItemArray(that.jobContent.toLocationTypes) } else { that.showMessage('列表数据为0'); } @@ -258,11 +259,10 @@ this.detailSource[0].subList.sort(compareAsc('scaned')); //按扫描信息排序 itemDetail.handleQty = Number(result.label.qty); itemDetail.toLocationCode = this.toLocationCode; + itemDetail.stdPackQty = result.package.stdPackQty itemDetail.labelQty = Number(result.label.qty); calcHandleQty(this.detailSource); this.continueScan() - this.$forceUpdate() - var list = this.detailSource[0].subList; } } } diff --git a/pages/unPlanned/coms/comReceiptDetailCard.vue b/pages/unPlanned/coms/comReceiptDetailCard.vue index d39e7a3f..f9ace0a0 100644 --- a/pages/unPlanned/coms/comReceiptDetailCard.vue +++ b/pages/unPlanned/coms/comReceiptDetailCard.vue @@ -3,7 +3,7 @@