From ab8a8694bbe6e3af0f7a82c098564589cc5cb046 Mon Sep 17 00:00:00 2001 From: qb <1191961160@qq.com> Date: Thu, 1 Aug 2024 14:22:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../artery/VehicleArrivalManagement.vue | 14 +++++++++----- src/views/distribution/inventory/BookingNote.vue | 2 +- src/views/distribution/inventory/CreateOrder.vue | 2 +- src/views/waybill/CreateZeroOrder.vue | 2 +- src/views/waybill/WaybillOrderList.vue | 2 +- 5 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src/views/distribution/artery/VehicleArrivalManagement.vue b/src/views/distribution/artery/VehicleArrivalManagement.vue index 89e1c1ea..a9304842 100644 --- a/src/views/distribution/artery/VehicleArrivalManagement.vue +++ b/src/views/distribution/artery/VehicleArrivalManagement.vue @@ -1343,11 +1343,15 @@ const handleUnloadByLoadId = (type: 1 | 2) => { if (details.selectionList.length === 0) return ElMessage.warning('请选择需要卸车的数据'); if (details.selectionList.length > 1) return ElMessage.warning('只支持单条数据操作'); - ElMessageBox.confirm('确认卸车吗?', '', { - confirmButtonText: '确认', - cancelButtonText: '取消', - type: 'warning', - }).then(async () => { + ElMessageBox.confirm( + '请确认卸车数据是否完成,未卸车数据将进入异常列表。', + type === 1 ? '中途卸车确认' : '终点卸车确认', + { + confirmButtonText: '确认', + cancelButtonText: '取消', + type: 'warning', + } + ).then(async () => { try { details.loadingObj.pageLoading = true; diff --git a/src/views/distribution/inventory/BookingNote.vue b/src/views/distribution/inventory/BookingNote.vue index dddb4b28..fef42c5e 100644 --- a/src/views/distribution/inventory/BookingNote.vue +++ b/src/views/distribution/inventory/BookingNote.vue @@ -1844,7 +1844,7 @@ const handlePrint = async () => { template = template.replace('第n页', `第${i + 1}页`); template = template.replace('共n页', `共${element.length}页`); - template = template.replaceAll('0.00', ``); + // template = template.replaceAll('0.00', ``); _html += JSON.parse(JSON.stringify(template)); } diff --git a/src/views/distribution/inventory/CreateOrder.vue b/src/views/distribution/inventory/CreateOrder.vue index 43a0b609..8e46a775 100644 --- a/src/views/distribution/inventory/CreateOrder.vue +++ b/src/views/distribution/inventory/CreateOrder.vue @@ -3674,7 +3674,7 @@ const handlePrint = async () => { template = template.replace('第n页', `第${i + 1}页`); template = template.replace('共n页', `共${element.length}页`); - template = template.replaceAll('0.00', ``); + // template = template.replaceAll('0.00', ``); _html += JSON.parse(JSON.stringify(template)); } diff --git a/src/views/waybill/CreateZeroOrder.vue b/src/views/waybill/CreateZeroOrder.vue index 75a9af09..14c8a894 100644 --- a/src/views/waybill/CreateZeroOrder.vue +++ b/src/views/waybill/CreateZeroOrder.vue @@ -3192,7 +3192,7 @@ const handlePrint = async () => { template = template.replace('第n页', `第${i + 1}页`); template = template.replace('共n页', `共${element.length}页`); - template = template.replaceAll('0.00', ``); + // template = template.replaceAll('0.00', ``); _html += JSON.parse(JSON.stringify(template)); } diff --git a/src/views/waybill/WaybillOrderList.vue b/src/views/waybill/WaybillOrderList.vue index f34934b2..c9faa5bd 100644 --- a/src/views/waybill/WaybillOrderList.vue +++ b/src/views/waybill/WaybillOrderList.vue @@ -659,7 +659,7 @@ const batchPrint = async () => { template = template.replace('第n页', `第${i + 1}页`); template = template.replace('共n页', `共${element.length}页`); - template = template.replaceAll('0.00', ``); + // template = template.replaceAll('0.00', ``); _html += JSON.parse(JSON.stringify(template)); }