From 33e0b4c459720252d1153fdc805bff0eeec2aebf Mon Sep 17 00:00:00 2001 From: yin <3313488199@qq.com> Date: Fri, 13 Nov 2026 18:01:33 +0800 Subject: [PATCH] =?UTF-8?q?feat(order):=20=E6=94=AF=E6=8C=81=20SN=20?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=AD=9B=E9=80=89=E4=B8=8E=E5=A4=8D=E6=A0=B8?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=EF=BC=8C=E4=BC=98=E5=8C=96=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=8A=A0=E8=BD=BD=E4=B8=8E=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E4=BA=A4=E4=BA=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - recheckOrder.confirmRecheck 支持 sn_map(key=stock_id,value=SN 码数组), 返回 has_sn_item / sn_count / sn_item_count;复核单列表新增「含SN」列 - 订单列表、待处理、复核筛选新增 is_sn_order(由 has_sn_item 归一化), ScanBox 增加「含SN商品」字段;导出新增 SN码数量 / SN码 / SN码汇总 三列, 并扩展 order-common-config 的列类型(formatter / copyAction / copyValue / 折叠) - 波次策略类型支持 3=SN 并允许数组多选,接口补充 excluded_sn_order_ids - 新增 order-detail-cache:按请求函数隔离的 15s TTL 缓存、并发合并、 fingerprint 失效与手动刷新绕过,切换 tab / 来回点行不再重复请求; 订单明细、待处理详情面板增加单元格格式化缓存并处理 copyAction 列 - 商品选择、组合商品选择、拆包库存选择新增「按货主过滤」开关 (默认开启,未指定货主时禁用),切换后保留已选状态 - 新建待处理订单预览行支持内联编辑来源单号、镇、邮编、单据类型、加急、 是否开票等字段,并跟踪行改动;出库单单据类型/来源类型改为中文映射, 出入库日志补充单据类型字典 - ToolbarButtonGroup 的 ResizeObserver 增加 80ms 防抖,useVerticalSplitPane 拖动改为 rAF 节流,减少拖拽分栏时的重复重排 --- .../order.deliveryorder/orderdeliveryOrder.ts | 4 + src/api/order.index/orderindex.ts | 17 +- .../order.pendingorder/orderpendingOrder.ts | 1 + src/api/order.recheckorder/recheckOrder.ts | 50 ++- src/api/order.revieworder/orderreviewOrder.ts | 1 + src/api/order.wave/orderwave.ts | 13 +- src/components/ToolbarButtonGroup/index.vue | 12 +- src/composables/useVerticalSplitPane.ts | 19 ++ src/utils/storeScanOptions.ts | 12 + .../components/StockPickerDialog.vue | 60 +++- src/views/express/returnUnpackwork/index.vue | 11 + .../order/orderManagement/archiveOrder.vue | 16 +- .../component/OrderItemsDetailPanel.vue | 73 +++-- .../component/PendingOrderDetailPanel.vue | 81 +++-- .../config/order-common-config.ts | 191 ++++++++++-- .../orderManagement/deliveryException.vue | 14 +- .../order/orderManagement/deliveryOrder.vue | 24 +- .../orderManagement/entrustWarehouse.vue | 14 +- .../order/orderManagement/exceptionOrder.vue | 54 ++-- src/views/order/orderManagement/index.vue | 14 +- .../order/orderManagement/outboundOrder.vue | 18 +- .../order/orderManagement/reviewOrder.vue | 17 +- .../utils/order-detail-cache.ts | 116 +++++++ .../orderWeighing/ExpressWeighingForm.vue | 16 +- .../form/RecheckOrderSingleListForm.vue | 3 + .../shared/component/SelectProductDialog.vue | 65 +++- .../CreatePendingOrderDialog.vue | 289 +++++++++++++++++- .../waveOrder/FallbackOrderListPanel.vue | 4 + .../waveOrder/GroupWaveBatchListPanel.vue | 4 + .../order/waveOrder/WaveStrategyListPanel.vue | 62 +++- .../component/PendingOrderListPanel.vue | 18 ++ .../order/waveOrder/config/wave-config.ts | 15 +- .../component/ComboGoodsFormDialog.vue | 19 +- .../component/ComboStockPickerDialog.vue | 90 +++++- src/views/stock/utils/stockPickerHelpers.ts | 2 + src/views/storage/log/log-config.ts | 56 +++- .../storage/receiving/component/Product.vue | 35 ++- src/views/storage/stockout/index.vue | 8 + src/views/storage/stockout/stockout-config.ts | 53 +++- src/views/store/stores/index.vue | 11 +- 40 files changed, 1340 insertions(+), 242 deletions(-) create mode 100644 src/views/order/orderManagement/utils/order-detail-cache.ts diff --git a/src/api/order.deliveryorder/orderdeliveryOrder.ts b/src/api/order.deliveryorder/orderdeliveryOrder.ts index ca31b726..20b3268b 100644 --- a/src/api/order.deliveryorder/orderdeliveryOrder.ts +++ b/src/api/order.deliveryorder/orderdeliveryOrder.ts @@ -79,6 +79,10 @@ export type DeliveryOrderListItem = { /** 重量类型 */ weight_type?: string | number | null is_urgency?: string + /** 是否含 SN(序列号) 商品原始列(后端订单分表 has_sn_item,enum Y/N;旧版基表存量恒为 N) */ + has_sn_item?: 'Y' | 'N' + /** 是否含 SN(序列号) 商品归一化字段(与 has_sn_item 同义,筛选与展示统一用它) */ + is_sn_order?: 'Y' | 'N' invoice_flag?: string status?: string name?: string diff --git a/src/api/order.index/orderindex.ts b/src/api/order.index/orderindex.ts index a905a083..8ef23bad 100644 --- a/src/api/order.index/orderindex.ts +++ b/src/api/order.index/orderindex.ts @@ -22,8 +22,9 @@ export type OrderListParams = { * - create_channel 订单来源渠道筛选(按订单表 create_channel 列过滤;枚举:MANUAL=手工单、API=接口、QM=奇门、STOCKOUT=出库转单): * {"create_channel":"MANUAL"} 单值精确;{"create_channel":["QM","API"]} 裸数组按 in 多选; * {"create_channel":{"operator":"in","value":["QM","API"]}} 标准结构多选;{"create_channel":{"operator":"ne","value":"MANUAL"}} 排除指定渠道。 - * 注意:列表响应中的 create_channel 已格式化为中文标签,查询条件须传英文枚举值。 - */ + * 注意:列表响应中的 create_channel 已格式化为中文标签,查询条件须传英文枚举值。 * - is_sn_order 是否含 SN(序列号) 商品筛选(后端订单分表 has_sn_item enum Y/N 归一化后输出): + * {"is_sn_order":"Y"} 仅含 SN 商品订单;{"is_sn_order":"N"} 仅无 SN 商品订单。 + * 响应行同时返回 has_sn_item(原始列)与 is_sn_order(归一化),前端筛选/展示统一用 is_sn_order。 */ where?: Record sort?: { sortField?: string @@ -185,14 +186,18 @@ export type OrderExportParams = { * 导出表头字段白名单(中文表头字符串数组,如 ["系统订单号","外部订单号"]);不传或空数组时输出全部列。 * 支持 export_columns 与 exportColumns 两种写法。 * - * 文档枚举共 52 个(校验不区分导出模式,选中当前模式不存在的表头时该列自动忽略;传入非法表头会报错并列出非法值): + * 文档枚举共 55 个(校验不区分导出模式,选中当前模式不存在的表头时该列自动忽略;传入非法表头会报错并列出非法值): * 系统订单号、外部订单号、平台单号、订单ID、订单号、外部单号、订单状态、抓取波次号、波次号、波次序号、 * 货主、平台、来源、店铺昵称、收件人、收件人电话、省、市、区、镇、详细地址、商品明细、仓库商品名称、 * 商品条码、商品图片、数量、物流公司、运单号、业务类型、运单接口、包材ID、包材编码、包材名称、分配时间、 - * 订单商品总类数、订单商品总数、商品重量、称重重量(g)、订单金额、实收金额、创建时间、支付时间、发货时间、 + * 订单商品总类数、订单商品总数、SN码数量、SN码、SN码汇总、商品重量、称重重量(g)、订单金额、实收金额、创建时间、支付时间、发货时间、 * 出库状态、复核状态、复核完成状态、配货状态、打包状态、备注、买家留言、卖家留言、归档时间。 - * 其中仅 waybill 输出:系统订单号、外部订单号、平台单号、抓取波次号、商品明细; - * 仅 item 输出:订单ID、订单号、外部单号、波次号、仓库商品名称、商品条码、商品图片、数量。 + * 其中仅 waybill 输出:系统订单号、外部订单号、平台单号、抓取波次号、商品明细、SN码汇总; + * 仅 item 输出:订单ID、订单号、外部单号、波次号、仓库商品名称、商品条码、商品图片、数量、SN码。 + * 「SN码数量」(sn_quantity)= 启用序列号管理商品(stock_warehouse.is_sn_mgmt='Y')的 plan_qty 合计; + * waybill 模式仅主单号行输出合计(子单号行为 0),item 模式按商品明细行输出(非 SN 商品行为 0)。 + * 「SN码」(sn_codes, item):该商品行复核时登记的 SN 码列表(状态限定 BOUND/VERIFIED/REISSUED,排除退回/作废); + * 「SN码汇总」(sn_codes_summary, waybill):整单全部已登记 SN 码汇总,仅主单号行输出。 * ⚠️ 白名单不含「领料状态」「确认打印状态」(列表页有该状态列,但导出不支持,传入会报错)。 * ⚠️ 「复核时间」(recheck_time) 已由后端支持(2026-10-08 确认),文档枚举暂未收录,保留在可选列中。 * 前端字段清单见 views/order/orderManagement/config/order-common-config.ts 的 ORDER_EXPORT_ALL_COLUMNS。 diff --git a/src/api/order.pendingorder/orderpendingOrder.ts b/src/api/order.pendingorder/orderpendingOrder.ts index 6a5eb5b1..355c2ba7 100644 --- a/src/api/order.pendingorder/orderpendingOrder.ts +++ b/src/api/order.pendingorder/orderpendingOrder.ts @@ -51,6 +51,7 @@ export type PendingOrderListParams = { * {"confirm_print_status":"fin"} 单值精确,也支持裸数组按 in 与 {operator,value} 标准结构(同 create_channel 示例)。 * claim_status 领料状态筛选(按订单表列过滤;枚举:none=未领料、padding=领料中、fin=已领料、error=异常): * 例 {"claim_status":{"operator":"ne","value":"fin"}} 查未完成领料的订单。 + * is_sn_order 是否含 SN(序列号)商品筛选(按 has_sn_item 归一化):{"is_sn_order":"Y"} 仅 SN 订单、"N" 仅非 SN 订单。 */ where?: OrderWhere; sort?: OrderSort; diff --git a/src/api/order.recheckorder/recheckOrder.ts b/src/api/order.recheckorder/recheckOrder.ts index 9940881f..372a8463 100644 --- a/src/api/order.recheckorder/recheckOrder.ts +++ b/src/api/order.recheckorder/recheckOrder.ts @@ -235,6 +235,12 @@ export type ConfirmRecheckResultShape = { recheck_time?: string review_no?: string reviewNo?: string + /** 是否含序列号管理商品:Y/N */ + has_sn_item?: 'Y' | 'N' + /** 本次提交并校验通过的 SN 数量(非 SN 订单为 0) */ + sn_count?: number + /** 本次提交涉及的序列号管理明细数(非 SN 订单为 0) */ + sn_item_count?: number } /** order.recheckOrder.scanOrder:扫码查询订单(运单号或车号) */ @@ -282,6 +288,13 @@ export type ConfirmRecheckParams = { id?: string | number orderId?: string | number wave_id?: string | number + /** + * SN 码提交(唯一格式,SN 订单必填):{ "stock_id": ["sn_code", ...] } + * - key = 仓库商品ID(订单明细里的 stock_id) + * - value = 该商品的 SN 码列表(也兼容逗号/换行分隔的字符串) + * - 数量必须等于该商品在订单内的 plan_qty 合计;非 SN 商品不允许提交 + */ + sn_map?: Record } function coerceOrderId(v: string | number): string | number { @@ -292,23 +305,32 @@ function coerceOrderId(v: string | number): string | number { return s } -function pickConfirmRecheckBody(data: ConfirmRecheckParams): Record { +function pickConfirmRecheckBody(data: ConfirmRecheckParams): Record { + const body: Record = {} // 团购波次模式:优先使用 wave_id if (data.wave_id !== undefined && data.wave_id !== null && `${data.wave_id}`.trim() !== '') { - return { wave_id: coerceOrderId(data.wave_id) } + body.wave_id = coerceOrderId(data.wave_id) + } else { + const raw = + data.order_id !== undefined && data.order_id !== null && `${data.order_id}`.trim() !== '' + ? data.order_id + : data.id !== undefined && data.id !== null && `${data.id}`.trim() !== '' + ? data.id + : data.orderId !== undefined && data.orderId !== null && `${data.orderId}`.trim() !== '' + ? data.orderId + : undefined + if (raw === undefined) { + throw new Error('订单 ID 不能为空(order_id / id / orderId / wave_id)') + } + body.order_id = coerceOrderId(raw) } - const raw = - data.order_id !== undefined && data.order_id !== null && `${data.order_id}`.trim() !== '' - ? data.order_id - : data.id !== undefined && data.id !== null && `${data.id}`.trim() !== '' - ? data.id - : data.orderId !== undefined && data.orderId !== null && `${data.orderId}`.trim() !== '' - ? data.orderId - : undefined - if (raw === undefined) { - throw new Error('订单 ID 不能为空(order_id / id / orderId / wave_id)') + + // SN 订单必填:sn_map(key=仓库商品 stock_id)透传给服务端;非 SN 订单不传 + if (data.sn_map && Object.keys(data.sn_map).length) { + body.sn_map = data.sn_map } - return { order_id: coerceOrderId(raw) } + + return body } /** order.recheckOrder.confirmRecheck:按订单 ID 确认复核并记录复核任务 */ @@ -395,6 +417,8 @@ export type RecheckOrderSingleListItem = { create_at?: string pick_time?: string recheck_time?: string + /** 是否含序列号管理商品:Y/N(SN 订单复核必须提交 SN 码) */ + has_sn_item?: 'Y' | 'N' } export type QueryRecheckOrderSingleListResponse = { diff --git a/src/api/order.revieworder/orderreviewOrder.ts b/src/api/order.revieworder/orderreviewOrder.ts index 20d61eae..9d0159fa 100644 --- a/src/api/order.revieworder/orderreviewOrder.ts +++ b/src/api/order.revieworder/orderreviewOrder.ts @@ -24,6 +24,7 @@ export type ReviewOrderListParams = { * {"create_channel":"MANUAL"} 单值精确;{"create_channel":["QM","API"]} 裸数组按 in 多选; * {"create_channel":{"operator":"in","value":["QM","API"]}} 标准结构多选;{"create_channel":{"operator":"ne","value":"MANUAL"}} 排除指定渠道。 * 注意:列表响应中的 create_channel 已格式化为中文标签,查询条件须传英文枚举值。 + * is_sn_order 是否含 SN(序列号)商品筛选(按 has_sn_item 归一化):{"is_sn_order":"Y"} 仅 SN 订单、"N" 仅非 SN 订单。 */ where?: OrderWhere sort?: OrderSort diff --git a/src/api/order.wave/orderwave.ts b/src/api/order.wave/orderwave.ts index 74f8a61b..11468083 100644 --- a/src/api/order.wave/orderwave.ts +++ b/src/api/order.wave/orderwave.ts @@ -303,10 +303,10 @@ export type WaveStrategyListParams = { page_size?: number size?: number } - /** 仅支持 1=散单、2=团购;与 where.strategy_type 同时存在时以顶层为准 */ - strategy_type?: number - /** 当前仅支持 where.strategy_type(1/2) */ - where?: { strategy_type?: number } & Record + /** 仅支持 1=散单、2=团购、3=SN(序列号管理);支持数组多选(如 [1,3]);与 where.strategy_type 同时存在时以顶层为准 */ + strategy_type?: number | number[] + /** 当前仅支持 where.strategy_type(1/2/3,支持数组) */ + where?: { strategy_type?: number | number[] } & Record /** 0-不计算(默认),1-计算并返回每条策略的 next_fetch_order_count;支持别名 calculateNextFetchOrderCount */ calculate_next_fetch_order_count?: number calculateNextFetchOrderCount?: number @@ -367,7 +367,9 @@ export type WaveStrategyListResponse = { export type WaveStrategyCreateParams = { strategy_name: string + /** 1=散单 2=团购 3=SN(序列号管理);3 时服务端固定 batch_mode=2、pick_mode=3 */ strategy_type: number + /** SN(3)可不传,服务端固定写入 2(先拣后分) */ batch_mode: number status?: number order_min_sku?: number | null @@ -397,6 +399,7 @@ type WaveStrategyIdentityParam = export type WaveStrategyUpdateParams = WaveStrategyIdentityParam & { strategy_name?: string + /** 1=散单 2=团购 3=SN(序列号管理);改为 3 时服务端同步将 batch_mode 固定为 2 */ strategy_type?: number batch_mode?: number status?: number @@ -1104,6 +1107,8 @@ export type WaveSingleFetchByIdsResponse = { excluded_locked_order_ids?: Array skipped_order_ids?: Array not_found_order_ids?: Array + /** 因 SN(序列号管理)被排除、未加入波次的订单 ID 列表 */ + excluded_sn_order_ids?: Array } export function orderWaveSingleFetchByIds( diff --git a/src/components/ToolbarButtonGroup/index.vue b/src/components/ToolbarButtonGroup/index.vue index 03ebe1a2..60bb8260 100644 --- a/src/components/ToolbarButtonGroup/index.vue +++ b/src/components/ToolbarButtonGroup/index.vue @@ -133,6 +133,8 @@ const expandVisible = ref(false) let resizeObserver: ResizeObserver | null = null let layoutFrame = 0 +/** ResizeObserver 防抖定时器:拖拽窗口/分栏时避免每个像素都跑一轮溢出测量 */ +let resizeTimer: ReturnType | null = null function emitAction(action: ToolbarButtonConfig['action']) { emit('action', action) @@ -221,7 +223,11 @@ async function scheduleLayout() { function setupResizeObserver() { resizeObserver?.disconnect() resizeObserver = new ResizeObserver(() => { - void scheduleLayout() + if (resizeTimer) clearTimeout(resizeTimer) + resizeTimer = setTimeout(() => { + resizeTimer = null + void scheduleLayout() + }, 80) }) const parent = containerRef.value?.parentElement @@ -239,6 +245,10 @@ onMounted(() => { onBeforeUnmount(() => { resizeObserver?.disconnect() resizeObserver = null + if (resizeTimer) { + clearTimeout(resizeTimer) + resizeTimer = null + } }) watch( diff --git a/src/composables/useVerticalSplitPane.ts b/src/composables/useVerticalSplitPane.ts index 4b1284d3..4ea285b0 100644 --- a/src/composables/useVerticalSplitPane.ts +++ b/src/composables/useVerticalSplitPane.ts @@ -26,15 +26,34 @@ export function useVerticalSplitPane(options: VerticalSplitPaneOptions = {}) { let dragStartY = 0 let dragStartPercent = 0 let stackHeightPx = 0 + /** mousemove → rAF 节流:鼠标事件可能 >100Hz,没必要每帧多次重排上下两区(含 el-table) */ + let dragRafId = 0 + let pendingMoveEvent: MouseEvent | null = null function cleanupDragListeners() { window.removeEventListener('mousemove', onResizeMouseMove) window.removeEventListener('mouseup', onResizeMouseUp) + if (dragRafId) { + cancelAnimationFrame(dragRafId) + dragRafId = 0 + } + pendingMoveEvent = null document.body.style.cursor = '' document.body.style.userSelect = '' } function onResizeMouseMove(e: MouseEvent) { + pendingMoveEvent = e + if (dragRafId) return + dragRafId = requestAnimationFrame(() => { + dragRafId = 0 + const event = pendingMoveEvent + pendingMoveEvent = null + if (event) applyResizeMove(event) + }) + } + + function applyResizeMove(e: MouseEvent) { if (stackHeightPx <= 0) return const dy = e.clientY - dragStartY // 鼠标下移 → 分隔线下移 → 上半列表区应变大 → 底部占比应变小(与 dy 反向) diff --git a/src/utils/storeScanOptions.ts b/src/utils/storeScanOptions.ts index 976b197a..21324062 100644 --- a/src/utils/storeScanOptions.ts +++ b/src/utils/storeScanOptions.ts @@ -67,6 +67,18 @@ export function extractStoreListFromResponse(storesRes: any): any[] { return storesRes?.stores || storesRes?.data?.stores || storesRes?.data || [] } +/** + * 货主展示名:下拉选项 label 在缺名称时会回退为数字 ID / 「货主 12」 + * 这类兜底值不适合展示在提示文案里,统一返回空字符串。 + */ +export function resolveStoreDisplayName(label: unknown): string { + const text = String(label ?? '').trim() + if (!text) return '' + if (/^\d+$/.test(text)) return '' + if (/^货主\s*\d+$/.test(text)) return '' + return text +} + export function fillStoreScanFieldOptions(availableFields: any[], rawStores: any[]) { const field = availableFields.find((f: any) => f.value === 'store_id') if (field) field.options = mapStoreListToSelectOptions(rawStores) diff --git a/src/views/express/returnUnpack/components/StockPickerDialog.vue b/src/views/express/returnUnpack/components/StockPickerDialog.vue index e8b4bb0e..f84353b7 100644 --- a/src/views/express/returnUnpack/components/StockPickerDialog.vue +++ b/src/views/express/returnUnpack/components/StockPickerDialog.vue @@ -19,6 +19,21 @@ @keyup.enter="handleSearch" /> 搜索 + + + 按货主过滤 + + + + + + ({ default: false }) -const props = withDefaults(defineProps<{ storeId?: number; initialKeyword?: string }>(), { +const props = withDefaults(defineProps<{ storeId?: number; storeName?: string; initialKeyword?: string }>(), { storeId: undefined, + storeName: '', initialKeyword: '', }) @@ -109,12 +125,16 @@ const keyword = ref('') const list = ref([]) const currentRow = ref(null) const tableRef = ref(null) +/** 是否按货主过滤商品(可选功能,默认启用;未指定货主时该开关不可用) */ +const filterByStore = ref(true) watch(visible, (opened) => { if (!opened) return focusMode.value = 'search' keyword.value = props.initialKeyword || '' currentRow.value = null + // 每次打开恢复默认:按货主过滤 + filterByStore.value = true if (props.initialKeyword) { handleSearch() } else { @@ -194,8 +214,10 @@ function formatRowLabel(item: StockPickerItem): string { async function loadInitialList() { loading.value = true try { + // 货主过滤为可选功能(默认启用):关闭时不加 store_id 限定 + const storeId = filterByStore.value ? props.storeId : undefined // where 统一按 stock.warehouse.list 规范:{ 字段: { operator, value, type } } - const where = buildStockQuery(props.storeId ? { store_id: props.storeId } : {}) + const where = buildStockQuery(storeId ? { store_id: storeId } : {}) const res: any = await stockWarehouse({ page: 1, pageSize: PICKER_LIST_PAGE_SIZE }, where) if (!isStockApiSuccess(res)) { list.value = [] @@ -219,7 +241,7 @@ async function handleSearch() { loading.value = true try { const params: { keyword: string; store_id?: number } = { keyword: text } - if (props.storeId) params.store_id = props.storeId + if (filterByStore.value && props.storeId) params.store_id = props.storeId const res: any = await warehouseSearch(params) if (!isStockApiSuccess(res)) { list.value = [] @@ -240,6 +262,17 @@ function handleCurrentChange(row: StockPickerItem | null) { currentRow.value = row } +/** 货主过滤开关切换:有关键字时重新搜索,否则重载首屏列表 */ +function handleStoreFilterChange() { + currentRow.value = null + tableRef.value?.setCurrentRow?.() + if (keyword.value.trim()) { + void handleSearch() + } else { + void loadInitialList() + } +} + function handleConfirm() { if (!currentRow.value) return emit('confirm', { ...currentRow.value }) @@ -352,6 +385,7 @@ onUnmounted(() => { diff --git a/src/views/stock/utils/stockPickerHelpers.ts b/src/views/stock/utils/stockPickerHelpers.ts index 12dde419..586cf5e7 100644 --- a/src/views/stock/utils/stockPickerHelpers.ts +++ b/src/views/stock/utils/stockPickerHelpers.ts @@ -16,6 +16,8 @@ export type OrderSelectedProductItem = { combo_id?: number /** 组合商品子项数量(展开时带出;建单导入按「该数量 × Excel 计划数量」计算) */ combo_item_quantity?: number + /** 实付单价(建单选填,字符串便于输入框编辑;提交时转为 number) */ + actual_price?: string } export function isStockApiSuccess(res: any) { diff --git a/src/views/storage/log/log-config.ts b/src/views/storage/log/log-config.ts index 866fc5cc..ea3778fe 100644 --- a/src/views/storage/log/log-config.ts +++ b/src/views/storage/log/log-config.ts @@ -107,29 +107,65 @@ export const inventoryTypeConfig = { FP: { text: '返品', tagType: 'info' } } -// 订单类型配置 +// 订单类型配置(出入库记录 order_type:业务单据类型 + 系统内部动作类型) export const orderTypeConfig: Record = { + // ===== 订单/单据 ===== ORDER: '订单', ORDER_CANCEL: '取消订单', - CGRK: '采购入库', - JYCK: '交易出库', - CGTH: '采购退货', - JYTH: '交易退货', - SCRK: '生产入库', - SHRK: '收货入库', DELIVERY_ORDER: '出库单', RECEIVING: '收货单', ENTRY_ORDER: '入库单', + entry_order: '入库单', INVENTORY: '盘点单', RETURN: '退货单', + + // ===== 入库单类型(与 storage/entry 筛选项同源) ===== + CGRK: '采购入库', + THRK: '退货入库', + QTRK: '其他入库', + PDRK: '盘点入库', + SCRK: '生产入库', + SHRK: '收货入库', + LYRK: '领用入库', + CCRK: '拆解入库', + DBRK: '调拨入库', + B2BRK: 'B2B入库', + XNRK: '虚拟入库', + MATCH: '入库匹配', + + // ===== 出库单类型(与 storage/stockout 单据类型同源) ===== + PTCK: '普通出库', + QTCK: '其他出库', + JYCK: '交易出库', + DBCK: '调拨出库', + THCK: '退货出库', + PDCK: '盘点出库', + LYCK: '领用出库', + SCCK: '生产出库', + CCCK: '拆解出库', + B2BCK: 'B2B出库', + XNCK: '虚拟出库', + CGTH: '采购退货', + JYTH: '交易退货', + + // ===== 拣货/系统内部动作 ===== PICK_OUTBOUND: '拣货出库', PICK_RETURN: '拣货返还', - entry_order: '入库单', - INTERCEPT_GAP: '拦截差异' + PICKING_LOCK: '拣货锁定', + PICKING_UNLOCK: '拣货解锁', + INTERCEPT_GAP: '拦截差异', + + // ===== 货主库存 / 库存转移 ===== + STOCK_STORE_INBOUND: '货主库存入库', + STOCK_STORE_OUTBOUND: '货主库存出库', + STOCK_TRANSFER_IN: '库存移入', + STOCK_TRANSFER_OUT: '库存移出' } export function getOrderTypeLabel(type: string): string { - return orderTypeConfig[type] || type || '—' + if (!type) return '—' + const key = String(type).trim() + return orderTypeConfig[key] ?? orderTypeConfig[key.toUpperCase()] ?? key } /** 库存类型展示文本(兼容后端小写/带空格的枚举值) */ diff --git a/src/views/storage/receiving/component/Product.vue b/src/views/storage/receiving/component/Product.vue index b6198ab1..4cc9e71d 100644 --- a/src/views/storage/receiving/component/Product.vue +++ b/src/views/storage/receiving/component/Product.vue @@ -502,10 +502,21 @@ 查询 + + + 按收货单货主过滤 + - - + + + @@ -1275,6 +1286,8 @@ const systemProductResults = ref([]) const systemProductAllResults = ref([]) const systemProductSelection = ref([]) const systemProductPagination = reactive({ page: 1, pageSize: 10, total: 0 }) +/** 查询系统商品时是否自动按收货单货主过滤(可选功能,默认启用;收货单未绑定货主时开关不可用) */ +const filterByReceivingStore = ref(true) /** 条码列多值折叠取值:只显示首个条码 + `+N` 展开全部(UpperTable copyAction 内置能力) */ const getSystemProductBarcodes = (row: any): unknown[] => @@ -2306,6 +2319,8 @@ const openEditSystemProductPicker = async () => { const openSystemProductPicker = async () => { systemProductPickerVisible.value = true systemProductSelection.value = [] + // 每次打开恢复默认:按收货单货主过滤 + filterByReceivingStore.value = true await querySystemProducts(1) } @@ -2455,12 +2470,13 @@ const onSystemProductPageSizeChange = (size: number) => { applySystemProductPageSlice() } -/** 查询系统商品:使用 stock.warehouse.search 关键字检索(store_id + keyword),一次取回全部匹配后本地分页 */ +/** 查询系统商品:使用 stock.warehouse.search 关键字检索(keyword + 可选 store_id),一次取回全部匹配后本地分页 */ const querySystemProducts = async (page = 1) => { systemProductLoading.value = true try { const keyword = String(systemProductKeyword.value ?? '').trim() - const storeId = boundStoreId.value + // 货主过滤为可选功能(默认启用):关闭时查询全部货主的商品 + const storeId = filterByReceivingStore.value ? boundStoreId.value : undefined const requestData: { keyword?: string; store_id?: number } = {} if (keyword) { @@ -3624,6 +3640,17 @@ onUnmounted(() => { } } +/* 按收货单货主过滤开关:默认勾选,未绑定货主时禁用 */ +.system-product-filter-switch { + margin-left: 4px; + margin-right: 0; + height: 24px; + + :deep(.el-checkbox__label) { + font-size: 12px; + } +} + /* 收货单货主过滤说明:与查询行同行、靠右,纯文字无容器背景 */ .system-product-filter-hint { margin-left: auto; diff --git a/src/views/storage/stockout/index.vue b/src/views/storage/stockout/index.vue index 1e1e6526..c7ec2195 100644 --- a/src/views/storage/stockout/index.vue +++ b/src/views/storage/stockout/index.vue @@ -590,6 +590,8 @@ import { stockoutToolbarButtons, formatStockoutData, formatStockoutListItems, + formatStockoutOrderType, + formatStockoutSourceType, normalizeStockoutWaybillCodes, splitStockoutWaybillCodes, isSameStockoutWaybillCodes, @@ -1520,6 +1522,12 @@ async function handleExport(mode: 'waybill' | 'item' = 'waybill') { if (col.prop === 'sync_status') { return syncStatusConfig[val as keyof typeof syncStatusConfig]?.text || val || '' } + if (col.prop === 'order_type') { + return formatStockoutOrderType(val) + } + if (col.prop === 'source_type') { + return formatStockoutSourceType(val) + } return val === null || val === undefined ? '' : val }) ) diff --git a/src/views/storage/stockout/stockout-config.ts b/src/views/storage/stockout/stockout-config.ts index 39c97ff8..fedc02be 100644 --- a/src/views/storage/stockout/stockout-config.ts +++ b/src/views/storage/stockout/stockout-config.ts @@ -142,6 +142,55 @@ export const syncStatusConfig: Record failed: { text: '同步失败', tagType: 'danger' } } +/** + * 单据类型 order_type(出库单):接口返回英文编码,展示时转中文。 + * 覆盖「XXCK」全套出库单据类型(与入库 CGRK/THRK/QTRK… 同一套编码规则), + * 同时保留历史英文枚举 TRANSFER / RETURN 兼容旧数据。 + */ +export const stockoutOrderTypeConfig: Record = { + PTCK: '普通出库', + QTCK: '其他出库', + JYCK: '交易出库', + DBCK: '调拨出库', + THCK: '退货出库', + PDCK: '盘点出库', + LYCK: '领用出库', + SCCK: '生产出库', + CCCK: '拆解出库', + B2BCK: 'B2B出库', + XNCK: '虚拟出库', + GFCK: '采购退货出库', + HHCK: '换货出库', + BFCK: '补发出库', + JXCK: '借出出库', + // 历史/兼容英文枚举 + TRANSFER: '调拨出库', + RETURN: '退货出库' +} + +/** 来源类型 source_type:QM=奇门 / API=接口 / WMS=系统(与 storage 模块其它页面同源) */ +export const stockoutSourceTypeConfig: Record = { + QM: '奇门', + API: '接口', + WMS: '系统' +} + +/** 单据类型展示文本(兼容大小写;已是中文/未知枚举直接原样返回) */ +export function formatStockoutOrderType(value: unknown): string { + if (value === null || value === undefined || value === '') return '--' + const key = String(value).trim() + const hit = stockoutOrderTypeConfig[key] ?? stockoutOrderTypeConfig[key.toUpperCase()] + return hit ?? key +} + +/** 来源类型展示文本(兼容大小写;已是中文/未知枚举直接原样返回) */ +export function formatStockoutSourceType(value: unknown): string { + if (value === null || value === undefined || value === '') return '--' + const key = String(value).trim() + const hit = stockoutSourceTypeConfig[key] ?? stockoutSourceTypeConfig[key.toUpperCase()] + return hit ?? key +} + // 时间格式化函数 export function formatDateTime(dateStr: string): string { if (!dateStr) return '--' @@ -220,8 +269,8 @@ export const entryColums = [ { prop: 'order_status', label: '出库状态', width: '100' }, { prop: 'sync_status', label: '同步状态', width: '100' }, { prop: 'sync_message', label: '同步消息', minWidth: '140', showOverflowTooltip: true }, - { prop: 'order_type', label: '单据类型', width: '100' }, - { prop: 'source_type', label: '来源类型', width: '100' }, + { prop: 'order_type', label: '单据类型', width: '100', formatter: (row: any) => formatStockoutOrderType(row?.order_type) }, + { prop: 'source_type', label: '来源类型', width: '100', formatter: (row: any) => formatStockoutSourceType(row?.source_type) }, { prop: 'store_name', label: '货主', minWidth: '140', formatter: (row: any) => String(row?.store_name || '').trim() || '--' }, { prop: 'source_platform_name', label: '来源平台', width: '130', formatter: (row: any) => String(row?.source_platform_name || '').trim() || '--' }, { prop: 'extend_props', label: '转单订单号', width: '180', formatter: (row: any) => formatTransferredOrderCode(row) }, diff --git a/src/views/store/stores/index.vue b/src/views/store/stores/index.vue index 2a4c5462..3c312805 100644 --- a/src/views/store/stores/index.vue +++ b/src/views/store/stores/index.vue @@ -225,6 +225,7 @@