diff --git a/src/api/returnunpack/index.ts b/src/api/returnunpack/index.ts index 9126a131..1133e335 100644 --- a/src/api/returnunpack/index.ts +++ b/src/api/returnunpack/index.ts @@ -813,6 +813,95 @@ export function returnUnpackTransferByWaybills( } as any) } +// ============ returnUnpack.transferByOrders ============ + +/** returnUnpack.transferByOrders 请求参数 */ +export type ReturnUnpackTransferByOrdersParams = { + /** 订单表主键ID列表(wms_order_delivery*.id,也兼容单个数值;服务端 Number() 归一化 + 过滤非正整数 + 去重,去重后单次上限 200) */ + ids: number[] | number +} + +/** returnUnpack.transferByOrders 成功项 */ +export type ReturnUnpackTransferByOrdersSuccessItem = { + /** 订单ID */ + order_id: number + /** 拆包单ID */ + unpack_id: number + /** 拆包单号 */ + unpack_no: string + /** 写入拆包单的运单号 */ + waybill_code: string + /** 明细行数 */ + detail_count: number + /** 明细数量合计 */ + total_quantity: number +} + +/** returnUnpack.transferByOrders 跳过项(静默跳过,不报错、不阻断其它订单) */ +export type ReturnUnpackTransferByOrdersSkippedItem = { + /** 订单ID */ + order_id: number + /** 跳过原因,如「非库内拦截订单」「订单已存在拆包单」「运单号已存在拆包单」「订单无明细可复制」 */ + reason: string +} + +/** returnUnpack.transferByOrders 失败项(非预期异常) */ +export type ReturnUnpackTransferByOrdersFailedItem = { + /** 订单ID */ + order_id: number + /** 失败原因 */ + reason: string +} + +/** returnUnpack.transferByOrders 响应(逐单处理,单条失败不阻断主流程,HTTP 整体仍成功) */ +export type ReturnUnpackTransferByOrdersResponse = { + code?: number + message?: string + /** 去重后待处理订单总数 */ + total: number + /** 成功创建拆包单的订单数量 */ + success_count: number + /** 静默跳过的订单数量(非库内拦截/已有拆包单/无运单号/无明细等) */ + skipped_count: number + /** 处理失败的订单数量(非预期异常,如数据库写入失败) */ + failed_count: number + /** 成功项数组 */ + success: ReturnUnpackTransferByOrdersSuccessItem[] + /** 跳过项数组 */ + skipped: ReturnUnpackTransferByOrdersSkippedItem[] + /** 失败项数组 */ + failed: ReturnUnpackTransferByOrdersFailedItem[] +} + +/** + * returnUnpack.transferByOrders:配送订单批量转退回拆包单(一次调用把多个配送订单批量转换为退回拆包单) + * - `ids` 为订单表主键ID(wms_order_delivery*.id),支持单个数值或数组;服务端 Number() 归一化 + 过滤非正整数 + 去重,去重后单次上限 200 + * - 仓库隔离:warehouse_id 由服务端从 ctx.user.store_id 注入,禁止前端传入 + * - 逐单处理,单条失败不阻断主流程;转换限制为「静默跳过」(不报错、不阻断其它订单): + * 仅允许「库内拦截」订单(intercept_status=intercepted_at_warehouse,兼容历史值 intercepted); + * 已有有效拆包单(同仓库 + order_id 命中,或同运单号已存在,status != 'cancelled')跳过; + * 订单不存在/不属于当前仓库、无运单号、无明细可复制的同样跳过 + * - 每单新建一张拆包单:订单主运单(business_key=1 优先)的 waybill_code 写入拆包单(无运单时回退订单发货单号), + * 回填 order_express_id/order_id/store_id/source_order_codes/shop_name + * - 明细:订单原本明细 1:1 复制(订单 items 优先,为空回退明细分表),product_status 固定 normal, + * 写入后回填主表 total_items/total_quantity/detail_status + */ +export function returnUnpackTransferByOrders( + data: ReturnUnpackTransferByOrdersParams +): Promise { + return request({ + url: '/system', + method: 'post', + params: { + method: 'returnUnpack.transferByOrders', + v, + timestamp: new Date().getTime() + }, + data, + isSystemApi: true + } as any) +} + // ============ 模块导出 ============ export const returnUnpackModule = { @@ -829,5 +918,6 @@ export const returnUnpackModule = { forceRecord: returnUnpackForceRecord, export: returnUnpackExport, exportTaskProgress: returnUnpackExportTaskProgress, - transferByWaybills: returnUnpackTransferByWaybills + transferByWaybills: returnUnpackTransferByWaybills, + transferByOrders: returnUnpackTransferByOrders } diff --git a/src/views/afterSale/list/index.vue b/src/views/afterSale/list/index.vue index b652bd46..0c7c7178 100644 --- a/src/views/afterSale/list/index.vue +++ b/src/views/afterSale/list/index.vue @@ -444,7 +444,7 @@ async function handleBatchSetPendingFeedback() { await ElMessageBox.confirm( `确认将 ${selectedRows.value.length} 个工单设为"待反馈"状态?`, '批量设待反馈', - { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' } + { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning', buttonSize: 'small' } ) } catch { return @@ -489,7 +489,7 @@ async function handleBatchStatus(status: 'completed' | 'closed', label: string, await ElMessageBox.confirm( `确认将 ${selectedRows.value.length} 个工单${label}?`, label, - { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' } + { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning', buttonSize: 'small' } ) } catch { return } diff --git a/src/views/afterSale/typelist/components/OperationCellRenderer.vue b/src/views/afterSale/typelist/components/OperationCellRenderer.vue index d2515d24..fbab63f4 100644 --- a/src/views/afterSale/typelist/components/OperationCellRenderer.vue +++ b/src/views/afterSale/typelist/components/OperationCellRenderer.vue @@ -94,7 +94,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/afterSale/typelist/pages/TypeFormDialog.vue b/src/views/afterSale/typelist/pages/TypeFormDialog.vue index 35acab70..f26a1093 100644 --- a/src/views/afterSale/typelist/pages/TypeFormDialog.vue +++ b/src/views/afterSale/typelist/pages/TypeFormDialog.vue @@ -88,8 +88,8 @@ diff --git a/src/views/inbox/autoReply/components/FunctionPanel.vue b/src/views/inbox/autoReply/components/FunctionPanel.vue index 23566c41..4dfd8fb0 100644 --- a/src/views/inbox/autoReply/components/FunctionPanel.vue +++ b/src/views/inbox/autoReply/components/FunctionPanel.vue @@ -201,6 +201,7 @@ async function handleRefresh() { try { await ElMessageBox.confirm('当前有未保存的关联修改,刷新后将被丢弃,是否继续?', '未保存修改', { type: 'warning', + buttonSize: 'small', confirmButtonText: '放弃修改并继续', cancelButtonText: '取消', }) diff --git a/src/views/inbox/autoReply/components/GroupPanel.vue b/src/views/inbox/autoReply/components/GroupPanel.vue index ef446866..1d179cda 100644 --- a/src/views/inbox/autoReply/components/GroupPanel.vue +++ b/src/views/inbox/autoReply/components/GroupPanel.vue @@ -172,6 +172,7 @@ async function handleRefresh() { try { await ElMessageBox.confirm('当前有未保存的白名单修改,刷新后将被丢弃,是否继续?', '未保存修改', { type: 'warning', + buttonSize: 'small', confirmButtonText: '放弃修改并继续', cancelButtonText: '取消', }) diff --git a/src/views/inbox/autoReply/components/KeywordPanel.vue b/src/views/inbox/autoReply/components/KeywordPanel.vue index b4ae715b..7737a5fc 100644 --- a/src/views/inbox/autoReply/components/KeywordPanel.vue +++ b/src/views/inbox/autoReply/components/KeywordPanel.vue @@ -278,6 +278,7 @@ async function handleDelete(row: InboxV2KeywordItem) { try { await ElMessageBox.confirm(`确定删除关键词「${row.keyword}」吗?`, '删除确认', { type: 'warning', + buttonSize: 'small', confirmButtonText: '删除', cancelButtonText: '取消', }) diff --git a/src/views/inbox/autoReply/components/NumberRulePanel.vue b/src/views/inbox/autoReply/components/NumberRulePanel.vue index b6694622..3ef41fe6 100644 --- a/src/views/inbox/autoReply/components/NumberRulePanel.vue +++ b/src/views/inbox/autoReply/components/NumberRulePanel.vue @@ -172,6 +172,7 @@ async function handleRefresh() { try { await ElMessageBox.confirm('当前有未保存的关联修改,刷新后将被丢弃,是否继续?', '未保存修改', { type: 'warning', + buttonSize: 'small', confirmButtonText: '放弃修改并继续', cancelButtonText: '取消', }) diff --git a/src/views/inbox/autoReply/components/ReplyPanel.vue b/src/views/inbox/autoReply/components/ReplyPanel.vue index ad98ae0b..3dc61787 100644 --- a/src/views/inbox/autoReply/components/ReplyPanel.vue +++ b/src/views/inbox/autoReply/components/ReplyPanel.vue @@ -184,6 +184,7 @@ async function handleRestore() { try { await ElMessageBox.confirm('删除仓库级配置后,该子类型将回退使用系统级配置,确定吗?', '还原确认', { type: 'warning', + buttonSize: 'small', confirmButtonText: '还原', cancelButtonText: '取消', }) diff --git a/src/views/inbox/autoReply/index.vue b/src/views/inbox/autoReply/index.vue index 91d3bf63..2ba29fac 100644 --- a/src/views/inbox/autoReply/index.vue +++ b/src/views/inbox/autoReply/index.vue @@ -429,6 +429,7 @@ async function confirmDiscardChanges(message: string): Promise { try { await ElMessageBox.confirm(message, '未保存修改', { type: 'warning', + buttonSize: 'small', confirmButtonText: '放弃修改并继续', cancelButtonText: '留在当前页', }) @@ -628,7 +629,7 @@ async function handleDeleteType() { await ElMessageBox.confirm( `确定删除类型「${type.name}」吗?该类型下存在子类型时无法删除。`, '删除确认', - { type: 'warning', confirmButtonText: '删除', cancelButtonText: '取消' } + { type: 'warning', confirmButtonText: '删除', cancelButtonText: '取消', buttonSize: 'small' } ) } catch { return @@ -713,7 +714,7 @@ async function handleDeleteSubType(row: InboxV2SubTypeItem) { await ElMessageBox.confirm( `确定删除子类型「${row.name}」吗?存在关键词/函数/取号/白名单/回复引用时无法删除。`, '删除确认', - { type: 'warning', confirmButtonText: '删除', cancelButtonText: '取消' } + { type: 'warning', confirmButtonText: '删除', cancelButtonText: '取消', buttonSize: 'small' } ) } catch { return diff --git a/src/views/message/components/DocSearchPicker.vue b/src/views/message/components/DocSearchPicker.vue index 3836a1c5..88fd0fa8 100644 --- a/src/views/message/components/DocSearchPicker.vue +++ b/src/views/message/components/DocSearchPicker.vue @@ -8,7 +8,7 @@ @clear="handleClear" > @@ -31,7 +31,7 @@ @keyup.enter="loadData(1)" > @@ -53,8 +53,8 @@ diff --git a/src/views/message/index.vue b/src/views/message/index.vue index 90f7be4e..3d07928a 100644 --- a/src/views/message/index.vue +++ b/src/views/message/index.vue @@ -474,7 +474,7 @@ async function handleBatchSetPendingFeedback() { await ElMessageBox.confirm( `确认将 ${selectedRows.value.length} 个工单设为"待反馈"状态?`, '批量设待反馈', - { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' } + { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning', buttonSize: 'small' } ) } catch { return // 用户取消 @@ -524,7 +524,7 @@ async function handleBatchStatus(status: 'completed' | 'closed', label: string, await ElMessageBox.confirm( `确认将 ${selectedRows.value.length} 个工单${label}?`, label, - { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' } + { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning', buttonSize: 'small' } ) } catch { return } diff --git a/src/views/order/orderManagement/component/TransferByOrdersDialog.vue b/src/views/order/orderManagement/component/TransferByOrdersDialog.vue new file mode 100644 index 00000000..c69ad787 --- /dev/null +++ b/src/views/order/orderManagement/component/TransferByOrdersDialog.vue @@ -0,0 +1,465 @@ + + + + + diff --git a/src/views/order/orderManagement/config/order-common-config.ts b/src/views/order/orderManagement/config/order-common-config.ts index 81e72791..b377a5c6 100644 --- a/src/views/order/orderManagement/config/order-common-config.ts +++ b/src/views/order/orderManagement/config/order-common-config.ts @@ -585,6 +585,15 @@ export const ORDER_TOOLBAR_BUTTONS: Record = { disabledKey: 'hasNoSelection', action: 'handleSubWaybillPrint' }, + /** 配送订单批量转退回拆包单(returnUnpack.transferByOrders):入参取勾选行 id(wms_order_delivery*.id) */ + transferToUnpack: { + key: 'transferToUnpack', + label: '转退回拆包', + size: 'small', + category: 'action', + disabledKey: 'hasNoSelection', + action: 'openTransferByOrdersDialog' + }, } @@ -1891,6 +1900,7 @@ export const deliveryOrderToolbarButtonKeys = [ 'batchPrint', 'allocateSubOrderNumber', 'subWaybillPrint', + 'transferToUnpack', ] export const deliveryOrderToolbarButtons = pickToolbarButtons(deliveryOrderToolbarButtonKeys) diff --git a/src/views/order/orderManagement/deliveryOrder.vue b/src/views/order/orderManagement/deliveryOrder.vue index d8df93b0..9091b13e 100644 --- a/src/views/order/orderManagement/deliveryOrder.vue +++ b/src/views/order/orderManagement/deliveryOrder.vue @@ -274,6 +274,13 @@ @submit="submitAllocateSubOrderNumber" /> + + + (null) @@ -705,6 +713,28 @@ function resetAllocateSubOrderNumberDialog() { toolbarActionMap.openAllocateSubOrderNumberDialog = openAllocateSubOrderNumberDialog +// 转退回拆包(returnUnpack.transferByOrders):入参取勾选配送订单的 id(wms_order_delivery*.id) +const transferByOrdersVisible = ref(false) +const transferByOrderRows = ref([]) + +function openTransferByOrdersDialog() { + const rows = selectionRows.value + if (!rows.length) { + ElMessage.warning('请先勾选需要转退回拆包的配送订单') + return + } + transferByOrderRows.value = rows.slice() + transferByOrdersVisible.value = true +} + +function handleTransferByOrdersSuccess() { + upperTable.value?.clearSelection?.() + selectionRows.value = [] + loadData() +} + +toolbarActionMap.openTransferByOrdersDialog = openTransferByOrdersDialog + function resolveButtonLoading(loadingKey?: string) { if (!loadingKey) return false return Boolean(buttonLoadingMap.value[loadingKey]) diff --git a/src/views/order/waveOrder/GroupWaveBatchListPanel.vue b/src/views/order/waveOrder/GroupWaveBatchListPanel.vue index c5e2e4a1..7c62d81d 100644 --- a/src/views/order/waveOrder/GroupWaveBatchListPanel.vue +++ b/src/views/order/waveOrder/GroupWaveBatchListPanel.vue @@ -735,6 +735,7 @@ :rules="waveStrategyFormRules" label-width="130px" class="wave-strategy-form-grid" + size="small" > diff --git a/src/views/order/waveOrder/WaveStrategyListPanel.vue b/src/views/order/waveOrder/WaveStrategyListPanel.vue index c44d3fb9..bb033735 100644 --- a/src/views/order/waveOrder/WaveStrategyListPanel.vue +++ b/src/views/order/waveOrder/WaveStrategyListPanel.vue @@ -196,6 +196,7 @@ :rules="waveStrategyActiveFormRules" label-width="130px" class="wave-strategy-form-grid" + size="small" > diff --git a/src/views/order/waveOrder/component/PendingOrderListPanel.vue b/src/views/order/waveOrder/component/PendingOrderListPanel.vue index dfc8a11a..2d527ad0 100644 --- a/src/views/order/waveOrder/component/PendingOrderListPanel.vue +++ b/src/views/order/waveOrder/component/PendingOrderListPanel.vue @@ -491,7 +491,7 @@ async function handleRemoveOrdersFromWave() { await ElMessageBox.confirm( `确定将选中的 ${ids.length} 条订单移出当前波次吗?`, '移出波次', - { type: 'warning', confirmButtonText: '确认移出', cancelButtonText: '取消' } + { type: 'warning', confirmButtonText: '确认移出', cancelButtonText: '取消', buttonSize: 'small' } ) } catch { return diff --git a/src/views/system/setting/account/index.vue b/src/views/system/setting/account/index.vue index 62a168c1..3c22b86b 100644 --- a/src/views/system/setting/account/index.vue +++ b/src/views/system/setting/account/index.vue @@ -99,7 +99,7 @@ - + @@ -246,8 +246,8 @@ @@ -291,7 +291,7 @@ @@ -552,7 +552,8 @@ const handleDelete = (row: any) => { ElMessageBox.confirm('确认停用该工号吗?', '提示', { confirmButtonText: '确定', cancelButtonText: '取消', - type: 'warning' + type: 'warning', + buttonSize: 'small' }).then(async () => { await accountdelete({ employee_id: row.employee_id }) ElMessage.success('已停用') @@ -564,7 +565,8 @@ const handleEnable = (row: any) => { ElMessageBox.confirm('确认启用该工号吗?', '提示', { confirmButtonText: '确定', cancelButtonText: '取消', - type: 'info' + type: 'info', + buttonSize: 'small' }).then(async () => { // 启用时保留原有角色组,ids 必传 await accountUpdate({ employee_id: row.employee_id, ids: row.role_ids || [] }) @@ -851,7 +853,8 @@ const handleUnbindWechat = (row: any) => { ElMessageBox.confirm(`确定要解除工号「${row.real_name}」的微信绑定吗?`, '提示', { confirmButtonText: '确定', cancelButtonText: '取消', - type: 'warning' + type: 'warning', + buttonSize: 'small' }).then(async () => { try { await unbindWechat({ user_id: row.account_id }) diff --git a/src/views/system/setting/basicManagement/newview/components/OperationCellRenderer.vue b/src/views/system/setting/basicManagement/newview/components/OperationCellRenderer.vue index d39ab3ea..33007092 100644 --- a/src/views/system/setting/basicManagement/newview/components/OperationCellRenderer.vue +++ b/src/views/system/setting/basicManagement/newview/components/OperationCellRenderer.vue @@ -96,7 +96,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/system/setting/basicManagement/newview/config/template-config.ts b/src/views/system/setting/basicManagement/newview/config/template-config.ts index b0c3c27f..e5fd10b3 100644 --- a/src/views/system/setting/basicManagement/newview/config/template-config.ts +++ b/src/views/system/setting/basicManagement/newview/config/template-config.ts @@ -1520,12 +1520,6 @@ export const tabPages: TabPageRawConfig[] = [ store_id: 'store_id', report_name: 'report_name' } - }, - { - key: 'viewDetail', - label: '查看详情', - actionType: 'action', - type: 'primary' } ] }, @@ -1536,7 +1530,7 @@ export const tabPages: TabPageRawConfig[] = [ label: '投递记录', scanBoxCacheKey: 'basic-settings-log', scanBoxFieldKeys: ['store_id', 'report_code', 'status'], - tableColumnKeys: ['id', 'store_id', 'report_code', 'biz_date', 'time_point', 'status', 'channel', 'retry_count', 'file_url', 'error_message', 'delivered_at', 'created_at', 'operation'], + tableColumnKeys: ['id', 'store_id', 'report_code', 'biz_date', 'time_point', 'status', 'channel', 'retry_count', 'file_url', 'error_message', 'delivered_at', 'created_at'], upperTableDefaults: { title: '报表投递记录', showSelection: false @@ -1574,15 +1568,7 @@ export const tabPages: TabPageRawConfig[] = [ ...(sort?.prop ? { sort: { sortField: sort.prop, sortOrder: sort.order === 'ascending' ? 'ASC' : 'DESC' } } : {}) } } - }, - operationButtons: [ - { - key: 'viewDetail', - label: '查看详情', - actionType: 'action', - type: 'primary' - } - ] + } }, // ===== 标签页五:报表定义(wms_report_definition 管理,report.definition.*) ===== diff --git a/src/views/system/setting/basicManagement/newview/index.vue b/src/views/system/setting/basicManagement/newview/index.vue index b9e55fd3..506bce8b 100644 --- a/src/views/system/setting/basicManagement/newview/index.vue +++ b/src/views/system/setting/basicManagement/newview/index.vue @@ -608,7 +608,8 @@ async function handleRegenerateSecret(row: Record) { const newSecret = res.self_app_secret || '' ElMessageBox.alert(`新 AppSecret:${newSecret}`, '密钥已重置 — 请妥善保存', { confirmButtonText: '我已保存', - type: 'warning' + type: 'warning', + buttonSize: 'small' }) loadData() } else { diff --git a/src/views/system/setting/basicManagement/newview/pages/ApiAppFormDialog.vue b/src/views/system/setting/basicManagement/newview/pages/ApiAppFormDialog.vue index dbce9f94..ba5e1c34 100644 --- a/src/views/system/setting/basicManagement/newview/pages/ApiAppFormDialog.vue +++ b/src/views/system/setting/basicManagement/newview/pages/ApiAppFormDialog.vue @@ -23,6 +23,7 @@ :rules="formRules" label-width="120px" label-position="right" + size="small" > diff --git a/src/views/system/setting/basicManagement/newview/pages/DefinitionFormDialog.vue b/src/views/system/setting/basicManagement/newview/pages/DefinitionFormDialog.vue index 12e9afaf..917f2995 100644 --- a/src/views/system/setting/basicManagement/newview/pages/DefinitionFormDialog.vue +++ b/src/views/system/setting/basicManagement/newview/pages/DefinitionFormDialog.vue @@ -42,7 +42,7 @@ />
报表类型一经创建不可更改
-
{{ currentTypeInfo.description }}
+
@@ -51,9 +51,9 @@ placeholder="导出文件名模板,支持 {date}/{time}/{datetime}/{timestamp} 占位(≤200 字符)" maxlength="200" /> -
+ diff --git a/src/views/system/setting/basicManagement/newview/pages/FrontConfigForm.vue b/src/views/system/setting/basicManagement/newview/pages/FrontConfigForm.vue index eab89a48..7dced411 100644 --- a/src/views/system/setting/basicManagement/newview/pages/FrontConfigForm.vue +++ b/src/views/system/setting/basicManagement/newview/pages/FrontConfigForm.vue @@ -17,7 +17,7 @@ 按仓库自持域名部署并品牌化前端(域名设置 / HTTPS 证书 / 品牌配置)
- 刷新 + 刷新
@@ -75,7 +75,7 @@

品牌配置

站点标题、Logo、favicon、登录页背景图与主题变量;图片可直接上传自动填入 URL,也可手填;留空即清空

- + @@ -145,7 +145,7 @@
@@ -179,7 +179,7 @@ :closable="false" class="front-config-alert" /> - +