diff --git a/src/common/detail.js b/src/common/detail.js index 3224c1cc..817bbf1c 100644 --- a/src/common/detail.js +++ b/src/common/detail.js @@ -120,15 +120,15 @@ export function calcHandleQty(detailSource) { export function calcHandleNewQty(detailSource) { for (let item of detailSource) { item.handleQty = new Decimal(0).toNumber(); - item.qty = new Decimal(0).toNumber(); + // item.qty = new Decimal(0).toNumber(); for (let detail of item.subList) { if (detail ) { if (!detail.isRecommend && detail.scaned) { item.handleQty = calc.add(item.handleQty, detail.handleQty); } - if (!detail.isRecommend ) { - item.qty = calc.add(item.qty, detail.qty); - } + // if (!detail.isRecommend ) { + // item.qty = calc.add(item.qty, detail.qty); + // } } } diff --git a/src/pages/unPlanned/job/issueJobDetail.vue b/src/pages/unPlanned/job/issueJobDetail.vue index 3f4867fb..f222312d 100644 --- a/src/pages/unPlanned/job/issueJobDetail.vue +++ b/src/pages/unPlanned/job/issueJobDetail.vue @@ -318,23 +318,12 @@ // 提交的数量和任务数量不一致提示 let str = '' this.detailSource.forEach((item) => { - item.subList.forEach(cur => { - if(!cur.isRecommend&&cur.scaned){ - if (cur.qty != cur.handleQty) { - var tempHandleQty =0 - if(cur.handleQty){ - tempHandleQty=cur.handleQty - }else { - tempHandleQty =0 - } - str += `物料号【${cur.itemCode}】提交数量【${tempHandleQty}】与任务物料数量【${cur.qty}】不一致` - } - } - - }) + if(item.qty!=item.handleQty){ + str += `物料号【${item.itemCode}】任务数量【${item.qty}】与实际提交数量【${item.handleQty}】不一致` + } }) if (str) { - str = '任务明细未全部完成,是否提交?\n'+str + str = str+'\n是否提交?' this.$refs.comMessage.showQuestionMessage1(str, 'red', res => { if (res) { this.submitJob()