From 4008a28796c9873585a234862b6781b873cd3362 Mon Sep 17 00:00:00 2001 From: yin <3313488199@qq.com> Date: Mon, 16 Nov 2026 18:05:41 +0800 Subject: [PATCH] =?UTF-8?q?feat(order):=20=E6=96=B0=E5=A2=9E=E5=BE=85?= =?UTF-8?q?=E5=A4=84=E7=90=86=20B2B=20=E8=AE=A2=E5=8D=95=E6=89=B9=E9=87=8F?= =?UTF-8?q?=E5=8F=96=E6=B6=88=EF=BC=8C=E5=AE=8C=E5=96=84=E6=94=B6=E8=B4=A7?= =?UTF-8?q?/=E7=9B=98=E7=82=B9=E7=AD=9B=E9=80=89=E4=B8=8E=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增 order.cancelB2b 接口与 CancelB2bForm 弹窗(convertToB2b 的反向操作), 待处理订单工具栏接入:展示已选标签、去重后可提交数量与上限,支持逐个移除, 提交后展示成功/跳过原因/未找到订单明细,并提示不支持取消的情形 - 待处理、归档等列表接口文档补充「默认排除 B2B 订单」,如需查询 B2B 改用 order.pendingOrder2b.list / order.deliveryOrder2b.list - 收货列表新增「隐藏无可用量」(filterDepleted)与「按入库单筛选」 (entry_order_id 弹窗选择),移除已废弃的 getAvailableInboundQuantity 接口 - 收货库存明细面板改用 entry / inventory 接口,展示入库单号、库区、库位、 数量、批次、生产/过期日期与库存类型;详情表单按来货方式动态隐藏物流单号 - 盘点明细新增「删除明细」(仅未开始作业的明细行可删),导出明细支持选择 「按库位明细」或「明细汇总」模式(商品类任务生效) - 新增 truncateLongMessage 截断工具,响应拦截与移库失败提示对超长 message 只保留前 3 段并提示总数,完整信息仍输出到控制台 --- .../order.archiveorder/orderarchiveorder.ts | 2 + .../orderdeliveryexpectionorder.ts | 2 + .../order.deliveryorder/orderdeliveryOrder.ts | 2 + .../order.entrustorder/orderentrustorder.ts | 2 + .../orderexpectionorder.ts | 2 + src/api/order.index/orderindex.ts | 4 +- .../order.outboundorder/orderoutboundOrder.ts | 2 + .../order.pendingorder/orderpendingOrder.ts | 52 ++ src/api/order.revieworder/orderreviewOrder.ts | 2 + src/api/order.wave/orderwave.ts | 2 + src/api/storage.receiving/receiving.ts | 50 -- src/utils/request.ts | 5 +- src/utils/truncateMessage.ts | 46 ++ .../config/order-common-config.ts | 10 + .../orderManagement/form/CancelB2bForm.vue | 638 ++++++++++++++++++ .../order/orderManagement/pendingOrder.vue | 48 +- .../inventory/component/panelstockdetail.vue | 5 +- .../receiving/component/DetailsPanel.vue | 13 +- .../storage/receiving/component/Storage.vue | 144 +++- src/views/storage/receiving/index.vue | 360 +++++++++- .../storage/receiving/receiving-config.ts | 13 + .../config/components/CheckItemsPanel.vue | 68 +- src/views/storage/stockcheck/index.vue | 103 ++- 23 files changed, 1472 insertions(+), 103 deletions(-) create mode 100644 src/utils/truncateMessage.ts create mode 100644 src/views/order/orderManagement/form/CancelB2bForm.vue diff --git a/src/api/order.archiveorder/orderarchiveorder.ts b/src/api/order.archiveorder/orderarchiveorder.ts index c13277cb..3fda678b 100644 --- a/src/api/order.archiveorder/orderarchiveorder.ts +++ b/src/api/order.archiveorder/orderarchiveorder.ts @@ -24,6 +24,8 @@ export type ArchiveOrderListParams = { * {"create_channel":"MANUAL"} 单值精确;{"create_channel":["QM","API"]} 裸数组按 in 多选; * {"create_channel":{"operator":"in","value":["QM","API"]}} 标准结构多选;{"create_channel":{"operator":"ne","value":"MANUAL"}} 排除指定渠道。 * 注意:列表响应中的 create_channel 已格式化为中文标签,查询条件须传英文枚举值。 + * 默认排除 B2B 订单(is_b2b='Y',NULL 存量行视为非 B2B)——服务端固定条件,前端无法通过 where 覆盖; + * 需要查询 B2B 订单请使用 order.pendingOrder2b.list / order.deliveryOrder2b.list。 */ where?: OrderWhere sort?: OrderSort diff --git a/src/api/order.deliveryexpectionorder/orderdeliveryexpectionorder.ts b/src/api/order.deliveryexpectionorder/orderdeliveryexpectionorder.ts index 670fc7b7..467c3be1 100644 --- a/src/api/order.deliveryexpectionorder/orderdeliveryexpectionorder.ts +++ b/src/api/order.deliveryexpectionorder/orderdeliveryexpectionorder.ts @@ -24,6 +24,8 @@ export type DeliveryExpectionOrderListParams = { * {"create_channel":"MANUAL"} 单值精确;{"create_channel":["QM","API"]} 裸数组按 in 多选; * {"create_channel":{"operator":"in","value":["QM","API"]}} 标准结构多选;{"create_channel":{"operator":"ne","value":"MANUAL"}} 排除指定渠道。 * 注意:列表响应中的 create_channel 已格式化为中文标签,查询条件须传英文枚举值。 + * 默认排除 B2B 订单(is_b2b='Y',NULL 存量行视为非 B2B)——服务端固定条件,前端无法通过 where 覆盖; + * 需要查询 B2B 订单请使用 order.pendingOrder2b.list / order.deliveryOrder2b.list。 */ where?: OrderWhere sort?: OrderSort diff --git a/src/api/order.deliveryorder/orderdeliveryOrder.ts b/src/api/order.deliveryorder/orderdeliveryOrder.ts index 8cbaea83..70eefaa0 100644 --- a/src/api/order.deliveryorder/orderdeliveryOrder.ts +++ b/src/api/order.deliveryorder/orderdeliveryOrder.ts @@ -24,6 +24,8 @@ export type DeliveryOrderListParams = { * {"create_channel":"MANUAL"} 单值精确;{"create_channel":["QM","API"]} 裸数组按 in 多选; * {"create_channel":{"operator":"in","value":["QM","API"]}} 标准结构多选;{"create_channel":{"operator":"ne","value":"MANUAL"}} 排除指定渠道。 * 注意:列表响应中的 create_channel 已格式化为中文标签,查询条件须传英文枚举值。 + * 默认排除 B2B 订单(is_b2b='Y',NULL 存量行视为非 B2B)——服务端固定条件,前端无法通过 where 覆盖; + * 需要查询 B2B 订单请使用 order.pendingOrder2b.list / order.deliveryOrder2b.list。 */ where?: OrderWhere sort?: OrderSort diff --git a/src/api/order.entrustorder/orderentrustorder.ts b/src/api/order.entrustorder/orderentrustorder.ts index 3d00c1a1..b0835b65 100644 --- a/src/api/order.entrustorder/orderentrustorder.ts +++ b/src/api/order.entrustorder/orderentrustorder.ts @@ -24,6 +24,8 @@ export type EntrustOrderListParams = { * {"create_channel":"MANUAL"} 单值精确;{"create_channel":["QM","API"]} 裸数组按 in 多选; * {"create_channel":{"operator":"in","value":["QM","API"]}} 标准结构多选;{"create_channel":{"operator":"ne","value":"MANUAL"}} 排除指定渠道。 * 注意:列表响应中的 create_channel 已格式化为中文标签,查询条件须传英文枚举值。 + * 默认排除 B2B 订单(is_b2b='Y',NULL 存量行视为非 B2B)——服务端固定条件,前端无法通过 where 覆盖; + * 需要查询 B2B 订单请使用 order.pendingOrder2b.list / order.deliveryOrder2b.list。 */ where?: OrderWhere sort?: OrderSort diff --git a/src/api/order.expectionorder/orderexpectionorder.ts b/src/api/order.expectionorder/orderexpectionorder.ts index 47c57d07..2699be54 100644 --- a/src/api/order.expectionorder/orderexpectionorder.ts +++ b/src/api/order.expectionorder/orderexpectionorder.ts @@ -24,6 +24,8 @@ export type ExpectionOrderListParams = { * {"create_channel":"MANUAL"} 单值精确;{"create_channel":["QM","API"]} 裸数组按 in 多选; * {"create_channel":{"operator":"in","value":["QM","API"]}} 标准结构多选;{"create_channel":{"operator":"ne","value":"MANUAL"}} 排除指定渠道。 * 注意:列表响应中的 create_channel 已格式化为中文标签,查询条件须传英文枚举值。 + * 默认排除 B2B 订单(is_b2b='Y',NULL 存量行视为非 B2B)——服务端固定条件,前端无法通过 where 覆盖; + * 需要查询 B2B 订单请使用 order.pendingOrder2b.list / order.deliveryOrder2b.list。 */ where?: OrderWhere sort?: OrderSort diff --git a/src/api/order.index/orderindex.ts b/src/api/order.index/orderindex.ts index fcf11d34..83858f4c 100644 --- a/src/api/order.index/orderindex.ts +++ b/src/api/order.index/orderindex.ts @@ -26,7 +26,9 @@ export type OrderListParams = { * {"is_sn_order":"Y"} 仅含 SN 商品订单;{"is_sn_order":"N"} 仅无 SN 商品订单。 * 响应行同时返回 has_sn_item(原始列)与 is_sn_order(归一化),前端筛选/展示统一用 is_sn_order。 * - sn_code / snCode / sn_codes / snCodes 按 SN 码反查订单(先查 wms_order_item_sn 拿 order_id 再回填,订单表结构不变): - * 值支持单个字符串、逗号/空格/分号分隔多个码、字符串数组或 { value } 结构,按完整 SN 码精确匹配。 */ + * 值支持单个字符串、逗号/空格/分号分隔多个码、字符串数组或 { value } 结构,按完整 SN 码精确匹配。 + * - 默认排除 B2B 订单(is_b2b='Y',NULL 存量行视为非 B2B)——服务端固定条件,前端无法通过 where 覆盖; + * 需要查询 B2B 订单请使用 order.pendingOrder2b.list / order.deliveryOrder2b.list。 */ where?: Record sort?: { sortField?: string diff --git a/src/api/order.outboundorder/orderoutboundOrder.ts b/src/api/order.outboundorder/orderoutboundOrder.ts index 3733e284..9bb51220 100644 --- a/src/api/order.outboundorder/orderoutboundOrder.ts +++ b/src/api/order.outboundorder/orderoutboundOrder.ts @@ -24,6 +24,8 @@ export type OutboundOrderListParams = { * {"create_channel":"MANUAL"} 单值精确;{"create_channel":["QM","API"]} 裸数组按 in 多选; * {"create_channel":{"operator":"in","value":["QM","API"]}} 标准结构多选;{"create_channel":{"operator":"ne","value":"MANUAL"}} 排除指定渠道。 * 注意:列表响应中的 create_channel 已格式化为中文标签,查询条件须传英文枚举值。 + * 默认排除 B2B 订单(is_b2b='Y',NULL 存量行视为非 B2B)——服务端固定条件,前端无法通过 where 覆盖; + * 需要查询 B2B 订单请使用 order.pendingOrder2b.list / order.deliveryOrder2b.list。 */ where?: OrderWhere sort?: OrderSort diff --git a/src/api/order.pendingorder/orderpendingOrder.ts b/src/api/order.pendingorder/orderpendingOrder.ts index b4d04fe2..d299a129 100644 --- a/src/api/order.pendingorder/orderpendingOrder.ts +++ b/src/api/order.pendingorder/orderpendingOrder.ts @@ -53,6 +53,8 @@ export type PendingOrderListParams = { * 例 {"claim_status":{"operator":"ne","value":"fin"}} 查未完成领料的订单。 * is_sn_order 是否含 SN(序列号)商品筛选(按 has_sn_item 归一化):{"is_sn_order":"Y"} 仅 SN 订单、"N" 仅非 SN 订单。 * sn_code / snCode / sn_codes / snCodes 按 SN 码反查订单(先查 wms_order_item_sn 回填,支持单值/分隔字符串/数组,完整码精确匹配)。 + * 默认排除 B2B 订单(is_b2b='Y',NULL 存量行视为非 B2B)——服务端固定条件,前端无法通过 where 覆盖; + * 需要查询 B2B 订单请使用 order.pendingOrder2b.list / order.deliveryOrder2b.list。 */ where?: OrderWhere; sort?: OrderSort; @@ -408,6 +410,54 @@ export function orderPendingOrderConvertToB2b( } as any); } +/** + * order.cancelB2b:取消 B2B,把 B2B 订单流转回正常订单(order.convertToB2b 的反向操作) + * - 仅查当前仓库 current 分表(wms_order_delivery_{warehouseId}),仓库取自登录上下文,禁止前端传入 + * - 准入:is_b2b=Y、step != 0(非待审核)、未锁定、未拦截;打印状态不限制(已打印同样可取消) + * - 事务内 is_b2b 置回 'N',并按 warehouse_id + order_id 物理删除 wms_order_b2b 作业明细(不保留历史) + * - 入参同 convertToB2b:ids / order_ids / orderIds / id / order_id / orderId 均可,单次上限 200; + * 不符合条件的订单只跳过、不报错,原因见 skipped_reasons + * - ⚠️ 文档归属模块为 order.index(folder order.index),此处与 convertToB2b 成对维护 + */ +export type PendingOrderCancelB2bParams = PendingOrderConvertToB2bParams; + +/** order.cancelB2b 跳过原因项 */ +export type PendingOrderCancelB2bSkippedReason = { + order_id: number; + delivery_order_code?: string; + /** 订单待审核,不允许取消B2B / 订单不是B2B订单 / 订单已锁定,不允许取消B2B / 订单已拦截,不允许取消B2B */ + reason: string; +}; + +/** order.cancelB2b 响应 */ +export type PendingOrderCancelB2bResponse = { + /** 取消成功的订单 ID(已去重) */ + canceled_order_ids: number[]; + canceled_count: number; + /** 命中但不满足取消条件被跳过的订单 ID */ + skipped_order_ids: number[]; + skipped_count: number; + skipped_reasons: PendingOrderCancelB2bSkippedReason[]; + /** 当前仓库 current 分表中查不到的订单 ID(已进配送/历史/外仓表,或不属于本仓) */ + not_found_order_ids: number[]; +}; + +export function orderPendingOrderCancelB2b( + data: PendingOrderCancelB2bParams, +): Promise { + return request({ + url: "/system", + method: "post", + params: { + method: "order.cancelB2b", + v, + timestamp: Date.now(), + }, + data, + isSystemApi: true, + } as any); +} + export function orderPendingOrderReverseReviewOrder( data: PendingOrderReverseReviewParams, ): Promise { @@ -886,6 +936,7 @@ export function orderPendingOrderUpdateRemark( export type OrderPendingOrderApi = { list: typeof orderPendingOrderList; convertToB2b: typeof orderPendingOrderConvertToB2b; + cancelB2b: typeof orderPendingOrderCancelB2b; detail: typeof orderPendingOrderDetail; reverseReviewOrder: typeof orderPendingOrderReverseReviewOrder; markPendingOutboundOrder: typeof orderPendingOrderMarkPendingOutboundOrder; @@ -923,6 +974,7 @@ export type OrderPendingOrderApi = { export const orderPendingOrder: OrderPendingOrderApi = { list: orderPendingOrderList, convertToB2b: orderPendingOrderConvertToB2b, + cancelB2b: orderPendingOrderCancelB2b, detail: orderPendingOrderDetail, reverseReviewOrder: orderPendingOrderReverseReviewOrder, markPendingOutboundOrder: orderPendingOrderMarkPendingOutboundOrder, diff --git a/src/api/order.revieworder/orderreviewOrder.ts b/src/api/order.revieworder/orderreviewOrder.ts index 05067cba..c400b33d 100644 --- a/src/api/order.revieworder/orderreviewOrder.ts +++ b/src/api/order.revieworder/orderreviewOrder.ts @@ -26,6 +26,8 @@ export type ReviewOrderListParams = { * 注意:列表响应中的 create_channel 已格式化为中文标签,查询条件须传英文枚举值。 * is_sn_order 是否含 SN(序列号)商品筛选(按 has_sn_item 归一化):{"is_sn_order":"Y"} 仅 SN 订单、"N" 仅非 SN 订单。 * sn_code / snCode / sn_codes / snCodes 按 SN 码反查订单(先查 wms_order_item_sn 回填,支持单值/分隔字符串/数组,完整码精确匹配)。 + * 默认排除 B2B 订单(is_b2b='Y',NULL 存量行视为非 B2B)——服务端固定条件,前端无法通过 where 覆盖; + * 需要查询 B2B 订单请使用 order.pendingOrder2b.list / order.deliveryOrder2b.list。 */ where?: OrderWhere sort?: OrderSort diff --git a/src/api/order.wave/orderwave.ts b/src/api/order.wave/orderwave.ts index 84609e62..65819def 100644 --- a/src/api/order.wave/orderwave.ts +++ b/src/api/order.wave/orderwave.ts @@ -554,6 +554,8 @@ export type WaveStrategyFallbackOrderListParams = { * 筛选白名单字段。 * 仅支持上述 where 类型中声明的字段,禁止传入 warehouse_id / warehouseId。 * 若传入未列出的字段或禁止字段,接口返回 400。 + * 默认排除 B2B 订单(is_b2b='Y',NULL 存量行视为非 B2B)——服务端固定条件,前端无法通过 where 覆盖; + * 需要查询 B2B 订单请使用 order.pendingOrder2b.list / order.deliveryOrder2b.list。 */ where?: WaveStrategyFallbackOrderListWhere } diff --git a/src/api/storage.receiving/receiving.ts b/src/api/storage.receiving/receiving.ts index a82227e4..2d2a0da2 100644 --- a/src/api/storage.receiving/receiving.ts +++ b/src/api/storage.receiving/receiving.ts @@ -2,56 +2,6 @@ import request from '@/utils/request' const v = '1.0' -export type GetAvailableInboundQuantityParams = { - stock_id: number -} - -export type AvailableInboundQuantityItem = { - detail_id?: number - receiving_id?: number - receiving_number?: string - product_name?: string - actual_quantity?: number - stored_quantity?: number - pending_allocated_quantity?: number - available_quantity?: number - storage_status?: string - batch_number?: string - production_date?: string - expiry_date?: string - space_id?: number - receiving_status?: string - [key: string]: unknown -} - -export type GetAvailableInboundQuantityResponse = { - code?: number - message?: string - list?: AvailableInboundQuantityItem[] - total?: number - data?: { - list?: AvailableInboundQuantityItem[] - total?: number - } -} - -/** 按 stock_id 查询可入库数量 */ -export function getAvailableInboundQuantity( - data: GetAvailableInboundQuantityParams -): Promise { - return request({ - url: '/system', - method: 'post', - params: { - method: 'storage.receiving.getAvailableInboundQuantity', - v, - timestamp: new Date().getTime() - }, - data, - isSystemApi: true - } as any) -} - /** storage.receiving.export 查询参数(货主维度收货单导出) */ export type ReceivingExportParams = { where?: Record diff --git a/src/utils/request.ts b/src/utils/request.ts index d1b42f64..e0bdee4b 100644 --- a/src/utils/request.ts +++ b/src/utils/request.ts @@ -5,6 +5,7 @@ import { } from '@/utils/auth' import router from '@/router' import { useUserStore } from '@/stores/modules/user' +import { truncateLongMessage } from '@/utils/truncateMessage' /** 全局默认超时时间(毫秒) */ const DEFAULT_TIMEOUT_MS = 10000 @@ -204,7 +205,9 @@ service.interceptors.response.use( return Promise.reject(createBusinessError(errorMessage, !silentError)) } - if (!silentError) ElMessage.error(errorMessage) + // 展示时截断超长文案(如静态盘点锁定会把上百个盘点单号拼进 message); + // 抛出的 Error 仍保留完整 message,便于 console 排查 + if (!silentError) ElMessage.error(truncateLongMessage(errorMessage)) return Promise.reject(createBusinessError(errorMessage, !silentError)) } else { // 请求成功,返回数据 diff --git a/src/utils/truncateMessage.ts b/src/utils/truncateMessage.ts new file mode 100644 index 00000000..7b62b22a --- /dev/null +++ b/src/utils/truncateMessage.ts @@ -0,0 +1,46 @@ +/** + * 后端报错文案截断 + * + * 适用场景:后端把「枚举清单」直接拼进 message,例如静态盘点锁定: + * 商品正在静态盘点中,禁止移库:011000001536(101380) 盘点单 PD...001/PD...002/…/PD...127 + * 这类文案可能上百条,直接 ElMessage 会弹一屏、且把按钮挤掉。 + * + * 规则: + * 1. 斜杠枚举列表超过 maxItems 项时,只保留前 maxItems 项 + 「等 N 项 / 等 N 张盘点单」 + * 2. 仍然超长时按 maxLength 硬截断并补省略号 + * 3. 非字符串 / 空值原样兜底(返回 fallback 或空串) + */ +export type TruncateMessageOptions = { + /** 枚举列表最多保留几项,默认 3 */ + maxItems?: number + /** 最终文案最大字符数,默认 120 */ + maxLength?: number + /** 分隔符,默认 '/' */ + separator?: string +} + +export function truncateLongMessage( + message: unknown, + options: TruncateMessageOptions = {} +): string { + const { maxItems = 3, maxLength = 120, separator = '/' } = options + const text = message === null || message === undefined ? '' : String(message).trim() + if (!text) return '' + + let output = text + + const segments = text.split(separator) + if (segments.length > maxItems + 1) { + const kept = segments.slice(0, maxItems).join(separator) + const total = segments.length + // 盘点单号清单这类文案给出更明确的单位 + const unit = text.includes('盘点单') ? '张盘点单' : '项' + output = `${kept} 等 ${total} ${unit}` + } + + if (output.length > maxLength) { + output = `${output.slice(0, maxLength)}…` + } + + return output +} diff --git a/src/views/order/orderManagement/config/order-common-config.ts b/src/views/order/orderManagement/config/order-common-config.ts index 9146ae83..86323c35 100644 --- a/src/views/order/orderManagement/config/order-common-config.ts +++ b/src/views/order/orderManagement/config/order-common-config.ts @@ -565,6 +565,15 @@ export const ORDER_TOOLBAR_BUTTONS: Record = { disabledKey: 'hasNoSelection', action: 'openConvertToB2bDialog' }, + /** 待处理B2B订单批量取消 B2B(order.cancelB2b):convertToB2b 的反向操作,同样展示逐单跳过原因 */ + cancelB2b: { + key: 'cancelB2b', + label: '取消B2B', + size: 'small', + category: 'cancel', + disabledKey: 'hasNoSelection', + action: 'openCancelB2bDialog' + }, batchLock: { key: 'batchLock', label: '批量锁定', size: 'small', category: 'action', loadingKey: 'batchAsyncTaskLoading', disabledKey: 'hasNoSelection', action: 'handleBatchLock' }, batchUnlock: { key: 'batchUnlock', label: '批量解锁', size: 'small', category: 'action', loadingKey: 'batchAsyncTaskLoading', disabledKey: 'hasNoSelection', action: 'handleBatchUnlock' }, batchPrint: { key: 'batchPrint', label: '批量打印', size: 'small', category: 'action', loadingKey: 'batchPrintLoading', disabledKey: 'hasNoSelection', action: 'handleBatchPrint' }, @@ -2445,6 +2454,7 @@ export const pendingToolbarButtonKeys = [ 'batchUnintercept', 'confirmIntercept', 'convertToB2b', + 'cancelB2b', 'batchLock', 'batchUnlock', 'batchPrint', diff --git a/src/views/order/orderManagement/form/CancelB2bForm.vue b/src/views/order/orderManagement/form/CancelB2bForm.vue new file mode 100644 index 00000000..b6470b22 --- /dev/null +++ b/src/views/order/orderManagement/form/CancelB2bForm.vue @@ -0,0 +1,638 @@ + + + + + + + diff --git a/src/views/order/orderManagement/pendingOrder.vue b/src/views/order/orderManagement/pendingOrder.vue index 887f3f32..54b5929e 100644 --- a/src/views/order/orderManagement/pendingOrder.vue +++ b/src/views/order/orderManagement/pendingOrder.vue @@ -408,6 +408,15 @@ @success="handleConvertToB2bSuccess" /> + + + import('@/views/order/waveOrder/component/WavePlatformPrintPreviewDialog.vue')) const ConvertToB2bForm = defineAsyncComponent(() => import('./form/ConvertToB2bForm.vue')) +const CancelB2bForm = defineAsyncComponent(() => import('./form/CancelB2bForm.vue')) const scanBox = ref(null) const upperTable = ref(null) @@ -584,9 +594,11 @@ const selectedOrderIds = computed(() => getSelectedIds()) const selectedOrderId = ref(null) const detailVisible = ref(true) -const toolbarButtons = computed(() => - props.b2b ? pendingToolbarButtons.filter((button) => button.key !== 'convertToB2b') : pendingToolbarButtons -) +const toolbarButtons = computed(() => { + // 两个 B2B 方向互斥:待处理页只能「转B2B」,B2B 页只能「取消B2B」 + const hiddenKey = props.b2b ? 'convertToB2b' : 'cancelB2b' + return pendingToolbarButtons.filter((button) => button.key !== hiddenKey) +}) const initialConditions = computed(() => { const waveNo = String(route.query.wave_no || '').trim() if (!waveNo) return undefined @@ -904,6 +916,35 @@ function removeConvertToB2bRow(value: string | number) { if (row) upperTable.value?.toggleRowSelection?.(row, false) } +// 批量取消 B2B(order.cancelB2b):仅「待处理B2B订单」页签可用 +const cancelB2bDialogVisible = ref(false) +const cancelB2bRows = ref([]) + +function openCancelB2bDialog() { + if (!selectionRows.value.length) { + ElMessage.warning('请先勾选需要取消 B2B 的订单') + return + } + cancelB2bRows.value = selectionRows.value.slice() + cancelB2bDialogVisible.value = true +} + +function handleCancelB2bSuccess() { + upperTable.value?.clearSelection?.() + selectionRows.value = [] + hasSelection.value = false + loadData() +} + +/** 取消 B2B 弹窗移除某个已选订单:同步快照行并取消列表勾选 */ +function removeCancelB2bRow(value: string | number) { + const target = String(value) + const index = cancelB2bRows.value.findIndex((row: any) => String(row?.id) === target) + if (index > -1) cancelB2bRows.value.splice(index, 1) + const row = selectionRows.value.find((item: any) => String(item?.id) === target) + if (row) upperTable.value?.toggleRowSelection?.(row, false) +} + async function submitResolveException() { if (resolveExceptionLoading.value) return const ids = [...resolveExceptionOrderIds.value] @@ -1131,6 +1172,7 @@ function removeQuickRecheckOrder(value: string | number) { toolbarActionMap['openResolveExceptionDialog'] = openResolveExceptionDialog toolbarActionMap['openConvertToB2bDialog'] = openConvertToB2bDialog +toolbarActionMap['openCancelB2bDialog'] = openCancelB2bDialog toolbarActionMap['handleBatchPrint'] = handleBatchPrint toolbarActionMap['handleSubWaybillPrint'] = handleSubWaybillPrint toolbarActionMap['handleConfirmInterceptBatch'] = handleConfirmInterceptBatch diff --git a/src/views/storage/inventory/component/panelstockdetail.vue b/src/views/storage/inventory/component/panelstockdetail.vue index 57deac83..acace442 100644 --- a/src/views/storage/inventory/component/panelstockdetail.vue +++ b/src/views/storage/inventory/component/panelstockdetail.vue @@ -363,6 +363,7 @@ import * as warehouseApi from '@/api/warehouse/warehouse' import * as indexApi from '@/api/index/index' import { ElMessage } from 'element-plus' import UpperTable from '@/components/UpperTable/index.vue' +import { truncateLongMessage } from '@/utils/truncateMessage' import { formatInventorySpaceLabel } from '../inventory-config' type TransferMode = 'location' | 'product' @@ -801,8 +802,10 @@ async function confirmTransfer() { // ignore } } catch (e: any) { + // 完整报错留在控制台(静态盘点锁定会把上百个盘点单号拼进 message) console.error('移库失败', e) - ElMessage.error(e?.message || '移库失败') + // 拦截器已弹过提示(notified=true)则不重复弹,避免长文案弹两次 + if (!e?.notified) ElMessage.error(truncateLongMessage(e?.message) || '移库失败') } finally { transferLoading.value = false } diff --git a/src/views/storage/receiving/component/DetailsPanel.vue b/src/views/storage/receiving/component/DetailsPanel.vue index 68defcd3..24309c0b 100644 --- a/src/views/storage/receiving/component/DetailsPanel.vue +++ b/src/views/storage/receiving/component/DetailsPanel.vue @@ -4,7 +4,7 @@
-