From 6241e913ae038fc0437317f23f8895b7c1d70351 Mon Sep 17 00:00:00 2001 From: niexiting <85552560@qq.com> Date: Thu, 28 Mar 2024 16:43:59 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A1=A5=E6=96=99?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/repleinsh/job/repleinshDetail.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pages/repleinsh/job/repleinshDetail.vue b/src/pages/repleinsh/job/repleinshDetail.vue index 3a4bfe98..166cad28 100644 --- a/src/pages/repleinsh/job/repleinshDetail.vue +++ b/src/pages/repleinsh/job/repleinshDetail.vue @@ -312,15 +312,15 @@ .toLocationCode; record.supplierCode = r.supplierCode; - if(record.parentPackingNumber!='') + if(r.parentPackingNumber!='') { - record.fromPackingNumber = record.parentPackingNumber; + record.fromPackingNumber = r.parentPackingNumber; record.toPackingNumber = r .packingNumber; } else { - record.fromPackingNumber = record.packingNumber; + record.fromPackingNumber = r.packingNumber; record.toPackingNumber = r .packingNumber; } From e50e73f3e08de77f9c90738d63b7ede701ce9762 Mon Sep 17 00:00:00 2001 From: niexiting <85552560@qq.com> Date: Fri, 29 Mar 2024 10:38:41 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=B6=E5=93=81?= =?UTF-8?q?=E6=94=B6=E8=B4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../job/productPutawayDetail.vue | 4 +- .../job/productReceiptDetail.vue | 27 +++++----- .../job/productionReceiptDetail.vue | 17 +++--- src/pages/putaway/job/putawayDetail.vue | 52 ++++++++++--------- 4 files changed, 52 insertions(+), 48 deletions(-) diff --git a/src/pages/productPutaway/job/productPutawayDetail.vue b/src/pages/productPutaway/job/productPutawayDetail.vue index 4c2b5d53..d719fc2f 100644 --- a/src/pages/productPutaway/job/productPutawayDetail.vue +++ b/src/pages/productPutaway/job/productPutawayDetail.vue @@ -314,13 +314,13 @@ }, scanLocationCode(location, code) { - this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => { + // this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => { this.toLocationCode = code this.detailSource.forEach(item => { item.subList.forEach(detail => { detail.toLocationCode = code }) - }) + // }) }) }, diff --git a/src/pages/productReceipt/job/productReceiptDetail.vue b/src/pages/productReceipt/job/productReceiptDetail.vue index b3baa289..6ca24d1a 100644 --- a/src/pages/productReceipt/job/productReceiptDetail.vue +++ b/src/pages/productReceipt/job/productReceiptDetail.vue @@ -15,7 +15,8 @@ + @remove="updateData" @updateData="updateData" + :locationAreaTypeList='toLocationAreaTypeList'> @@ -27,8 +28,8 @@ - @@ -103,8 +104,8 @@ detailSource: [], //绑定在页面上的数据源 toLocationAreaTypeList: [], managementList: [], - jobStatus:"", - jobToLocationCode:"" + jobStatus: "", + jobToLocationCode: "" }; }, @@ -132,7 +133,7 @@ onBackPress(e) { //已经接收但是没提交任务 if (e.from == 'backbutton') { - if (this.jobStatus=="2") { + if (this.jobStatus == "2") { //取消承接任务 cancleTakeProductReceiptJob(this.id).then(res => { uni.navigateBack(); @@ -255,14 +256,14 @@ scanLocationCode(location, code) { - this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => { - this.toLocationCode = code - this.detailSource.forEach(item => { - item.subList.forEach(detail => { - detail.toLocationCode = code - }) + // this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => { + this.toLocationCode = code + this.detailSource.forEach(item => { + item.subList.forEach(detail => { + detail.toLocationCode = code }) }) + // }) }, checkLocation() { @@ -415,4 +416,4 @@ + \ No newline at end of file diff --git a/src/pages/productionReceipt/job/productionReceiptDetail.vue b/src/pages/productionReceipt/job/productionReceiptDetail.vue index 6a28d995..41e29b80 100644 --- a/src/pages/productionReceipt/job/productionReceiptDetail.vue +++ b/src/pages/productionReceipt/job/productionReceiptDetail.vue @@ -244,11 +244,11 @@ getScanResult(result) { try { - var supplierCode = result.label.supplierCode; - if (supplierCode == '' || supplierCode == undefined) { - this.showErrorMessage("标签中未解析到供应商信息,请重新扫描") - return; - } + // var supplierCode = result.label.supplierCode; + // if (supplierCode == '' || supplierCode == undefined) { + // this.showErrorMessage("标签中未解析到供应商信息,请重新扫描") + // return; + // } var packingNumber = result.balance.packingNumber; var batch = result.balance.batch; var qty = result.balance.qty; @@ -282,7 +282,7 @@ ']不一致,是否继续上架?', res => { if (res) { itemDetail.scaned = true; - itemDetail.supplierCode = supplierCode + // itemDetail.supplierCode = supplierCode itemDetail.handleQty = Number(result.balance.qty) itemDetail.toInventoryStatus = result.balance.inventoryStatus; itemDetail.balance = result.balance; @@ -322,13 +322,14 @@ }, scanLocationCode(location, code) { - this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => { + // this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => { + this.toLocationCode = code this.detailSource.forEach(item => { item.subList.forEach(detail => { detail.toLocationCode = code }) - }) + // }) }) }, diff --git a/src/pages/putaway/job/putawayDetail.vue b/src/pages/putaway/job/putawayDetail.vue index 8c0aceab..2395c9a1 100644 --- a/src/pages/putaway/job/putawayDetail.vue +++ b/src/pages/putaway/job/putawayDetail.vue @@ -15,7 +15,8 @@ + @remove="updateData" @updateData="updateData" + :locationAreaTypeList='toLocationAreaTypeList'> @@ -26,8 +27,8 @@ - @@ -37,7 +38,8 @@ - + + @@ -101,8 +103,8 @@ fromLocationCode: "", toLocationCode: "", toLocationAreaTypeList: [], - jobStatus:"", - jobToLocationCode:"", + jobStatus: "", + jobToLocationCode: "", }; }, onLoad(option) { @@ -128,7 +130,7 @@ onBackPress(e) { //已经接收但是没提交任务 if (e.from == 'backbutton') { - if (this.jobStatus=="2") { + if (this.jobStatus == "2") { //取消承接任务 cancleTakePutawayJob(this.id).then(res => { uni.navigateBack(); @@ -272,7 +274,7 @@ r.batch == batch && r.fromLocationCode == result.fromLocationCode }) - + if (itemDetail == undefined) { var isExit; for (let subItem of detail.subList) { @@ -288,13 +290,13 @@ if (item != undefined) { subItem.scaned = true subItem.handleQty = 0; - item=undefined + item = undefined } } - if(isExit == undefined){ + if (isExit == undefined) { this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【" + result .fromLocationCode + "】不在列表中") - }else { + } else { if (isExit.scaned) { this.showMessage("箱码【" + packingNumber + "】已经扫描") } else { @@ -306,13 +308,13 @@ calcTreeHandleQty(this.detailSource); this.$forceUpdate() } else { - var scanedLength =0; - itemDetail.packList.forEach(res=>{ - if(res.scaned){ + var scanedLength = 0; + itemDetail.packList.forEach(res => { + if (res.scaned) { scanedLength++; } }) - if (itemDetail.scaned&&scanedLength==itemDetail.packList.length) { + if (itemDetail.scaned && scanedLength == itemDetail.packList.length) { this.showMessage("箱码【" + packingNumber + "】已经扫描") } else { itemDetail.scaned = true; @@ -324,7 +326,7 @@ pac.handleQty = Number(pac.qty); pac.toLocationCode = this.toLocationCode; }) - + calcTreeHandleQty(this.detailSource); this.continueScan() this.$forceUpdate() @@ -338,12 +340,12 @@ scanLocationCode(location, code) { // this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => { - this.toLocationCode = code - this.detailSource.forEach(item => { - item.subList.forEach(detail => { - detail.toLocationCode = code - }) + this.toLocationCode = code + this.detailSource.forEach(item => { + item.subList.forEach(detail => { + detail.toLocationCode = code }) + }) // }) }, @@ -448,14 +450,14 @@ detail.toPackingNumber = info.packingNumber; detail.toBatch = info.batch; detail.toContainerNumber = ''; - + detail.singlePrice = 1; detail.amount = 11; - + detail.arriveDate = getCurrDateTime(); detail.produceDate = getCurrDateTime(); detail.expireDate = getCurrDateTime(); - + // detail.singlePrice = detail.balance.singlePrice; // detail.amount = detail.balance.singlePrice * detail.handleQty; @@ -530,4 +532,4 @@ + \ No newline at end of file From 4fc1029961d1d64234cf369615395bfc8dc5e9a5 Mon Sep 17 00:00:00 2001 From: niexiting <85552560@qq.com> Date: Fri, 29 Mar 2024 10:50:19 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E8=BD=AC=E7=A7=BB=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/inventoryMove/coms/comMoveRecord.vue | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/pages/inventoryMove/coms/comMoveRecord.vue b/src/pages/inventoryMove/coms/comMoveRecord.vue index 946aaced..ef6e69c2 100644 --- a/src/pages/inventoryMove/coms/comMoveRecord.vue +++ b/src/pages/inventoryMove/coms/comMoveRecord.vue @@ -22,8 +22,9 @@ + + :locationAreaTypeList="toLocationAreaTypeList" :isShowEdit='true' > @@ -161,19 +162,23 @@ } else if (this.businessTypeCode == "HoldToScrap") { this.title = "隔离转报废记录"; this.toInventoryStatus = "SCRAP" - this.toLocationCode = "SCRAP" + this.toLocationCode = "" + // this.toLocationCode = "SCRAP" } else if (this.businessTypeCode == "OkToHold") { this.title = "合格转隔离记录"; this.toInventoryStatus = "HOLD" - this.toLocationCode = "HOLD" + this.toLocationCode = "" + // this.toLocationCode = "HOLD" } else if (this.businessTypeCode == "OkToScrap") { this.title = "合格转报废记录"; this.toInventoryStatus = "SCRAP" - this.toLocationCode = "SCRAP" + this.toLocationCode = "" + // this.toLocationCode = "SCRAP" } else if (this.businessTypeCode == "ScrapToHold") { this.title = "报废转隔离记录"; this.toInventoryStatus = "HOLD" - this.toLocationCode = "HOLD" + // this.toLocationCode = "HOLD" + this.toLocationCode = "" } uni.setNavigationBarTitle({ title: this.title