diff --git a/src/pages/package/job/overPackageJob.vue b/src/pages/package/job/overPackageJob.vue index 5ba2e277..8bf8fee0 100644 --- a/src/pages/package/job/overPackageJob.vue +++ b/src/pages/package/job/overPackageJob.vue @@ -162,7 +162,7 @@ this.businessType = res.businessType; this.openScanPopup(); } else { - this.showErrorMessage(res.message) + this.showMessage(res.message) } }); }, diff --git a/src/pages/package/job/overPackageJobDetail.vue b/src/pages/package/job/overPackageJobDetail.vue index d42813db..0e3ddcec 100644 --- a/src/pages/package/job/overPackageJobDetail.vue +++ b/src/pages/package/job/overPackageJobDetail.vue @@ -401,7 +401,9 @@ mask: true }); var params = this.setParams() - console.log(params); + + console.log("提交参数"+JSON.stringify(params)); + return overPageSubmit(params).then(res => { uni.hideLoading() // if (res.data == '打印任务已发送,等待打印机处理!') { @@ -492,28 +494,15 @@ record.toBatch = r.batch; record.toPackingNumber = "" - - //使用在途库不改变管理模式 - // if (this.jobContent - // .useOnTheWayLocation == - // 'TRUE') { - // record.toPackingNumber = r - // .packingNumber; - // record.toBatch = r.batch; - // } else { - // var info = - // getPackingNumberAndBatch( - // this.managementList, r - // .itemCode, - // r.packingNumber, r - // .batch); - // record.toPackingNumber = info - // .packingNumber; - // record.toBatch = info.batch; - // } subItem.recordList.push(record); }) - subList.push(deepCopyData(subItem)); + + var itemInfo = subList.find(r => r.itemCode == subItem.itemCode&& r.fromLocationCode == subItem.fromLocationCode); + if(itemInfo){ + itemInfo.recordList.push(...subItem.recordList) + }else { + subList.push(deepCopyData(subItem)); + } } } })