diff --git a/src/views/order/waveOrder/component/WavePlatformPrintPreviewDialog.vue b/src/views/order/waveOrder/component/WavePlatformPrintPreviewDialog.vue index 0bfcd2a1..76db1737 100644 --- a/src/views/order/waveOrder/component/WavePlatformPrintPreviewDialog.vue +++ b/src/views/order/waveOrder/component/WavePlatformPrintPreviewDialog.vue @@ -2,7 +2,7 @@
-

接口:order.print.getWavePlatformPrintData

-
- 仓库 ID:{{ requestMeta?.warehouse_id ?? '—' }} - 请求波次 ID 数:{{ requestMeta?.wave_ids?.length ?? 0 }} - 返回通过过滤波次数:{{ (payload.wave_ids || []).length }} +
+ + +
- - {{ filterHint }} - +
+ 仓库:{{ requestMeta?.warehouse_id ?? '—' }} + 请求波次:{{ requestMeta?.wave_ids?.length ?? 0 }} + 返回波次:{{ waveGroupList.length }} +
-

汇总 summary

- - - {{ formatPrimitive(v) }} - - -

(无 summary 或为空对象)

-
+

波次 / 平台列表

+
+
+
+
+ 波次: + {{ wave.wave_no }} + | + ID: + {{ wave.wave_id }} +
+
+ 平台 {{ wave.platforms.length }} + 订单 {{ wave.order_count }} +
+
-
-

通过过滤的波次 ID wave_ids

-
- - {{ id }} - +
+
+
+
+ {{ platform.platform_name }} + {{ platform.platform }} +
+ 订单 {{ platform.order_count }} +
+
+
+

(该波次无平台数据)

+
-

(无 wave_ids)

- - -
-

主结构 waveGroups(波次 → 平台 → 订单)

-
{{ waveGroupsJson }}
-

- (无 waveGroups;新接口主字段为空时可查看下方兼容字段 order_list / platform_groups) -

-
- -
-

兼容:按平台分组 platform_groups

-
{{ platformGroupsJson }}
-

(无 platform_groups)

-
- -
-

兼容:逐单明细 order_list

-

列为后端返回首条记录字段动态展开(至多 16 列)。

- - - - - -

(无 order_list)

-
- -
-

扩展 ext

-
{{ JSON.stringify(payload.ext, null, 2) }}
+

(无 waveGroups)

(无数据)
diff --git a/src/views/order/waveOrder/config/wave-config.ts b/src/views/order/waveOrder/config/wave-config.ts index 9fcdf5f7..bac4b3fa 100644 --- a/src/views/order/waveOrder/config/wave-config.ts +++ b/src/views/order/waveOrder/config/wave-config.ts @@ -405,29 +405,102 @@ export function getWaveToolbarButtons(waveType: 1 | 2): WaveToolbarButtonConfig[ /** 解析 order.print.getWavePlatformPrintData 响应(支持 res.data 包裹) */ export function unwrapWavePlatformPrintPayload(res: unknown): WavePlatformPrintDataPayload { + const toObject = (v: unknown): Record | undefined => { + if (!v || typeof v !== 'object' || Array.isArray(v)) return undefined + return v as Record + } + + const toOrderList = (v: unknown): Record[] => { + if (!Array.isArray(v)) return [] + return v.filter((x) => x && typeof x === 'object') as Record[] + } + + // 兼容后端直接返回数组:[{ wave_id, wave_no, order_count, platforms: [...] }] + const normalizeWaveGroups = (list: unknown): unknown[] | undefined => { + if (!Array.isArray(list)) return undefined + const groups = list + .filter((x) => x && typeof x === 'object') + .map((wave) => { + const waveObj = wave as Record + const rawPlatforms = Array.isArray(waveObj.platforms) ? waveObj.platforms : [] + const platforms = rawPlatforms + .filter((p) => p && typeof p === 'object') + .map((p) => { + const platformObj = p as Record + return { + platform: platformObj.platform, + platform_name: platformObj.platform_name, + order_count: platformObj.order_count, + orders: toOrderList(platformObj.orders) + } + }) + return { + wave_id: waveObj.wave_id, + wave_no: waveObj.wave_no, + order_count: waveObj.order_count, + platforms + } + }) + return groups + } + const r = res as Record | null | undefined + + // 情况1:顶层就是波次数组 + if (Array.isArray(res)) { + const waveGroups = normalizeWaveGroups(res) + const wave_ids = (waveGroups || []) + .map((x) => (x && typeof x === 'object' ? (x as Record).wave_id : undefined)) + .filter((id) => id !== undefined && id !== null && id !== '') as Array + return { + wave_ids: wave_ids.length ? wave_ids : undefined, + waveGroups, + platform_groups: undefined, + order_list: undefined, + summary: undefined, + ext: undefined + } + } + const inner = r?.data !== undefined && r?.data !== null && typeof r.data === 'object' && !Array.isArray(r.data) ? (r.data as Record) : (r as Record) || {} + + // 情况2:res.data 是波次数组 + if (Array.isArray(r?.data)) { + const waveGroups = normalizeWaveGroups(r.data) + const wave_ids = (waveGroups || []) + .map((x) => (x && typeof x === 'object' ? (x as Record).wave_id : undefined)) + .filter((id) => id !== undefined && id !== null && id !== '') as Array + return { + wave_ids: wave_ids.length ? wave_ids : undefined, + waveGroups, + platform_groups: undefined, + order_list: undefined, + summary: undefined, + ext: undefined + } + } + const summaryRaw = inner?.summary - const summary = - summaryRaw !== undefined && summaryRaw !== null && typeof summaryRaw === 'object' && !Array.isArray(summaryRaw) - ? (summaryRaw as Record) - : undefined + const summary = toObject(summaryRaw) const wave_ids = Array.isArray(inner?.wave_ids) ? (inner.wave_ids as Array) : undefined - const waveGroups = Array.isArray(inner?.waveGroups) ? inner.waveGroups : undefined + const waveGroups = Array.isArray(inner?.waveGroups) + ? inner.waveGroups + : normalizeWaveGroups((inner as Record).wave_list) const platform_groups = Array.isArray(inner?.platform_groups) ? inner.platform_groups : undefined - const orderListRaw = inner?.order_list - const order_list = Array.isArray(orderListRaw) - ? (orderListRaw.filter((x) => x && typeof x === 'object') as Record[]) - : undefined + const order_list = toOrderList(inner?.order_list) const extRaw = inner?.ext - const ext = - extRaw !== undefined && extRaw !== null && typeof extRaw === 'object' && !Array.isArray(extRaw) - ? (extRaw as Record) - : undefined - return { summary, wave_ids, waveGroups, platform_groups, order_list, ext } + const ext = toObject(extRaw) + return { + summary, + wave_ids, + waveGroups, + platform_groups, + order_list: order_list.length ? order_list : undefined, + ext + } } /** 异步任务状态文案 */ diff --git a/src/views/storage/inventory/index.vue b/src/views/storage/inventory/index.vue index 6c7dafbe..97b4dc72 100644 --- a/src/views/storage/inventory/index.vue +++ b/src/views/storage/inventory/index.vue @@ -58,6 +58,22 @@ + + + + + +