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 @@ - + {{ phase === 'progress' && !isFinished ? '后台处理' : '关闭' }} - 关闭 - 执行发货 + 关闭 + 执行发货 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 @@ - 取消 - + 取消 + {{ submitButtonText }} 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 @@ - 取消 - + 取消 + {{ requestId ? '处理中' : '确认同步' }} 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 @@ - 关闭 - 复制 JSON - 浏览器打印 + 关闭 + 复制 JSON + 浏览器打印 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 @@ - 取消 + 取消 - 查询 + 查询 @@ -247,8 +248,8 @@ - 取消 - 使用选中库位 + 取消 + 使用选中库位 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 @@ /> - 取消 - + 取消 + {{ confirmButtonText }} @@ -152,6 +152,7 @@ clearable /> --> - 取消 + 取消 { confirmButtonText: '确定绑定', cancelButtonText: '取消', type: 'warning', + buttonSize: 'small', dangerouslyUseHTMLString: true } ) diff --git a/src/views/storage/receiving/component/Product.vue b/src/views/storage/receiving/component/Product.vue index 8f086fd0..57436d3f 100644 --- a/src/views/storage/receiving/component/Product.vue +++ b/src/views/storage/receiving/component/Product.vue @@ -160,7 +160,7 @@ - + - 取消 - 保存 + 取消 + 保存 @@ -269,8 +269,8 @@ - 取消 - 保存 + 取消 + 保存 @@ -306,8 +306,8 @@ - 取消 - 确认绑定 + 取消 + 确认绑定 @@ -316,7 +316,7 @@ - 查询 + 查询 已按收货单货主过滤:{{ boundStoreName || ('ID ' + boundStoreId) }} @@ -345,8 +345,8 @@ - 取消 - 使用选中商品 + 取消 + 使用选中商品 @@ -355,7 +355,7 @@ - 查询 + 查询 @@ -381,8 +381,8 @@ - 取消 - 使用选中库位 + 取消 + 使用选中库位 @@ -395,11 +395,11 @@ style="display:none" @change="onBatchImportFileChange" /> - 选择Excel - 下载模板 - 清除数据 - 只重试失败 - 导入 + 选择Excel + 下载模板 + 清除数据 + 只重试失败 + 导入 已选文件:{{ batchImportFileName || '未选择' }} @@ -453,7 +453,7 @@ - 关闭 + 关闭 @@ -737,6 +737,7 @@ const confirmBatchDeleteDetails = async () => { '批量删除确认', { type: 'warning', + buttonSize: 'small', confirmButtonText: '确认删除', cancelButtonText: '取消' } @@ -807,6 +808,7 @@ const confirmDeleteDetail = async (row: any) => { '删除确认', { type: 'warning', + buttonSize: 'small', confirmButtonText: '确认删除', cancelButtonText: '取消' } @@ -2541,7 +2543,7 @@ const openDateDialog = (row: any) => { ElMessageBox.alert( `商品名称:${row?.product_name || '--'}已过期,请移除拒绝收货。`, '过期提醒', - { type: 'warning' } + { type: 'warning', buttonSize: 'small' } ) } } diff --git a/src/views/storage/receiving/index.vue b/src/views/storage/receiving/index.vue index c4211bab..884120aa 100644 --- a/src/views/storage/receiving/index.vue +++ b/src/views/storage/receiving/index.vue @@ -1029,7 +1029,7 @@ async function confirmcomplete() { } try { - await ElMessageBox.confirm(`确定要批量完成 ${selectionRows.value.length} 个收货单的收货吗?`, '确认完成', { type: 'success' }) + await ElMessageBox.confirm(`确定要批量完成 ${selectionRows.value.length} 个收货单的收货吗?`, '确认完成', { type: 'success', buttonSize: 'small' }) for (const row of selectionRows.value) { // console.log('正在执行完成收货,请求数据:', { id: row.id, type: 'complete' }) @@ -1061,7 +1061,7 @@ async function confirmBatchCancel() { } try { - await ElMessageBox.confirm(`确定要批量作废 ${selectionRows.value.length} 个收货单吗?`, '确认作废', { type: 'warning' }) + await ElMessageBox.confirm(`确定要批量作废 ${selectionRows.value.length} 个收货单吗?`, '确认作废', { type: 'warning', buttonSize: 'small' }) const ids = selectionRows.value.map(row => row.id) const res: any = await receivingApi.batchCancelReceiving({ ids }) @@ -1092,7 +1092,7 @@ async function handleReviewReceiving() { await ElMessageBox.confirm( `确定要批量审核 ${selectionRows.value.length} 个收货单吗?\n审核后将会直接通知货主且不可撤销。`, '确认审核', - { type: 'warning' } + { type: 'warning', buttonSize: 'small' } ) } catch { return @@ -1483,7 +1483,7 @@ async function submitMatchPutaway() { await ElMessageBox.confirm( `将对收货单「${row?.receiving_number || receivingId}」与入库单「${entry.entry_order_code || entryId}」执行匹配入库(按 SKU 数量匹配)。确定继续?`, '确认匹配入库', - { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' } + { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning', buttonSize: 'small' } ) } catch { return @@ -1549,7 +1549,7 @@ async function handleQuickPutaway() { ElMessageBox.alert( `${errors.join('')}`, '校验未通过,无法转入库单', - { confirmButtonText: '确定', dangerouslyUseHTMLString: true, type: 'error' } + { confirmButtonText: '确定', dangerouslyUseHTMLString: true, type: 'error', buttonSize: 'small' } ) return } @@ -1558,7 +1558,7 @@ async function handleQuickPutaway() { await ElMessageBox.confirm( `确定对选中的 ${validRows.length} 条收货单执行转入库单吗?`, '转入库单确认', - { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' } + { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning', buttonSize: 'small' } ) } catch { return @@ -1583,7 +1583,7 @@ async function handleQuickPutaway() { ElMessageBox.alert( `${failList.join('')}`, `${failList.length} 条收货单处理失败`, - { confirmButtonText: '确定', dangerouslyUseHTMLString: true, type: 'error' } + { confirmButtonText: '确定', dangerouslyUseHTMLString: true, type: 'error', buttonSize: 'small' } ) } else { ElMessage.success('选中的收货单已全部转入库单成功') @@ -1622,7 +1622,7 @@ async function handleDirectPutaway() { ElMessageBox.alert( `${errors.join('')}`, '校验未通过,无法收货单直入', - { confirmButtonText: '确定', dangerouslyUseHTMLString: true, type: 'error' } + { confirmButtonText: '确定', dangerouslyUseHTMLString: true, type: 'error', buttonSize: 'small' } ) return } @@ -1631,7 +1631,7 @@ async function handleDirectPutaway() { await ElMessageBox.confirm( `确定对收货单「${row.receiving_number}」执行收货单直入吗?未入库明细将按库位直接写入库存并生成入库单。`, '收货单直入确认', - { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' } + { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning', buttonSize: 'small' } ) } catch { return diff --git a/src/views/storage/stockcheck/components/OperationCellRenderer.vue b/src/views/storage/stockcheck/components/OperationCellRenderer.vue index c456157f..8c3c39e0 100644 --- a/src/views/storage/stockcheck/components/OperationCellRenderer.vue +++ b/src/views/storage/stockcheck/components/OperationCellRenderer.vue @@ -98,7 +98,8 @@ async function handleActionClick(btn: OperationButtonConfig) { { confirmButtonText: btn.confirmButtonText || '确定', cancelButtonText: '取消', - type: (btn.confirmType || 'warning') as any + type: (btn.confirmType || 'warning') as any, + buttonSize: 'small' } ) } catch { diff --git a/src/views/storage/stockcheck/config/components/CheckItemsPanel.vue b/src/views/storage/stockcheck/config/components/CheckItemsPanel.vue index 768bf58e..0654fcee 100644 --- a/src/views/storage/stockcheck/config/components/CheckItemsPanel.vue +++ b/src/views/storage/stockcheck/config/components/CheckItemsPanel.vue @@ -791,7 +791,7 @@ async function handleMarkEmpty(row: Record) { await ElMessageBox.confirm( `确认库位「${location}」为空?\n标记后该库位下的商品记录将被清除;若库位账面还有库存,会按盘亏计入差异。`, '标记库位为空', - { confirmButtonText: '确认标记', cancelButtonText: '取消', type: 'warning' } + { confirmButtonText: '确认标记', cancelButtonText: '取消', type: 'warning', buttonSize: 'small' } ) } catch { return @@ -852,7 +852,7 @@ async function finishCheck() { await ElMessageBox.confirm( '完成后不再允许修改盘点记录;未盘商品明细将按实盘 0 处理(计入盘亏与差异行数),未盘库位明细不计差异。确定完成?', '完成盘点', - { confirmButtonText: '确定完成', cancelButtonText: '取消', type: 'warning' } + { confirmButtonText: '确定完成', cancelButtonText: '取消', type: 'warning', buttonSize: 'small' } ) } catch { return diff --git a/src/views/storage/stockcheck/config/components/CheckRecordsPanel.vue b/src/views/storage/stockcheck/config/components/CheckRecordsPanel.vue index 24e51ede..e58adf90 100644 --- a/src/views/storage/stockcheck/config/components/CheckRecordsPanel.vue +++ b/src/views/storage/stockcheck/config/components/CheckRecordsPanel.vue @@ -754,7 +754,7 @@ async function handleDeleteRecord(record: Record, row?: Record) { `将删除该库位全部作业记录${row?.is_empty ? '与空库位标记' : ''}(当前 ${count} 条),` + '该库位回到未盘;盘点单状态不变。', '重盘清除库位', - { confirmButtonText: '确定清除', cancelButtonText: '取消', type: 'warning' } + { confirmButtonText: '确定清除', cancelButtonText: '取消', type: 'warning', buttonSize: 'small' } ) } catch { return diff --git a/src/views/storage/stockcheck/index.vue b/src/views/storage/stockcheck/index.vue index 1cef9e10..a5fe78e7 100644 --- a/src/views/storage/stockcheck/index.vue +++ b/src/views/storage/stockcheck/index.vue @@ -535,7 +535,8 @@ async function handleAuditReject(row: Record) { cancelButtonText: '取消', inputType: 'textarea', inputPlaceholder: '可留空', - type: 'warning' + type: 'warning', + buttonSize: 'small' } ) reason = String(res.value ?? '').trim() @@ -699,7 +700,8 @@ async function doBatchDelete() { await ElMessageBox.confirm(confirmText, '批量删除盘点任务', { confirmButtonText: '确定删除', cancelButtonText: '取消', - type: 'warning' + type: 'warning', + buttonSize: 'small' }) } catch { return @@ -980,7 +982,7 @@ async function handleCreateSuccess(task: { await ElMessageBox.confirm( `盘点单 ${task.check_no || task.id} 已创建(空盘点单),是否立即添加${targetLabel}?`, `添加${targetLabel}`, - { confirmButtonText: '立即添加', cancelButtonText: '稍后再说', type: 'info' } + { confirmButtonText: '立即添加', cancelButtonText: '稍后再说', type: 'info', buttonSize: 'small' } ) } catch { return diff --git a/src/views/storage/stockcheck/pages/CheckStockPickerDialog.vue b/src/views/storage/stockcheck/pages/CheckStockPickerDialog.vue index 0380159a..8862b09b 100644 --- a/src/views/storage/stockcheck/pages/CheckStockPickerDialog.vue +++ b/src/views/storage/stockcheck/pages/CheckStockPickerDialog.vue @@ -669,7 +669,7 @@ async function submitLocationRows(taskId: number) { await ElMessageBox.confirm( '未选择库位,将由后端自动拉取全仓库启用库位生成盘点范围,确定继续?', '添加盘点库位', - { confirmButtonText: '确定继续', cancelButtonText: '取消', type: 'warning' } + { confirmButtonText: '确定继续', cancelButtonText: '取消', type: 'warning', buttonSize: 'small' } ) } catch { return diff --git a/src/views/storage/stockout/index.vue b/src/views/storage/stockout/index.vue index a262532a..158b8774 100644 --- a/src/views/storage/stockout/index.vue +++ b/src/views/storage/stockout/index.vue @@ -240,8 +240,8 @@ - 取消 - 确认转单 + 取消 + 确认转单 @@ -386,8 +386,8 @@ - 取消 - 保存修改 + 取消 + 保存修改 @@ -441,8 +441,8 @@ - 取消 - 确认更新 + 取消 + 确认更新 @@ -772,7 +772,7 @@ async function handleSingleRowCancel(row: any) { await ElMessageBox.confirm( `确定要取消出库单「${row.stockout_order_code || row.id}」吗?取消后将释放库存锁定。`, '取消出库单', - { type: 'warning', confirmButtonText: '确认取消', cancelButtonText: '返回' } + { type: 'warning', buttonSize: 'small', confirmButtonText: '确认取消', cancelButtonText: '返回' } ) } catch { return @@ -1277,7 +1277,7 @@ async function handleSingleRowStockout(row: any) { await ElMessageBox.confirm( `确定要一键出库出库单「${row.stockout_order_code || row.id}」吗?确认后状态将变更为"已完成"。请确保已填写运单号。`, '一键出库', - { type: 'warning', confirmButtonText: '确认', cancelButtonText: '取消' } + { type: 'warning', buttonSize: 'small', confirmButtonText: '确认', cancelButtonText: '取消' } ) } catch { return @@ -1317,7 +1317,7 @@ async function confirmBatchCancel() { return } try { - await ElMessageBox.confirm(`确定要批量作废 ${selectionRows.value.length} 个出库单吗?`, '确认', { type: 'warning' }) + await ElMessageBox.confirm(`确定要批量作废 ${selectionRows.value.length} 个出库单吗?`, '确认', { type: 'warning', buttonSize: 'small' }) let successCount = 0 let failCount = 0 for (const row of selectionRows.value) {
是否确认分配?
订单号:{{ sourceOrderCode || '-' }}