From 8ccae95455d59664bfbc069671e8344ee436b816 Mon Sep 17 00:00:00 2001 From: liufumingren Date: Thu, 11 Jun 2026 09:38:02 +0800 Subject: [PATCH] 1 --- src/views/order/orderreview/index.vue | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/views/order/orderreview/index.vue b/src/views/order/orderreview/index.vue index 35850b9e..b6093f9d 100644 --- a/src/views/order/orderreview/index.vue +++ b/src/views/order/orderreview/index.vue @@ -1018,15 +1018,6 @@ const isAllSameProductInWave = computed(() => { return stock.every((s: any) => String(s.item_code || s.barcode || '').trim() === firstCode) }) -// 团购同款全部扫完时自动弹出称重弹窗 -watch(allItemsScanned, (scanned) => { - if (scanned && isAllSameProductInWave.value && !weighingDialogVisible.value && !confirmLoading.value) { - weighingBeforeConfirm.value = true - weighingForm.weight = null - weighingDialogVisible.value = true - } -}) - /** 选中订单是否设置了拦截 */ const hasSelectedIntercept = computed(() => { const order = selectedOrderRow.value as any @@ -1479,6 +1470,14 @@ async function handleConfirm() { return } + // 团购波次且所有商品一致:先弹出称重弹窗,称重完成后再确认复核 + if (isAllSameProductInWave.value) { + weighingBeforeConfirm.value = true + weighingForm.weight = null + weighingDialogVisible.value = true + return + } + try { await ElMessageBox.confirm(`确认对订单 ID ${id} 提交复核记录?`, '确认复核', { type: 'warning'