From bce4898c20c7445faed1a0b3a68875cf0047b0ef Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Tue, 2 Jul 2024 20:00:56 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=B8=8D=E5=8F=AF=E4=BB=A5=E8=BE=93?= =?UTF-8?q?=E5=85=A5=E8=B4=9F=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/mycomponents/qty/balanceQtyEdit.vue | 20 ++++++++++--------- .../purchaseReceipt/job/receiptDetail.vue | 5 +---- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/src/mycomponents/qty/balanceQtyEdit.vue b/src/mycomponents/qty/balanceQtyEdit.vue index cbd92cdf..741d2cc3 100644 --- a/src/mycomponents/qty/balanceQtyEdit.vue +++ b/src/mycomponents/qty/balanceQtyEdit.vue @@ -178,18 +178,20 @@ }, setValue() { var balanceQty = Number(this.dataContent.balanceQty); - if (this.allQty == 0) { - this.$refs.comMessage.showConfirmWarningModal('数量必须大于0', + if(this.allQty<0){ + this.$refs.comMessage.showConfirmWarningModal('数量必须大于等于0', res => { this.allQty = balanceQty; }) - } else if (this.allQty > balanceQty) { - this.$refs.comMessage.showConfirmWarningModal('数量[' + this.allQty + ']不允许大于库存数量[' + balanceQty + ']', - res => { - this.allQty = balanceQty; - }) - } else { - this.callback(); + }else { + if (this.allQty > balanceQty) { + this.$refs.comMessage.showConfirmWarningModal('数量[' + this.allQty + ']不允许大于库存数量[' + balanceQty + ']', + res => { + this.allQty = balanceQty; + }) + } else { + this.callback(); + } } }, callback() { diff --git a/src/pages/purchaseReceipt/job/receiptDetail.vue b/src/pages/purchaseReceipt/job/receiptDetail.vue index 3f016a43..eb213c52 100644 --- a/src/pages/purchaseReceipt/job/receiptDetail.vue +++ b/src/pages/purchaseReceipt/job/receiptDetail.vue @@ -515,10 +515,7 @@ const timer1 = setInterval(async () => { if (timerCount == 15) { clearInterval(timer1) - uni.showToast({ - title: "跳转打印页面失败", - icon: "none" - }); + this.showErrorMessage("上架任务生成异常，请到收货记录里重新生成上架申请") return; } await getPutawayJobList({ From 984fc9d606c4c7f2510506aa91adb7bf0b4e48ba Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Wed, 3 Jul 2024 09:14:52 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=AB=E6=8F=8F?= =?UTF-8?q?=E5=8F=AB=E6=96=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/issue/request/issueScanRequest.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/issue/request/issueScanRequest.vue b/src/pages/issue/request/issueScanRequest.vue index 46aee81a..d52e0114 100644 --- a/src/pages/issue/request/issueScanRequest.vue +++ b/src/pages/issue/request/issueScanRequest.vue @@ -97,8 +97,6 @@ var labelInfo = data.label; var data = { - productionLineCode:labelInfo.productionLineCode, - workStationCode:labelInfo.workStationCode, itemCode:labelInfo.itemCode, location:labelInfo.location, qty:labelInfo.qty, @@ -107,6 +105,8 @@ }; this.detailSource.subList.push(data) + this.detailSource.productionLineCode=labelInfo.productionLineCode; + this.detailSource.workStationCode=labelInfo.workStationCode; this.detailSource.warehouseCode = labelInfo.warehouseCode; this.detailSource.workshopCode = labelInfo.workshopCode; this.submit(); From d33c18bbec9f2a43c7a40a1ac589bc0123677884 Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Wed, 3 Jul 2024 11:51:30 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9B=B4=E6=8E=A5?= =?UTF-8?q?=E8=A1=A5=E6=96=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../record/recordComDetailCard.vue | 31 +++++++++++-------- .../record/directRepleinshRecord.vue | 3 +- 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/src/mycomponents/record/recordComDetailCard.vue b/src/mycomponents/record/recordComDetailCard.vue index d1082ca4..f5fd805e 100644 --- a/src/mycomponents/record/recordComDetailCard.vue +++ b/src/mycomponents/record/recordComDetailCard.vue @@ -1,22 +1,23 @@ @@ -90,19 +91,23 @@ }, }, watch: { + dataContent: { handler(newName, oldName) { if (this.dataContent.subList.length > 0) { - if (this.$refs.collapse1 != undefined && this.$refs.collapse1 != null) { - this.$nextTick(res => { - this.$refs.collapse1.resize() - }) - } + this.$nextTick(res => { + setTimeout(() => { + if (this.$refs.collapse1) { + this.$refs.collapse1.resize(); + } + }, 500) + }) } }, immediate: true, deep: true } + }, data() { @@ -176,4 +181,4 @@ + \ No newline at end of file diff --git a/src/pages/repleinsh/record/directRepleinshRecord.vue b/src/pages/repleinsh/record/directRepleinshRecord.vue index cea8602c..1bf861a3 100644 --- a/src/pages/repleinsh/record/directRepleinshRecord.vue +++ b/src/pages/repleinsh/record/directRepleinshRecord.vue @@ -285,7 +285,8 @@ }, selectBalanceItem(balance) { - this.afterGetBalance(this.resultData, balance); + this.resultData.balance =balance; + this.afterGetBalance(this.resultData); }, afterGetBalance(result){ From bd6edb3bb270c7ac1c70142a28298bb8f78d8deb Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Wed, 3 Jul 2024 14:48:50 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8A=E6=9E=B6?= =?UTF-8?q?=E6=8E=A8=E8=8D=90=E5=BA=93=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/request2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/api/request2.js b/src/api/request2.js index bff958ec..a1c135c1 100644 --- a/src/api/request2.js +++ b/src/api/request2.js @@ -475,7 +475,7 @@ export function validateItemAndLocation(parmas) { export function getPutawayRecommendLocation(params) { return request({ - url: baseApi + "/wms/location/recommendLocationNew", + url: baseApi + "/wms/location/recommendLocation", method: "post", data: params, }); From dcfc2de656e7a465cd0bcb1b03284dcf33d5e785 Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Wed, 3 Jul 2024 14:52:12 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=81=A2=E5=A4=8D=E4=B8=8A=E6=9E=B6?= =?UTF-8?q?=E6=8E=A8=E8=8D=90=E5=BA=93=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/request2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/api/request2.js b/src/api/request2.js index a1c135c1..bff958ec 100644 --- a/src/api/request2.js +++ b/src/api/request2.js @@ -475,7 +475,7 @@ export function validateItemAndLocation(parmas) { export function getPutawayRecommendLocation(params) { return request({ - url: baseApi + "/wms/location/recommendLocation", + url: baseApi + "/wms/location/recommendLocationNew", method: "post", data: params, });