From 993b73fc9d530b1760b3358a0b76c48396d60e81 Mon Sep 17 00:00:00 2001 From: yin <3313488199@qq.com> Date: Thu, 15 Oct 2026 17:57:29 +0800 Subject: [PATCH] 1 --- src/views/data/packingflow/index.vue | 7 ++-- .../component/BatchImportDialog.vue | 12 +++--- .../form/PackageMaterialSearchForm.vue | 2 +- src/views/material/packageMaterial/index.vue | 9 ++-- src/views/material/packageSupplier/index.vue | 9 ++-- .../BindPackageMaterialByWaybillDialog.vue | 4 +- .../component/CreateOrderFloatWidget.vue | 1 + .../component/CreatePendingOrderDialog.vue | 23 ++++++---- .../component/ExpressWaybillPanel.vue | 6 +-- .../component/OrderExportColumnsDialog.vue | 8 ++-- .../component/OrderExportProgressDialog.vue | 2 +- .../component/OrderReviewDialog.vue | 4 +- .../component/SelectProductDialog.vue | 4 +- .../order/orderManagement/exceptionOrder.vue | 6 +-- .../form/AllocateExpressForm.vue | 4 +- .../form/AllocateSubOrderNumberForm.vue | 4 +- .../form/BatchAsyncTaskForm.vue | 3 +- .../form/BatchQuickRecheckForm.vue | 4 +- .../orderManagement/form/CloneOrderForm.vue | 4 +- .../form/ManualWaybillForm.vue | 4 +- .../form/StorageAllocateForm.vue | 4 +- .../orderManagement/form/SyncOrderIdsForm.vue | 4 +- .../form/UpdateAddressForm.vue | 4 +- .../form/UpdateOrderMetaForm.vue | 4 +- .../orderManagement/form/UpdateRemarkForm.vue | 4 +- .../order/orderManagement/pendingOrder.vue | 8 ++-- .../order/orderManagement/reviewOrder.vue | 2 +- .../orderManagement/utils/toolbar-actions.ts | 4 +- .../order/waveOrder/WavePickTaskListPanel.vue | 2 + .../component/PrinterListTestDialog.vue | 3 +- .../component/WaveBatchPrintPreviewDialog.vue | 6 +-- src/views/stock/stock/component/add.vue | 4 +- .../component/DirectInboundImportDialog.vue | 9 ++-- .../entry/component/DirectInboundLogs.vue | 4 +- .../entry/component/QuickInboundForm.vue | 2 +- .../UnbindReceivingToEntryDialog.vue | 1 + .../storage/entry/component/entrydetail.vue | 1 + src/views/storage/entry/index.vue | 3 +- .../component/InventoryStockPickerDialog.vue | 4 +- .../inventory/component/SpaceStockDialog.vue | 2 +- .../inventory/component/panelstockdetail.vue | 9 ++-- src/views/storage/inventory/index.vue | 2 +- .../receiving/component/DetailsPanel.vue | 1 + .../storage/receiving/component/Product.vue | 42 ++++++++++--------- src/views/storage/receiving/index.vue | 18 ++++---- .../components/OperationCellRenderer.vue | 3 +- .../config/components/CheckItemsPanel.vue | 4 +- .../config/components/CheckRecordsPanel.vue | 4 +- src/views/storage/stockcheck/index.vue | 8 ++-- .../pages/CheckStockPickerDialog.vue | 2 +- src/views/storage/stockout/index.vue | 18 ++++---- 51 files changed, 168 insertions(+), 138 deletions(-) diff --git a/src/views/data/packingflow/index.vue b/src/views/data/packingflow/index.vue index df4e7788..90e4346c 100644 --- a/src/views/data/packingflow/index.vue +++ b/src/views/data/packingflow/index.vue @@ -314,8 +314,8 @@ @@ -815,7 +815,8 @@ async function openForceRecordDialog(row: PackingTaskItem) { { confirmButtonText: '确定', cancelButtonText: '取消', - type: 'warning' + type: 'warning', + buttonSize: 'small' } ) await doForceRecord() diff --git a/src/views/material/packageMaterial/component/BatchImportDialog.vue b/src/views/material/packageMaterial/component/BatchImportDialog.vue index eb709dbe..cb546af0 100644 --- a/src/views/material/packageMaterial/component/BatchImportDialog.vue +++ b/src/views/material/packageMaterial/component/BatchImportDialog.vue @@ -16,11 +16,11 @@ style="display: none" @change="handleFileChange" /> - 选择Excel - 下载模板 - 清除数据 - 只重试失败 - 导入 + 选择Excel + 下载模板 + 清除数据 + 只重试失败 + 导入 已选文件:{{ fileName || '未选择' }} @@ -87,7 +87,7 @@ diff --git a/src/views/material/packageMaterial/form/PackageMaterialSearchForm.vue b/src/views/material/packageMaterial/form/PackageMaterialSearchForm.vue index 413ff4d3..75f93ca8 100644 --- a/src/views/material/packageMaterial/form/PackageMaterialSearchForm.vue +++ b/src/views/material/packageMaterial/form/PackageMaterialSearchForm.vue @@ -68,7 +68,7 @@ diff --git a/src/views/material/packageMaterial/index.vue b/src/views/material/packageMaterial/index.vue index b391ea51..e28d61b9 100644 --- a/src/views/material/packageMaterial/index.vue +++ b/src/views/material/packageMaterial/index.vue @@ -185,8 +185,8 @@ @@ -563,7 +563,7 @@ async function deleteByIds(ids: number[]) { function handleDelete(row: PackageMaterialRecord) { if (!row.id) return const name = row.material_name || row.material_code || String(row.id) - ElMessageBox.confirm(`确认删除包材「${name}」吗?`, '提示', { type: 'warning' }) + ElMessageBox.confirm(`确认删除包材「${name}」吗?`, '提示', { type: 'warning', buttonSize: 'small' }) .then(async () => { const ok = await deleteByIds([row.id as number]) if (!ok) return @@ -579,7 +579,8 @@ function handleDelete(row: PackageMaterialRecord) { function handleBatchDelete() { if (!selectedIds.value.length || batchDeleting.value) return ElMessageBox.confirm(`确认删除选中的 ${selectedIds.value.length} 条包材吗?`, '提示', { - type: 'warning' + type: 'warning', + buttonSize: 'small' }) .then(async () => { batchDeleting.value = true diff --git a/src/views/material/packageSupplier/index.vue b/src/views/material/packageSupplier/index.vue index 0e6e6047..977069b2 100644 --- a/src/views/material/packageSupplier/index.vue +++ b/src/views/material/packageSupplier/index.vue @@ -106,8 +106,8 @@ @@ -433,7 +433,7 @@ async function deleteByIds(ids: number[]) { function handleDelete(row: PackageSupplierRecord) { if (!row.id) return const name = row.supplier_name || row.supplier_code || String(row.id) - ElMessageBox.confirm(`确认删除供应商「${name}」吗?`, '提示', { type: 'warning' }) + ElMessageBox.confirm(`确认删除供应商「${name}」吗?`, '提示', { type: 'warning', buttonSize: 'small' }) .then(async () => { const ok = await deleteByIds([row.id as number]) if (!ok) return @@ -449,7 +449,8 @@ function handleDelete(row: PackageSupplierRecord) { function handleBatchDelete() { if (!selectedIds.value.length || batchDeleting.value) return ElMessageBox.confirm(`确认删除选中的 ${selectedIds.value.length} 条供应商吗?`, '提示', { - type: 'warning' + type: 'warning', + buttonSize: 'small' }) .then(async () => { batchDeleting.value = true diff --git a/src/views/order/orderManagement/component/BindPackageMaterialByWaybillDialog.vue b/src/views/order/orderManagement/component/BindPackageMaterialByWaybillDialog.vue index 92f86d93..d37ddc5b 100644 --- a/src/views/order/orderManagement/component/BindPackageMaterialByWaybillDialog.vue +++ b/src/views/order/orderManagement/component/BindPackageMaterialByWaybillDialog.vue @@ -61,8 +61,8 @@ diff --git a/src/views/order/orderManagement/component/CreateOrderFloatWidget.vue b/src/views/order/orderManagement/component/CreateOrderFloatWidget.vue index e0879576..1df515fa 100644 --- a/src/views/order/orderManagement/component/CreateOrderFloatWidget.vue +++ b/src/views/order/orderManagement/component/CreateOrderFloatWidget.vue @@ -62,6 +62,7 @@ async function handleClose() { try { await ElMessageBox.confirm('关闭后将清空当前建单数据,是否继续?', '关闭建单', { type: 'warning', + buttonSize: 'small', confirmButtonText: '关闭并清空', cancelButtonText: '取消' }) diff --git a/src/views/order/orderManagement/component/CreatePendingOrderDialog.vue b/src/views/order/orderManagement/component/CreatePendingOrderDialog.vue index 275a6bf6..16ff3b45 100644 --- a/src/views/order/orderManagement/component/CreatePendingOrderDialog.vue +++ b/src/views/order/orderManagement/component/CreatePendingOrderDialog.vue @@ -33,10 +33,11 @@ style="display: none" @change="handleImportFileChange" /> - 选择Excel - 下载模板 - 添加明细 + 选择Excel + 下载模板 + 添加明细 地址重识 - 清除数据 + 清除数据 @@ -455,8 +463,8 @@ --> @@ -816,6 +824,7 @@ async function confirmDiscardSession() { try { await ElMessageBox.confirm('关闭后将清空当前建单数据,是否继续?', '关闭建单', { type: 'warning', + buttonSize: 'small', confirmButtonText: '关闭并清空', cancelButtonText: '取消' }) @@ -1323,7 +1332,7 @@ async function removeSelectedPreviewRows() { await ElMessageBox.confirm( `确认删除已勾选的 ${targetRows.length} 行明细?`, '批量删除', - { type: 'warning', confirmButtonText: '删除', cancelButtonText: '取消' } + { type: 'warning', buttonSize: 'small', confirmButtonText: '删除', cancelButtonText: '取消' } ) } catch { return diff --git a/src/views/order/orderManagement/component/ExpressWaybillPanel.vue b/src/views/order/orderManagement/component/ExpressWaybillPanel.vue index 1df3171d..2e5d35cb 100644 --- a/src/views/order/orderManagement/component/ExpressWaybillPanel.vue +++ b/src/views/order/orderManagement/component/ExpressWaybillPanel.vue @@ -59,8 +59,8 @@ @@ -181,7 +181,7 @@ async function handleInterceptScan(row: any) { await ElMessageBox.confirm( `确认对运单「${waybillCode}」执行库内拦截吗?该操作将标记运单退回并处理关联售后工单。`, '库内拦截确认', - { type: 'warning', confirmButtonText: '确认拦截', cancelButtonText: '取消' } + { type: 'warning', buttonSize: 'small', confirmButtonText: '确认拦截', cancelButtonText: '取消' } ) } catch { return diff --git a/src/views/order/orderManagement/component/OrderExportColumnsDialog.vue b/src/views/order/orderManagement/component/OrderExportColumnsDialog.vue index 18444645..d579d933 100644 --- a/src/views/order/orderManagement/component/OrderExportColumnsDialog.vue +++ b/src/views/order/orderManagement/component/OrderExportColumnsDialog.vue @@ -33,8 +33,8 @@ > 全选 - 反选 - 清空 + 反选 + 清空 已选 {{ selected.length }} / {{ totalColumnCount }} @@ -75,8 +75,8 @@ diff --git a/src/views/order/orderManagement/component/OrderExportProgressDialog.vue b/src/views/order/orderManagement/component/OrderExportProgressDialog.vue index fafe82fa..ef1789bf 100644 --- a/src/views/order/orderManagement/component/OrderExportProgressDialog.vue +++ b/src/views/order/orderManagement/component/OrderExportProgressDialog.vue @@ -25,7 +25,7 @@ diff --git a/src/views/order/orderManagement/component/OrderReviewDialog.vue b/src/views/order/orderManagement/component/OrderReviewDialog.vue index fa85ea04..849c5841 100644 --- a/src/views/order/orderManagement/component/OrderReviewDialog.vue +++ b/src/views/order/orderManagement/component/OrderReviewDialog.vue @@ -36,8 +36,8 @@ diff --git a/src/views/order/orderManagement/component/SelectProductDialog.vue b/src/views/order/orderManagement/component/SelectProductDialog.vue index 0b1bb2fb..0f424d10 100644 --- a/src/views/order/orderManagement/component/SelectProductDialog.vue +++ b/src/views/order/orderManagement/component/SelectProductDialog.vue @@ -90,8 +90,8 @@ diff --git a/src/views/order/orderManagement/exceptionOrder.vue b/src/views/order/orderManagement/exceptionOrder.vue index 333edcf0..0f4391f4 100644 --- a/src/views/order/orderManagement/exceptionOrder.vue +++ b/src/views/order/orderManagement/exceptionOrder.vue @@ -338,8 +338,8 @@ @@ -801,7 +801,7 @@ async function submitResolveException() { await ElMessageBox.confirm( `确定将选中的 ${ids.length} 条异常订单恢复为待处理状态吗?`, '确认处理', - { type: 'warning' } + { type: 'warning', buttonSize: 'small' } ) } catch { return diff --git a/src/views/order/orderManagement/form/AllocateExpressForm.vue b/src/views/order/orderManagement/form/AllocateExpressForm.vue index d9b5626c..c0cf1670 100644 --- a/src/views/order/orderManagement/form/AllocateExpressForm.vue +++ b/src/views/order/orderManagement/form/AllocateExpressForm.vue @@ -9,8 +9,8 @@ >

是否确认分配?

diff --git a/src/views/order/orderManagement/form/AllocateSubOrderNumberForm.vue b/src/views/order/orderManagement/form/AllocateSubOrderNumberForm.vue index 9289eba1..7c3847be 100644 --- a/src/views/order/orderManagement/form/AllocateSubOrderNumberForm.vue +++ b/src/views/order/orderManagement/form/AllocateSubOrderNumberForm.vue @@ -33,8 +33,8 @@ diff --git a/src/views/order/orderManagement/form/BatchAsyncTaskForm.vue b/src/views/order/orderManagement/form/BatchAsyncTaskForm.vue index e6476a15..10f63460 100644 --- a/src/views/order/orderManagement/form/BatchAsyncTaskForm.vue +++ b/src/views/order/orderManagement/form/BatchAsyncTaskForm.vue @@ -54,10 +54,11 @@ diff --git a/src/views/order/orderManagement/form/CloneOrderForm.vue b/src/views/order/orderManagement/form/CloneOrderForm.vue index 9cabf9c1..9475d183 100644 --- a/src/views/order/orderManagement/form/CloneOrderForm.vue +++ b/src/views/order/orderManagement/form/CloneOrderForm.vue @@ -18,8 +18,8 @@

订单号:{{ sourceOrderCode || '-' }}

diff --git a/src/views/order/orderManagement/form/ManualWaybillForm.vue b/src/views/order/orderManagement/form/ManualWaybillForm.vue index 1a0d27af..cc991b59 100644 --- a/src/views/order/orderManagement/form/ManualWaybillForm.vue +++ b/src/views/order/orderManagement/form/ManualWaybillForm.vue @@ -40,8 +40,8 @@ diff --git a/src/views/order/orderManagement/form/StorageAllocateForm.vue b/src/views/order/orderManagement/form/StorageAllocateForm.vue index b11d5a12..f3c63c67 100644 --- a/src/views/order/orderManagement/form/StorageAllocateForm.vue +++ b/src/views/order/orderManagement/form/StorageAllocateForm.vue @@ -35,8 +35,8 @@ diff --git a/src/views/order/orderManagement/form/SyncOrderIdsForm.vue b/src/views/order/orderManagement/form/SyncOrderIdsForm.vue index 5fc80d75..c4cb8f2e 100644 --- a/src/views/order/orderManagement/form/SyncOrderIdsForm.vue +++ b/src/views/order/orderManagement/form/SyncOrderIdsForm.vue @@ -33,8 +33,8 @@ diff --git a/src/views/order/orderManagement/form/UpdateAddressForm.vue b/src/views/order/orderManagement/form/UpdateAddressForm.vue index 3a06fc21..485d2740 100644 --- a/src/views/order/orderManagement/form/UpdateAddressForm.vue +++ b/src/views/order/orderManagement/form/UpdateAddressForm.vue @@ -113,8 +113,8 @@ diff --git a/src/views/order/orderManagement/form/UpdateOrderMetaForm.vue b/src/views/order/orderManagement/form/UpdateOrderMetaForm.vue index 3697181f..abe3a484 100644 --- a/src/views/order/orderManagement/form/UpdateOrderMetaForm.vue +++ b/src/views/order/orderManagement/form/UpdateOrderMetaForm.vue @@ -32,8 +32,8 @@ diff --git a/src/views/order/orderManagement/form/UpdateRemarkForm.vue b/src/views/order/orderManagement/form/UpdateRemarkForm.vue index 92917f4c..5809849f 100644 --- a/src/views/order/orderManagement/form/UpdateRemarkForm.vue +++ b/src/views/order/orderManagement/form/UpdateRemarkForm.vue @@ -34,8 +34,8 @@ diff --git a/src/views/order/orderManagement/pendingOrder.vue b/src/views/order/orderManagement/pendingOrder.vue index 85e55af5..89df696b 100644 --- a/src/views/order/orderManagement/pendingOrder.vue +++ b/src/views/order/orderManagement/pendingOrder.vue @@ -334,8 +334,8 @@ @@ -730,7 +730,7 @@ async function submitResolveException() { await ElMessageBox.confirm( `确定将选中的 ${ids.length} 条异常订单恢复为待处理状态吗?`, '确认处理', - { type: 'warning' } + { type: 'warning', buttonSize: 'small' } ) } catch { return @@ -1085,7 +1085,7 @@ async function handleConfirmInterceptBatch() { await ElMessageBox.confirm( `确定对选中的 ${ids.length} 条订单执行库内拦截确定吗?`, '库内拦截确定', - { type: 'warning' } + { type: 'warning', buttonSize: 'small' } ) } catch { return diff --git a/src/views/order/orderManagement/reviewOrder.vue b/src/views/order/orderManagement/reviewOrder.vue index 9462a056..3bd9dbd7 100644 --- a/src/views/order/orderManagement/reviewOrder.vue +++ b/src/views/order/orderManagement/reviewOrder.vue @@ -538,7 +538,7 @@ async function handleSingleReview() { return } try { - await ElMessageBox.confirm('确定审核通过当前订单吗?', '确认', { type: 'warning' }) + await ElMessageBox.confirm('确定审核通过当前订单吗?', '确认', { type: 'warning', buttonSize: 'small' }) await submitReview([selectedRow.value.id]) } catch (e) {} } diff --git a/src/views/order/orderManagement/utils/toolbar-actions.ts b/src/views/order/orderManagement/utils/toolbar-actions.ts index 01ffb23f..b667b269 100644 --- a/src/views/order/orderManagement/utils/toolbar-actions.ts +++ b/src/views/order/orderManagement/utils/toolbar-actions.ts @@ -68,7 +68,7 @@ async function executeApiAction(params: { await ElMessageBox.confirm( config.confirmText.replace('{count}', String(ids.length)), '确认', - { type: config.confirmType || 'warning' } + { type: config.confirmType || 'warning', buttonSize: 'small' } ) } } catch { @@ -678,7 +678,7 @@ export function createPendingToolbarController(params: { await ElMessageBox.confirm( `确定将选中的 ${ids.length} 条订单按散单抓取至波次吗?`, '抓取散单', - { type: 'warning' } + { type: 'warning', buttonSize: 'small' } ) } catch { return diff --git a/src/views/order/waveOrder/WavePickTaskListPanel.vue b/src/views/order/waveOrder/WavePickTaskListPanel.vue index ef80b5f5..bd13988a 100644 --- a/src/views/order/waveOrder/WavePickTaskListPanel.vue +++ b/src/views/order/waveOrder/WavePickTaskListPanel.vue @@ -156,6 +156,7 @@ v-if="!isPickTaskCancelled(row) && !isPickTaskPickFinished(row)" type="primary" link + size="small" :loading="completingTaskId === getTaskId(row)" :disabled="!getTaskId(row)" @click.stop="handleCompletePickTask(row)" @@ -166,6 +167,7 @@ v-if="!isPickTaskCancelled(row) && !isPickTaskPickFinished(row)" type="danger" link + size="small" :loading="cancelingTaskId === getTaskId(row)" :disabled="!getTaskId(row)" @click.stop="handleCancelTask(row)" diff --git a/src/views/order/waveOrder/component/PrinterListTestDialog.vue b/src/views/order/waveOrder/component/PrinterListTestDialog.vue index 7d43e25a..5104f76e 100644 --- a/src/views/order/waveOrder/component/PrinterListTestDialog.vue +++ b/src/views/order/waveOrder/component/PrinterListTestDialog.vue @@ -55,6 +55,7 @@ /> diff --git a/src/views/order/waveOrder/component/WaveBatchPrintPreviewDialog.vue b/src/views/order/waveOrder/component/WaveBatchPrintPreviewDialog.vue index 890c75b9..6b1b6968 100644 --- a/src/views/order/waveOrder/component/WaveBatchPrintPreviewDialog.vue +++ b/src/views/order/waveOrder/component/WaveBatchPrintPreviewDialog.vue @@ -76,9 +76,9 @@ diff --git a/src/views/stock/stock/component/add.vue b/src/views/stock/stock/component/add.vue index cdaa87e6..7450e65d 100644 --- a/src/views/stock/stock/component/add.vue +++ b/src/views/stock/stock/component/add.vue @@ -286,7 +286,7 @@
- 添加 + 添加
@@ -309,7 +309,7 @@ - 添加 + 添加
diff --git a/src/views/storage/entry/component/DirectInboundImportDialog.vue b/src/views/storage/entry/component/DirectInboundImportDialog.vue index c8bab6e7..4035b386 100644 --- a/src/views/storage/entry/component/DirectInboundImportDialog.vue +++ b/src/views/storage/entry/component/DirectInboundImportDialog.vue @@ -187,8 +187,9 @@ diff --git a/src/views/storage/entry/component/DirectInboundLogs.vue b/src/views/storage/entry/component/DirectInboundLogs.vue index 20c91e72..bfbd102c 100644 --- a/src/views/storage/entry/component/DirectInboundLogs.vue +++ b/src/views/storage/entry/component/DirectInboundLogs.vue @@ -210,7 +210,7 @@ async function handleRemoveRow(row: DirectInboundLog) { await ElMessageBox.confirm( `确认移除「${label}」的导入/PDA 入库记录(数量 ${quantity})?\n移除后对应商品的已导入数量将扣减。`, '移除入库记录', - { type: 'warning', confirmButtonText: '确认移除', cancelButtonText: '取消' } + { type: 'warning', buttonSize: 'small', confirmButtonText: '确认移除', cancelButtonText: '取消' } ) } catch { return @@ -246,7 +246,7 @@ async function handleBatchRemove() { await ElMessageBox.confirm( `确认批量移除 ${rows.length} 条导入/PDA 入库记录?\n移除后对应商品的已导入数量将扣减。`, '批量移除入库记录', - { type: 'warning', confirmButtonText: '确认移除', cancelButtonText: '取消' } + { type: 'warning', buttonSize: 'small', confirmButtonText: '确认移除', cancelButtonText: '取消' } ) } catch { return diff --git a/src/views/storage/entry/component/QuickInboundForm.vue b/src/views/storage/entry/component/QuickInboundForm.vue index f6ca985a..54d2cf0f 100644 --- a/src/views/storage/entry/component/QuickInboundForm.vue +++ b/src/views/storage/entry/component/QuickInboundForm.vue @@ -229,7 +229,7 @@ async function handleSubmit() { await ElMessageBox.confirm( `确定对入库单「${code}」执行快捷直入吗?\n所有商品将按明细数量直入虚拟库位,入库单状态变为「已完成」。`, '快捷直入确认', - { confirmButtonText: '确认直入', cancelButtonText: '取消', type: 'warning' } + { confirmButtonText: '确认直入', cancelButtonText: '取消', type: 'warning', buttonSize: 'small' } ) } catch { return diff --git a/src/views/storage/entry/component/UnbindReceivingToEntryDialog.vue b/src/views/storage/entry/component/UnbindReceivingToEntryDialog.vue index 264c64c0..bcd79e2f 100644 --- a/src/views/storage/entry/component/UnbindReceivingToEntryDialog.vue +++ b/src/views/storage/entry/component/UnbindReceivingToEntryDialog.vue @@ -397,6 +397,7 @@ async function handleUnbindSubmit() { '确认解除绑定', { type: 'warning', + buttonSize: 'small', confirmButtonText: '确认解绑', cancelButtonText: '取消', confirmButtonClass: 'el-button--danger', diff --git a/src/views/storage/entry/component/entrydetail.vue b/src/views/storage/entry/component/entrydetail.vue index 1e7747f7..ffa61c39 100644 --- a/src/views/storage/entry/component/entrydetail.vue +++ b/src/views/storage/entry/component/entrydetail.vue @@ -323,6 +323,7 @@ async function askOwnerNotice(actionDesc: string): Promise { confirmButtonText: '通知货主', cancelButtonText: '不通知', type: 'warning', + buttonSize: 'small', distinguishCancelAndClose: true }) .then(() => resolve(0)) diff --git a/src/views/storage/entry/index.vue b/src/views/storage/entry/index.vue index 98d9ae87..a6d1b2e6 100644 --- a/src/views/storage/entry/index.vue +++ b/src/views/storage/entry/index.vue @@ -1054,6 +1054,7 @@ async function askOwnerNotice(actionDesc: string): Promise { confirmButtonText: '通知货主', cancelButtonText: '不通知', type: 'warning', + buttonSize: 'small', distinguishCancelAndClose: true }) .then(() => resolve(0)) @@ -1225,7 +1226,7 @@ async function confirmBatchCancel() { const skippedTip = blockedCount ? `;另有 ${blockedCount} 个非「已创建/待入库」状态将被跳过` : '' try { - await ElMessageBox.confirm(`确定要作废选中的 ${ids.length} 个入库单吗?${skippedTip}`, '确认', { type: 'warning' }) + await ElMessageBox.confirm(`确定要作废选中的 ${ids.length} 个入库单吗?${skippedTip}`, '确认', { type: 'warning', buttonSize: 'small' }) loading.value = true // storage.entry.cancel 入参:批量作废统一传 ids(number[],非空数组;ids 优先于 id) diff --git a/src/views/storage/inventory/component/InventoryStockPickerDialog.vue b/src/views/storage/inventory/component/InventoryStockPickerDialog.vue index 84f82e42..cd2aaf7f 100644 --- a/src/views/storage/inventory/component/InventoryStockPickerDialog.vue +++ b/src/views/storage/inventory/component/InventoryStockPickerDialog.vue @@ -72,8 +72,8 @@ diff --git a/src/views/storage/inventory/component/SpaceStockDialog.vue b/src/views/storage/inventory/component/SpaceStockDialog.vue index 118d5465..f417092b 100644 --- a/src/views/storage/inventory/component/SpaceStockDialog.vue +++ b/src/views/storage/inventory/component/SpaceStockDialog.vue @@ -64,7 +64,7 @@ diff --git a/src/views/storage/inventory/component/panelstockdetail.vue b/src/views/storage/inventory/component/panelstockdetail.vue index 1afab5b0..3d53104f 100644 --- a/src/views/storage/inventory/component/panelstockdetail.vue +++ b/src/views/storage/inventory/component/panelstockdetail.vue @@ -113,8 +113,8 @@ /> @@ -152,6 +152,7 @@ clearable /> -->