生产更新:同步已提交的海外仓分析及业务修复(2026-10-16) #20

Merged
admin merged 63 commits from release/test into main 2026-10-16 18:03:19 +08:00
Showing only changes of commit c61ae525e1 - Show all commits
@@ -668,11 +668,10 @@ const tableColumns = computed(() =>
warehouseName(row.overseasWarehouseId)
}}</template>
<template #movement-4="{ row }">{{
row.movementType === "RECEIPT"
? "退货签收"
: row.movementType === "MERGE"
? "退货合箱"
: "退货出库"
({ RECEIPT: "退货签收", MERGE: "退货合箱", OUTBOUND: "退货出库",
SKU_CONVERSION_OUT: "SKU换标", SKU_CONVERSION_IN: "SKU换标",
SKU_CONVERSION_REVERSE_IN: "SKU换标撤销", SKU_CONVERSION_REVERSE_OUT: "SKU换标撤销"
} as Record<string, string>)[row.movementType] || row.movementType || "—"
}}</template>
<template #plan-customer="{ row }">{{ customerName(row.customerId) }}</template>
<template #plan-return-nos="{ row }">{{