From 9ac369b9924a82386521741a3963cdad2c9fdeec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=BF=97=E5=9B=BD?= <854933521@qq.com> Date: Mon, 4 Nov 2024 15:23:21 +0800 Subject: [PATCH] =?UTF-8?q?page/transfer=20=E6=96=87=E4=BB=B6=E8=BF=81?= =?UTF-8?q?=E7=A7=BB=208/8-10/25?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/transfer/coms/comTransferRecord.vue | 6 +++--- src/pages/transfer/job/issueDetail.vue | 10 +++++++--- src/pages/transfer/job/receiptDetail.vue | 10 +++++++--- src/pages/transfer/job/transferDetail.vue | 2 +- src/pages/transfer/record/deliverRecord.vue | 2 +- src/pages/transfer/record/receiptRecord.vue | 2 +- 6 files changed, 20 insertions(+), 12 deletions(-) diff --git a/src/pages/transfer/coms/comTransferRecord.vue b/src/pages/transfer/coms/comTransferRecord.vue index 6bc51e4c..2ea1546e 100644 --- a/src/pages/transfer/coms/comTransferRecord.vue +++ b/src/pages/transfer/coms/comTransferRecord.vue @@ -170,7 +170,7 @@ item.subList.push(newDetail); } else { if (detail.scaned == true) { - this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]已经在列表中") + this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]重复扫描") } } } @@ -263,7 +263,7 @@ transferIssueRecordSubmit(params).then(res => { uni.hideLoading() if (res.data) { - this.showCommitSuccessMessage("提交成功
生成调拨出库记录
" + res.data) + this.showCommitSuccessMessage("提交成功\n生成调拨出库记录\n" + res.data) } else { this.showErrorMessage("提交失败[" + res.msg + "]") } @@ -275,7 +275,7 @@ transferReceiptRecordSubmit(params).then(res => { uni.hideLoading() if (res.data) { - this.showCommitSuccessMessage("提交成功
生成调拨入库记录
" + res.data) + this.showCommitSuccessMessage("提交成功\n生成调拨入库记录\n" + res.data) } else { this.showErrorMessage("提交失败[" + res.msg + "]") } diff --git a/src/pages/transfer/job/issueDetail.vue b/src/pages/transfer/job/issueDetail.vue index 1eb22a40..3576037a 100644 --- a/src/pages/transfer/job/issueDetail.vue +++ b/src/pages/transfer/job/issueDetail.vue @@ -273,10 +273,14 @@ const commit = () => { // 扫描数量小于任务数量，判断是否允许部分提交 if (jobContent.value.allowPartialComplete == 'TRUE') { // 提交 - submitJob() + comMessageRef.value.showQuestionMessage1("任务明细未全部完成,是否提交?", 'red', res => { + if (res) { + submitJob() + } + }); } else { // 不允许部分提交，提示 - comMessageRef.value.showErrorMessage('请完成扫描后,再进行提交
' + `已经扫描[${scanCount.value}]箱总共[${subList.value.length}]箱`, (res) => { + comMessageRef.value.showErrorMessage('请完成扫描后,再进行提交\n' + `已经扫描[${scanCount.value}]箱总共[${subList.value.length}]箱`, (res) => { if (res) { openScanPopup() } @@ -301,7 +305,7 @@ const submitJob = () => { transferIssueJobSubmit(params) .then((res) => { if (res.data) { - showCommitSuccessMessage(`提交成功
生成调拨出库记录${res.data}`) + showCommitSuccessMessage(`提交成功\n生成调拨出库记录${res.data}`) } else { showErrorMessage(`提交失败[${res.msg}]`) } diff --git a/src/pages/transfer/job/receiptDetail.vue b/src/pages/transfer/job/receiptDetail.vue index dd7f49af..cd3584b0 100644 --- a/src/pages/transfer/job/receiptDetail.vue +++ b/src/pages/transfer/job/receiptDetail.vue @@ -294,10 +294,14 @@ const commit = () => { // 扫描数量小于任务数量，判断是否允许部分提交 if (jobContent.value.allowPartialComplete == 'TRUE') { // 提交 - submitJob() + comMessageRef.value.showQuestionMessage1("任务明细未全部完成,是否提交?", 'red', res => { + if (res) { + submitJob() + } + }); } else { // 不允许部分提交，提示 - comMessageRef.value.showErrorMessage('请完成扫描后,再进行提交
' + `已经扫描[${scanCount.value}]箱总共[${subList.value.length}]箱`, (res) => { + comMessageRef.value.showErrorMessage('请完成扫描后,再进行提交\n' + `已经扫描[${scanCount.value}]箱总共[${subList.value.length}]箱`, (res) => { if (res) { openScanPopup() } @@ -327,7 +331,7 @@ const submitJob = () => { .then((res) => { uni.hideLoading() if (res.data) { - showCommitSuccessMessage(`提交成功
生成调拨入库记录
${res.data}`) + showCommitSuccessMessage(`提交成功\n生成调拨入库记录\n${res.data}`) } else { showErrorMessage(`提交失败[${res.msg}]`) } diff --git a/src/pages/transfer/job/transferDetail.vue b/src/pages/transfer/job/transferDetail.vue index d19b0cab..62a1cd07 100644 --- a/src/pages/transfer/job/transferDetail.vue +++ b/src/pages/transfer/job/transferDetail.vue @@ -14,7 +14,7 @@ - diff --git a/src/pages/transfer/record/deliverRecord.vue b/src/pages/transfer/record/deliverRecord.vue index ae1932b1..82d777a6 100644 --- a/src/pages/transfer/record/deliverRecord.vue +++ b/src/pages/transfer/record/deliverRecord.vue @@ -119,7 +119,7 @@ const getScanResult = (result) => { const newDetail = createDetailInfo(label, pack) item.subList.push(newDetail) } else if (detail.scaned == true) { - showErrorMessage(`箱码[${balance.packingNumber}批次[${balance.batch}]已经在列表中`) + showErrorMessage(`箱码[${balance.packingNumber}批次[${balance.batch}]重复扫描`) } } handleCalcHandleQty() diff --git a/src/pages/transfer/record/receiptRecord.vue b/src/pages/transfer/record/receiptRecord.vue index 62067412..14e1201c 100644 --- a/src/pages/transfer/record/receiptRecord.vue +++ b/src/pages/transfer/record/receiptRecord.vue @@ -113,7 +113,7 @@ const getScanResult = (result) => { const newDetail = createDetailInfo(label, pack) item.subList.push(newDetail) } else if (detail.scaned == true) { - showErrorMessage(`箱码[${label.packingNumber}批次[${balance.batch}]已经在列表中`) + showErrorMessage(`箱码[${label.packingNumber}批次[${balance.batch}]重复扫描`) } } handleCalcHandleQty()