优化

AGENTS.md

@@ -54,7 +54,8 @@
 | 统一订单展示 | `src/modules/order-management/` | `src/modules/first-leg/` 与对应后端订单契约 |
 | 客户财务账单、入仓码联查、收款、未收余额与客户确认 | `src/modules/finance/`；确认与明细入口 `views/FinanceBillsView.vue`、`api/finance.ts`，入仓码通过 `src/modules/first-leg/public.ts` 复用 `InboundCodeAssociationDialog` | Backend `finance/`；账单行只显示服务端 `inboundCode` 并按登录客户查询业务关系，缺失显示“—”，不得回退内部 ID。收款方式由服务端枚举映射中文。出账或已出账调整后为 `PENDING_CONFIRMATION`，客户确认提交登录成员、`expectedVersion` 和幂等键 |
 | 客户资金账户、授信与充值申请 | `src/modules/finance/views/FinanceAccountView.vue`、`api/account.ts` | 显示当前企业 CNY 实际余额、冻结金额、授信额度、授信有效期、已用授信、冻结授信、总可用余额和不可变流水；数据加载前显示“—”，不得先伪装为零。授信到期日当天仍有效，次日已用授信并入实际余额，负数实际余额会阻止提交新订单。充值只展示服务端启用的平台统一静态收款码，客户上传 JPG/PNG 付款截图后进入待审核。客户范围只取登录态，无收款码时禁止提交，不模拟支付成功 |
-| 海外采购、美国本土卡与美本土散板 | `src/modules/cross-border/routes.ts`、`components/BusinessOrdersView.vue`、`api/businessOrders.ts` | 三个路由均为 `active`，客户范围只取 Token；采购创建的 `customerName` 只取当前认证会话企业名称，不允许自由输入或冒用其他客户。Backend `lastleg-service/` 的 `procurement/`、`trucking/`、`looseboard/` 客户接口 |
+| 海外采购 | `src/modules/cross-border/routes.ts`、`views/ProcurementView.vue`、`components/ProcurementDetailPanel.vue`、`api/procurement.ts` | 独立列表、新建及详情路由；客户范围只取 Token，创建的 `customerName` 只取认证会话企业名称。详情消费独立客户投影，展示履约、已确认箱明细、实际运单和费用结果，不开放内部文件或平台操作。Backend `lastleg-service/procurement/` |
+| 美国本土卡与美本土散板 | `src/modules/cross-border/routes.ts`、`components/BusinessOrdersView.vue`、`api/businessOrders.ts` | 两个运输业务共用列表/表单组件，客户范围只取 Token；不消费采购字段或状态。Backend `lastleg-service/` 的 `trucking/`、`looseboard/` 客户接口 |
 | 海外仓入库订单 | `src/modules/order-management/routes.ts`、`views/InboundOrdersView.vue`、`api/inboundPlans.ts` | `orders/inbound` 为只读列表/详情，权限 `merchant:warehouse:inbound:list`；不展示或提交内部 ID |
 | 海外仓贴标、仓储转运、货物废弃 | `src/modules/overseas-warehouse/routes.ts`、`views/WarehouseServiceView.vue`、`api/warehouseServices.ts` | 三个路由均为 `active`；退货预报另见本节独立入口；贴标申请先选国外中转仓和有库存历史入仓单，换标类型为只换 SKU、只换箱唛、SKU+箱唛。涉及箱唛换标时，整张贴标申请只选择一个 FBA 目的仓，全部箱级明细统一提交该目的仓，模板和明细不再逐行选择目的仓。箱唛换标明细一行固定代表一箱，箱数不可编辑，提交也固定为 1。货物明细外层始终提供“SKU 关联”“箱号关联”“SKU 混箱换标”三套模板的下载、上传，不随换标类型切换；上传只进入待导入关系区，客户可勾选部分或全选后导入本次明细，只有进入明细的库存才随申请提交和冻结。明细也支持手动新增编辑，组合换标以仓库唛头连接旧/新 SKU 和新 FBA 箱唛关系。涉及箱唛换标时必须选择卡车、自提或快递；快递可选择打印面单并上传 PDF/图片。PDA 逐箱换标、上传照片并由仓库复核后，客户详情展示完工照片和“换标完成确认”；客户确认前不得继续出库，确认后卡车进入预排车，自提/快递进入换标出库待创建。历史库存位置不能解释成箱唛与具体托盘快照，客户页面不暴露托盘、库位和内部库存 ID |
 

src/components.d.ts

@@ -42,6 +42,7 @@ declare module 'vue' {
     ElRadio: typeof import('element-plus/es')['ElRadio']
     ElRadioButton: typeof import('element-plus/es')['ElRadioButton']
     ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
+    ElResult: typeof import('element-plus/es')['ElResult']
     ElSelect: typeof import('element-plus/es')['ElSelect']
     ElSkeleton: typeof import('element-plus/es')['ElSkeleton']
     ElSwitch: typeof import('element-plus/es')['ElSwitch']

src/modules/cross-border/api/businessOrders.ts

@@ -8,7 +8,7 @@ export interface PageResult<T> {
   pages: number
 }
 
-export type CrossBorderBusinessKind = 'procurement' | 'trucking' | 'looseboard'
+export type CrossBorderBusinessKind = 'trucking' | 'looseboard'
 
 export interface BusinessOrderQuery {
   page: number
@@ -16,8 +16,6 @@ export interface BusinessOrderQuery {
   orderNo?: string
   status?: string
   routeKeyword?: string
-  productName?: string
-  purchaseCategory?: string
   transportType?: string
   transportMode?: string
   requestedFrom?: string
@@ -26,54 +24,6 @@ export interface BusinessOrderQuery {
   createdTo?: string
 }
 
-export interface ProcurementSummary {
-  orderNo: string
-  purchaseCategory: string
-  productName: string
-  productSpecification: string | null
-  purchaseQuantity: number
-  budgetUnitPrice: number | null
-  currency: string | null
-  inboundQuantity: number
-  outboundQuantity: number
-  inventoryQuantity: number
-  status: string
-  version: number
-  createdAt: string
-  updatedAt: string
-}
-
-export interface ProcurementDetail {
-  summary: ProcurementSummary
-  productUrl: string | null
-  receivingAddress: string | null
-  contactName: string
-  contactPhone: string
-  domesticCarrier: string | null
-  domesticTrackingNo: string | null
-  overseasCarrier: string | null
-  overseasTrackingNo: string | null
-  estimatedArrivalAt: string | null
-  remark: string | null
-  reviewRemark: string | null
-}
-
-export interface ProcurementCreate {
-  customerName: string
-  purchaseCategory: string
-  productName: string
-  productSpecification?: string
-  productUrl?: string
-  purchaseQuantity: number
-  budgetUnitPrice?: number
-  currency?: string
-  receivingAddress?: string
-  contactName: string
-  contactPhone: string
-  remark?: string
-  idempotencyKey: string
-}
-
 export interface TransportSummary {
   fleetArrangement: import('../fleetArrangement').FleetArrangement | null
   orderNo: string
@@ -132,7 +82,6 @@ export interface TransportUpdate extends Omit<TransportCreate, 'idempotencyKey'>
 }
 
 const endpointByKind: Record<CrossBorderBusinessKind, string> = {
-  procurement: '/merchant/v1/last-leg/overseas-procurements',
   trucking: '/merchant/v1/last-leg/us-truck-orders',
   looseboard: '/merchant/v1/last-leg/local-looseboard-orders',
 }
@@ -149,10 +98,6 @@ export function getBusinessOrder<T>(kind: CrossBorderBusinessKind, orderNo: stri
   return apiRequest<T>({ method: 'GET', url: `${endpointByKind[kind]}/${encodeURIComponent(orderNo)}` })
 }
 
-export function createProcurement(payload: ProcurementCreate) {
-  return apiRequest<ProcurementDetail>({ method: 'POST', url: endpointByKind.procurement, data: payload })
-}
-
 export function createTransport(kind: 'trucking' | 'looseboard', payload: TransportCreate) {
   return apiRequest<TransportDetail>({ method: 'POST', url: endpointByKind[kind], data: payload })
 }

src/modules/cross-border/api/procurement.ts

@@ -0,0 +1,108 @@
+import { apiRequest } from '@/api/http'
+import type { PageResult } from './businessOrders'
+
+export type Amount = number | string
+export interface ProcurementSummary {
+  orderNo: string
+  purchaseCategory: string
+  productName: string
+  productSpecification: string | null
+  purchaseQuantity: number
+  budgetUnitPrice: Amount | null
+  currency: string | null
+  status: string
+  version: number
+  createdAt: string
+  updatedAt: string
+}
+export interface ProcurementOrder extends ProcurementSummary {
+  productUrl: string | null
+  receivingAddress: string
+  contactName: string
+  contactPhone: string
+  estimatedArrivalAt: string | null
+  plannedWarehouseName: string | null
+  actualWarehouseCode: string | null
+  actualWarehouseName: string | null
+}
+export interface ProcurementFee {
+  feeNo: string
+  purpose: string
+  name: string
+  version: number | null
+  active: boolean
+  determination: string
+  amount: Amount
+  currency: string
+  originalAmount: Amount | null
+  originalCurrency: string | null
+  exchangeRate: Amount | null
+  exchangeRateMonth: string | null
+  businessDate: string | null
+  parentFeeNo: string | null
+  walletStatus: string | null
+  sourceLinked: boolean
+}
+export interface ProcurementBox {
+  cartonNo: string
+  quantity: number
+  lengthCm: Amount
+  widthCm: Amount
+  heightCm: Amount
+  grossWeightKg: Amount
+}
+export interface ProcurementShipment {
+  shipmentNo: string
+  leg: 'OVERSEAS' | 'DOMESTIC'
+  shippedAt: string
+  cartonNo: string
+  quantity: number
+  carrier: string
+  trackingNo: string
+}
+export interface ProcurementDetail {
+  order: ProcurementOrder
+  budget: { totalAmount: Amount | null; currency: string; authorizedAt: string | null }
+  purchased: boolean
+  purchaseConfirmed: boolean
+  purchaseNeedsAttention: boolean
+  progress: { key: string; title: string; completedAt: string | null }[]
+  boxes: ProcurementBox[]
+  shipments: ProcurementShipment[]
+  fees: ProcurementFee[]
+  exceptionSummaries: string[]
+}
+export interface ProcurementCreate {
+  customerName: string
+  purchaseCategory: string
+  productName: string
+  productSpecification?: string
+  productUrl?: string
+  purchaseQuantity: number
+  budgetUnitPrice: number
+  currency: 'CNY' | 'USD'
+  receivingAddress: string
+  contactName: string
+  contactPhone: string
+  remark?: string
+  idempotencyKey: string
+}
+export interface ProcurementQuery {
+  page: number
+  size: number
+  orderNo?: string
+  productName?: string
+  purchaseCategory?: string
+  status?: string
+}
+const endpoint = '/merchant/v1/last-leg/overseas-procurements'
+export async function listProcurements(params: ProcurementQuery) {
+  const result = await apiRequest<PageResult<ProcurementSummary>>({ method: 'GET', url: endpoint, params })
+  return { ...result, page: Number(result.page), size: Number(result.size), total: Number(result.total), pages: Number(result.pages) }
+}
+export function getProcurement(orderNo: string) {
+  return apiRequest<ProcurementDetail>({ method: 'GET', url: `${endpoint}/${encodeURIComponent(orderNo)}` })
+}
+export function createProcurement(data: ProcurementCreate) {
+  return apiRequest<ProcurementDetail>({ method: 'POST', url: endpoint, data })
+}

src/modules/cross-border/businessOrders.test.mjs

@@ -7,6 +7,8 @@ import ts from 'typescript'
 const api = readFileSync(new URL('./api/businessOrders.ts', import.meta.url), 'utf8')
 const routes = readFileSync(new URL('./routes.ts', import.meta.url), 'utf8')
 const view = readFileSync(new URL('./components/BusinessOrdersView.vue', import.meta.url), 'utf8')
+const procurementApi = readFileSync(new URL('./api/procurement.ts', import.meta.url), 'utf8')
+const procurementView = readFileSync(new URL('./views/ProcurementView.vue', import.meta.url), 'utf8')
 
 test('renders unknown pallet service and container type as dashes while preserving explicit values', () => {
   const helpers = view.slice(view.indexOf('function read('), view.indexOf('function idempotencyKey('))
@@ -42,14 +44,15 @@ test('activates all three customer cross-border pages with frozen permissions',
     assert.match(routes, new RegExp(`path: '${path}'[\\s\\S]*?release: 'active'[\\s\\S]*?permission: '${permission}'`))
   }
   assert.doesNotMatch(view, /PrototypeFeatureView|mock|customerId|tenantId/i)
-  assert.match(view, /merchant:cross-border:procurement:create/)
+  assert.match(procurementView, /merchant:cross-border:procurement:create/)
   assert.match(view, /merchant:cross-border:domestic-trucking:create/)
   assert.match(view, /merchant:cross-border:pallet-shipping:create/)
   assert.match(view, /v-if="canCreate"[^>]*type="primary"/)
 })
 
 test('uses only merchant overseas endpoints and keeps retry idempotency stable', () => {
-  assert.match(api, /overseas-procurements/)
+  assert.match(procurementApi, /overseas-procurements/)
+  assert.doesNotMatch(api, /overseas-procurements|ProcurementSummary|ProcurementDetail/)
   assert.match(api, /us-truck-orders/)
   assert.match(api, /local-looseboard-orders/)
   assert.doesNotMatch(api, /\/platform\/|\/internal\/|customerId|tenantId/)
@@ -69,11 +72,9 @@ test('covers list detail create loading error empty pagination and actions-first
   assert.match(view, /<DataTable[^>]*:row-actions="getRowActions"/)
   assert.match(view, /key: 'actions', label: '操作', width: 90, fixed: 'left'/)
   assert.match(view, /class="business-table-card"/)
-  assert.match(view, /PENDING_OUTBOUND: '待出库'/)
-  assert.match(view, /PARTIALLY_OUTBOUND: '部分出库'/)
-  assert.match(view, /OUTBOUNDED: '全部出库'/)
-  assert.match(view, /\['入库量', read\(summary, 'inboundQuantity'\)\]/)
-  assert.match(view, /\['审核备注', current\.reviewRemark\]/)
+  assert.doesNotMatch(procurementView, /inventoryQuantity|outboundQuantity|reviewRemark/)
+  assert.match(procurementView, /procurementStatuses/)
+  assert.match(procurementView, /ProcurementDetailPanel/)
 })
 
 test('opens every dashboard cross-border action on a dedicated protected create page', () => {
@@ -100,7 +101,7 @@ test('opens all cross-border details on dedicated protected routes', () => {
   assert.match(view, /class="business-detail-error"/)
 })
 
-test('keeps procurement filters, details and forms readable at PDA width', () => {
+test('preserves the existing transport responsive rules without adding a narrow-screen procurement acceptance gate', () => {
   assert.match(view, /@media \(max-width: 767px\)/)
   assert.match(view, /queryFields/)
   assert.match(view, /\.detail-grid \{ grid-template-columns: 1fr; \}/)

src/modules/cross-border/components/BusinessOrdersView.vue

@@ -7,13 +7,10 @@ import QueryToolbar, { type QueryField, type QueryModel } from '@/components/com
 import type { TableAction } from '@/components/common/tableActions'
 import { useAuthStore } from '@/modules/auth/public'
 import {
-  createProcurement,
   createTransport,
   getBusinessOrder,
   listBusinessOrders,
   type CrossBorderBusinessKind,
-  type ProcurementDetail,
-  type ProcurementSummary,
   type TransportDetail,
   type TransportSummary,
 } from '../api/businessOrders'
@@ -26,23 +23,17 @@ const router = useRouter()
 const route = useRoute()
 const detailOrderNo = computed(() => String(route.params.orderNo || ''))
 const canCreate = computed(() => auth.hasPermission(({
-  procurement: 'merchant:cross-border:procurement:create',
   trucking: 'merchant:cross-border:domestic-trucking:create',
   looseboard: 'merchant:cross-border:pallet-shipping:create',
 } as Record<CrossBorderBusinessKind, string>)[props.kind]))
 
-type BusinessRow = ProcurementSummary | TransportSummary
-type BusinessDetail = ProcurementDetail | TransportDetail
+type BusinessRow = TransportSummary
+type BusinessDetail = TransportDetail
 type PageMode = 'list' | 'create' | 'detail'
 
 interface ColumnDefinition { key: string; label: string; width?: number }
 
 interface BusinessForm {
-  purchaseCategory: string
-  productName: string
-  productSpecification: string
-  productUrl: string
-  purchaseQuantity: number
   transportMode: string
   palletRequired: string
   transportType: string
@@ -60,28 +51,10 @@ interface BusinessForm {
   contactName: string
   contactInfo: string
   requestedDate: string
-  receivingAddress: string
   remark: string
 }
 
 const configuration = computed(() => ({
-  procurement: {
-    title: '海外采购',
-    description: '查询并管理海外采购订单',
-    columns: [
-      { key: 'orderNo', label: '订单号', width: 180 },
-      { key: 'purchaseCategory', label: '采购品类', width: 130 },
-      { key: 'productName', label: '商品名称', width: 160 },
-      { key: 'productSpecification', label: '商品规格', width: 160 },
-      { key: 'purchaseQuantity', label: '采购数量', width: 100 },
-      { key: 'budgetUnitPrice', label: '预算单价', width: 110 },
-      { key: 'inboundQuantity', label: '入库量', width: 90 },
-      { key: 'outboundQuantity', label: '出库量', width: 90 },
-      { key: 'inventoryQuantity', label: '库存量', width: 90 },
-      { key: 'status', label: '状态', width: 120 },
-      { key: 'createdAt', label: '创建时间', width: 170 },
-    ] satisfies ColumnDefinition[],
-  },
   trucking: {
     title: '美国本土卡',
     description: '查询并管理美国本土卡订单',
@@ -117,23 +90,19 @@ const submitKey = ref('')
 const error = ref('')
 const rows = ref<BusinessRow[]>([])
 const detail = ref<BusinessDetail | null>(null)
-const fleetArrangement = computed(() => detail.value && props.kind !== 'procurement' ? (detail.value as TransportDetail).summary.fleetArrangement : null)
+const fleetArrangement = computed(() => detail.value ? (detail.value as TransportDetail).summary.fleetArrangement : null)
 const formRef = ref<FormInstance>()
-const query = reactive({ page: 1, size: 20, orderNo: '', routeKeyword: '', status: '', productName: '', purchaseCategory: '' })
+const query = reactive({ page: 1, size: 20, orderNo: '', routeKeyword: '', status: '' })
 const total = ref(0)
 
 const queryModel = computed<QueryModel>({
   get: () => ({
     orderNo: query.orderNo,
-    purchaseCategory: query.purchaseCategory,
-    productName: query.productName,
     routeKeyword: query.routeKeyword,
     status: query.status,
   }),
   set: (value) => {
     query.orderNo = String(value.orderNo || '')
-    query.purchaseCategory = String(value.purchaseCategory || '')
-    query.productName = String(value.productName || '')
     query.routeKeyword = String(value.routeKeyword || '')
     query.status = String(value.status || '')
   },
@@ -141,12 +110,7 @@ const queryModel = computed<QueryModel>({
 
 const queryFields = computed<QueryField[]>(() => [
   { key: 'orderNo', label: '订单号', type: 'input', placeholder: '请输入订单号' },
-  ...(props.kind === 'procurement'
-    ? [
-        { key: 'purchaseCategory', label: '采购品类', type: 'input', placeholder: '请输入采购品类' } as QueryField,
-        { key: 'productName', label: '商品名称', type: 'input', placeholder: '请输入商品名称' } as QueryField,
-      ]
-    : [{ key: 'routeKeyword', label: '运输路线', type: 'input', placeholder: '请输入起运地或目的地' } as QueryField]),
+  { key: 'routeKeyword', label: '运输路线', type: 'input', placeholder: '请输入起运地或目的地' },
   {
     key: 'status',
     label: '状态',
@@ -156,11 +120,8 @@ const queryFields = computed<QueryField[]>(() => [
       { label: '待审核', value: 'PENDING_REVIEW' },
       { label: '已通过', value: 'APPROVED' },
       { label: '已拒绝', value: 'REJECTED' },
-      { label: '待出库', value: 'PENDING_OUTBOUND' },
-      { label: '部分出库', value: 'PARTIALLY_OUTBOUND' },
-      { label: '全部出库', value: 'OUTBOUNDED' },
       { label: '待接单', value: 'PENDING_ACCEPTANCE' },
-      ...(props.kind === 'procurement' ? [] : Object.entries(poolOrderStatusLabels).filter(([value]) => !['IN_TRANSIT', 'COMPLETED', 'CANCELLED'].includes(value)).map(([value, label]) => ({ value, label }))),
+      ...Object.entries(poolOrderStatusLabels).filter(([value]) => !['IN_TRANSIT', 'COMPLETED', 'CANCELLED'].includes(value)).map(([value, label]) => ({ value, label })),
       { label: '处理中', value: 'PROCESSING' },
       { label: '运输中', value: 'IN_TRANSIT' },
       { label: '已完成', value: 'COMPLETED' },
@@ -171,9 +132,6 @@ const queryFields = computed<QueryField[]>(() => [
 
 const form = reactive<BusinessForm>(emptyForm())
 const rules: FormRules<BusinessForm> = {
-  purchaseCategory: [{ required: true, message: '请输入采购品类', trigger: 'blur' }],
-  productName: [{ required: true, message: '请输入商品名称', trigger: 'blur' }],
-  purchaseQuantity: [{ required: true, type: 'number', min: 1, message: '采购数量至少为 1', trigger: 'change' }],
   origin: [{ required: true, message: '请输入起运地', trigger: 'blur' }],
   destination: [{ required: true, message: '请输入目的地', trigger: 'blur' }],
   palletCount: [{ required: true, type: 'number', min: 1, message: '托盘数至少为 1', trigger: 'change' }],
@@ -185,21 +143,6 @@ const rules: FormRules<BusinessForm> = {
 const detailFields = computed(() => {
   if (!detail.value) return []
   const summary = detail.value.summary
-  if (props.kind === 'procurement') {
-    const current = detail.value as ProcurementDetail
-    return [
-      ['采购品类', read(summary, 'purchaseCategory')],
-      ['商品名称', read(summary, 'productName')], ['商品规格', read(summary, 'productSpecification')],
-      ['采购数量', read(summary, 'purchaseQuantity')], ['预算单价', money(read(summary, 'budgetUnitPrice'), read(summary, 'currency'))],
-      ['入库量', read(summary, 'inboundQuantity')], ['出库量', read(summary, 'outboundQuantity')],
-      ['库存量', read(summary, 'inventoryQuantity')], ['预计到达时间', dateTime(current.estimatedArrivalAt)],
-      ['联系人', current.contactName], ['联系电话', current.contactPhone],
-      ['收货地址', current.receivingAddress], ['商品链接', current.productUrl],
-      ['国内运单', joinText(current.domesticCarrier, current.domesticTrackingNo)],
-      ['海外运单', joinText(current.overseasCarrier, current.overseasTrackingNo)],
-      ['审核备注', current.reviewRemark], ['备注', current.remark],
-    ]
-  }
   const current = detail.value as TransportDetail
   return [
     ['运输方式', transportModeLabel(read(summary, 'transportMode'))],
@@ -228,18 +171,16 @@ const detailStatus = computed(() => detail.value ? statusLabel(detail.value.summ
 
 function emptyForm(): BusinessForm {
   return {
-    purchaseCategory: '', productName: '', productSpecification: '', productUrl: '', purchaseQuantity: 1,
     transportMode: 'SHARED_TRUCK', palletRequired: 'NO', transportType: 'PORT_PICKUP', origin: '', originAddress: '',
     destination: '', destinationAddress: '', containerType: DEFAULT_CONTAINER_TYPE, palletCount: 1, packageCount: 0,
     totalWeightKg: 0, totalVolumeCbm: 0, currency: 'USD', contactName: '', contactInfo: '', requestedDate: '',
-    receivingAddress: '', remark: '',
+    remark: '',
   }
 }
 
 function resetForm() { Object.assign(form, emptyForm()); submitKey.value = ''; formRef.value?.clearValidate() }
 function read(source: object, key: string) { return Reflect.get(source, key) as unknown }
 function text(value: unknown) { return value === null || value === undefined || value === '' ? '—' : String(value) }
-function joinText(...values: unknown[]) { const result = values.filter(Boolean).join(' / '); return result || '—' }
 function money(amount: unknown, currency: unknown) { return amount === null || amount === undefined ? '—' : `${text(currency)} ${Number(amount).toFixed(2)}` }
 function dateTime(value: unknown) { return value ? new Date(String(value)).toLocaleString('zh-CN', { hour12: false }) : '—' }
 function yesNo(value: unknown) { return value === 'YES' ? '是' : value === 'NO' ? '否' : text(value) }
@@ -247,10 +188,10 @@ function transportTypeLabel(value: unknown) { return ({ PORT_PICKUP: '港口提
 function transportModeLabel(value: unknown) { return ({ SHARED_TRUCK: '拼车', PRIORITY_CONSOLIDATION: '优先拼载' } as Record<string, string>)[String(value)] || text(value) }
 function statusLabel(value: unknown) {
   if (poolOrderStatusLabels[String(value)]) return poolOrderStatusLabels[String(value)]
-  return ({ PENDING_REVIEW: '待审核', APPROVED: '已通过', REJECTED: '已拒绝', PENDING_OUTBOUND: '待出库', PARTIALLY_OUTBOUND: '部分出库', OUTBOUNDED: '全部出库', PENDING_ACCEPTANCE: '待接单', PROCESSING: '处理中', IN_TRANSIT: '运输中', COMPLETED: '已完成', CANCELLED: '已取消' } as Record<string, string>)[String(value)] || text(value)
+  return ({ PENDING_REVIEW: '待审核', APPROVED: '已通过', REJECTED: '已拒绝', PENDING_ACCEPTANCE: '待接单', PROCESSING: '处理中', IN_TRANSIT: '运输中', COMPLETED: '已完成', CANCELLED: '已取消' } as Record<string, string>)[String(value)] || text(value)
 }
 function statusTone(value: unknown) {
-  return ({ APPROVED: 'success', COMPLETED: 'success', OUTBOUNDED: 'success', REJECTED: 'danger', CANCELLED: 'info', PENDING_REVIEW: 'warning', PENDING_ACCEPTANCE: 'warning', PROCESSING: 'primary', IN_TRANSIT: 'primary' } as Record<string, 'success' | 'warning' | 'danger' | 'info' | 'primary'>)[String(value)] || 'info'
+  return ({ APPROVED: 'success', COMPLETED: 'success', REJECTED: 'danger', CANCELLED: 'info', PENDING_REVIEW: 'warning', PENDING_ACCEPTANCE: 'warning', PROCESSING: 'primary', IN_TRANSIT: 'primary' } as Record<string, 'success' | 'warning' | 'danger' | 'info' | 'primary'>)[String(value)] || 'info'
 }
 function displayCell(candidate: unknown, key: string) {
   const row = candidate as BusinessRow
@@ -260,7 +201,7 @@ function displayCell(candidate: unknown, key: string) {
   if (key === 'transportMode') return transportModeLabel(value)
   if (key === 'palletRequired') return yesNo(value)
   if (key === 'createdAt') return dateTime(value)
-  if (key === 'budgetUnitPrice' || key === 'budgetAmount') return money(value, read(row, 'currency'))
+  if (key === 'budgetAmount') return money(value, read(row, 'currency'))
   return text(value)
 }
 function idempotencyKey() { return globalThis.crypto?.randomUUID?.() || `client-${Date.now()}-${Math.random().toString(16).slice(2)}` }
@@ -272,12 +213,9 @@ async function load() {
   try {
     const params = {
       page: query.page, size: query.size, orderNo: query.orderNo || undefined, status: query.status || undefined,
-      routeKeyword: query.routeKeyword || undefined, productName: query.productName || undefined,
-      purchaseCategory: query.purchaseCategory || undefined,
+      routeKeyword: query.routeKeyword || undefined,
     }
-    const result = props.kind === 'procurement'
-      ? await listBusinessOrders<ProcurementSummary>('procurement', params)
-      : await listBusinessOrders<TransportSummary>(props.kind, params)
+    const result = await listBusinessOrders<TransportSummary>(props.kind, params)
     rows.value = result.records
     total.value = result.total
   } catch (cause) {
@@ -289,7 +227,7 @@ async function load() {
 
 function resetQuery() {
   const reloadDirectly = query.page === 1
-  Object.assign(query, { page: 1, orderNo: '', routeKeyword: '', status: '', productName: '', purchaseCategory: '' })
+  Object.assign(query, { page: 1, orderNo: '', routeKeyword: '', status: '' })
   if (reloadDirectly) void load()
 }
 
@@ -303,16 +241,14 @@ function getRowActions(candidate: object): TableAction[] {
 }
 
 function detailFieldClass(label: unknown) {
-  return ['收货地址', '商品链接', '国内运单', '海外运单', '审核备注', '备注', '起运地址', '目的地址'].includes(String(label)) ? 'is-wide' : ''
+  return ['备注', '起运地址', '目的地址'].includes(String(label)) ? 'is-wide' : ''
 }
 
 const listRouteName = computed(() => ({
-  procurement: 'cross-border-procurement',
   trucking: 'cross-border-domestic-trucking',
   looseboard: 'cross-border-pallet-shipping',
 } as Record<CrossBorderBusinessKind, string>)[props.kind])
 const detailRouteName = computed(() => ({
-  procurement: 'cross-border-procurement-detail',
   trucking: 'cross-border-domestic-trucking-detail',
   looseboard: 'cross-border-pallet-shipping-detail',
 } as Record<CrossBorderBusinessKind, string>)[props.kind])
@@ -334,9 +270,7 @@ async function loadDetail() {
   loading.value = true
   error.value = ''
   try {
-    detail.value = props.kind === 'procurement'
-      ? await getBusinessOrder<ProcurementDetail>('procurement', detailOrderNo.value)
-      : await getBusinessOrder<TransportDetail>(props.kind, detailOrderNo.value)
+    detail.value = await getBusinessOrder<TransportDetail>(props.kind, detailOrderNo.value)
     mode.value = 'detail'
   } catch (cause) { detail.value = null; error.value = errorMessage(cause); ElMessage.error(error.value) }
   finally { loading.value = false }
@@ -348,31 +282,19 @@ async function submit() {
   const stableSubmitKey = submitKey.value || idempotencyKey()
   submitKey.value = stableSubmitKey
   try {
-    if (props.kind === 'procurement') {
-      await createProcurement({
-        customerName: auth.user?.tenantName || '',
-        purchaseCategory: form.purchaseCategory, productName: form.productName,
-        productSpecification: form.productSpecification || undefined, productUrl: form.productUrl || undefined,
-        purchaseQuantity: form.purchaseQuantity, budgetUnitPrice: form.budgetAmount,
-        currency: form.currency || undefined, receivingAddress: form.receivingAddress || undefined,
-        contactName: form.contactName, contactPhone: form.contactInfo, remark: form.remark || undefined,
-        idempotencyKey: stableSubmitKey,
-      })
-    } else {
-      const base = {
-        transportType: form.transportType, origin: form.origin, originAddress: form.originAddress || undefined,
-        destination: form.destination, destinationAddress: form.destinationAddress || undefined,
-        containerType: form.containerType || undefined, packageCount: form.packageCount,
-        totalWeightKg: form.totalWeightKg, totalVolumeCbm: form.totalVolumeCbm,
-        budgetAmount: form.budgetAmount, currency: form.currency || undefined,
-        contactName: form.contactName || undefined, contactInfo: form.contactInfo || undefined,
-        requestedDate: form.requestedDate || undefined, remark: form.remark || undefined,
-        idempotencyKey: stableSubmitKey,
-      }
-      await createTransport(props.kind, props.kind === 'trucking'
-        ? { ...base, palletCount: form.palletCount }
-        : { ...base, transportMode: form.transportMode, palletRequired: form.palletRequired })
+    const base = {
+      transportType: form.transportType, origin: form.origin, originAddress: form.originAddress || undefined,
+      destination: form.destination, destinationAddress: form.destinationAddress || undefined,
+      containerType: form.containerType || undefined, packageCount: form.packageCount,
+      totalWeightKg: form.totalWeightKg, totalVolumeCbm: form.totalVolumeCbm,
+      budgetAmount: form.budgetAmount, currency: form.currency || undefined,
+      contactName: form.contactName || undefined, contactInfo: form.contactInfo || undefined,
+      requestedDate: form.requestedDate || undefined, remark: form.remark || undefined,
+      idempotencyKey: stableSubmitKey,
     }
+    await createTransport(props.kind, props.kind === 'trucking'
+      ? { ...base, palletCount: form.palletCount }
+      : { ...base, transportMode: form.transportMode, palletRequired: form.palletRequired })
     ElMessage.success('订单提交成功')
     resetForm()
     if (props.createPage) await router.push({ name: listRouteName.value })
@@ -442,15 +364,6 @@ onMounted(() => { if (props.detailPage) void loadDetail(); else if (!props.creat
 
     <el-card v-else shadow="never" class="form-card">
       <el-form ref="formRef" :model="form" :rules="rules" label-width="120px">
-        <template v-if="kind === 'procurement'">
-          <el-form-item label="采购品类" prop="purchaseCategory"><el-input v-model.trim="form.purchaseCategory" maxlength="128" placeholder="请输入采购品类" /></el-form-item>
-          <el-form-item label="商品名称" prop="productName"><el-input v-model.trim="form.productName" maxlength="255" placeholder="请输入商品名称" /></el-form-item>
-          <el-form-item label="商品规格"><el-input v-model.trim="form.productSpecification" maxlength="500" placeholder="请输入规格、型号等信息" /></el-form-item>
-          <el-form-item label="商品链接"><el-input v-model.trim="form.productUrl" maxlength="2000" placeholder="请输入商品链接" /></el-form-item>
-          <el-form-item label="采购数量" prop="purchaseQuantity"><el-input-number v-model="form.purchaseQuantity" :min="1" placeholder="请输入数量" /></el-form-item>
-          <el-form-item label="收货地址"><el-input v-model.trim="form.receivingAddress" maxlength="1000" placeholder="请输入收货地址" /></el-form-item>
-        </template>
-        <template v-else>
           <el-form-item v-if="kind === 'looseboard'" label="运输方式"><el-radio-group v-model="form.transportMode"><el-radio-button value="SHARED_TRUCK">拼车</el-radio-button><el-radio-button value="PRIORITY_CONSOLIDATION">优先拼载</el-radio-button></el-radio-group></el-form-item>
           <el-form-item v-if="kind === 'looseboard'" label="是否打盘"><el-radio-group v-model="form.palletRequired"><el-radio-button value="NO">否</el-radio-button><el-radio-button value="YES">是</el-radio-button></el-radio-group></el-form-item>
           <el-form-item label="运输类型"><el-select v-model="form.transportType"><el-option label="港口提柜" value="PORT_PICKUP" /><el-option label="仓到仓" value="WAREHOUSE_TO_WAREHOUSE" /><el-option label="仓到门" value="WAREHOUSE_TO_DOOR" /></el-select></el-form-item>
@@ -464,8 +377,7 @@ onMounted(() => { if (props.detailPage) void loadDetail(); else if (!props.creat
           <el-form-item label="总重量(kg)"><el-input-number v-model="form.totalWeightKg" :min="0" :precision="2" placeholder="请输入总重量" /></el-form-item>
           <el-form-item label="总体积(m³)"><el-input-number v-model="form.totalVolumeCbm" :min="0" :precision="3" placeholder="请输入总体积" /></el-form-item>
           <el-form-item label="要求时间" :prop="kind === 'trucking' ? 'requestedDate' : undefined"><el-date-picker v-model="form.requestedDate" type="date" value-format="YYYY-MM-DD" /></el-form-item>
-        </template>
-        <el-form-item class="budget-form-item" :label="kind === 'procurement' ? '预算单价' : '预算金额'"><el-input-number v-model="form.budgetAmount" :min="0" :precision="2" placeholder="请输入预算金额" /><el-select v-model="form.currency" class="currency"><el-option label="USD" value="USD" /><el-option label="CNY" value="CNY" /></el-select></el-form-item>
+        <el-form-item class="budget-form-item" label="预算金额"><el-input-number v-model="form.budgetAmount" :min="0" :precision="2" placeholder="请输入预算金额" /><el-select v-model="form.currency" class="currency"><el-option label="USD" value="USD" /><el-option label="CNY" value="CNY" /></el-select></el-form-item>
         <el-form-item label="联系人" prop="contactName"><el-input v-model.trim="form.contactName" maxlength="128" placeholder="请输入联系人" /></el-form-item>
         <el-form-item label="联系方式" prop="contactInfo"><el-input v-model.trim="form.contactInfo" maxlength="128" placeholder="请输入电话、微信或邮箱" /></el-form-item>
         <el-form-item label="备注"><el-input v-model="form.remark" type="textarea" :rows="4" maxlength="1000" show-word-limit placeholder="请输入其他要求" /></el-form-item>

src/modules/cross-border/components/ProcurementDetailPanel.vue

@@ -0,0 +1,106 @@
+<script setup lang="ts">
+import { computed } from 'vue'
+import type { ProcurementDetail, ProcurementFee } from '../api/procurement'
+import { dateTime, feePurposes, feeStatus, feeTone, feeTotals, measurement, money, productHref, text } from '../procurementPresentation'
+
+const props = defineProps<{ detail: ProcurementDetail }>()
+const totals = computed(() => feeTotals(props.detail.fees))
+const progress = computed(() => props.detail.progress.filter(step => step.key !== 'closed_at' || step.completedAt))
+const ended = computed(() => ['REJECTED', 'CANCELLED', 'EXCEPTION_CLOSED', 'SHIPPED_TO_CUSTOMER'].includes(props.detail.order.status))
+const hasPending = computed(() => props.detail.fees.some(f => f.walletStatus?.endsWith('_PENDING') || f.walletStatus?.endsWith('_FAILED')))
+</script>
+
+<template>
+  <section class="procurement-section" aria-label="采购履约进度">
+    <h3>履约进度</h3>
+    <ol class="procurement-progress">
+      <li v-for="step in progress" :key="step.key" :class="{ 'is-complete': step.completedAt }">
+        <strong>{{ step.title }}</strong><span>{{ step.completedAt ? dateTime(step.completedAt) : ended ? '未执行' : '待处理' }}</span>
+      </li>
+    </ol>
+    <p v-if="detail.purchaseNeedsAttention" class="procurement-note">购买资料正在核对，客服将协助处理。已发生的收货与费用结果仍保留在本单。</p>
+  </section>
+  <section class="procurement-section" aria-label="商品与收件信息">
+    <h3>商品与收件信息</h3>
+    <dl class="procurement-grid">
+      <div><dt>采购品类</dt><dd>{{ detail.order.purchaseCategory }}</dd></div>
+      <div><dt>商品名称</dt><dd>{{ detail.order.productName }}</dd></div>
+      <div><dt>商品规格</dt><dd>{{ text(detail.order.productSpecification) }}</dd></div>
+      <div><dt>采购数量</dt><dd>{{ detail.order.purchaseQuantity }} 件</dd></div>
+      <div><dt>下单预算单价</dt><dd>{{ money(detail.order.budgetUnitPrice, detail.order.currency) }}</dd></div>
+      <div><dt>货款预算总上限</dt><dd>{{ money(detail.budget.totalAmount, detail.budget.currency) }}</dd></div>
+      <div><dt>预算核验时间</dt><dd>{{ dateTime(detail.budget.authorizedAt) }}</dd></div>
+      <div><dt>预计到海外仓</dt><dd>{{ dateTime(detail.order.estimatedArrivalAt) }}</dd></div>
+      <div><dt>收件人</dt><dd>{{ detail.order.contactName }}</dd></div>
+      <div><dt>联系电话</dt><dd>{{ detail.order.contactPhone }}</dd></div>
+      <div class="wide"><dt>下单收货地址</dt><dd>{{ detail.order.receivingAddress }}</dd></div>
+      <div class="wide"><dt>实际海外仓</dt><dd>{{ text(detail.order.actualWarehouseName) }}<span v-if="detail.order.actualWarehouseCode">（{{ detail.order.actualWarehouseCode }}）</span></dd></div>
+      <div class="wide"><dt>商品链接</dt><dd><a v-if="productHref(detail.order.productUrl)" :href="productHref(detail.order.productUrl)" target="_blank" rel="noopener noreferrer">{{ detail.order.productUrl }}</a><span v-else>{{ text(detail.order.productUrl) }}</span></dd></div>
+    </dl>
+  </section>
+  <section class="procurement-section" aria-label="已确认海外装箱清单">
+    <h3>已确认海外装箱清单</h3>
+    <el-table :data="detail.boxes" border stripe empty-text="尚无已确认的装箱清单" row-key="cartonNo">
+      <el-table-column prop="cartonNo" label="箱号" min-width="170" />
+      <el-table-column label="箱内商品" min-width="200"><template #default>{{ detail.order.productName }}</template></el-table-column>
+      <el-table-column label="规格" min-width="180"><template #default>{{ text(detail.order.productSpecification) }}</template></el-table-column>
+      <el-table-column prop="quantity" label="数量（件）" width="120" />
+      <el-table-column label="外箱长 × 宽 × 高（cm）" min-width="240"><template #default="{ row }">{{ measurement(row.lengthCm, 2) }} × {{ measurement(row.widthCm, 2) }} × {{ measurement(row.heightCm, 2) }}</template></el-table-column>
+      <el-table-column label="封箱毛重（kg）" width="170"><template #default="{ row }">{{ measurement(row.grossWeightKg, 3) }}</template></el-table-column>
+    </el-table>
+  </section>
+  <section class="procurement-section" aria-label="两段实际运输">
+    <h3>两段实际运输</h3>
+    <el-table :data="detail.shipments" border stripe empty-text="尚无实际交寄记录">
+      <el-table-column label="运输段" width="150"><template #default="{ row }">{{ row.leg === 'OVERSEAS' ? '国际段 · 海外交寄' : '国内段 · 寄客户' }}</template></el-table-column>
+      <el-table-column prop="shipmentNo" label="交寄编号" min-width="270" />
+      <el-table-column prop="cartonNo" label="原箱号" min-width="150" />
+      <el-table-column prop="quantity" label="实际件数" width="110" />
+      <el-table-column prop="carrier" label="承运商" min-width="140" />
+      <el-table-column prop="trackingNo" label="运单号" min-width="230" />
+      <el-table-column label="实际交寄时间" width="185"><template #default="{ row }">{{ dateTime(row.shippedAt) }}</template></el-table-column>
+    </el-table>
+    <p class="procurement-note">这里显示已实际交给承运方的记录；国内寄客户后，本单履约完成。</p>
+  </section>
+  <section class="procurement-section" aria-label="采购费用与资金结果">
+    <h3>费用与资金结果</h3>
+    <dl class="procurement-grid money-grid">
+      <div><dt>累计成功扣款</dt><dd>{{ money(totals?.paid) }}</dd></div>
+      <div><dt>累计成功退款</dt><dd>{{ money(totals?.refunded) }}</dd></div>
+      <div><dt>净实扣</dt><dd>{{ money(totals?.net) }}</dd></div>
+      <div><dt>预估国际运费占款</dt><dd>{{ money(totals?.estimatedHold) }}</dd></div>
+    </dl>
+    <p class="procurement-note">预算上限仅包含样品货款。预估国际运费只冻结、不直接扣款，最终以实际费用结算；表内保留原费用、追加及退款记录。</p>
+    <el-table :data="detail.fees" border stripe empty-text="尚无已核定费用" row-key="feeNo">
+      <el-table-column prop="feeNo" label="费用编号" min-width="270" />
+      <el-table-column label="费用用途" min-width="145"><template #default="{ row }">{{ feePurposes[row.purpose] || '待核定' }}</template></el-table-column>
+      <el-table-column prop="name" label="费用名称" min-width="145" />
+      <el-table-column label="原币金额" min-width="130"><template #default="{ row }">{{ money(row.originalAmount, row.originalCurrency) }}</template></el-table-column>
+      <el-table-column label="汇率 / 月份" min-width="150"><template #default="{ row }">{{ measurement(row.exchangeRate, 6) }}<br /><small>{{ text(row.exchangeRateMonth) }}</small></template></el-table-column>
+      <el-table-column label="人民币金额" min-width="130"><template #default="{ row }">{{ money(row.amount) }}</template></el-table-column>
+      <el-table-column label="处理结果" min-width="190"><template #default="{ row }"><el-tag :type="feeTone(row as ProcurementFee)" size="small">{{ feeStatus(row as ProcurementFee) }}</el-tag><small v-if="row.purpose !== 'INTERNATIONAL_ESTIMATE' && row.walletStatus === 'SETTLED' && !row.sourceLinked" class="fee-sync">费用结果同步中</small></template></el-table-column>
+      <el-table-column prop="parentFeeNo" label="关联原费用 / 预估" min-width="270"><template #default="{ row }">{{ text(row.parentFeeNo) }}</template></el-table-column>
+    </el-table>
+    <p v-if="hasPending" class="procurement-note">部分资金处理尚未完成，可点击页面“刷新”查看最新结果；如需协助请联系客户服务。</p>
+  </section>
+  <section v-if="detail.exceptionSummaries.length" class="procurement-section" aria-label="客服处理说明">
+    <h3>客服处理说明</h3><ul class="procurement-summaries"><li v-for="(summary, index) in detail.exceptionSummaries" :key="index">{{ summary }}</li></ul>
+  </section>
+</template>
+
+<style scoped>
+.procurement-section { margin-top: 18px; min-width: 0; }
+h3 { margin: 0 0 10px; padding-bottom: 7px; border-bottom: 1px solid var(--border); color: var(--navy); font-size: 14px; }
+.procurement-progress { display: grid; grid-template-columns: repeat(4, minmax(0, 1fr)); gap: 0; padding: 0; margin: 0; list-style: none; border-top: 1px solid var(--border); border-left: 1px solid var(--border); }
+.procurement-progress li { display: grid; gap: 7px; padding: 12px; border-bottom: 1px solid var(--border); border-right: 1px solid var(--border); color: var(--muted); }
+.procurement-progress strong { font-size: 13px; font-weight: 600; }.procurement-progress span { font-size: 12px; }.procurement-progress .is-complete strong { color: var(--navy); }
+.procurement-grid { display: grid; grid-template-columns: repeat(4, minmax(0, 1fr)); margin: 0; border-left: 1px solid var(--border); border-top: 1px solid var(--border); }
+.procurement-grid > div { display: grid; grid-template-columns: 110px minmax(0, 1fr); align-items: center; gap: 8px; padding: 9px 12px; border-right: 1px solid var(--border); border-bottom: 1px solid var(--border); min-width: 0; }
+.procurement-grid dt { font-size: 12px; color: var(--muted); }.procurement-grid dd { margin: 0; font-size: 13px; line-height: 1.6; color: var(--navy); overflow-wrap: anywhere; }
+.procurement-grid .wide { grid-column: span 2; }.money-grid > div { grid-template-columns: minmax(0, 1fr); }.money-grid dd { font-size: 16px; font-weight: 600; }
+a { color: var(--client-action); } .procurement-note { margin: 10px 0; color: var(--muted); font-size: 12px; line-height: 1.7; }
+.fee-sync { display: block; padding-top: 5px; color: var(--muted); }.procurement-summaries { margin: 0; padding-left: 22px; line-height: 1.8; color: var(--navy); font-size: 13px; white-space: pre-wrap; }
+@media (max-width: 767px) {
+  .procurement-progress, .procurement-grid { grid-template-columns: 1fr; }.procurement-grid .wide { grid-column: auto; }
+}
+</style>

src/modules/cross-border/procurement.test.mjs

@@ -0,0 +1,165 @@
+import assert from 'node:assert/strict'
+import test from 'node:test'
+import { readFileSync } from 'node:fs'
+import { runInNewContext } from 'node:vm'
+import ts from 'typescript'
+import * as vue from 'vue'
+import { parse, compileScript } from 'vue/compiler-sfc'
+
+let nextKey = 0
+const crypto = { randomUUID: () => `test-key-${++nextKey}` }
+function moduleFrom(source, require = () => { throw new Error('unexpected import') }) {
+  const context = { exports: {}, require, URL, Error, crypto }
+  const code = ts.transpileModule(source, { compilerOptions: { target: ts.ScriptTarget.ES2022, module: ts.ModuleKind.CommonJS } }).outputText
+  runInNewContext(code, context)
+  return context.exports
+}
+const presentation = moduleFrom(readFileSync(new URL('./procurementPresentation.ts', import.meta.url), 'utf8'))
+const submission = moduleFrom(readFileSync(new URL('./procurementSubmission.ts', import.meta.url), 'utf8'), name => {
+  if (name === './procurementPresentation') return presentation
+  throw new Error(`unexpected import ${name}`)
+})
+const normalized = value => JSON.parse(JSON.stringify(value))
+const draft = () => ({ ...presentation.emptyProcurementDraft(), purchaseCategory: 'Sample', productName: 'Test product', productSpecification: 'A',
+  purchaseQuantity: '3', budgetUnitPrice: '0.29', receivingAddress: '测试省测试市测试街 1 号', contactName: '测试收件人', contactPhone: '13800000000' })
+const fee = (purpose, walletStatus, amount) => ({ purpose, walletStatus, amount, currency: 'CNY' })
+
+test('budget distinguishes unknown from zero, preserves cents, and requires a real telephone/address', () => {
+  assert.equal(presentation.draftBudgetTotal(draft()), '0.87')
+  const valid = presentation.buildProcurementCreate(draft(), 'Authenticated Company', 'same-key')
+  assert.equal(valid.customerName, 'Authenticated Company')
+  assert.equal(valid.budgetUnitPrice, 0.29)
+  for (const value of ['', '-1', '1.001', '90071992547409.91']) assert.throws(() => presentation.buildProcurementCreate({ ...draft(), budgetUnitPrice: value }, 'Company', 'key'), /预算/)
+  assert.equal(presentation.buildProcurementCreate({ ...draft(), budgetUnitPrice: '0' }, 'Company', 'key').budgetUnitPrice, 0)
+  for (const patch of [{ contactPhone: 'wechat-name' }, { contactPhone: 'a@test.invalid' }, { receivingAddress: '' }, { purchaseQuantity: '1.5' }]) {
+    assert.throws(() => presentation.buildProcurementCreate({ ...draft(), ...patch }, 'Company', 'key'))
+  }
+  assert.equal(presentation.measurement(20, 2), '20.00')
+  assert.equal(presentation.measurement('5.125', 3), '5.125')
+  assert.equal(presentation.measurement('1.234', 2), '待核对')
+  assert.equal(presentation.money(null), '—')
+  assert.equal(presentation.money(0), 'CNY 0.00')
+  assert.equal(presentation.productHref('javascript:alert(1)'), undefined)
+  assert.equal(presentation.productHref('https://example.com/item'), 'https://example.com/item')
+})
+
+test('successful net debit excludes the original estimate and counts only successful refunds and differences', () => {
+  const result = presentation.feeTotals([fee('INTERNATIONAL_ESTIMATE', 'SETTLED', '100'), fee('INTERNATIONAL_FREIGHT', 'SETTLED', '100'),
+    fee('ADJUSTMENT', 'SETTLED', '20'), fee('ADJUSTMENT', 'SETTLED', '10'), fee('REFUND', 'REFUNDED', '20'), fee('REFUND', 'REFUND_PENDING', '5')])
+  assert.deepEqual(normalized(result), { paid: '130.00', refunded: '20.00', net: '110.00', estimatedHold: '0.00' })
+  assert.equal(presentation.feeTotals([fee('INTERNATIONAL_ESTIMATE', 'RELEASE_PENDING', '100')]).estimatedHold, '100.00')
+  assert.equal(presentation.feeTotals([fee('DUTY', 'SETTLED', 'unknown')]), null)
+  assert.equal(presentation.feeStatus(fee('INTERNATIONAL_ESTIMATE', 'FROZEN', 100)), '已冻结，未扣款')
+  assert.equal(presentation.feeStatus(fee('INTERNATIONAL_ESTIMATE', 'SETTLED', 100)), '原预估已结清')
+  assert.equal(presentation.feeStatus(fee('DUTY', null, 100)), '待核定')
+})
+
+test('request recovery preserves content and identity while malformed recovery cannot create a replacement', () => {
+  const original = presentation.buildProcurementCreate(draft(), 'Company', 'fixed-key')
+  assert.deepEqual(normalized(submission.restoreProcurementSubmission(JSON.stringify(original))), normalized(original))
+  assert.throws(() => submission.restoreProcurementSubmission('{}'))
+  assert.throws(() => submission.restoreProcurementSubmission(JSON.stringify({ ...original, currency: 'EUR' })))
+  assert.equal(submission.definitelyRejected({ code: 'TIMEOUT' }), false)
+  assert.equal(submission.definitelyRejected({ status: 500 }), false)
+  assert.equal(submission.definitelyRejected({ status: 409 }), false)
+  assert.equal(submission.definitelyRejected({ status: 400 }), true)
+  assert.equal(submission.procurementRequestKey({ getRandomValues: target => { target.set([1, 2, 3, 4]); return target } }), 'proc-00000001000000020000000300000004')
+})
+
+class ApiError extends Error { constructor(message, code, status) { super(message); this.code = code; this.status = status } }
+const flush = async () => { await vue.nextTick(); await new Promise(resolve => setImmediate(resolve)); await vue.nextTick() }
+function viewHarness({ createPage = false, detailPage = false, api = {}, storage = new Map() } = {}) {
+  const props = vue.reactive({ createPage, detailPage })
+  const route = vue.reactive({ params: { orderNo: detailPage ? 'PO-1' : '' } })
+  const auth = vue.reactive({ token: 'identity-A', user: { tenantName: 'Company' }, profile: { tenantName: 'Company' }, hasPermission: () => true })
+  const pushes = [], dispose = []
+  const defaults = { listProcurements: async () => ({ records: [], total: 0 }), getProcurement: async orderNo => ({ order: { orderNo } }), createProcurement: async () => ({ order: { orderNo: 'PO-CREATED' } }) }
+  const { descriptor } = parse(readFileSync(new URL('./views/ProcurementView.vue', import.meta.url), 'utf8'))
+  const source = compileScript(descriptor, { id: 'procurement-test' }).content
+  const context = { exports: {}, Error, crypto, sessionStorage: { getItem: key => storage.get(key) || null, setItem: (key, value) => storage.set(key, value), removeItem: key => storage.delete(key) },
+    require(name) {
+      if (name === 'vue') return { ...vue, onBeforeUnmount: callback => dispose.push(callback), watch: (...args) => { const stop = vue.watch(...args); dispose.push(stop); return stop } }
+      if (name === 'vue-router') return { useRoute: () => route, useRouter: () => ({ push: async target => pushes.push(target) }) }
+      if (name === 'element-plus') return { ElMessage: { success: () => {} } }
+      if (name === '@/api/types') return { ApiError }
+      if (name === '@/api/session') return { accessTokenIdentity: token => token }
+      if (name === '@/modules/auth/public') return { useAuthStore: () => auth }
+      if (name === '../api/procurement') return { ...defaults, ...api }
+      if (name === '../procurementPresentation') return presentation
+      if (name === '../procurementSubmission') return submission
+      if (name.endsWith('.vue')) return { default: {} }
+      throw new Error(`unexpected view import ${name}`)
+    },
+  }
+  runInNewContext(ts.transpileModule(source, { compilerOptions: { target: ts.ScriptTarget.ES2022, module: ts.ModuleKind.CommonJS } }).outputText, context)
+  const state = context.exports.default.setup(props, { expose: () => {} })
+  return { state, props, route, auth, pushes, storage, dispose: () => dispose.forEach(callback => callback()) }
+}
+
+test('detail has one in-flight request and an older response cannot overwrite another order', async () => {
+  const calls = [], pending = new Map()
+  const harness = viewHarness({ detailPage: true, api: { getProcurement: orderNo => { calls.push(orderNo); return new Promise(resolve => pending.set(orderNo, resolve)) } } })
+  try {
+    assert.deepEqual(calls, ['PO-1'])
+    await harness.state.loadDetail(); assert.equal(calls.length, 1)
+    harness.route.params.orderNo = 'PO-2'; await flush(); assert.deepEqual(calls, ['PO-1', 'PO-2'])
+    pending.get('PO-1')({ order: { orderNo: 'PO-1' } }); await flush(); assert.equal(harness.state.detail.value, null)
+    pending.get('PO-2')({ order: { orderNo: 'PO-2' } }); await flush(); assert.equal(harness.state.detail.value.order.orderNo, 'PO-2')
+    assert.equal(harness.state.loading.value, false)
+  } finally { harness.dispose() }
+})
+
+test('timeout retries the exact original body after reload and does not accept changed form data', async () => {
+  const storage = new Map(), calls = []
+  const first = viewHarness({ createPage: true, storage, api: { createProcurement: async payload => { calls.push(normalized(payload)); throw new ApiError('timeout', 'TIMEOUT') } } })
+  try {
+    Object.assign(first.state.form, draft()); await first.state.submit(); assert.equal(calls.length, 1); assert.ok(first.state.pending.value)
+    first.state.form.productName = 'changed'; await first.state.submit(); assert.deepEqual(calls[1], calls[0])
+  } finally { first.dispose() }
+  const recovered = viewHarness({ createPage: true, storage, api: { createProcurement: async payload => { calls.push(normalized(payload)); return { order: { orderNo: 'PO-SAME' } } } } })
+  try {
+    assert.equal(recovered.state.form.productName, 'Test product'); await recovered.state.submit(); assert.deepEqual(calls[2], calls[0])
+    assert.equal(storage.size, 0); assert.equal(recovered.pushes[0].params.orderNo, 'PO-SAME')
+  } finally { recovered.dispose() }
+})
+
+test('submission double-click sends once and definitive validation rejection permits correction', async () => {
+  let reject, calls = 0
+  const harness = viewHarness({ createPage: true, api: { createProcurement: () => { calls++; return new Promise((_, failure) => { reject = failure }) } } })
+  try {
+    Object.assign(harness.state.form, draft()); const first = harness.state.submit(); await harness.state.submit(); assert.equal(calls, 1)
+    reject(new ApiError('invalid', 'A0422')); await first
+    assert.equal(harness.state.pending.value, null); assert.equal(harness.storage.size, 0)
+  } finally { harness.dispose() }
+})
+
+test('pagination batches one request and switching account clears old rows before the new response', async () => {
+  const calls = []; let resolveSecond
+  const harness = viewHarness({ api: { listProcurements: async params => {
+    calls.push(normalized(params)); if (calls.length < 3) return { records: [{ orderNo: 'PO-A' }], total: 100 }
+    return new Promise(resolve => { resolveSecond = resolve })
+  } } })
+  try {
+    await flush(); assert.equal(calls.length, 1)
+    harness.state.query.page = 2; harness.state.query.size = 50; await flush(); assert.equal(calls.length, 2)
+    harness.auth.token = 'identity-B'; await vue.nextTick(); assert.equal(harness.state.rows.value.length, 0); assert.equal(harness.state.total.value, 0)
+    resolveSecond({ records: [{ orderNo: 'PO-B' }], total: 1 }); await flush(); assert.equal(harness.state.rows.value[0].orderNo, 'PO-B')
+    assert.ok(calls.every(params => !('customerId' in params) && !('tenantId' in params)))
+  } finally { harness.dispose() }
+})
+
+
+test('replay rejection cannot discard an earlier unknown creation outcome', async () => {
+  const calls = []; let attempt = 0
+  const harness = viewHarness({ createPage: true, api: { createProcurement: async payload => {
+    calls.push(normalized(payload)); attempt++
+    if (attempt === 1) throw new ApiError('timeout', 'TIMEOUT')
+    throw new ApiError('permission revoked', 'A0403')
+  } } })
+  try {
+    Object.assign(harness.state.form, draft()); await harness.state.submit()
+    const saved = [...harness.storage.values()][0]; await harness.state.submit()
+    assert.equal([...harness.storage.values()][0], saved); assert.ok(harness.state.pending.value)
+    assert.deepEqual(calls[1], calls[0])
+  } finally { harness.dispose() }
+})

src/modules/cross-border/procurementPresentation.ts

@@ -0,0 +1,123 @@
+import type { Amount, ProcurementCreate, ProcurementFee } from './api/procurement'
+
+export const procurementStatuses: Record<string, string> = {
+  PENDING_REVIEW: '待审核', WAIT_PURCHASE: '待购买', WAIT_OVERSEAS_RECEIPT: '待海外到仓', OVERSEAS_RECEIVING: '海外收货中',
+  WAIT_PACKING: '待装箱', WAIT_LABELS: '待面单及预估处理', WAIT_OVERSEAS_SHIPMENT: '待海外交寄', INTERNATIONAL_TRANSIT: '国际运输中',
+  DOMESTIC_RECEIVING: '国内收货中', WAIT_CHARGES: '待国内核费', WAIT_CUSTOMER_SHIPMENT: '待寄客户', SHIPPED_TO_CUSTOMER: '已寄客户',
+  REJECTED: '已拒绝', CANCELLED: '已取消', EXCEPTION_CLOSED: '异常关闭',
+}
+export const feePurposes: Record<string, string> = {
+  SAMPLE_PAYMENT: '样品货款', INTERNATIONAL_ESTIMATE: '预估国际运费', INTERNATIONAL_FREIGHT: '实际国际运费',
+  DUTY: '关税', DOMESTIC_FREIGHT: '国内运费', OTHER: '其他费用', ADJUSTMENT: '追加费用', REFUND: '退款',
+}
+export function statusLabel(status: string | null | undefined) { return status ? procurementStatuses[status] || '待核对进度' : '—' }
+export function statusTone(status: string | null | undefined): 'success' | 'warning' | 'danger' | 'info' | 'primary' {
+  if (status === 'SHIPPED_TO_CUSTOMER') return 'success'
+  if (status === 'REJECTED' || status === 'EXCEPTION_CLOSED') return 'danger'
+  if (status === 'CANCELLED') return 'info'
+  if (status === 'INTERNATIONAL_TRANSIT') return 'primary'
+  return 'warning'
+}
+function cents(value: Amount | null | undefined): bigint | null {
+  if (value === null || value === undefined) return null
+  const match = /^(-?)(\d+)(?:\.(\d{1,2}))?$/.exec(String(value).trim())
+  if (!match) return null
+  const result = BigInt(match[2]) * 100n + BigInt((match[3] || '').padEnd(2, '0'))
+  return match[1] ? -result : result
+}
+function decimal(value: bigint) {
+  const absolute = value < 0n ? -value : value
+  return `${value < 0n ? '-' : ''}${absolute / 100n}.${String(absolute % 100n).padStart(2, '0')}`
+}
+export function money(value: Amount | null | undefined, currency: string | null | undefined = 'CNY') {
+  const amount = cents(value)
+  return amount === null ? '—' : `${currency || '—'} ${decimal(amount)}`
+}
+export function dateTime(value: string | null | undefined) { return value ? value.replace('T', ' ').replace(/\.\d+$/, '') : '—' }
+export function measurement(value: Amount | null | undefined, scale: number) {
+  if (value === null || value === undefined) return '—'
+  const parts = /^(\d+)(?:\.(\d+))?$/.exec(String(value))
+  if (!parts || (parts[2] || '').length > scale) return '待核对'
+  return `${parts[1]}.${(parts[2] || '').padEnd(scale, '0')}`
+}
+export function text(value: unknown) { return value === null || value === undefined || value === '' ? '—' : String(value) }
+export function productHref(value: string | null | undefined) {
+  if (!value) return undefined
+  try { const url = new URL(value); return ['http:', 'https:'].includes(url.protocol) ? url.href : undefined } catch { return undefined }
+}
+export function feeStatus(fee: ProcurementFee) {
+  if (fee.purpose === 'INTERNATIONAL_ESTIMATE') {
+    const label: Record<string, string> = { FROZEN: '已冻结，未扣款', ZERO: '零预估已确认', SETTLED: '原预估已结清', RELEASED: '预估已释放' }
+    if (fee.walletStatus && label[fee.walletStatus]) return label[fee.walletStatus]
+  }
+  const labels: Record<string, string> = {
+    FREEZE_PENDING: '冻结处理中', FREEZE_FAILED: '冻结未成功', FROZEN: '等待扣款', SETTLE_PENDING: '扣款处理中', SETTLE_ACTUAL_PENDING: '实际费用结算中',
+    SETTLE_FAILED: '扣款未成功', SETTLE_ACTUAL_FAILED: '实际费用未结清', SETTLED: '已扣款', RELEASE_PENDING: '释放处理中', RELEASE_FAILED: '释放未成功',
+    RELEASED: '已释放冻结', REFUND_PENDING: '退款处理中', REFUND_FAILED: '退款未成功', REFUNDED: '已退款', ZERO: '已确认零元', NOT_APPLICABLE: '不适用', TERMINATED: '已终止',
+  }
+  return fee.walletStatus ? labels[fee.walletStatus] || '待核定' : '待核定'
+}
+export function feeTone(fee: ProcurementFee): 'success' | 'warning' | 'danger' | 'info' {
+  if (fee.walletStatus?.endsWith('_FAILED')) return 'danger'
+  if (['SETTLED', 'REFUNDED', 'ZERO', 'NOT_APPLICABLE', 'RELEASED'].includes(fee.walletStatus || '')) return 'success'
+  if (fee.walletStatus === 'TERMINATED') return 'info'
+  return 'warning'
+}
+export function feeTotals(fees: ProcurementFee[]) {
+  let paid = 0n, refunded = 0n, estimatedHold = 0n
+  for (const fee of fees) {
+    const estimate = fee.purpose === 'INTERNATIONAL_ESTIMATE'
+    const include = (!estimate && fee.walletStatus === 'SETTLED') || fee.walletStatus === 'REFUNDED'
+      || (estimate && ['FROZEN', 'RELEASE_PENDING', 'RELEASE_FAILED'].includes(fee.walletStatus || ''))
+    if (!include) continue
+    const amount = cents(fee.amount)
+    if (amount === null || amount < 0n || fee.currency !== 'CNY') return null
+    if (estimate) estimatedHold += amount
+    else if (fee.walletStatus === 'REFUNDED') refunded += amount
+    else paid += amount
+  }
+  return { paid: decimal(paid), refunded: decimal(refunded), net: decimal(paid - refunded), estimatedHold: decimal(estimatedHold) }
+}
+export interface ProcurementDraft {
+  purchaseCategory: string
+  productName: string
+  productSpecification: string
+  productUrl: string
+  purchaseQuantity: string
+  budgetUnitPrice: string
+  currency: 'CNY' | 'USD'
+  receivingAddress: string
+  contactName: string
+  contactPhone: string
+  remark: string
+}
+export function emptyProcurementDraft(): ProcurementDraft {
+  return { purchaseCategory: '', productName: '', productSpecification: '', productUrl: '', purchaseQuantity: '1', budgetUnitPrice: '', currency: 'USD', receivingAddress: '', contactName: '', contactPhone: '', remark: '' }
+}
+export function draftBudgetTotal(draft: ProcurementDraft) {
+  const price = cents(draft.budgetUnitPrice)
+  if (price === null || price < 0n || !/^\d+$/.test(draft.purchaseQuantity)) return null
+  return decimal(price * BigInt(draft.purchaseQuantity))
+}
+export function buildProcurementCreate(draft: ProcurementDraft, customerName: string, key: string): ProcurementCreate {
+  for (const [field, label, max] of [
+    ['purchaseCategory', '采购品类', 128], ['productName', '商品名称', 255], ['receivingAddress', '完整国内收货地址', 1000],
+    ['contactName', '最终收件人', 128], ['contactPhone', '联系电话', 64],
+  ] as const) {
+    if (!draft[field].trim() || draft[field].trim().length > max) throw new Error(`请填写有效的${label}`)
+  }
+  if (!customerName.trim()) throw new Error('当前企业信息尚未加载，请刷新登录信息后重试')
+  if (!/^\d+$/.test(draft.purchaseQuantity) || !Number.isSafeInteger(Number(draft.purchaseQuantity)) || Number(draft.purchaseQuantity) <= 0) throw new Error('采购数量必须为正整数')
+  const price = cents(draft.budgetUnitPrice)
+  if (price === null || price < 0n) throw new Error('请明确填写非负预算单价，最多两位小数；免费样品填写 0')
+  if (price > BigInt(Number.MAX_SAFE_INTEGER) || cents(Number(decimal(price))) !== price) throw new Error('预算金额过大，无法准确表示，请核对金额')
+  if (!['CNY', 'USD'].includes(draft.currency)) throw new Error('预算币种只支持 CNY 或 USD')
+  if (!/^[+0-9][0-9 ()-]{5,63}$/.test(draft.contactPhone.trim())) throw new Error('请填写快递可联系的电话号码，微信或邮箱不能代替电话')
+  if (draft.productUrl && (!productHref(draft.productUrl.trim()) || draft.productUrl.trim().length > 2000)) throw new Error('商品链接须为有效的 http 或 https 地址')
+  if (draft.productSpecification.length > 500 || draft.remark.length > 1000) throw new Error('商品规格或备注超过长度限制')
+  return { customerName: customerName.trim(), purchaseCategory: draft.purchaseCategory.trim(), productName: draft.productName.trim(),
+    productSpecification: draft.productSpecification.trim() || undefined, productUrl: draft.productUrl.trim() || undefined,
+    purchaseQuantity: Number(draft.purchaseQuantity), budgetUnitPrice: Number(decimal(price)), currency: draft.currency,
+    receivingAddress: draft.receivingAddress.trim(), contactName: draft.contactName.trim(), contactPhone: draft.contactPhone.trim(),
+    remark: draft.remark.trim() || undefined, idempotencyKey: key }
+}

src/modules/cross-border/procurementSubmission.ts

@@ -0,0 +1,24 @@
+import type { ProcurementCreate } from './api/procurement'
+import { buildProcurementCreate, emptyProcurementDraft } from './procurementPresentation'
+
+/** Restore the exact request; an unknown result cannot become a new order. */
+export function restoreProcurementSubmission(raw: string): ProcurementCreate {
+  const saved: unknown = JSON.parse(raw)
+  if (!saved || typeof saved !== 'object' || Array.isArray(saved)) throw new Error('提交记录格式错误')
+  const value = saved as Record<string, unknown>
+  for (const key of ['customerName', 'purchaseCategory', 'productName', 'currency', 'receivingAddress', 'contactName', 'contactPhone', 'idempotencyKey']) if (typeof value[key] !== 'string') throw new Error('提交记录不完整')
+  if (typeof value.purchaseQuantity !== 'number' || typeof value.budgetUnitPrice !== 'number' || !String(value.idempotencyKey).trim() || String(value.idempotencyKey).length > 255) throw new Error('提交记录不完整')
+  for (const key of ['productSpecification', 'productUrl', 'remark']) if (value[key] !== undefined && typeof value[key] !== 'string') throw new Error('提交记录不完整')
+  if (value.currency !== 'CNY' && value.currency !== 'USD') throw new Error('提交记录币种无效')
+  return buildProcurementCreate({ ...emptyProcurementDraft(), purchaseCategory: String(value.purchaseCategory), productName: String(value.productName),
+    productSpecification: String(value.productSpecification || ''), productUrl: String(value.productUrl || ''), purchaseQuantity: String(value.purchaseQuantity),
+    budgetUnitPrice: String(value.budgetUnitPrice), currency: value.currency, receivingAddress: String(value.receivingAddress), contactName: String(value.contactName),
+    contactPhone: String(value.contactPhone), remark: String(value.remark || '') }, String(value.customerName), String(value.idempotencyKey))
+}
+export function definitelyRejected(error: { code?: string; status?: number }) {
+  return ['A0400', 'A0401', 'A0403', 'A0422'].includes(error.code || '') || [400, 401, 403, 422].includes(error.status || 0)
+}
+export function procurementRequestKey(provider: Pick<Crypto, 'getRandomValues'> & Partial<Pick<Crypto, 'randomUUID'>> = globalThis.crypto) {
+  if (provider.randomUUID) return provider.randomUUID()
+  return `proc-${Array.from(provider.getRandomValues(new Uint32Array(4)), value => value.toString(16).padStart(8, '0')).join('')}`
+}

src/modules/cross-border/views/ProcurementView.vue

@@ -1,6 +1,187 @@
 <script setup lang="ts">
-import BusinessOrdersView from '../components/BusinessOrdersView.vue'
-defineProps<{ createPage?: boolean; detailPage?: boolean }>()
+import { computed, onBeforeUnmount, reactive, ref, shallowRef, watch } from 'vue'
+import { useRoute, useRouter } from 'vue-router'
+import { ElMessage } from 'element-plus'
+import { ApiError } from '@/api/types'
+import { accessTokenIdentity } from '@/api/session'
+import { useAuthStore } from '@/modules/auth/public'
+import DataTable, { type DataTableColumn } from '@/components/common/DataTable.vue'
+import QueryToolbar, { type QueryField, type QueryModel } from '@/components/common/QueryToolbar.vue'
+import type { TableAction } from '@/components/common/tableActions'
+import ProcurementDetailPanel from '../components/ProcurementDetailPanel.vue'
+import { createProcurement, getProcurement, listProcurements, type ProcurementCreate, type ProcurementDetail, type ProcurementSummary } from '../api/procurement'
+import { buildProcurementCreate, dateTime, draftBudgetTotal, emptyProcurementDraft, money, procurementStatuses, statusLabel, statusTone } from '../procurementPresentation'
+import { definitelyRejected, procurementRequestKey, restoreProcurementSubmission } from '../procurementSubmission'
+
+const props = withDefaults(defineProps<{ createPage?: boolean; detailPage?: boolean }>(), { createPage: false, detailPage: false })
+const auth = useAuthStore(), route = useRoute(), router = useRouter()
+const mode = computed(() => props.detailPage ? 'detail' : props.createPage ? 'create' : 'list')
+const orderNo = computed(() => typeof route.params.orderNo === 'string' ? route.params.orderNo : '')
+const canCreate = computed(() => auth.hasPermission('merchant:cross-border:procurement:create'))
+const canList = computed(() => auth.hasPermission('merchant:cross-border:procurement:list'))
+const identity = computed(() => auth.token ? accessTokenIdentity(auth.token) : null)
+const storageKey = computed(() => identity.value ? `cc-procurement-submit:${encodeURIComponent(identity.value)}` : null)
+const companyName = computed(() => auth.profile.tenantName || (auth.user?.tenantName && !/^企业租户 \d+$/.test(auth.user.tenantName) ? auth.user.tenantName : ''))
+const form = reactive(emptyProcurementDraft())
+const pending = shallowRef<ProcurementCreate | null>(null)
+const recoveryError = ref(''), submitError = ref(''), submittedOrder = ref('')
+const submitting = ref(false), loading = ref(false), error = ref('')
+const detail = shallowRef<ProcurementDetail | null>(null)
+const rows = ref<ProcurementSummary[]>([]), total = ref(0)
+const query = reactive({ page: 1, size: 20, orderNo: '', purchaseCategory: '', productName: '', status: '' })
+let requestSequence = 0, active = true, inFlight = ''
+const queryModel = computed<QueryModel>({
+  get: () => ({ orderNo: query.orderNo, purchaseCategory: query.purchaseCategory, productName: query.productName, status: query.status }),
+  set: value => { for (const key of ['orderNo', 'purchaseCategory', 'productName', 'status'] as const) query[key] = String(value[key] || '') },
+})
+const queryFields: QueryField[] = [
+  { key: 'orderNo', label: '采购单号', type: 'input' }, { key: 'purchaseCategory', label: '采购品类', type: 'input' },
+  { key: 'productName', label: '商品名称', type: 'input' },
+  { key: 'status', label: '履约进度', type: 'select', options: Object.entries(procurementStatuses).map(([value, label]) => ({ value, label })) },
+]
+const columns: DataTableColumn[] = [
+  { key: 'actions', label: '操作', width: 90, fixed: 'left', slotName: 'actions' },
+  { prop: 'orderNo', label: '采购单号', minWidth: 250, slotName: 'orderNo' },
+  { prop: 'purchaseCategory', label: '采购品类', width: 120 }, { prop: 'productName', label: '商品名称', minWidth: 200 },
+  { prop: 'productSpecification', label: '商品规格', minWidth: 160 }, { prop: 'purchaseQuantity', label: '采购数量（件）', width: 135 },
+  { prop: 'budgetUnitPrice', label: '预算单价', width: 155, slotName: 'budget' },
+  { prop: 'status', label: '履约进度', width: 180, slotName: 'status' }, { prop: 'createdAt', label: '下单时间', width: 185, slotName: 'createdAt' },
+]
+function rowActions(row: object): TableAction[] { return [{ key: 'detail', label: '详情', run: () => openDetail(row as ProcurementSummary) }] }
+function openDetail(row: ProcurementSummary) { if (row.orderNo) void router.push({ name: 'cross-border-procurement-detail', params: { orderNo: row.orderNo } }) }
+function returnToList() { if (canList.value) void router.push({ name: 'cross-border-procurement' }) }
+function message(cause: unknown) {
+  if (cause instanceof ApiError && ((cause.status || 0) >= 500 || cause.code.startsWith('B'))) return '服务暂不可用，请稍后重试'
+  return cause instanceof Error ? cause.message : '请求失败，请稍后重试'
+}
+async function loadList() {
+  const params = { page: query.page, size: query.size, orderNo: query.orderNo || undefined, productName: query.productName || undefined, purchaseCategory: query.purchaseCategory || undefined, status: query.status || undefined }
+  const key = JSON.stringify([identity.value, params])
+  if (inFlight === key) return
+  const sequence = ++requestSequence; inFlight = key; loading.value = true; error.value = ''
+  try { const result = await listProcurements(params); if (sequence === requestSequence) { rows.value = result.records; total.value = result.total } }
+  catch (cause) { if (sequence === requestSequence) { rows.value = []; total.value = 0; error.value = message(cause) } }
+  finally { if (sequence === requestSequence) { loading.value = false; inFlight = '' } }
+}
+async function loadDetail() {
+  if (!orderNo.value) { error.value = '采购单号缺失'; return }
+  const key = JSON.stringify([identity.value, orderNo.value])
+  if (inFlight === key) return
+  const sequence = ++requestSequence; inFlight = key; loading.value = true; error.value = ''; detail.value = null
+  try { const result = await getProcurement(orderNo.value); if (sequence === requestSequence) detail.value = result }
+  catch (cause) { if (sequence === requestSequence) error.value = message(cause) }
+  finally { if (sequence === requestSequence) { loading.value = false; inFlight = '' } }
+}
+function search() { if (query.page === 1) void loadList(); else query.page = 1 }
+function resetQuery() { const reload = query.page === 1; Object.assign(query, { page: 1, orderNo: '', purchaseCategory: '', productName: '', status: '' }); if (reload) void loadList() }
+function populate(payload: ProcurementCreate) {
+  Object.assign(form, { purchaseCategory: payload.purchaseCategory, productName: payload.productName, productSpecification: payload.productSpecification || '', productUrl: payload.productUrl || '',
+    purchaseQuantity: String(payload.purchaseQuantity), budgetUnitPrice: String(payload.budgetUnitPrice), currency: payload.currency, receivingAddress: payload.receivingAddress,
+    contactName: payload.contactName, contactPhone: payload.contactPhone, remark: payload.remark || '' })
+}
+function restorePending() {
+  pending.value = null; recoveryError.value = ''; submitError.value = ''; submittedOrder.value = ''; Object.assign(form, emptyProcurementDraft())
+  if (!storageKey.value) return
+  try { const saved = sessionStorage.getItem(storageKey.value); if (saved) { pending.value = Object.freeze(restoreProcurementSubmission(saved)); populate(pending.value) } }
+  catch { recoveryError.value = '上次提交记录暂无法恢复，请先在订单列表或通过客服核对提交结果，避免重复下单。' }
+}
+async function submit() {
+  if (submitting.value || !canCreate.value || recoveryError.value || !storageKey.value) return
+  submitError.value = ''; const owner = identity.value, key = storageKey.value; const resuming = Boolean(pending.value)
+  let started = false
+  try {
+    if (!pending.value) {
+      const payload = buildProcurementCreate(form, companyName.value, procurementRequestKey())
+      try { sessionStorage.setItem(key, JSON.stringify(payload)) } catch { throw new Error('浏览器暂无法保留提交信息，请允许会话存储后重试') }
+      pending.value = Object.freeze(payload)
+    }
+    submitting.value = true; started = true
+    const result = await createProcurement(pending.value)
+    sessionStorage.removeItem(key)
+    if (!active || owner !== identity.value) return
+    pending.value = null; submittedOrder.value = result.order.orderNo; ElMessage.success('采购订单已提交')
+    if (canList.value) await router.push({ name: 'cross-border-procurement-detail', params: { orderNo: result.order.orderNo } })
+  } catch (cause) {
+    if (!active || owner !== identity.value) return
+    if (!resuming && cause instanceof ApiError && definitelyRejected(cause)) { sessionStorage.removeItem(key); pending.value = null }
+    submitError.value = started && pending.value ? `${message(cause)}。提交结果尚未确认，请再次确认上次提交结果。` : message(cause)
+  } finally { submitting.value = false }
+}
+watch(() => [mode.value, orderNo.value, query.page, query.size, identity.value], (values, previous) => {
+  if (values[4] !== previous?.[4]) { rows.value = []; total.value = 0 }
+  ++requestSequence; inFlight = ''; loading.value = false; error.value = ''; detail.value = null
+  if (mode.value === 'create') restorePending()
+  else if (mode.value === 'detail') void loadDetail()
+  else void loadList()
+}, { immediate: true })
+onBeforeUnmount(() => { active = false; ++requestSequence })
 </script>
 
-<template><BusinessOrdersView kind="procurement" :create-page="createPage" :detail-page="detailPage" /></template>
+<template>
+  <section class="procurement-page client-ui" :aria-busy="loading || submitting">
+    <template v-if="mode === 'list'">
+      <QueryToolbar v-model="queryModel" layout="grid" ariaLabel="采购订单查询条件" :fields="queryFields" :search-on-reset="false" @search="search" @reset="resetQuery" />
+      <div class="procurement-table-card">
+        <DataTable v-model:page="query.page" v-model:page-size="query.size" :data="rows" :columns="columns" :row-actions="rowActions" :loading="loading" :total="total" :page-sizes="[10, 20, 50, 100]" row-key="orderNo" empty-text="暂无采购订单">
+          <template #toolbar-actions><el-button v-if="canCreate" type="primary" @click="router.push({ name: 'cross-border-procurement-create' })">新增下单</el-button></template>
+          <template v-if="error" #error><div class="procurement-error" role="alert"><span>{{ error }}</span><el-button :disabled="loading" @click="loadList">重新加载</el-button></div></template>
+          <template #orderNo="{ row }"><button class="procurement-link" type="button" @click="openDetail(row as ProcurementSummary)">{{ (row as ProcurementSummary).orderNo || '—' }}</button></template>
+          <template #budget="{ row }">{{ money((row as ProcurementSummary).budgetUnitPrice, (row as ProcurementSummary).currency) }}</template>
+          <template #status="{ row }"><el-tag :type="statusTone((row as ProcurementSummary).status)" size="small">{{ statusLabel((row as ProcurementSummary).status) }}</el-tag></template>
+          <template #createdAt="{ row }">{{ dateTime((row as ProcurementSummary).createdAt) }}</template>
+        </DataTable>
+      </div>
+    </template>
+    <section v-else-if="mode === 'detail'" v-loading="loading" class="procurement-detail" aria-label="采购订单详情">
+      <header class="procurement-heading"><div><el-button link type="primary" @click="returnToList">← 返回列表</el-button><h2>{{ detail?.order.orderNo || '采购订单详情' }}</h2></div><div><el-tag v-if="detail" :type="statusTone(detail.order.status)">{{ statusLabel(detail.order.status) }}</el-tag><el-button :disabled="loading" @click="loadDetail">刷新</el-button></div></header>
+      <div v-if="error" class="procurement-error" role="alert"><span>{{ error }}</span><el-button :disabled="loading" @click="loadDetail">重新加载</el-button></div>
+      <ProcurementDetailPanel v-else-if="detail" :detail="detail" /><el-skeleton v-else :rows="8" animated />
+    </section>
+    <section v-else class="procurement-create" aria-label="采购下单">
+      <header class="procurement-heading"><div><h2>海外采购下单</h2><p>一单一个商品及规格；预算仅授权样品货款，运费及关税另行核定。</p></div><el-button v-if="canList" @click="returnToList">返回列表</el-button></header>
+      <el-result v-if="!canCreate" icon="warning" title="没有采购下单权限" sub-title="请联系企业管理员配置权限" />
+      <el-result v-else-if="submittedOrder" icon="success" title="采购订单已提交" :sub-title="submittedOrder"><template #extra><el-button @click="restorePending">新建另一单</el-button></template></el-result>
+      <template v-else>
+        <el-alert v-if="recoveryError" :title="recoveryError" type="error" :closable="false" />
+        <el-alert v-else-if="pending" title="已保留本次提交内容。请再次确认上次提交结果，确认前不修改订单信息。" type="warning" :closable="false" />
+        <el-alert v-if="submitError" class="submit-error" :title="submitError" type="error" :closable="false" />
+        <el-form :model="form" label-position="top" :disabled="submitting || Boolean(pending) || Boolean(recoveryError)" @submit.prevent="submit">
+          <h3>商品与预算</h3><div class="procurement-form-grid">
+            <el-form-item label="采购品类" required><el-input v-model.trim="form.purchaseCategory" maxlength="128" placeholder="请输入采购品类" /></el-form-item>
+            <el-form-item label="商品名称" required><el-input v-model.trim="form.productName" maxlength="255" placeholder="请输入商品名称" /></el-form-item>
+            <el-form-item label="商品规格"><el-input v-model.trim="form.productSpecification" maxlength="500" placeholder="规格、型号" /></el-form-item>
+            <el-form-item label="采购数量（件）" required><el-input v-model.trim="form.purchaseQuantity" inputmode="numeric" maxlength="18" placeholder="正整数" /></el-form-item>
+            <el-form-item label="预算单价" required><el-input v-model.trim="form.budgetUnitPrice" inputmode="decimal" maxlength="20" placeholder="请明确填写；免费样品填 0" /></el-form-item>
+            <el-form-item label="预算币种" required><el-select v-model="form.currency"><el-option label="美元 USD" value="USD" /><el-option label="人民币 CNY" value="CNY" /></el-select></el-form-item>
+            <el-form-item class="full" label="商品链接"><el-input v-model.trim="form.productUrl" maxlength="2000" placeholder="https://…" /></el-form-item>
+          </div><p class="procurement-hint">货款预算总上限：<strong>{{ money(draftBudgetTotal(form), form.currency) }}</strong>。零预算仅授权免费样品；实际货款按供应商实付核定。</p>
+          <h3>最终国内收件资料</h3><div class="procurement-form-grid">
+            <el-form-item label="收件人" required><el-input v-model.trim="form.contactName" maxlength="128" placeholder="实际收件人姓名" /></el-form-item>
+            <el-form-item label="联系电话" required><el-input v-model.trim="form.contactPhone" maxlength="64" type="tel" placeholder="快递可联系的电话" /></el-form-item>
+            <el-form-item label="下单企业"><el-input :model-value="companyName" disabled /></el-form-item>
+            <el-form-item class="full" label="完整国内地址" required><el-input v-model.trim="form.receivingAddress" maxlength="1000" placeholder="省、市、区县、街道及详细门牌" /></el-form-item>
+            <el-form-item class="full" label="采购要求"><el-input v-model="form.remark" type="textarea" :rows="3" maxlength="1000" show-word-limit placeholder="其他采购要求（选填）" /></el-form-item>
+          </div>
+        </el-form>
+        <footer class="procurement-form-actions"><el-button v-if="canList" :disabled="submitting" @click="returnToList">返回列表</el-button><el-button type="primary" :loading="submitting" :disabled="Boolean(recoveryError) || (!pending && !companyName) || !identity" @click="submit">{{ pending ? '确认上次提交结果' : '提交采购订单' }}</el-button></footer>
+      </template>
+    </section>
+  </section>
+</template>
+
+<style scoped>
+.procurement-page { display: grid; gap: var(--client-section-gap); min-width: 0; }
+.procurement-table-card, .procurement-detail, .procurement-create { min-width: 0; border: 1px solid var(--client-border); border-radius: var(--client-radius); background: #fff; }
+.procurement-table-card { overflow: hidden; }.procurement-detail, .procurement-create { padding: 16px 20px 24px; }
+.procurement-heading { display: flex; justify-content: space-between; align-items: center; gap: 20px; min-height: 54px; border-bottom: 1px solid var(--border); padding-bottom: 12px; }
+.procurement-heading > div { display: flex; align-items: center; gap: 14px; min-width: 0; }.procurement-heading h2 { margin: 0; color: var(--navy); font-size: 18px; overflow-wrap: anywhere; }
+.procurement-create .procurement-heading > div { display: block; }.procurement-heading p { margin: 7px 0 0; font-size: 13px; color: var(--muted); }
+.procurement-link { padding: 0; border: 0; background: transparent; color: var(--client-action); font: inherit; cursor: pointer; text-align: left; }.procurement-link:hover { text-decoration: underline; }
+.procurement-error { min-height: 160px; display: flex; justify-content: center; align-items: center; gap: 16px; color: #b42318; }.procurement-error span { max-width: 900px; overflow-wrap: anywhere; }
+.procurement-form-grid { display: grid; grid-template-columns: repeat(3, minmax(0, 1fr)); gap: 0 24px; }.procurement-form-grid .full { grid-column: 1 / -1; }.procurement-form-grid :deep(.el-select) { width: 100%; }
+.procurement-create h3 { margin: 22px 0 16px; color: var(--navy); font-size: 14px; }.procurement-hint { margin: 0 0 20px; line-height: 1.8; font-size: 13px; color: var(--muted); }.procurement-hint strong { color: var(--navy); }
+.procurement-form-actions { display: flex; justify-content: flex-end; gap: 12px; padding-top: 16px; border-top: 1px solid var(--border); }.submit-error { margin: 12px 0; }
+@media (max-width: 767px) {
+  .procurement-form-grid { grid-template-columns: 1fr; }.procurement-heading, .procurement-heading > div { flex-wrap: wrap; }
+}
+</style>

src/modules/notifications/notifications.test.mjs

@@ -36,7 +36,7 @@ test('keeps customer message actions first and covers the requested local states
   assert.match(source, /notification-state--error/)
   assert.match(source, /暂无消息/)
   assert.doesNotMatch(source, /清空已读|删除消息/)
-  assert.match(source, /Promise\.all\(\[load\(\), notifications\.refreshUnreadCount\(\)\]\)/)
+  assert.match(source, /Promise\.all\(\[load\(\), notifications\.refreshUnreadCount\(true\)\]\)/)
   assert.match(source, /auth\.hasPermission\('merchant:notification:read'\)/)
   assert.match(source, /auth\.hasPermission\('merchant:notification:read-all'\)/)
   assert.match(source, /v-if="canMarkAllRead"/)

src/modules/notifications/store/notifications.test.mjs

@@ -0,0 +1,49 @@
+import test from 'node:test'
+import assert from 'node:assert/strict'
+import { readFileSync } from 'node:fs'
+import ts from 'typescript'
+import { computed, ref } from 'vue'
+
+function setup() {
+  const requests = []
+  const source = readFileSync(new URL('./notifications.ts', import.meta.url), 'utf8').replace(/^import [^\r\n]*\r?\n/gm, '').replace('export const', 'const')
+  const code = ts.transpileModule(source, { compilerOptions: { target: ts.ScriptTarget.ES2022 } }).outputText
+  const store = new Function('computed', 'ref', 'defineStore', 'getMyUnreadNotificationCount', code + '\nreturn useNotificationsStore()')(computed, ref, (_id, factory) => factory, () => new Promise((resolve, reject) => requests.push({ resolve, reject })))
+  return { store, requests }
+}
+
+test('shell and page concurrent reads share one pending request', async () => {
+  const { store, requests } = setup()
+  const a = store.refreshUnreadCount(), b = store.refreshUnreadCount()
+  assert.equal(requests.length, 1)
+  requests[0].resolve(5)
+  await Promise.all([a, b])
+  assert.equal(store.unreadCount.value, 5)
+  assert.equal(store.loading.value, false)
+})
+
+test('post-mutation refresh reads again after a pending pre-mutation read', async () => {
+  const { store, requests } = setup()
+  const a = store.refreshUnreadCount(), b = store.refreshUnreadCount(true)
+  assert.equal(requests.length, 1)
+  requests[0].resolve(5)
+  await a
+  await Promise.resolve()
+  assert.equal(requests.length, 2)
+  requests[1].resolve(0)
+  await b
+  assert.equal(store.unreadCount.value, 0)
+})
+
+test('failed request releases the pending guard for retry', async () => {
+  const { store, requests } = setup()
+  const a = store.refreshUnreadCount()
+  requests[0].reject(new Error('network'))
+  await a
+  const b = store.refreshUnreadCount()
+  assert.equal(requests.length, 2)
+  requests[1].resolve(2)
+  await b
+  assert.equal(store.unreadCount.value, 2)
+  assert.equal(store.errorMessage.value, '')
+})

src/modules/notifications/store/notifications.ts

@@ -9,7 +9,19 @@ export const useNotificationsStore = defineStore('client-notifications', () => {
 
   const hasUnread = computed(() => (unreadCount.value ?? 0) > 0)
 
-  async function refreshUnreadCount() {
+  let pending: Promise<void> | null = null
+
+  async function refreshUnreadCount(afterMutation = false): Promise<void> {
+    if (pending) {
+      if (!afterMutation) return pending
+      await pending
+      return refreshUnreadCount()
+    }
+    pending = loadUnreadCount().finally(() => { pending = null })
+    return pending
+  }
+
+  async function loadUnreadCount() {
     loading.value = true
     errorMessage.value = ''
     try {

src/modules/notifications/views/NotificationDetailView.vue

@@ -10,7 +10,7 @@ import type { NotificationDetail } from '../contracts'
 import { notificationCategoryLabel, notificationSentAt } from '../presentation'
 const route = useRoute(); const router = useRouter(); const auth = useAuthStore(); const notifications = useNotificationsStore(); const detail = ref<NotificationDetail | null>(null); const loading = ref(false); const errorMessage = ref(''); const readErrorMessage = ref('')
 const canMarkRead = computed(() => auth.hasPermission('merchant:notification:read'))
-async function markReadIfAllowed(){if(!detail.value||detail.value.status!=='UNREAD'||!canMarkRead.value)return;try{await markMyNotificationRead(detail.value.id);detail.value={...detail.value,status:'READ'};await notifications.refreshUnreadCount()}catch(error){readErrorMessage.value=error instanceof ApiError?error.message:'消息已加载，但自动标记已读失败'}}
+async function markReadIfAllowed(){if(!detail.value||detail.value.status!=='UNREAD'||!canMarkRead.value)return;try{await markMyNotificationRead(detail.value.id);detail.value={...detail.value,status:'READ'};await notifications.refreshUnreadCount(true)}catch(error){readErrorMessage.value=error instanceof ApiError?error.message:'消息已加载，但自动标记已读失败'}}
 async function load(){loading.value=true;errorMessage.value='';readErrorMessage.value='';try{detail.value=await getMyNotification(String(route.params.notificationId));await markReadIfAllowed()}catch(error){detail.value=null;errorMessage.value=error instanceof ApiError?error.message:'消息加载失败，请稍后重试'}finally{loading.value=false}}
 onMounted(()=>{void load()})
 </script>

src/modules/notifications/views/NotificationsView.vue

@@ -78,7 +78,7 @@ async function markRead(row: NotificationSummary) {
   if (!canMarkRead.value) return
   try {
     await markMyNotificationRead(row.id)
-    await Promise.all([load(), notifications.refreshUnreadCount()])
+    await Promise.all([load(), notifications.refreshUnreadCount(true)])
   } catch (error) {
     errorMessage.value = messageOf(error)
   }
@@ -89,7 +89,7 @@ async function markAllRead() {
   markingAll.value = true
   try {
     await markAllMyNotificationsRead()
-    await Promise.all([load(), notifications.refreshUnreadCount()])
+    await Promise.all([load(), notifications.refreshUnreadCount(true)])
   } catch (error) {
     errorMessage.value = messageOf(error)
   } finally {

src/modules/overseas-warehouse/api/returnInventory.ts

@@ -4,17 +4,25 @@ import type { PageResult } from './warehouseServices'
 export interface ReturnInventoryItem {
   overseasWarehouseId: string; cartonMark: string; sourceBatchNo?: string; status: string; skuCode: string
   productNameZh?: string; quantity: number; cartonSkuTypes: number; cartonTotalQuantity: number; receivedAt: string
+  relabelledQuantity: number; remainingRelabelQuantity: number
 }
 
 export interface ReturnInventorySummaryItem {
   overseasWarehouseId: string; skuCode: string; productNameZh?: string
-  availableQuantity: number; cartonQuantity: number; updatedAt: string
+  totalQuantity: number; availableQuantity: number; relabelLockedQuantity: number; cartonQuantity: number; updatedAt: string
 }
 
-export interface ReturnInventoryCartonItem { skuCode: string; productNameZh?: string; quantity: number }
+export interface ReturnSkuConversion {
+  relabelNo: string; cartonMark: string; oldSkuCode: string; newSkuCode: string; quantity: number
+  status: 'APPLIED' | 'CONFIRMED' | 'REVERSED'; completedAt: string
+}
+export interface ReturnInventoryCartonItem {
+  skuCode: string; productNameZh?: string; quantity: number; availableQuantity: number
+  relabelledQuantity: number; remainingRelabelQuantity: number
+}
 
 export interface ReturnInventoryCartonSummary {
-  cartonMark: string; overseasWarehouseId: string; sourceBatchNo?: string; sourceReturnNo?: string; status: string
+  cartonMark: string; overseasWarehouseId: string; sourceBatchNo?: string; sourceReturnNo?: string; relabelStatus?: string; relabelledQuantity?: number; relabelReservedQuantity?: number; status: string
   skuTypes: number; totalQuantity: number; length?: number; width?: number; height?: number; weight?: number; createdAt: string
 }
 
@@ -23,7 +31,8 @@ export function listReturnInventoryCartons(params: Record<string, unknown>) {
 }
 
 export interface ReturnInventoryCartonDetail {
-  cartonMark: string; overseasWarehouseId: string; sourceBatchNo?: string; sourceReturnNo?: string; status: string
+  skuConversions: ReturnSkuConversion[]
+  cartonMark: string; overseasWarehouseId: string; sourceBatchNo?: string; sourceReturnNo?: string; relabelStatus?: string; relabelledQuantity?: number; relabelReservedQuantity?: number; status: string
   skuTypes: number; totalQuantity: number; length?: number; width?: number; height?: number; weight?: number; receivedAt: string; items: ReturnInventoryCartonItem[]
 }
 

src/modules/overseas-warehouse/api/returnOrders.ts

@@ -2,7 +2,7 @@ import { apiRequest, apiBlobRequest } from '@/api/http'
 import type { PageResult } from './warehouseServices'
 
 export interface ReturnOrderSummary {
-  relabelApplications?: Array<{ relabelNo: string; status: string; quantity: number; createdAt: string }>
+  relabelApplications?: Array<{ relabelNo: string; status: string; quantity: number; quantityUnit?: string; createdAt: string }>
   returnNo: string; overseasWarehouseId: string; warehouseContactName?: string; warehouseContactPhone?: string; customerReferenceNo?: string; status: string
   skuTypes: number; expectedQuantity: number; receivedQuantity: number; needRelabel: boolean; relabelNo?: string; relabelStatus?: string; createdAt: string
 }
@@ -13,14 +13,15 @@ export interface ReturnReceipt {
   receiptNo: string; receiptBatchNo: string; palletCode?: string; trackingNo?: string; startedBy: 'RETURN_NO' | 'SKU'
   receivedQuantity: number; operatorName?: string; signedAt: string; unitType: 'PALLET' | 'BOX' | 'PARCEL'; unitCode?: string; boxCount: number
   items: Array<{ skuCode: string; productNameZh?: string; quantity: number; boxCount: number }>; cartonMark?: string; printableHtml?: string
-  labels?: Array<{ cartonMark: string; printableHtml: string }>
+  labels?: Array<{ cartonMark: string; printableHtml: string }>; length?: number | null; width?: number | null; height?: number | null; weight?: number | null
   labelRepairRequired?: boolean
 }
 export interface ReturnPallet { palletCode: string; unitType: 'PALLET' | 'BOX'; unitCode: string; skuTypes: number; totalQuantity: number; totalBoxCount: number; length?: number; width?: number; height?: number; weight?: number; volumeCbm?: number; items: Array<{ skuCode: string; productNameZh?: string; quantity: number; boxCount: number }> }
 export interface ReturnPhoto { fileId: number; fileName: string; contentType: string; sizeBytes: number }
-export interface ReturnPackingDetail { sourceCartonMark: string; targetCartonMark: string; returnNo: string; skuCode: string; quantity: number; createdAt: string }
-export interface ReturnReceiptCarton { receiptNo: string; palletCode?: string; cartonMark: string; countStatus: 'PENDING' | 'CONFIRMED' | 'UNRECORDED'; countedAt?: string; items: ReturnReceipt['items'] }
-export interface ReturnOrderDetail { order: ReturnOrderSummary; remark?: string; items: ReturnOrderItem[]; receipts: ReturnReceipt[]; pallets: ReturnPallet[]; photos: ReturnPhoto[]; packingDetails?: ReturnPackingDetail[]; cartons?: ReturnReceiptCarton[] }
+export interface ReturnPackingDetail { planNo?: string; sourceCartonMark: string; targetCartonMark: string; returnNo: string; skuCode: string; quantity: number; createdAt: string }
+export interface CurrentReturnCarton { carton: import('./returnInventory').ReturnInventoryCartonDetail; ownership: Array<{ returnNo: string; skuCode: string; quantity: number }>; orderQuantity: number; labelStatus: string; canRelabel: boolean; blockReason?: string }
+export interface ReturnReceiptCarton { receiptNo: string; palletCode?: string; cartonMark: string; countStatus: 'PENDING' | 'CONFIRMED' | 'UNRECORDED'; countedAt?: string; items: ReturnReceipt['items']; length?: number | null; width?: number | null; height?: number | null; weight?: number | null }
+export interface ReturnOrderDetail { order: ReturnOrderSummary; remark?: string; items: ReturnOrderItem[]; receipts: ReturnReceipt[]; pallets: ReturnPallet[]; photos: ReturnPhoto[]; packingDetails?: ReturnPackingDetail[]; cartons?: ReturnReceiptCarton[]; currentCartons?: CurrentReturnCarton[] }
 export interface ReturnOrderCreate {
   overseasWarehouseId: string; warehouseContactName: string; warehouseContactPhone: string; customerReferenceNo?: string; remark?: string; needRelabel: boolean; idempotencyKey: string
   items: Array<{ skuCode: string; productNameZh?: string; expectedQuantity: number }>

src/modules/overseas-warehouse/api/warehouseServices.ts

@@ -7,7 +7,7 @@ export interface PageResult<T> { records: T[]; page: number; size: number; total
 export interface LastlegOrderSummary { id: string; orderNo: string; inboundCode: string; orderType: string; packageCount: number; overseasWarehouseId?: string }
 export interface HistoricalOrderSummary { id: string | null; orderNo: string; sourceOrderNo?: string; outboundOrderNo?: string; relabelOrderNo?: string; orderType?: string; status?: string; packageCount?: number }
 export interface TransferSummary { id: string; transferNo: string; inboundCode: string; lastlegOrderId: string; lastlegOrderNo: string; operatingWarehouseId: string; fbaWarehouseCode?: string; packageCount: number; deliveryMethod: string; needRelabel: boolean; relabelNo?: string; relabelStatus?: string; relabelFulfillmentStatus?: string; status: string; estimatedArrivalAt: string; estimatedShipAt?: string; actualShipAt?: string; reviewedAt?: string; measuredAt?: string; outboundAt?: string; relabelCompletedAt?: string; createdAt: string }
-export interface RelabelSummary { id: string; relabelNo: string; lastlegOrderId: string; lastlegOrderNo: string; customerOrderNo: string; overseasWarehouseId: string; status: string; itemCount: number; totalPackageCount: number; notifiedPackageCount: number; skuCodes: string; createdAt: string; reviewedAt?: string; relabelCompletedAt?: string; outboundAt?: string; totalFileId?: string; totalFileName?: string; totalFileUrl?: string; cartonTotalFileId?: string; cartonTotalFileName?: string; cartonTotalFileUrl?: string; skuTotalFileId?: string; skuTotalFileName?: string; skuTotalFileUrl?: string; deliveryMethod?: RelabelDeliveryMethod; printShippingLabel?: boolean; shippingLabelFileId?: string; shippingLabelFileName?: string; shippingLabelFileUrl?: string; fulfillmentStatus?: string; outboundOrderNo?: string; customerConfirmedAt?: string; reviewChannel?: 'TAIL_ORDER' | 'RELABEL_ORDER'; reviewRemark?: string }
+export interface RelabelSummary { relatedBusinessOrderNos?: string[]; operationTypes?: Array<'CARTON_LABEL' | 'SKU_LABEL' | 'CARTON_AND_SKU' | 'RETURN_BULK_SKU_LABEL'>; id: string; relabelNo: string; lastlegOrderId: string; lastlegOrderNo: string; customerOrderNo: string; overseasWarehouseId: string; status: string; itemCount: number; totalPackageCount: number; notifiedPackageCount: number; skuCodes: string; createdAt: string; reviewedAt?: string; relabelCompletedAt?: string; outboundAt?: string; totalFileId?: string; totalFileName?: string; totalFileUrl?: string; cartonTotalFileId?: string; cartonTotalFileName?: string; cartonTotalFileUrl?: string; skuTotalFileId?: string; skuTotalFileName?: string; skuTotalFileUrl?: string; deliveryMethod?: RelabelDeliveryMethod; printShippingLabel?: boolean; shippingLabelFileId?: string; shippingLabelFileName?: string; shippingLabelFileUrl?: string; fulfillmentStatus?: string; outboundOrderNo?: string; customerConfirmedAt?: string; reviewChannel?: 'TAIL_ORDER' | 'RELABEL_ORDER'; reviewRemark?: string }
 export interface RelabelItemDetail {
   id: string; skuCode?: string; productNameZh: string; totalPackageCount: number; notifiedPackageCount: number
   shipmentNo: string; trackingCode?: string; newSkuCode?: string; labelRequirement?: string; remark?: string
@@ -28,13 +28,16 @@ export interface RelabelDetail {
 export interface DiscardSummary { id: string; discardNo: string; outboundNo?: string; inboundCodes: string; overseasWarehouseId: string; overseasWarehouseName: string; totalPackages: number; totalFee: number; currency: string; status: string; createdAt: string; completedAt?: string }
 export interface DiscardCandidate { orderId: string; sourceType?: 'DROPSHIP' | 'RETURN_CARTON'; returnCartonId?: string; cartonMark?: string; inboundCode: string; inboundOrderNo: string; overseasWarehouseId: string; overseasWarehouseName: string; availablePackages: number; skus: Array<{ skuCode: string; productName: string; availablePackages: number }> }
 export interface RelabelInventoryCandidate {
+  cartonSkuItems: Array<{ skuCode: string; quantity: number }>; cartonAvailablePackages: number | string
+  skuConversions?: import('./returnInventory').ReturnSkuConversion[]
+  stockQuantity?: number; inventoryStatus?: string; occupiedRelabelNo?: string; mergedIntoCartonMarks?: string[]; hasOutbound?: boolean
   inventoryBalanceId: string; inboundOrderId: string; inboundOrderNo?: string; inboundCode?: string
   overseasWarehouseId: string; overseasWarehouseCode?: string; overseasWarehouseName?: string
   destinationFbaWarehouseCode?: string; destinationFbaWarehouseName?: string; skuCode?: string; productNameZh?: string
   availablePackages: number | string; version: number
   positions: Array<{ positionId: string; palletNo?: string; batchNo?: string; warehouseLocationCode?: string; availablePackages: number }>
   sourceType?: 'INBOUND' | 'RETURN_CARTON' | 'RETURN_PARCEL'; returnCartonId?: string; cartonMark?: string
-  skuItems?: Array<{ skuCode: string; newSkuCode?: string; quantity: number; remark?: string }>; relabelledPackages?: number
+  skuItems?: Array<{ skuCode: string; newSkuCode?: string; quantity: number; remark?: string }>; relabelledPackages?: number; relabelledQuantity?: number; relabelReservedQuantity?: number; relabelStatus?: string
 }
 
 export interface TransferCreate {
@@ -130,3 +133,8 @@ export function createDiscard(payload: { items: Array<{ orderId?: string; return
 export function cancelDiscard(discardNo: string) {
   return apiRequest<Record<string, unknown>>({ method: 'POST', url: `/merchant/v1/last-leg/cargo-discards/${encodeURIComponent(discardNo)}/cancel` })
 }
+
+export interface DiscardPhoto { fileId: string; palletNo: string; fileName: string; createdAt: string; submittedAt: string }
+export function downloadDiscardPhoto(discardNo: string, fileId: string) {
+  return apiBlobRequest({ method: 'GET', url: `/merchant/v1/last-leg/cargo-discards/${encodeURIComponent(discardNo)}/photos/files/${encodeURIComponent(fileId)}/download` })
+}

src/modules/overseas-warehouse/permissions.test.mjs

@@ -42,7 +42,10 @@ test('opens warehouse service and return receipt details as dedicated protected
 
 test('returns to the labeling list after a labeling application is submitted', () => {
   assert.match(services, /ElMessage\.success\(`\$\{config\.value\.title\}提交成功`\)[\s\S]*?router\.push\(\{ name: serviceListRouteName\(props\.service\) \}\)/)
-  assert.match(services, /uploadReturnRelabelFile\([\s\S]*?router\.push\(\{ name: serviceListRouteName\(props\.service\) \}\)/)
+  // Return-carton sources use the unified relabel application and its file endpoint.
+  assert.match(services, /returnCartonId: item\.returnCartonId/)
+  assert.match(services, /uploadRelabelFile\(created\.application\.relabelNo,[\s\S]*?router\.push\(\{ name: serviceListRouteName\(props\.service\) \}\)/)
+  assert.match(services, /申请已创建，附件待补传/)
 })
 
 test('keeps overseas warehouse writes behind operation-specific button permissions', () => {

src/modules/overseas-warehouse/utils/relabelSkuDisplay.test.mjs

@@ -0,0 +1,14 @@
+import assert from 'node:assert/strict'
+import { readFileSync } from 'node:fs'
+import test from 'node:test'
+import ts from 'typescript'
+
+const source = readFileSync(new URL('./relabelSkuDisplay.ts', import.meta.url), 'utf8')
+const js = ts.transpileModule(source, { compilerOptions: { module: ts.ModuleKind.ESNext, target: ts.ScriptTarget.ES2022 } }).outputText
+const { relabelSkuCodes, relabelSkuCount } = await import(`data:text/javascript;base64,${Buffer.from(js).toString('base64')}`)
+test('one box with two SKU mappings shows both and counts unique SKUs across boxes', () => {
+  const item = { skuCode: 'FIRST', skuItems: [{ skuCode: 'FIRST' }, { skuCode: 'SECOND' }] }
+  assert.deepEqual(relabelSkuCodes(item), ['FIRST', 'SECOND'])
+  assert.equal(relabelSkuCount([item, { skuCode: 'SECOND' }]), 2)
+  assert.deepEqual(relabelSkuCodes({ skuCode: 'FIRST,SECOND', skuItems: [] }), ['FIRST', 'SECOND'])
+})

src/modules/overseas-warehouse/utils/relabelSkuDisplay.ts

@@ -0,0 +1,13 @@
+interface RelabelSkuSource {
+  skuCode?: string | null
+  skuItems?: Array<{ skuCode: string }> | null
+}
+
+export function relabelSkuCodes(item: RelabelSkuSource): string[] {
+  const codes = item.skuItems?.length ? item.skuItems.map(line => line.skuCode) : (item.skuCode || '').split(',')
+  return [...new Set(codes.map(code => code.trim()).filter(Boolean))]
+}
+
+export function relabelSkuCount(items: RelabelSkuSource[]): number {
+  return new Set(items.flatMap(relabelSkuCodes)).size
+}

src/modules/overseas-warehouse/utils/returnReceiptDisplay.test.mjs

@@ -0,0 +1,44 @@
+import assert from 'node:assert/strict'
+import { readFileSync } from 'node:fs'
+import test from 'node:test'
+import ts from 'typescript'
+
+const source = readFileSync(new URL('./returnReceiptDisplay.ts', import.meta.url), 'utf8')
+const compiled = ts.transpileModule(source, { compilerOptions: { target: ts.ScriptTarget.ES2022, module: ts.ModuleKind.CommonJS } }).outputText
+const exports = {}
+new Function('exports', compiled)(exports)
+
+test('多次签收的字符串箱数按数值累计：三箱加四箱等于七箱', () => {
+  assert.equal(exports.receiptPrintableBoxCount([{ boxCount: '3' }, { boxCount: '4' }]), 7)
+  assert.equal(exports.receiptPrintableBoxCount([{ boxCount: '3', labels: [{}, {}, {}] }, { boxCount: '4', labels: [{}, {}, {}, {}] }]), 7)
+})
+
+test('签收箱号只包含箱子和托盘签收，包裹实物记录不重复展示为箱子', () => {
+  const receipts = [{ receiptNo: 'PARCEL-1', unitType: 'PARCEL' }, { receiptNo: 'BOX-1', unitType: 'BOX' }, { receiptNo: 'PALLET-1', unitType: 'PALLET' }]
+  const cartons = [{ receiptNo: 'PARCEL-1', cartonMark: 'RP-1' }, { receiptNo: 'BOX-1', cartonMark: 'RC-1' }, { receiptNo: 'PALLET-1', cartonMark: 'RC-2' }, { receiptNo: 'UNKNOWN', cartonMark: 'RP-UNKNOWN' }]
+  assert.deepEqual(exports.receiptBoxDetails(receipts, cartons).map(item => item.cartonMark), ['RC-1', 'RC-2'])
+  assert.deepEqual(exports.receiptBoxDetails(receipts.slice(0, 1), cartons), [])
+})
+
+test('volume rounds upward to exactly three decimal places without increasing exact thousandths', () => {
+  for (const [input, expected] of [[0.186624, '0.187'], [0.15, '0.150'], [1.001, '1.001'], [1.00100001, '1.002'], [0.0000001, '0.001'], [0, '0.000'], [null, '—'], [NaN, '—']]) {
+    assert.equal(exports.formatReturnVolume(input), expected)
+  }
+})
+
+test('箱子在签收箱号明细展示一次，真实托盘和缺少箱号明细的实物仍保留', () => {
+  const boxes = Array.from({ length: 6 }, (_, index) => ({ cartonMark: `RC-${index}` }))
+  const units = boxes.map(box => ({ unitType: 'BOX', unitCode: box.cartonMark, palletCode: 'PLT-SHARED' }))
+  assert.deepEqual(exports.receiptPhysicalDetails(units, boxes), [])
+  const pallet = { unitType: 'PALLET', unitCode: 'PLT-SHARED', palletCode: 'PLT-SHARED' }
+  const unmatchedBox = { unitType: 'BOX', unitCode: 'RC-UNKNOWN', palletCode: 'PLT-SHARED' }
+  assert.deepEqual(exports.receiptPhysicalDetails([...units, pallet, unmatchedBox], boxes), [pallet, unmatchedBox])
+  assert.deepEqual(exports.receiptPhysicalDetails(units, []), units)
+})
+
+test('parcel waybills appear as tracking numbers while generated parcel codes remain physical codes', () => {
+  assert.equal(exports.receiptTrackingNo({ unitType: 'PARCEL', unitCode: 'sf561626' }), 'sf561626')
+  assert.equal(exports.receiptTrackingNo({ unitType: 'PARCEL', unitCode: 'PK0123456789ABCDEF' }), '')
+  assert.equal(exports.receiptTrackingNo({ unitType: 'PARCEL', unitCode: 'PK0123456789ABCDEF', trackingNo: ' SF123 ' }), 'SF123')
+  assert.equal(exports.receiptTrackingNo({ unitType: 'PALLET', unitCode: 'PLT123' }), '')
+})

src/modules/overseas-warehouse/utils/returnReceiptDisplay.ts

@@ -0,0 +1,35 @@
+import type { ReturnPallet, ReturnReceipt, ReturnReceiptCarton } from '../api/returnOrders'
+
+export function receiptPrintableBoxCount(receipts: ReturnReceipt[]) {
+  return receipts.reduce((total, receipt) => total + Number(receipt.labels?.length || receipt.boxCount || 1), 0)
+}
+
+export function receiptPhysicalDetails(pallets: ReturnPallet[], boxes: ReturnReceiptCarton[]) {
+  const signedBoxMarks = new Set(boxes.map(box => box.cartonMark))
+  return pallets.filter(unit => unit.unitType !== 'BOX' || !signedBoxMarks.has(unit.unitCode || unit.palletCode))
+}
+
+export function receiptBoxDetails(receipts: Pick<ReturnReceipt, 'receiptNo' | 'unitType'>[], cartons: ReturnReceiptCarton[]) {
+  const boxReceiptNos = new Set(receipts.filter(receipt => receipt.unitType === 'BOX' || receipt.unitType === 'PALLET').map(receipt => receipt.receiptNo))
+  return cartons.filter(carton => boxReceiptNos.has(carton.receiptNo))
+}
+
+export function receiptTrackingNo(receipt: Pick<ReturnReceipt, 'trackingNo' | 'unitCode' | 'unitType'> | Record<string, unknown>) {
+  const trackingNo = typeof receipt.trackingNo === 'string' ? receipt.trackingNo.trim() : ''
+  if (trackingNo) return trackingNo
+  const code = typeof receipt.unitCode === 'string' ? receipt.unitCode.trim() : ''
+  return receipt.unitType === 'PARCEL' && code && !/^PK[0-9A-F]{16}$/.test(code) ? code : ''
+}
+
+export function formatReturnVolume(value?: number | null) {
+  if (value == null || !Number.isFinite(value) || value < 0) return '—'
+  // Shift the decimal in text to avoid floating-point over-rounding exact thousandths.
+  const [coefficient, exponent = '0'] = String(value).toLowerCase().split('e')
+  const [integer, fraction = ''] = coefficient!.split('.')
+  const digits = integer! + fraction
+  const cutoff = integer!.length + Number(exponent) + 3
+  const scaled = cutoff <= 0 ? '0' : digits.slice(0, cutoff).padEnd(cutoff, '0')
+  const remainder = cutoff < 0 ? digits : digits.slice(Math.max(0, cutoff))
+  const rounded = BigInt(scaled) + (/[1-9]/.test(remainder) ? 1n : 0n)
+  return `${rounded / 1000n}.${String(rounded % 1000n).padStart(3, '0')}`
+}

src/modules/overseas-warehouse/utils/returnRelabelCandidates.test.mjs

@@ -0,0 +1,31 @@
+import assert from 'node:assert/strict'
+import { readFileSync } from 'node:fs'
+import test from 'node:test'
+import ts from 'typescript'
+
+const source = readFileSync(new URL('./returnRelabelCandidates.ts', import.meta.url), 'utf8')
+const js = ts.transpileModule(source, { compilerOptions: { module: ts.ModuleKind.ESNext, target: ts.ScriptTarget.ES2022 } }).outputText
+const { returnRelabelCandidate } = await import(`data:text/javascript;base64,${Buffer.from(js).toString('base64')}`)
+const converted = {
+  returnCartonId: '20', cartonMark: 'NEW-BOX', availablePackages: 0, skuItems: [],
+  cartonAvailablePackages: 1, cartonSkuItems: [{ skuCode: 'NEW-A', quantity: 10 }, { skuCode: 'NEW-B', quantity: 5 }],
+}
+
+test('carton labeling selects the current box and both converted SKUs', () => {
+  const candidate = returnRelabelCandidate(converted, 'carton')
+  assert.equal(candidate.cartonMark, 'NEW-BOX')
+  assert.equal(candidate.availablePackages, 1)
+  assert.equal(candidate.skuCode, 'NEW-A,NEW-B')
+  assert.deepEqual(candidate.skuItems, converted.cartonSkuItems)
+})
+
+test('SKU and combined labeling still exclude completed SKU quantities', () => {
+  for (const mode of ['sku', 'carton_and_sku']) {
+    assert.equal(returnRelabelCandidate(converted, mode).availablePackages, 0)
+    assert.deepEqual(returnRelabelCandidate(converted, mode).skuItems, [])
+  }
+})
+
+test('an occupied box cannot be selected for carton labeling', () => {
+  assert.equal(returnRelabelCandidate({ ...converted, cartonAvailablePackages: 0 }, 'carton').availablePackages, 0)
+})

src/modules/overseas-warehouse/utils/returnRelabelCandidates.ts

@@ -0,0 +1,11 @@
+import type { RelabelInventoryCandidate } from '../api/warehouseServices'
+
+export function returnRelabelCandidate(candidate: RelabelInventoryCandidate, mode: string): RelabelInventoryCandidate {
+  if (!candidate.returnCartonId || mode !== 'carton') return candidate
+  return {
+    ...candidate,
+    availablePackages: candidate.cartonAvailablePackages,
+    skuItems: candidate.cartonSkuItems,
+    skuCode: candidate.cartonSkuItems.map(item => item.skuCode).join(','),
+  }
+}

src/modules/overseas-warehouse/utils/returnRelabelProgress.ts

@@ -0,0 +1,4 @@
+export function returnRelabelStatusLabel(status?: string) {
+  const labels: Record<string, string> = { UNLABELLED: '未换标', BOUND: '处理中', PROCESSING: '处理中', PARTIALLY_COMPLETED: '部分完成', COMPLETED: '全部完成' }
+  return status ? labels[status] || '—' : '—'
+}

src/modules/overseas-warehouse/views/ReturnInventoryView.vue

@@ -1,4 +1,5 @@
 <script setup lang="ts">
+import { returnRelabelStatusLabel } from '../utils/returnRelabelProgress'
 import { computed, onMounted, reactive, ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import { ArrowLeft, Printer, Plus } from '@lucide/vue'
@@ -89,18 +90,36 @@ const summaryColumns: DataTableColumn[] = [
   { key: 'actions', label: '操作', slotName: 'actions', width: 110, fixed: 'left' },
   { key: 'warehouse', label: '海外仓', slotName: 'warehouse', minWidth: 190 },
   { prop: 'skuCode', label: 'SKU', minWidth: 190 }, { prop: 'productNameZh', label: '中文品名', minWidth: 190 },
-  { prop: 'availableQuantity', label: '可用库存', width: 110, align: 'right' }, { prop: 'cartonQuantity', label: '所在箱数', width: 110, align: 'right' },
+  { prop: 'totalQuantity', label: '在仓总库存（件）', width: 150, align: 'right' },
+  { prop: 'availableQuantity', label: '可用库存', width: 110, align: 'right' },
+  { prop: 'relabelLockedQuantity', label: '换标占用（件）', width: 140, align: 'right' },
+  { prop: 'cartonQuantity', label: '所在箱数', width: 110, align: 'right' },
   { key: 'time', label: '库存更新时间', slotName: 'time', width: 180 },
 ]
 const cartonItemColumns: DataTableColumn[] = [
   { prop: 'skuCode', label: 'SKU', minWidth: 200 },
   { prop: 'productNameZh', label: '中文品名', minWidth: 240 },
   { prop: 'quantity', label: '数量', width: 110, align: 'right', headerAlign: 'right' },
+  { prop: 'availableQuantity', label: '可用数量（件）', width: 150, align: 'right' },
+  { prop: 'relabelledQuantity', label: '已换标数量（件）', width: 160, align: 'right' },
+  { prop: 'remainingRelabelQuantity', label: '剩余可换（件）', width: 150, align: 'right' },
 ]
+const conversionColumns: DataTableColumn[] = [
+  { prop: 'cartonMark', label: '包裹 / 箱识别码', minWidth: 220 },
+  { prop: 'relabelNo', label: '换标单号', minWidth: 200 },
+  { prop: 'oldSkuCode', label: '旧 SKU', minWidth: 180 },
+  { prop: 'newSkuCode', label: '新 SKU', minWidth: 180 },
+  { prop: 'quantity', label: '实际换标数量（件）', width: 170, align: 'right' },
+  { key: 'conversionStatus', label: '状态', slotName: 'conversionStatus', width: 140 },
+]
+function conversionStatusLabel(status: string) {
+  return ({ APPLIED: '已换标，待确认', CONFIRMED: '已确认', REVERSED: '已退回冲回' } as Record<string, string>)[status] || '—'
+}
 const cartonSummaryColumns: DataTableColumn[] = [
   { key: 'actions', label: '操作', slotName: 'actions', width: 150, fixed: 'left' }, { prop: 'cartonMark', label: '箱号', minWidth: 220 },
   { key: 'warehouse', label: '海外仓', slotName: 'warehouse', minWidth: 190 }, { prop: 'skuTypes', label: 'SKU 种类', width: 110, align: 'right' },
   { prop: 'totalQuantity', label: '总件数', width: 100, align: 'right' }, { prop: 'sourceReturnNo', label: '来源退货单', minWidth: 210 },
+  { key: 'relabelProgress', label: '换标进度', minWidth: 290, slotName: 'relabelProgress' },
   { prop: 'sourceBatchNo', label: '签收批次', minWidth: 180 }, { key: 'dimensions', label: '箱规', slotName: 'dimensions', width: 170 },
   { key: 'weight', label: '重量', slotName: 'weight', width: 100 }, { key: 'time', label: '生成时间', slotName: 'time', width: 180 },
 ]
@@ -109,6 +128,8 @@ const cartonColumns: DataTableColumn[] = [
   { key: 'warehouse', label: '海外仓', slotName: 'warehouse', minWidth: 190 }, { prop: 'skuCode', label: 'SKU', minWidth: 180 },
   { prop: 'productNameZh', label: '中文品名', minWidth: 180 }, { prop: 'quantity', label: '本箱数量', width: 110, align: 'right' },
   { prop: 'cartonSkuTypes', label: 'SKU 种类', width: 110, align: 'right' }, { prop: 'cartonTotalQuantity', label: '总件数', width: 100, align: 'right' },
+  { prop: 'relabelledQuantity', label: '已换标数量（件）', width: 160, align: 'right' },
+  { prop: 'remainingRelabelQuantity', label: '剩余可换（件）', width: 150, align: 'right' },
   { key: 'status', label: '箱状态', slotName: 'status', width: 100 }, { prop: 'sourceBatchNo', label: '签收批次', minWidth: 180 },
   { key: 'time', label: '生成时间', slotName: 'time', width: 180 },
 ]
@@ -257,6 +278,7 @@ onMounted(() => { if (props.detailPage) void Promise.all([loadCartonDetail(), lo
     <div v-else class="return-inventory-table">
       <DataTable v-model:page="query.page" v-model:page-size="query.size" :data="currentRows" :columns="currentColumns" :loading="loading" :total="total" :page-sizes="[20, 50, 100]" :row-actions="rowActions" :empty-text="loadError ? '库存加载失败，请核对权限或重试' : '暂无数据'">
         <template #warehouse="{ row }">{{ warehouseLabel(row.overseasWarehouseId) }}</template>
+        <template #relabelProgress="{ row }">{{ returnRelabelStatusLabel(row.relabelStatus) }}｜实际完成 {{ row.relabelledQuantity ?? '—' }} 件｜处理中占用 {{ row.relabelReservedQuantity ?? '—' }} 件</template>
         <template #status="{ row }"><el-tag effect="light">{{ cartonStatusLabel(row.status) }}</el-tag></template>
         <template #dimensions="{ row }">{{ row.length && row.width && row.height ? `${row.length} × ${row.width} × ${row.height} cm` : '—' }}</template>
         <template #weight="{ row }">{{ row.weight ? `${row.weight} kg` : '—' }}</template>
@@ -268,8 +290,9 @@ onMounted(() => { if (props.detailPage) void Promise.all([loadCartonDetail(), lo
     <article v-else v-loading="loading" class="carton-detail-surface">
       <template v-if="cartonDetail">
         <header class="carton-detail-header"><button type="button" class="carton-detail-back" @click="returnToCartons"><ArrowLeft :size="16" />返回列表</button><div><strong>{{ cartonDetail.cartonMark }}</strong><span>{{ warehouseLabel(cartonDetail.overseasWarehouseId) }} · 退货箱明细</span></div><div class="carton-detail-actions"><el-tag effect="light">{{ cartonStatusLabel(cartonDetail.status) }}</el-tag><el-button type="primary" @click="printLabel(cartonDetail.cartonMark)"><Printer :size="16" />打印箱唛</el-button></div></header>
-        <section class="carton-detail-section"><h3>箱号概览</h3><dl class="carton-detail-grid"><div><dt>来源退货单</dt><dd>{{ cartonDetail.sourceReturnNo || '—' }}</dd></div><div><dt>签收批次</dt><dd>{{ cartonDetail.sourceBatchNo || '—' }}</dd></div><div><dt>SKU 种类</dt><dd>{{ cartonDetail.skuTypes }}</dd></div><div><dt>箱内总件数</dt><dd>{{ cartonDetail.totalQuantity }}</dd></div><div><dt>箱规</dt><dd>{{ cartonDetail.length && cartonDetail.width && cartonDetail.height ? `${cartonDetail.length} × ${cartonDetail.width} × ${cartonDetail.height} cm` : '—' }}</dd></div><div><dt>重量</dt><dd>{{ cartonDetail.weight ? `${cartonDetail.weight} kg` : '—' }}</dd></div><div><dt>签收时间</dt><dd>{{ formatInventoryTime(cartonDetail.receivedAt) }}</dd></div></dl></section>
+        <section class="carton-detail-section"><h3>箱号概览</h3><dl class="carton-detail-grid"><div><dt>来源退货单</dt><dd>{{ cartonDetail.sourceReturnNo || '—' }}</dd></div><div><dt>签收批次</dt><dd>{{ cartonDetail.sourceBatchNo || '—' }}</dd></div><div><dt>SKU 种类</dt><dd>{{ cartonDetail.skuTypes }}</dd></div><div><dt>箱内总件数</dt><dd>{{ cartonDetail.totalQuantity }}</dd></div><div><dt>箱规</dt><dd>{{ cartonDetail.length && cartonDetail.width && cartonDetail.height ? `${cartonDetail.length} × ${cartonDetail.width} × ${cartonDetail.height} cm` : '—' }}</dd></div><div><dt>重量</dt><dd>{{ cartonDetail.weight ? `${cartonDetail.weight} kg` : '—' }}</dd></div><div><dt>换标进度</dt><dd>{{ returnRelabelStatusLabel(cartonDetail.relabelStatus) }}</dd></div><div><dt>实际完成（件）</dt><dd>{{ cartonDetail.relabelledQuantity ?? '—' }}</dd></div><div><dt>处理中占用（件）</dt><dd>{{ cartonDetail.relabelReservedQuantity ?? '—' }}</dd></div><div><dt>签收时间</dt><dd>{{ formatInventoryTime(cartonDetail.receivedAt) }}</dd></div></dl></section>
         <section class="carton-detail-section"><h3>箱内 SKU</h3><DataTable :data="cartonDetail.items" :columns="cartonItemColumns" row-key="skuCode" empty-text="暂无箱内 SKU" /></section>
+        <section class="carton-detail-section"><h3>SKU 换标明细</h3><DataTable :data="cartonDetail.skuConversions" :columns="conversionColumns" empty-text="暂无 SKU 换标记录"><template #conversionStatus="{ row }">{{ conversionStatusLabel(row.status) }}</template></DataTable></section>
       </template>
       <div v-else class="carton-detail-error" role="alert"><strong>{{ detailError || '箱号详情加载失败' }}</strong><el-button @click="loadCartonDetail">重新加载</el-button></div>
     </article>

src/modules/overseas-warehouse/views/ReturnOrdersView.test.mjs

@@ -77,6 +77,17 @@ test('新建退货预报使用独立路由页面，编辑仍保留加宽弹框',
   assert.match(view, /class="return-create-actions"[\s\S]*?<el-button type="primary" :loading="creating" @click="submit">提交预报<\/el-button>/)
 })
 
+test('新建预报居左限宽，联系字段与数量输入保持紧凑', () => {
+  assert.match(view, /return-create-surface \{ width:calc\(100% - 24px\);[^}]*max-width:1120px;[^}]*margin:0 0 0 24px; justify-self:start;/)
+  assert.match(view, /<el-form label-width="130px" class="return-create-form">/)
+  assert.match(view, /return-create-form :deep\(\.el-input\) \{ max-width:320px;/)
+  assert.match(view, /return-create-form :deep\(\.el-select\) \{ max-width:520px;/)
+  assert.match(view, /:deep\(\.el-table \.el-input-number\) \{ width:120px;/)
+  assert.match(view, /<el-table class="return-forecast-table"[^>]*>/)
+  assert.match(view, /return-forecast-table \{[^}]*border-radius:8px;/)
+  assert.match(view, /return-forecast-table :deep\(th.el-table__cell\) \{ height:38px;/)
+})
+
 test('退货列表和详情使用客户可读仓库、状态与时间', () => {
   assert.match(view, /function operationWarehouseLabel\(warehouseId: string\)/)
   assert.match(view, /return warehouse \? warehouseLabel\(warehouse\) : '未关联'/)
@@ -92,10 +103,9 @@ test('退货列表和详情使用客户可读仓库、状态与时间', () => {
 })
 
 test('可操作退货表格把操作列固定在最左侧', () => {
-  const createTable = view.slice(view.indexOf('<el-table :data="form.items"'), view.indexOf('</el-table>', view.indexOf('<el-table :data="form.items"')))
   assert.match(view, /label: '操作', slotName: 'actions', width: 220, fixed: 'left'/)
   assert.match(view, /<DataTable[^>]*:row-actions="rowActions"/)
-  assert.match(createTable, /^<el-table[\s\S]*?<el-table-column label="操作" width="80" fixed="left">/)
+  assert.match(view, /<el-table class="return-forecast-table"[\s\S]*?<el-table-column label="操作" width="80" fixed="left">/)
 })
 
 test('分页初始化不会重复请求退货列表', () => {
@@ -134,6 +144,28 @@ function printHarness() {
   return { print, calls }
 }
 
+test('包裹唛头可按实物识别码打印，不把快递单号或商品件数当作唛头', async () => {
+  const { print, calls } = printHarness()
+  await print({ unitType: 'PARCEL', unitCode: 'PK-PARCEL-1', trackingNo: 'SF-WAYBILL', receivedQuantity: 20 })
+  assert.deepEqual(calls.fetched, ['PK-PARCEL-1'])
+  assert.ok(calls.html.includes('data-barcode="PK-PARCEL-1"'))
+  assert.equal((calls.html.match(/<section class="return-label">/g) || []).length, 1)
+  assert.equal(calls.printed, 1)
+  assert.deepEqual(calls.errors, [])
+})
+
+test('批量包裹唛头按包裹分页、去重并保留服务端条码模板', async () => {
+  const { print, calls } = printHarness()
+  const parcels = ['PK-PARCEL-1', 'PK-PARCEL-2'].map(mark => ({ unitType: 'PARCEL', unitCode: mark,
+    receivedQuantity: 3, labels: [{ cartonMark: mark, printableHtml: labelHtml(mark) }] }))
+  await print([...parcels, parcels[0]])
+  assert.equal((calls.html.match(/<section class="return-label">/g) || []).length, 2)
+  assert.ok(calls.html.includes('data-barcode="PK-PARCEL-1"'))
+  assert.ok(calls.html.includes('data-barcode="PK-PARCEL-2"'))
+  assert.deepEqual(calls.fetched, [])
+  assert.equal(calls.printed, 1)
+})
+
 test('退货箱唛打印保留服务端整份模板，不另行覆盖纸张或条码', async () => {
   const { print, calls } = printHarness()
   const printableHtml = labelHtml('RETURN-TEST-1')
@@ -191,13 +223,38 @@ test('两托各两箱合并为一次四页打印，每箱条码保留且模板
   assert.deepEqual(calls.errors, [])
 })
 
+test('同一托盘分两次签收三箱和四箱，打印全部七个独立箱唛', async () => {
+  const { print, calls } = printHarness()
+  const receipts = [3, 4].map((count, batch) => ({
+    palletCode: 'PLT-SHARED', boxCount: String(count),
+    labels: Array.from({ length: count }, (_, index) => ({ cartonMark: `BATCH-${batch}-${index}`, printableHtml: labelHtml(`BATCH-${batch}-${index}`) })),
+    printableHtml: 'old-batch-template',
+  }))
+  await print(receipts)
+  assert.equal((calls.html.match(/<section class="return-label">/g) || []).length, 7)
+  for (const receipt of receipts) for (const label of receipt.labels) assert.ok(calls.html.includes(`data-barcode="${label.cartonMark}"`))
+  assert.equal(calls.printed, 1)
+  assert.deepEqual(calls.errors, [])
+})
+
+test('打印以完整箱唛列表为准，不使用可能只包含最后一批的汇总模板', async () => {
+  const { print, calls } = printHarness()
+  const labels = Array.from({ length: 7 }, (_, index) => ({ cartonMark: `RC-${index}`, printableHtml: labelHtml(`RC-${index}`) }))
+  await print({ labels, printableHtml: 'last-four-boxes-only' })
+  assert.equal((calls.html.match(/<section class="return-label">/g) || []).length, 7)
+  assert.equal(calls.printed, 1)
+  assert.deepEqual(calls.errors, [])
+})
+
 test('待审核退货可编辑，完成入库后从独立新增页发起贴标', () => {
   assert.match(view, /row\.status === 'PENDING_REVIEW'.*key: 'edit'/)
   assert.match(view, /if \(editingReturnNo\.value\) await updateReturnOrder\(editingReturnNo\.value, payload\)/)
   assert.match(view, /else await createReturnOrder\(payload\)/)
   assert.match(view, /order\.status === 'COMPLETED' && order\.needRelabel === true/)
   assert.match(view, /name: 'overseas-labeling-create'/)
-  assert.match(view, /query: \{ returnNo: order\.returnNo, warehouseId: String\(order\.overseasWarehouseId\) \}/)
+  assert.match(view, /query: \{ returnNo: order\.returnNo, warehouseId: String\(order\.overseasWarehouseId\)/)
+  assert.match(view, /cartonMark \? \{ cartonMark \}/)
+  assert.match(view, /openRelabel\(selected\.order, current\.carton\.cartonMark\)/)
   assert.match(view, /v-for="application in row\.relabelApplications \|\| \[\]"/)
   assert.match(view, /relabelStatusLabel\(application\.status\)/)
 })

src/modules/overseas-warehouse/views/ReturnOrdersView.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { computed, onBeforeUnmount, onMounted, reactive, ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
-import { ArrowLeft, Plus } from '@lucide/vue'
+import { ArrowLeft, ChevronDown, Plus } from '@lucide/vue'
 import { useRoute, useRouter } from 'vue-router'
 import QueryToolbar, { type QueryField, type QueryModel } from '@/components/common/QueryToolbar.vue'
 import DataTable, { type DataTableColumn } from '@/components/common/DataTable.vue'
@@ -11,6 +11,7 @@ import { getMerchantWarehouses, type MerchantWarehouse } from '@/modules/first-l
 import { createIdempotencyKey } from '@/utils/idempotencyKey'
 import { createReturnOrder, downloadReturnPhoto, getReturnOrder, listReturnOrders, updateReturnOrder, type ReturnOrderDetail, type ReturnOrderSummary, type ReturnReceipt } from '../api/returnOrders'
 import { getReturnInventoryLabel } from '../api/returnInventory'
+import { formatReturnVolume, receiptBoxDetails, receiptPhysicalDetails, receiptPrintableBoxCount, receiptTrackingNo } from '../utils/returnReceiptDisplay'
 
 const props = withDefaults(defineProps<{ createPage?: boolean; detailPage?: boolean; returnNo?: string }>(), { createPage: false, detailPage: false, returnNo: '' })
 const router = useRouter()
@@ -25,8 +26,16 @@ const showCreate = ref(false)
 const editingReturnNo = ref('')
 const selected = ref<ReturnOrderDetail>()
 const showCartons = ref(false)
+const parcelDetailsExpanded = ref(true)
+const receiptBatchesExpanded = ref(true)
+const signedBoxDetails = computed(() => receiptBoxDetails(selected.value?.receipts || [], selected.value?.cartons || []).map(box => ({
+  ...box,
+  measurements: selected.value?.pallets.find(unit => unit.unitType === 'BOX' && (unit.unitCode || unit.palletCode) === box.cartonMark) || (box.length != null || box.width != null || box.height != null || box.weight != null ? { ...box, volumeCbm: box.length != null && box.width != null && box.height != null ? Number(box.length) * Number(box.width) * Number(box.height) / 1_000_000 : null } : undefined),
+})))
+const physicalDetails = computed(() => receiptPhysicalDetails(selected.value?.pallets || [], signedBoxDetails.value))
 const printableReceipts = computed(() => selected.value?.receipts.filter(item => item.unitType !== 'PARCEL' && (item.cartonMark || item.labels?.length)) || [])
-const printableBoxCount = computed(() => printableReceipts.value.reduce((total, receipt) => total + (receipt.labels?.length || receipt.boxCount || 1), 0))
+const parcelReceipts = computed(() => selected.value?.receipts.filter(item => item.unitType === 'PARCEL') || [])
+const printableBoxCount = computed(() => receiptPrintableBoxCount(printableReceipts.value))
 const photoUrls = reactive<Record<string, string>>({})
 const rows = ref<ReturnOrderSummary[]>([])
 const total = ref(0)
@@ -58,16 +67,17 @@ const tableColumns: DataTableColumn[] = [
   { key: 'createdAt', label: '创建时间', slotName: 'createdAt', width: 180 },
 ]
 const itemColumns: DataTableColumn[] = [
-  { prop: 'skuCode', label: 'SKU', minWidth: 150 },
-  { prop: 'productNameZh', label: '中文品名', minWidth: 180 },
-  { prop: 'expectedQuantity', label: '预报数量', width: 100 },
-  { prop: 'receivedQuantity', label: '实收数量', width: 100 },
+  { prop: 'skuCode', label: 'SKU', width: 300 },
+  { prop: 'productNameZh', label: '中文品名', width: 300 },
+  { prop: 'expectedQuantity', label: '预报数量', width: 200 },
+  { prop: 'receivedQuantity', label: '实收数量', width: 140 },
+  { key: 'spacer', label: '', minWidth: 1 },
 ]
 const receiptColumns: DataTableColumn[] = [
   { prop: 'receiptBatchNo', label: '批次号', minWidth: 145 },
   { prop: 'receiptNo', label: '签收单号', minWidth: 145 },
   { key: 'unitType', label: '实物类型', slotName: 'unitType', width: 90 },
-  { prop: 'unitCode', label: '实物编码', minWidth: 160 },
+  { key: 'unitCode', label: '实物编码', slotName: 'unitCode', minWidth: 160 },
   { key: 'trackingNo', label: '快递单号', slotName: 'trackingNo', minWidth: 140 },
   { key: 'startedBy', label: '开始方式', slotName: 'startedBy', width: 100 },
   { prop: 'receivedQuantity', label: '实收', width: 80 },
@@ -186,13 +196,15 @@ async function printReturnLabel(receipt: ReturnReceipt | ReturnReceipt[]) {
   if (!popup) { ElMessage.warning('请允许浏览器打开打印窗口'); return }
   popup.opener = null
   try {
-    const groups = await Promise.all(receipts.map(async item => item.labels?.length
-      ? await Promise.all(item.labels.map(async label => ({ ...label, printableHtml: label.printableHtml || (await getReturnInventoryLabel(label.cartonMark)).printableHtml })))
-      : item.cartonMark ? [{ cartonMark: item.cartonMark, printableHtml: item.printableHtml || (await getReturnInventoryLabel(item.cartonMark)).printableHtml }] : []))
+    const groups = await Promise.all(receipts.map(async item => {
+      if (item.labels?.length) return await Promise.all(item.labels.map(async label => ({ ...label, printableHtml: label.printableHtml || (await getReturnInventoryLabel(label.cartonMark)).printableHtml })))
+      const mark = item.cartonMark || (item.unitType === 'PARCEL' ? item.unitCode : undefined)
+      return mark ? [{ cartonMark: mark, printableHtml: item.printableHtml || (await getReturnInventoryLabel(mark)).printableHtml }] : []
+    }))
     const labels = [...new Map(groups.flat().map(label => [label.cartonMark, label])).values()]
-    if (!labels.length) { popup.close(); ElMessage.warning('暂无可打印的箱唛'); return }
+    if (!labels.length) { popup.close(); ElMessage.warning('暂无可打印的唛头'); return }
     const printStyles = [...new Set(labels.flatMap(label => label.printableHtml.match(/<style\b[^>]*>[\s\S]*?<\/style>/gi) || []))].join('')
-    const printableHtml = (receipts.length === 1 ? receipts[0]?.printableHtml : undefined) || `<!doctype html><html><head><meta charset="utf-8"><title>退货箱唛</title>${printStyles}<style>.return-label{break-after:page}.return-label:last-child{break-after:auto}.return-label .label{page-break-after:auto}</style></head><body>${labels.map((label) => {
+    const printableHtml = (receipts.length === 1 && !receipts[0]?.labels?.length ? receipts[0]?.printableHtml : undefined) || `<!doctype html><html><head><meta charset="utf-8"><title>退货箱唛</title>${printStyles}<style>.return-label{break-after:page}.return-label:last-child{break-after:auto}.return-label .label{page-break-after:auto}</style></head><body>${labels.map((label) => {
         const html = label.printableHtml || ''
         const bodyStart = html.indexOf('<body')
         const contentStart = bodyStart < 0 ? 0 : html.indexOf('>', bodyStart) + 1
@@ -207,15 +219,15 @@ async function printReturnLabel(receipt: ReturnReceipt | ReturnReceipt[]) {
     popup.print()
   } catch (error) {
     popup.close()
-    ElMessage.error(error instanceof Error ? error.message : '箱唛加载失败')
+    ElMessage.error(error instanceof Error ? error.message : '唛头加载失败')
   }
 }
 function openDetail(returnNo: string) { void router.push({ name: 'overseas-return-relabel-detail', params: { returnNo } }) }
 function returnToList() { void router.push({ name: 'overseas-return-relabel' }) }
 function cancelCreate() { resetForm(); void router.push({ name: 'overseas-return-relabel' }) }
 function canApplyRelabel(order: { status?: unknown; needRelabel?: unknown; relabelNo?: unknown }) { return order.status === 'COMPLETED' && order.needRelabel === true && !order.relabelNo }
-function openRelabel(order: Pick<ReturnOrderSummary, 'returnNo' | 'overseasWarehouseId'>) {
-  void router.push({ name: 'overseas-labeling-create', query: { returnNo: order.returnNo, warehouseId: String(order.overseasWarehouseId) } })
+function openRelabel(order: Pick<ReturnOrderSummary, 'returnNo' | 'overseasWarehouseId'>, cartonMark?: string) {
+  void router.push({ name: 'overseas-labeling-create', query: { returnNo: order.returnNo, warehouseId: String(order.overseasWarehouseId), ...(cartonMark ? { cartonMark } : {}) } })
 }
 async function submit() {
   const items = form.items.map(({ skuCode, productNameZh, expectedQuantity }) => ({ skuCode: skuCode.trim(), productNameZh: productNameZh.trim(), expectedQuantity }))
@@ -248,10 +260,13 @@ function statusLabel(status: string, needRelabel = false) {
   return ({ PENDING_REVIEW: '待审核', PENDING_RECEIPT: '待签收', PARTIALLY_RECEIVED: '部分签收', REJECTED: '已驳回', CANCELLED: '已取消' } as Record<string, string>)[status] ?? (status || '未知状态')
 }
 function relabelStatusType(status?: string) {
-  return ({ PENDING_REVIEW: 'warning', PENDING_PROCESSING: 'primary', PROCESSING: 'primary', CUSTOMER_CONFIRM_PENDING: 'warning', COMPLETED: 'success', REJECTED: 'danger', CANCELLED: 'info' } as Record<string, 'primary' | 'success' | 'warning' | 'danger' | 'info'>)[status || ''] || 'info'
+  return ({ PENDING_REVIEW: 'warning', PENDING_PROCESSING: 'primary', PROCESSING: 'primary', CUSTOMER_CONFIRM_PENDING: 'warning', READY_FOR_OUTBOUND: 'success', COMPLETED: 'success', REJECTED: 'danger', CANCELLED: 'info' } as Record<string, 'primary' | 'success' | 'warning' | 'danger' | 'info'>)[status || ''] || 'info'
 }
 function relabelStatusLabel(status?: string) {
-  return ({ PENDING_REVIEW: '待审核', PENDING_PROCESSING: '待处理', PROCESSING: '处理中', CUSTOMER_CONFIRM_PENDING: '待客户确认', COMPLETED: '已完成', REJECTED: '已驳回', CANCELLED: '已取消' } as Record<string, string>)[status || ''] ?? (status || '—')
+  return ({ PENDING_REVIEW: '待审核', PENDING_PROCESSING: '待处理', PROCESSING: '处理中', CUSTOMER_CONFIRM_PENDING: '待客户确认', READY_FOR_OUTBOUND: '换标完成', COMPLETED: '已完成', REJECTED: '已驳回', CANCELLED: '已取消' } as Record<string, string>)[status || ''] ?? (status || '—')
+}
+function relabelQuantityUnit(unit?: string) {
+  return unit === '箱' ? '箱' : '件'
 }
 function startedByLabel(startedBy: ReturnReceipt['startedBy']) { return startedBy === 'SKU' ? 'SKU 查询' : '退货单号' }
 function formatDateTime(value?: string | null) {
@@ -281,21 +296,21 @@ onBeforeUnmount(clearPhotoUrls)
           <el-button @click="returnToList"><ArrowLeft :size="16" />返回列表</el-button>
         </header>
         <div class="return-create-body">
-          <el-form label-width="150px" class="return-create-form">
-            <el-form-item label="海外仓" required class="return-form-wide"><el-select v-model="form.overseasWarehouseId" filterable clearable :loading="operationWarehousesLoading" :disabled="Boolean(operationWarehousesError)" placeholder="请选择海外仓" @change="selectOperationWarehouse"><el-option v-for="warehouse in operationWarehouses" :key="warehouse.id" :label="warehouseLabel(warehouse)" :value="String(warehouse.id)" /></el-select><div v-if="operationWarehousesError" class="warehouse-error">{{ operationWarehousesError }}</div></el-form-item>
+          <el-form label-width="130px" class="return-create-form">
+            <el-form-item label="海外仓" required><el-select v-model="form.overseasWarehouseId" filterable clearable :loading="operationWarehousesLoading" :disabled="Boolean(operationWarehousesError)" placeholder="请选择海外仓" @change="selectOperationWarehouse"><el-option v-for="warehouse in operationWarehouses" :key="warehouse.id" :label="warehouseLabel(warehouse)" :value="String(warehouse.id)" /></el-select><div v-if="operationWarehousesError" class="warehouse-error">{{ operationWarehousesError }}</div></el-form-item>
+            <el-form-item label="客户参考号"><el-input v-model="form.customerReferenceNo" placeholder="可填写客户侧参考号" /></el-form-item>
             <el-form-item label="海外仓联系人" required><el-input v-model="form.warehouseContactName" :readonly="Boolean(selectedOperationWarehouse?.contactName)" :placeholder="selectedOperationWarehouse?.contactName ? '已从海外仓资料带出' : '该海外仓未维护，请手动填写'" /></el-form-item>
             <el-form-item label="海外仓联系电话" required><el-input v-model="form.warehouseContactPhone" :readonly="Boolean(selectedOperationWarehouse?.contactPhone)" :placeholder="selectedOperationWarehouse?.contactPhone ? '已从海外仓资料带出' : '该海外仓未维护，请手动填写'" /></el-form-item>
-            <el-form-item label="客户参考号" class="return-form-wide"><el-input v-model="form.customerReferenceNo" placeholder="可填写客户侧参考号" /></el-form-item>
-            <el-form-item label="备注" class="return-form-wide"><el-input v-model="form.remark" type="textarea" :rows="3" placeholder="填写退货说明（选填）" /></el-form-item>
+            <el-form-item label="备注" class="return-form-wide"><el-input v-model="form.remark" type="textarea" :rows="2" placeholder="填写退货说明（选填）" /></el-form-item>
           </el-form>
           <div class="items-title"><span>SKU 预报明细</span><el-button text type="primary" @click="addItem"><Plus :size="15" />添加 SKU</el-button></div>
-          <div class="return-relabel-option"><span>换标</span><el-checkbox v-model="form.needRelabel">需要换标</el-checkbox></div>
+          <div class="return-relabel-option"><span>是否换标</span><el-radio-group v-model="form.needRelabel" aria-label="是否换标"><el-radio-button :value="false">不换标</el-radio-button><el-radio-button :value="true">需要换标</el-radio-button></el-radio-group></div>
           <div class="items-hint">客户只需填写预计退回的 SKU 和数量；快递单号由仓库签收时按实际包裹扫描绑定。</div>
-          <el-table :data="form.items" row-key="id" size="small" border>
+          <el-table class="return-forecast-table" :data="form.items" row-key="id" size="small">
             <el-table-column label="操作" width="80" fixed="left"><template #default="{ $index }"><el-button link type="danger" :disabled="form.items.length === 1" @click="removeItem($index)">删除</el-button></template></el-table-column>
-            <el-table-column label="SKU" min-width="240"><template #default="{ row }"><div><el-input v-model="row.skuCode" :class="{ 'duplicate-sku-input': duplicateSkuIds.has(row.id) }" placeholder="填写 SKU" @blur="row.skuCode = row.skuCode.trim()" /><div v-if="duplicateSkuIds.has(row.id)" class="duplicate-sku-error">该 SKU 已在明细中填写</div></div></template></el-table-column>
+            <el-table-column label="SKU" width="300"><template #default="{ row }"><div><el-input v-model="row.skuCode" :class="{ 'duplicate-sku-input': duplicateSkuIds.has(row.id) }" placeholder="填写 SKU" @blur="row.skuCode = row.skuCode.trim()" /><div v-if="duplicateSkuIds.has(row.id)" class="duplicate-sku-error">该 SKU 已在明细中填写</div></div></template></el-table-column>
             <el-table-column label="中文品名" min-width="320"><template #default="{ row }"><el-input v-model="row.productNameZh" placeholder="填写中文品名（选填）" /></template></el-table-column>
-            <el-table-column label="预报数量" width="180"><template #default="{ row }"><el-input-number v-model="row.expectedQuantity" :min="1" controls-position="right" placeholder="数量" /></template></el-table-column>
+            <el-table-column label="预报数量" width="150"><template #default="{ row }"><el-input-number v-model="row.expectedQuantity" :min="1" controls-position="right" placeholder="数量" /></template></el-table-column>
           </el-table>
         </div>
         <footer class="return-create-actions"><el-button @click="cancelCreate">取消</el-button><el-button type="primary" :loading="creating" @click="submit">提交预报</el-button></footer>
@@ -303,14 +318,14 @@ onBeforeUnmount(clearPhotoUrls)
     </template>
 
     <template v-else-if="!props.detailPage">
-    <QueryToolbar v-model="queryModel" layout="grid" ariaLabel="退货签收筛选" :fields="queryFields" @search="search" />
+    <QueryToolbar v-model="queryModel" class="return-query" layout="grid" ariaLabel="退货签收筛选" :fields="queryFields" @search="search" />
     <div class="return-table-card">
       <DataTable v-model:page="query.page" v-model:page-size="query.size" :data="rows" :columns="tableColumns" :loading="loading" :total="total" :page-sizes="[15, 30, 50, 100]" :row-actions="rowActions" row-key="returnNo" empty-text="暂无退货预报">
         <template #toolbar-actions><el-button v-if="canCreate" type="primary" @click="openCreate"><Plus :size="16" />新建退货预报</el-button></template>
         <template #warehouse="{ row }">{{ operationWarehouseLabel(row.overseasWarehouseId) }}</template>
         <template #relabel="{ row }"><el-tag v-if="row.needRelabel" type="warning" effect="light">需要换标</el-tag><span v-else>否</span></template>
         <template #status="{ row }"><el-tag :type="statusType(row.status, row.needRelabel)" :class="statusClass(row.status, row.needRelabel)" effect="light">{{ statusLabel(row.status, row.needRelabel) }}</el-tag></template>
-        <template #relabelApplications="{ row }"><div v-for="application in row.relabelApplications || []" :key="application.relabelNo" class="relabel-suborder"><span>{{ application.relabelNo }}</span><el-tag :type="relabelStatusType(application.status)" effect="light">{{ relabelStatusLabel(application.status) }}</el-tag><span>{{ application.quantity }} 件</span></div><span v-if="!row.relabelApplications?.length">—</span></template>
+        <template #relabelApplications="{ row }"><div v-for="application in row.relabelApplications || []" :key="application.relabelNo" class="relabel-suborder"><span>{{ application.relabelNo }}</span><el-tag :type="relabelStatusType(application.status)" effect="light">{{ relabelStatusLabel(application.status) }}</el-tag><span>{{ application.quantity }} {{ relabelQuantityUnit(application.quantityUnit) }}</span></div><span v-if="!row.relabelApplications?.length">—</span></template>
         <template #createdAt="{ row }">{{ formatDateTime(row.createdAt) }}</template>
       </DataTable>
     </div>
@@ -324,7 +339,7 @@ onBeforeUnmount(clearPhotoUrls)
         <el-form-item label="备注" class="return-form-wide"><el-input v-model="form.remark" type="textarea" placeholder="填写退货说明（选填）" /></el-form-item>
       </el-form>
       <div class="items-title"><span>SKU 预报明细</span><el-button text type="primary" @click="addItem"><Plus :size="15" />添加 SKU</el-button></div>
-      <div class="return-relabel-option"><span>换标</span><el-checkbox v-model="form.needRelabel">需要换标</el-checkbox></div>
+      <div class="return-relabel-option"><span>是否换标</span><el-radio-group v-model="form.needRelabel" aria-label="是否换标"><el-radio-button :value="false">不换标</el-radio-button><el-radio-button :value="true">需要换标</el-radio-button></el-radio-group></div>
       <div class="items-hint">客户只需填写预计退回的 SKU 和数量；快递单号由仓库签收时按实际包裹扫描绑定。</div>
       <el-table :data="form.items" row-key="id" size="small">
         <el-table-column label="操作" width="80" fixed="left"><template #default="{ $index }"><el-button link type="danger" :disabled="form.items.length === 1" @click="removeItem($index)">删除</el-button></template></el-table-column>
@@ -356,40 +371,45 @@ onBeforeUnmount(clearPhotoUrls)
           </div>
           <div v-if="selected.remark" class="return-detail-remark"><span>备注</span><strong>{{ selected.remark }}</strong></div>
         </section>
-        <section class="return-detail-section">
+        <section v-if="selected.order.relabelApplications?.length" class="return-detail-section">
           <h3>换标子单（{{ selected.order.relabelApplications?.length || 0 }}）</h3>
-          <el-table :data="selected.order.relabelApplications || []" empty-text="暂无换标申请">
-            <el-table-column prop="relabelNo" label="换标单号" min-width="180" />
-            <el-table-column label="状态" min-width="110"><template #default="{ row }"><el-tag :type="relabelStatusType(row.status)">{{ relabelStatusLabel(row.status) }}</el-tag></template></el-table-column>
-            <el-table-column prop="quantity" label="本次换标数量（件）" min-width="140" />
+          <el-table class="return-aligned-table" :data="selected.order.relabelApplications || []" empty-text="暂无换标申请">
+            <el-table-column prop="relabelNo" label="换标单号" width="300" />
+            <el-table-column label="状态" width="300"><template #default="{ row }"><el-tag :type="relabelStatusType(row.status)">{{ relabelStatusLabel(row.status) }}</el-tag></template></el-table-column>
+            <el-table-column label="本次换标数量" width="200"><template #default="{ row }">{{ row.quantity }} {{ relabelQuantityUnit(row.quantityUnit) }}</template></el-table-column>
+            <el-table-column min-width="1" />
           </el-table>
         </section>
-        <section class="return-detail-section">
+        <section v-if="selected.items?.length" class="return-detail-section">
           <h3>预报与实收</h3>
-          <DataTable :data="selected.items" :columns="itemColumns" row-key="skuCode" empty-text="暂无 SKU 明细" />
+          <DataTable class="return-aligned-table" :data="selected.items" :columns="itemColumns" row-key="skuCode" empty-text="暂无 SKU 明细" />
         </section>
         <section v-if="selected.packingDetails?.length" class="return-detail-section">
           <h3>合箱明细</h3>
-          <el-table :data="selected.packingDetails" size="small">
-            <el-table-column prop="sourceCartonMark" label="来源箱唛" min-width="160" />
-            <el-table-column prop="targetCartonMark" label="目标箱唛" min-width="160" />
-            <el-table-column prop="skuCode" label="SKU" min-width="140" />
-            <el-table-column prop="quantity" label="本单装入数量" width="120" />
-            <el-table-column prop="createdAt" label="合箱时间" min-width="160" />
+          <el-table class="return-aligned-table" :data="selected.packingDetails" size="small">
+            <el-table-column prop="planNo" label="合箱计划" width="240" />
+            <el-table-column prop="sourceCartonMark" label="来源箱唛" width="300" />
+            <el-table-column prop="targetCartonMark" label="目标箱唛" width="300" />
+            <el-table-column prop="skuCode" label="SKU" width="200" />
+            <el-table-column prop="quantity" label="本单装入数量" width="140" />
+            <el-table-column label="合箱时间" width="200"><template #default="{ row }">{{ formatDateTime(row.createdAt) }}</template></el-table-column>
+            <el-table-column min-width="1" />
           </el-table>
         </section>
         <section v-if="selected.receipts?.some(item => item.unitType === 'PARCEL')" class="return-detail-section">
-          <h3>包裹签收明细</h3>
-          <div v-for="receipt in (selected.receipts || []).filter(item => item.unitType === 'PARCEL')" :key="`${receipt.receiptNo}-items`" class="return-parcel-items">
-            <div class="return-parcel-items__head"><strong>包裹 {{ receipt.unitCode || receipt.trackingNo || receipt.receiptNo }}</strong><span>{{ receipt.receivedQuantity }} 件</span></div>
+          <h3 class="section-heading-with-action return-parcel-heading"><span>包裹签收明细</span><span class="return-label-actions"><el-button type="primary" size="small" @click="printReturnLabel(parcelReceipts)">打印包裹唛头（{{ parcelReceipts.length }} 个）</el-button><el-button text :aria-expanded="parcelDetailsExpanded" aria-controls="return-parcel-details" @click="parcelDetailsExpanded = !parcelDetailsExpanded">{{ parcelDetailsExpanded ? '收起明细' : '展开明细' }}</el-button></span></h3>
+          <div v-show="parcelDetailsExpanded" id="return-parcel-details">
+          <details v-for="receipt in parcelReceipts" :key="`${receipt.receiptNo}-items`" class="return-parcel-items" open>
+            <summary class="return-parcel-items__head"><div class="return-parcel-items__identity"><strong>包裹 {{ receipt.unitCode || receipt.trackingNo || receipt.receiptNo }}</strong><span class="return-parcel-items__measurements">长 {{ receipt.length ?? '—' }} cm · 宽 {{ receipt.width ?? '—' }} cm · 高 {{ receipt.height ?? '—' }} cm · 体积 {{ formatReturnVolume(receipt.length != null && receipt.width != null && receipt.height != null ? receipt.length * receipt.width * receipt.height / 1_000_000 : null) }} m³ · 重量 {{ receipt.weight ?? '—' }} kg</span></div><span class="return-parcel-items__summary">{{ receipt.receivedQuantity }} 件<ChevronDown :size="16" aria-hidden="true" /></span></summary>
             <div class="return-parcel-items__list"><div v-for="item in receipt.items" :key="item.skuCode" class="return-parcel-item"><span class="return-parcel-item__sku">{{ item.skuCode }}</span><span class="return-parcel-item__name">{{ item.productNameZh || '中文品名未填写' }}</span><strong>{{ item.quantity }} 件</strong></div></div>
+          </details>
           </div>
         </section>
-        <section v-if="selected.pallets?.length" class="return-detail-section">
-          <h3 class="section-heading-with-action"><span>实物明细（{{ selected.pallets?.length || 0 }} 个托盘/箱）</span><span v-if="printableReceipts.length" class="return-label-actions"><el-button type="primary" size="small" @click="printReturnLabel(printableReceipts)">打印全部箱唛（{{ printableBoxCount }} 箱）</el-button></span></h3>
-          <el-collapse v-if="selected.pallets?.length" class="return-pallet-list">
-            <el-collapse-item v-for="pallet in selected.pallets" :key="pallet.palletCode" :name="pallet.palletCode">
-              <template #title><strong>{{ pallet.unitType === 'BOX' ? '箱子' : '托盘' }} {{ pallet.unitCode || pallet.palletCode }}</strong><span class="return-pallet-summary">{{ pallet.skuTypes }} 种 SKU · {{ pallet.totalQuantity }} 件 · {{ pallet.totalBoxCount }} 箱 · 体积 {{ pallet.volumeCbm == null ? '—' : `${pallet.volumeCbm} m³` }}</span></template>
+        <section v-if="physicalDetails.length" class="return-detail-section">
+          <h3 class="section-heading-with-action"><span>实物明细（{{ physicalDetails.length }} 个托盘/箱）</span><span v-if="printableReceipts.length" class="return-label-actions"><el-button type="primary" size="small" @click="printReturnLabel(printableReceipts)">打印全部箱唛（{{ printableBoxCount }} 箱）</el-button></span></h3>
+          <el-collapse v-if="physicalDetails.length" class="return-pallet-list">
+            <el-collapse-item v-for="pallet in physicalDetails" :key="pallet.palletCode" :name="pallet.palletCode">
+              <template #title><strong>{{ pallet.unitType === 'BOX' ? '箱子' : '托盘' }} {{ pallet.unitCode || pallet.palletCode }}</strong><span class="return-pallet-summary">{{ pallet.skuTypes }} 种 SKU · {{ pallet.totalQuantity }} 件 · {{ pallet.totalBoxCount }} 箱 · 体积 {{ formatReturnVolume(pallet.volumeCbm) }} m³</span></template>
               <div class="return-pallet-measurements">长 {{ pallet.length ?? '—' }} cm · 宽 {{ pallet.width ?? '—' }} cm · 高 {{ pallet.height ?? '—' }} cm · 重量 {{ pallet.weight ?? '—' }} kg</div>
               <el-table :data="pallet.items" size="small" border>
                 <el-table-column prop="skuCode" label="SKU" min-width="150" />
@@ -401,14 +421,15 @@ onBeforeUnmount(clearPhotoUrls)
           </el-collapse>
           <el-empty v-else description="暂无打托记录" :image-size="64" />
         </section>
-        <section v-if="selected.cartons?.length" class="return-detail-section">
-          <h3 class="section-heading-with-action"><span>签收箱号明细（{{ selected.cartons?.length || 0 }} 箱）</span><span class="return-label-actions"><el-button type="primary" size="small" @click="showCartons = true">查看箱号明细</el-button></span></h3>
+        <section v-if="signedBoxDetails.length" class="return-detail-section">
+          <h3 class="section-heading-with-action"><span>签收箱号明细（{{ signedBoxDetails.length }} 箱）</span><span class="return-label-actions"><el-button v-if="!physicalDetails.length && printableReceipts.length" type="primary" size="small" @click="printReturnLabel(printableReceipts)">打印全部箱唛（{{ printableBoxCount }} 箱）</el-button><el-button type="primary" size="small" @click="showCartons = true">查看箱号明细</el-button></span></h3>
           <el-dialog v-model="showCartons" title="签收箱号明细" width="1120px" align-center destroy-on-close>
           <div class="return-cartons-dialog-body">
-          <el-collapse v-if="selected.cartons?.length" class="return-pallet-list">
-            <el-collapse-item v-for="box in selected.cartons" :key="box.cartonMark" :name="box.cartonMark">
+          <el-collapse v-if="signedBoxDetails.length" class="return-pallet-list">
+            <el-collapse-item v-for="box in signedBoxDetails" :key="box.cartonMark" :name="box.cartonMark">
               <template #title><strong>{{ box.cartonMark }}</strong><span class="return-pallet-summary">{{ box.countStatus === 'CONFIRMED' ? `已确认 · ${box.items.length} 种 SKU · ${box.items.reduce((sum, item) => sum + Number(item.quantity), 0)} 件` : box.countStatus === 'PENDING' ? '待清点' : '未留存箱内签收明细' }}</span></template>
               <div class="return-pallet-measurements">签收单 {{ box.receiptNo }}<template v-if="box.palletCode"> · 托盘 {{ box.palletCode }}</template><template v-if="box.countedAt"> · 确认时间 {{ formatDateTime(box.countedAt) }}</template></div>
+              <div v-if="box.measurements" class="return-pallet-measurements">长 {{ box.measurements.length ?? '—' }} cm · 宽 {{ box.measurements.width ?? '—' }} cm · 高 {{ box.measurements.height ?? '—' }} cm · 重量 {{ box.measurements.weight ?? '—' }} kg · 体积 {{ formatReturnVolume(box.measurements.volumeCbm) }} m³</div>
               <el-table v-if="box.countStatus === 'CONFIRMED'" :data="box.items" size="small" border>
                 <el-table-column prop="skuCode" label="SKU" min-width="220" />
                 <el-table-column prop="productNameZh" label="中文品名" min-width="180" />
@@ -423,6 +444,24 @@ onBeforeUnmount(clearPhotoUrls)
           </el-dialog>
         </section>
         <section class="return-detail-section">
+          <h3>当前关联实物箱</h3>
+          <el-collapse v-if="selected.currentCartons?.length">
+            <el-collapse-item v-for="current in selected.currentCartons" :key="current.carton.cartonMark" :name="current.carton.cartonMark">
+              <template #title>{{ current.carton.cartonMark }} · 整箱 {{ current.carton.totalQuantity }} 件 · 本单 {{ current.orderQuantity }} 件 · {{ current.carton.sourceReturnNo?.includes(',') ? '跨来源单合箱' : '单一来源' }}</template>
+              <p>来源退货单：{{ current.carton.sourceReturnNo }} · 我方箱唛：{{ current.labelStatus === 'CONFIRMED' ? '已确认贴标' : '待贴标确认' }}</p>
+              <el-table :data="current.ownership" border>
+                <el-table-column prop="returnNo" label="来源退货单" min-width="200" />
+                <el-table-column prop="skuCode" label="SKU" min-width="180" />
+                <el-table-column prop="quantity" label="来源贡献数量" width="130" />
+              </el-table>
+              <p>换箱唛以当前实物箱为单位；跨来源单同 SKU 的部分贴标须先现场分拣确认。</p>
+              <el-button v-if="canCreateRelabel" :disabled="!current.canRelabel" @click="openRelabel(selected.order, current.carton.cartonMark)">选择此箱贴标</el-button>
+              <p v-if="!current.canRelabel">{{ current.blockReason }}</p>
+            </el-collapse-item>
+          </el-collapse>
+          <el-empty v-else description="暂无当前关联实物箱" :image-size="64" />
+        </section>
+        <section v-if="selected.photos?.length" class="return-detail-section">
           <h3>退货打托照片（{{ selected.photos?.length || 0 }} 张）</h3>
           <div v-if="selected.photos?.length" class="return-photo-grid">
             <button v-for="photo in selected.photos" :key="photo.fileId" class="return-photo" type="button" @click="previewPhoto(photo.fileId)">
@@ -433,15 +472,17 @@ onBeforeUnmount(clearPhotoUrls)
           </div>
           <el-empty v-else description="暂无退货打托照片" :image-size="64" />
         </section>
-        <section class="return-detail-section">
-          <h3>签收批次</h3>
+        <section v-if="selected.receipts?.length" class="return-detail-section">
+          <h3 class="section-heading-with-action"><span>签收批次</span><span class="return-label-actions"><el-button text :aria-expanded="receiptBatchesExpanded" aria-controls="return-receipt-batches" @click="receiptBatchesExpanded = !receiptBatchesExpanded">{{ receiptBatchesExpanded ? '收起批次' : '展开批次' }}</el-button></span></h3>
+          <div v-show="receiptBatchesExpanded" id="return-receipt-batches">
           <DataTable :data="selected.receipts" :columns="receiptColumns" row-key="receiptNo" empty-text="暂无签收批次">
             <template #unitType="{ row }">{{ row.unitType === 'PALLET' ? '托盘' : row.unitType === 'BOX' ? '箱子' : '包裹' }}</template>
-            <template #trackingNo="{ row }">{{ row.trackingNo || '无快递单号' }}</template>
+            <template #unitCode="{ row }">{{ row.unitType === 'PARCEL' && row.unitCode === receiptTrackingNo(row) ? '—' : row.unitCode || '—' }}</template>
+            <template #trackingNo="{ row }">{{ receiptTrackingNo(row) || '无快递单号' }}</template>
             <template #startedBy="{ row }">{{ startedByLabel(row.startedBy) }}</template>
             <template #signedAt="{ row }">{{ formatDateTime(row.signedAt) }}</template>
           </DataTable>
-
+          </div>
         </section>
       </template>
     </article>
@@ -449,16 +490,37 @@ onBeforeUnmount(clearPhotoUrls)
 </template>
 
 <style scoped>
+.return-query.query-toolbar--grid { display:grid; grid-template-columns:repeat(4,minmax(0,280px)) max-content; gap:14px 18px; align-items:end; }
+.return-query :deep(.query-toolbar__filters) { display:contents; }
+.return-query :deep(.query-toolbar__field) { display:flex; flex-direction:column; align-items:stretch; gap:6px; }
+.return-query :deep(.query-toolbar__label) { line-height:18px; }
+.return-query :deep(.query-toolbar__actions) { margin:0; padding:0; border:0; align-self:end; }
+@media(max-width:1200px) { .return-query.query-toolbar--grid { grid-template-columns:repeat(2,minmax(0,320px)); } }
 .relabel-suborder { display: flex; align-items: center; gap: 8px; min-height: 30px; white-space: nowrap; }
 .return-orders-page { display:grid; gap:12px; } .return-create-form { display:grid; grid-template-columns:repeat(2,minmax(0,1fr)); column-gap:20px; } .return-form-wide { grid-column:1 / -1; } .items-title { display:flex; justify-content:space-between; align-items:center; margin:16px 0 4px; font-weight:600; } .items-hint { margin-bottom:10px; color:var(--el-text-color-secondary); font-size:12px; } h3 { margin:24px 0 10px; font-size:16px; } h4 { margin:16px 0 8px; font-size:14px; } .remark { white-space:pre-wrap; } .warehouse-error, .duplicate-sku-error { margin-top:6px; color:var(--el-color-danger); font-size:12px; } :deep(.duplicate-sku-input .el-input__wrapper) { box-shadow:0 0 0 1px var(--el-color-danger) inset; } :deep(.el-dialog .el-select) { width:100%; }
-.return-create-surface { overflow:hidden; border:1px solid var(--client-border); border-radius:var(--client-radius); background:#fff; }
+.return-create-surface { width:calc(100% - 24px); max-width:1120px; min-width:0; margin:0 0 0 24px; justify-self:start; box-sizing:border-box; overflow:hidden; border:1px solid var(--client-border); border-radius:var(--client-radius); background:#fff; }
 .return-create-header { display:flex; min-height:68px; align-items:center; justify-content:space-between; gap:20px; padding:12px 20px; border-bottom:1px solid var(--client-border); }
 .return-create-header h2 { margin:0; color:#1f2d45; font-size:20px; }
 .return-create-header p { margin:4px 0 0; color:#7c899c; font-size:12px; }
 .return-create-body { padding:18px 20px 14px; }
 .return-create-body :deep(.el-select), .return-create-body :deep(.el-input-number) { width:100%; }
+.return-create-body .return-create-form { max-width:900px; column-gap:24px; }
+.return-create-body .return-create-form :deep(.el-form-item) { margin-bottom:16px; }
+.return-create-body .return-create-form :deep(.el-form-item__content) { min-width:0; }
+.return-create-body .return-create-form :deep(.el-input) { max-width:320px; }
+.return-create-body .return-create-form :deep(.el-select) { max-width:520px; }
+.return-create-body .return-create-form :deep(.el-textarea) { max-width:100%; }
+.return-create-body :deep(.el-table .el-input-number) { width:120px; }
+.return-forecast-table { overflow:hidden; border:1px solid var(--client-border); border-radius:8px; --el-table-header-bg-color:#f5f7fb; --el-table-header-text-color:#526176; --el-table-border-color:#edf1f5; --el-table-row-hover-bg-color:#f8faff; }
+.return-forecast-table :deep(th.el-table__cell) { height:38px; padding:4px 0; font-size:12px; font-weight:600; }
+.return-forecast-table :deep(td.el-table__cell) { padding:9px 0; }
+.return-forecast-table :deep(.cell) { padding:0 12px; }
+.return-forecast-table :deep(.el-input__wrapper) { min-height:30px; box-sizing:border-box; border-radius:6px; }
+.return-forecast-table :deep(.el-input__inner) { font-size:13px; }
+.return-forecast-table :deep(.el-button) { font-size:12px; }
 .return-create-body .items-title { margin-top:8px; }
-.return-relabel-option { display:flex; align-items:center; gap:16px; margin:8px 0; color:#526176; }
+.return-relabel-option { display:flex; align-items:center; gap:16px; margin:12px 0; color:#526176; }
+.return-relabel-option :deep(.el-radio-button__inner) { min-width:96px; padding:8px 16px; }
 .return-create-actions { display:flex; align-items:center; justify-content:flex-end; gap:10px; padding:12px 20px; border-top:1px solid var(--client-border); background:#fbfcfe; }
 .return-table-card { overflow:hidden; border:1px solid var(--client-border); border-radius:var(--client-radius); background:#fff; box-shadow:none; }
 .return-table-card :deep(.el-table) { width:100%; }
@@ -486,6 +548,10 @@ onBeforeUnmount(clearPhotoUrls)
 .section-heading-with-action { display:flex; align-items:center; justify-content:space-between; gap:12px; }
 .return-label-actions { display:flex; align-items:center; gap:6px; }
 .return-label-actions :deep(.el-button) { height:28px; margin:0; padding:0 12px; border-radius:6px; font-size:12px; box-shadow:0 2px 5px rgba(33,103,232,.14); }
+.return-parcel-heading { display:grid; grid-template-columns:800px minmax(0,1fr); gap:0; }
+.return-parcel-heading .return-label-actions { display:grid; grid-template-columns:134px max-content; gap:6px; justify-content:start; }
+.return-parcel-heading .return-label-actions :deep(.el-button:first-child) { height:auto; min-height:28px; padding:4px 2px; white-space:normal; }
+.return-parcel-heading .return-label-actions :deep(.el-button:first-child > span) { line-height:16px; }
 .return-detail-grid { display:grid; grid-template-columns:repeat(4,minmax(0,1fr)); border-top:1px solid #edf1f5; }
 .return-detail-grid div { display:flex; min-width:0; min-height:40px; align-items:center; gap:6px; padding:6px 10px; border-right:1px solid #edf1f5; border-bottom:1px solid #edf1f5; }
 .return-detail-grid span,.return-detail-remark span { flex:0 0 82px; color:#8490a1; font-size:12px; }
@@ -496,6 +562,7 @@ onBeforeUnmount(clearPhotoUrls)
 .return-detail-section :deep(.el-table th.el-table__cell) { height:34px; padding:0; }
 .return-detail-section :deep(.el-table td.el-table__cell) { height:36px; padding:0; }
 .return-detail-section :deep(.el-table .cell) { padding:0 8px; line-height:18px; }
+.return-detail-section :deep(.return-aligned-table .cell) { padding:0 14px; text-align:left; }
 .return-detail-section :deep(.el-table .el-tag) { font-size:12px; }
 .return-pallet-list { padding:0 14px 10px; }
 .return-cartons-dialog-body { max-height:65vh; overflow-y:auto; }
@@ -505,12 +572,22 @@ onBeforeUnmount(clearPhotoUrls)
 .return-photo { min-width:0; overflow:hidden; padding:0; border:1px solid #dfe6ef; border-radius:6px; color:#526176; background:#fff; cursor:pointer; }
 .return-photo img,.return-photo>span { display:flex; width:100%; height:120px; align-items:center; justify-content:center; object-fit:cover; background:#f4f7fb; }
 .return-photo small { display:block; overflow:hidden; padding:7px; text-overflow:ellipsis; white-space:nowrap; }
-.return-parcel-items { margin:10px 16px 16px; overflow:hidden; border:1px solid #dfe6ef; border-radius:8px; background:#fbfcfe; }
-.return-parcel-items__head { display:flex; align-items:center; justify-content:space-between; gap:12px; padding:10px 14px; color:#26364f; background:#f3f7fc; border-bottom:1px solid #e7edf5; }
+.return-parcel-items { width:calc(100% - 32px); max-width:760px; box-sizing:border-box; margin:8px 16px 12px; overflow:hidden; border:1px solid #dfe6ef; border-radius:8px; background:#fbfcfe; }
+.return-parcel-items__head { display:flex; align-items:center; justify-content:space-between; gap:12px; padding:8px 12px; color:#26364f; font-size:13px; background:#f3f7fc; border-bottom:1px solid #e7edf5; }
 .return-parcel-items__head span { color:#1764c0; font-size:12px; font-weight:600; }
-.return-parcel-items__list { display:grid; grid-template-columns:repeat(auto-fit,minmax(280px,1fr)); gap:8px; padding:10px; }
-.return-parcel-item { display:grid; grid-template-columns:minmax(110px,1fr) minmax(100px,1.4fr) auto; align-items:center; gap:10px; min-height:38px; padding:7px 10px; border:1px solid #edf1f5; border-radius:6px; background:#fff; }
-.return-parcel-item__sku { color:#2c3c55; font-weight:600; }
+.return-parcel-items__identity { display:flex; align-items:center; flex-wrap:wrap; gap:8px 16px; min-width:0; }
+.return-parcel-items__identity strong { overflow-wrap:anywhere; }
+.return-parcel-items__head .return-parcel-items__measurements { color:#7c899c; font-weight:400; }
+.return-parcel-items__head { cursor:pointer; list-style:none; }
+.return-parcel-items__head::-webkit-details-marker { display:none; }
+.return-parcel-items__head:focus-visible { outline:2px solid var(--el-color-primary); outline-offset:-2px; }
+.return-parcel-items__summary { display:flex; align-items:center; flex-shrink:0; gap:12px; white-space:nowrap; }
+.return-parcel-items__summary svg { transition:transform .15s ease; }
+.return-parcel-items:not([open]) .return-parcel-items__summary svg { transform:rotate(-90deg); }
+.return-parcel-items__list { display:grid; grid-template-columns:minmax(0,1fr); gap:6px; padding:8px; }
+/* Match the 300px table columns above, accounting for the parcel card's inset and 8px gaps. */
+.return-parcel-item { display:grid; grid-template-columns:minmax(0,272px) minmax(0,292px) minmax(0,1fr); align-items:center; gap:8px; min-height:32px; box-sizing:border-box; padding:5px 8px; border:1px solid #edf1f5; border-radius:6px; background:#fff; font-size:12px; }
+.return-parcel-item__sku { min-width:0; overflow-wrap:anywhere; color:#2c3c55; font-weight:600; }
 .return-parcel-item__name { overflow:hidden; color:#8490a1; font-size:12px; text-overflow:ellipsis; white-space:nowrap; }
 .return-parcel-item strong { color:#1764c0; white-space:nowrap; }
 @media (max-width: 760px) { .return-create-form { grid-template-columns:1fr; } }

src/modules/overseas-warehouse/views/WarehouseServiceView.vue

@@ -7,10 +7,11 @@ import QueryToolbar, { type QueryField, type QueryModel } from '@/components/com
 import DataTable, { type DataTableColumn } from '@/components/common/DataTable.vue'
 import type { TableAction } from '@/components/common/tableActions'
 import { useAuthStore } from '@/modules/auth/public'
+import { returnRelabelCandidate } from '../utils/returnRelabelCandidates'
 import {
   createDiscard, createRelabel, createTransfer, getDiscard, getRelabel, getTransfer, resubmitRelabel,
   getTransferCartonLabel, submitTransfer, updateTransfer,
-  confirmRelabelCompletion, confirmTransferMeasurement, downloadRelabelCompletionPhoto, downloadTransferMeasurementPhoto, uploadRelabelShippingLabel,
+  confirmRelabelCompletion, confirmTransferMeasurement, downloadRelabelCompletionPhoto, downloadTransferMeasurementPhoto, downloadDiscardPhoto, type DiscardPhoto, uploadRelabelShippingLabel,
   uploadRelabelFile,
   listDiscards, listRelabelInventoryCandidates, listRelabelHistoricalOrders, listRelabels, listTransfers, cancelDiscard,
   type RelabelInventoryCandidate,
@@ -26,13 +27,14 @@ import {
 } from '@/modules/first-leg/api/firstLeg'
 import { loadAllWarehouseRecords } from '@/modules/first-leg/utils/warehousePagination'
 import { createIdempotencyKey } from '@/utils/idempotencyKey'
+import { relabelSkuCodes, relabelSkuCount } from '../utils/relabelSkuDisplay'
 
 type ServiceType = 'labeling' | 'transfer' | 'disposal' | 'relabel'
 type PageMode = 'list' | 'create' | 'edit' | 'detail'
 type LabelingMode = 'carton' | 'sku' | 'carton_and_sku'
 type RelabelTemplateType = 'carton' | 'sku' | 'mixed'
 interface CargoRow { id: number; included?: boolean; sku: string; name: string; quantity: number; availableQuantity?: number; sourceOrderId?: string; sourceType?: 'DROPSHIP' | 'RETURN_CARTON' | 'RETURN_PARCEL'; sourceInventoryBalanceId?: string; sourceInventoryPositionId?: string; sourceInboundOrderId?: string; returnCartonId?: string; sourceInboundOrderNo?: string; sourceInboundCode?: string; sourceWarehouseName?: string; palletNo?: string; warehouseLocationCode?: string; fnsku: string; shipmentNo: string; newSkuCode: string; shippingMark: string; customerCartonMarks: string; cartonMark: string; fbaCartonMark: string; destinationWarehouseId: string; remark: string }
-interface SkuRelabelRow { id: number; sourceRowId: number | null; cartonMark: string; originalSku: string; newSku: string; quantity: number; fbaCartonMark: string; destinationWarehouseId: string; remark: string }
+interface SkuRelabelRow { id: number; sourceRowId: number | null; cartonMark: string; originalSku: string; newSku: string; quantity: number; fbaCartonMark: string; shipmentNo: string; destinationWarehouseId: string; remark: string }
 interface ImportedRelabelBinding extends SkuRelabelRow { templateType: RelabelTemplateType; selected: boolean; shipmentNo: string }
 interface ServiceConfig { title: string; createTitle: string; numberLabel: string; emptyText: string; columns: string[] }
 interface TransferCarton { cartonMark: string; customerCartonMark?: string; cartonIndex: number; totalCartons: number; status: string }
@@ -53,7 +55,7 @@ const canConfirmRelabel = computed(() => auth.hasPermission('merchant:overseas-w
 const canConfirmTransfer = computed(() => auth.hasPermission('merchant:overseas-warehouse:transfer:confirm'))
 const canCancelDiscard = computed(() => auth.hasPermission('merchant:overseas-warehouse:discard:cancel'))
 const configs: Record<ServiceType, ServiceConfig> = {
-  labeling: { title: '贴标申请', createTitle: '新增贴标申请', numberLabel: '贴标申请单号', emptyText: '暂无贴标申请', columns: ['操作', '贴标申请单号', '客户单号', '海外操作仓', '贴标要求', 'SKU 数', '总箱数', '状态', '审核时间', '贴标完成时间', '贴标出库时间', '创建时间'] },
+  labeling: { title: '贴标申请', createTitle: '新增贴标申请', numberLabel: '贴标申请单号', emptyText: '暂无贴标申请', columns: ['操作', '贴标申请单号', '关联业务单号', '海外操作仓', 'SKU 数（种）', '总箱数/包裹', '换标类型', '状态', '审核时间', '贴标完成时间', '贴标出库时间', '创建时间'] },
   transfer: { title: '仓储转运单', createTitle: '新增仓储转运单', numberLabel: '转运单号', emptyText: '暂无仓储转运订单', columns: ['操作', '转运单号', '箱数', '海外仓', 'FBA 目的仓', '入仓方式', '是否换标', '换标单号', '换标状态', '状态', '审核时间', '测量时间', '出库时间', '创建时间'] },
   disposal: { title: '货物废弃', createTitle: '新增货物废弃申请', numberLabel: '废弃申请单号', emptyText: '暂无货物废弃申请', columns: ['操作', '废弃申请单号', '废弃出库单号', '进仓编号', '操作仓', 'SKU 汇总', '废弃数量', '预估费用', '状态', '废弃完成时间', '创建时间'] },
   relabel: { title: '退货换标', createTitle: '新建退货换标单', numberLabel: '退货换标单号', emptyText: '暂无退货换标订单', columns: ['操作', '退货换标单号', '来源 FBA 仓', '目的 FBA 仓', 'SKU 汇总', '退件总数', '是否换标', '换标状态', '尾程状态', '审核时间', '测量时间', '出库时间', '创建时间'] },
@@ -117,6 +119,7 @@ const editingTransferNo = ref('')
 interface TransferPallet { id?: string | number; sequenceNo?: number; palletNo?: string; warehouseLocationCode?: string; cartonCount?: number; lengthCm?: number; widthCm?: number; heightCm?: number; grossWeightKg?: number; volumeCbm?: number; status?: string; completedAt?: string }
 interface TransferMeasurementPhoto { fileId: string | number; fileName?: string; contentType?: string; sizeBytes?: number; uploadedAt?: string }
 interface ServiceDetail extends Record<string, unknown> {
+  discardNo?: string; photos?: DiscardPhoto[]
   transferNo?: string; status?: string; operatingWarehouseId?: string; fbaWarehouseCode?: string
   destinationType?: 'NONE' | 'FBA' | 'PRIVATE'; destinationWarehouseCode?: string; destinationWarehouseName?: string
   privateDestinationAddress?: string; privateDestinationPostalCode?: string; privateDestinationContactName?: string; privateDestinationContactPhone?: string
@@ -144,6 +147,21 @@ const measurementPhotoLoading = reactive<Record<string, boolean>>({})
 const measurementPhotoErrors = reactive<Record<string, boolean>>({})
 const measurementPhotoPreviewUrls = computed(() => (selectedDetail.value?.measurementPhotos || [])
   .map((photo) => measurementPhotoUrls[photo.fileId]).filter(Boolean))
+const discardPhotoUrls = reactive<Record<string, string>>({})
+const discardPhotoLoading = reactive<Record<string, boolean>>({})
+const discardPhotoErrors = reactive<Record<string, boolean>>({})
+const discardPhotoPreviewUrls = computed(() => (selectedDetail.value?.photos || []).map(photo => discardPhotoUrls[photo.fileId]).filter(Boolean))
+let discardPhotoGeneration = 0
+function clearDiscardPhotos() { discardPhotoGeneration++; Object.values(discardPhotoUrls).forEach(URL.revokeObjectURL); for (const map of [discardPhotoUrls, discardPhotoLoading, discardPhotoErrors]) Object.keys(map).forEach(key => delete map[key]) }
+async function loadDiscardPhoto(fileId: string) {
+  const current = selectedDetail.value; const generation = discardPhotoGeneration
+  if (!current?.discardNo || discardPhotoLoading[fileId]) return
+  discardPhotoLoading[fileId] = true; discardPhotoErrors[fileId] = false
+  try { const blob = await downloadDiscardPhoto(current.discardNo, fileId); if (generation !== discardPhotoGeneration || selectedDetail.value !== current || mode.value !== 'detail') return; if (discardPhotoUrls[fileId]) URL.revokeObjectURL(discardPhotoUrls[fileId]); discardPhotoUrls[fileId] = URL.createObjectURL(blob) }
+  catch { if (generation === discardPhotoGeneration) discardPhotoErrors[fileId] = true }
+  finally { if (generation === discardPhotoGeneration) discardPhotoLoading[fileId] = false }
+}
+async function loadDiscardPhotos() { clearDiscardPhotos(); await Promise.all((selectedDetail.value?.photos || []).map(photo => loadDiscardPhoto(photo.fileId))) }
 const fbaWarehouses = ref<MerchantWarehouse[]>([])
 const operationWarehouses = ref<MerchantWarehouse[]>([])
 const fbaWarehousesLoading = ref(false)
@@ -180,8 +198,9 @@ const listQueryFields = computed<QueryField[]>(() => {
 })
 const listColumns = computed<DataTableColumn[]>(() => config.value.columns.map((label, index) => index === 0
   ? { key: 'actions', label, slotName: 'actions', width: props.service === 'transfer' ? 210 : 160, fixed: 'left' }
-  : { key: String(index - 1), prop: String(index - 1), label, minWidth: index === 1 || label === '换标单号' ? 190 : 130,
-      slotName: props.service === 'transfer' && label === '换标状态' ? 'transferRelabelStatus' : props.service === 'transfer' && label === '状态' ? 'transferStatus' : undefined }))
+  : { key: String(index - 1), prop: String(index - 1), label, minWidth: label === '关联业务单号' ? 300 : index === 1 || label === '换标单号' ? 190 : 130,
+      singleLine: label !== '关联业务单号', className: label === '关联业务单号' ? 'related-business-number-cell' : undefined,
+      slotName: props.service === 'labeling' && label === '换标类型' ? 'labelingType' : props.service === 'labeling' && label === '状态' ? 'labelingStatus' : props.service === 'transfer' && label === '换标状态' ? 'transferRelabelStatus' : props.service === 'transfer' && label === '状态' ? 'transferStatus' : undefined }))
 const discardCandidates = ref<import('../api/warehouseServices').DiscardCandidate[]>([])
 const selectedDiscardOrderId = ref('')
 const discardCandidatesLoading = ref(false)
@@ -198,37 +217,61 @@ const selectedTransferInventory = ref('')
 const selectedTransferSourceOrderIds = ref<string[]>([])
 const isReturnRelabelSource = computed(() => props.service === 'labeling' && selectedRelabelInboundOrderId.value.startsWith('RETURN_ORDER:'))
 const selectedReturnOrderNo = computed(() => isReturnRelabelSource.value ? selectedRelabelInboundOrderId.value.slice('RETURN_ORDER:'.length) : '')
-const hideReturnSkuCartonMark = computed(() => isReturnRelabelSource.value && labelingMode.value === 'sku')
-const selectedReturnCandidates = computed(() => relabelCandidates.value.filter(item => Boolean(item.returnCartonId) && item.inboundOrderNo === selectedReturnOrderNo.value))
-const returnBoxCandidates = computed(() => selectedReturnCandidates.value.filter(item => item.sourceType === 'RETURN_CARTON'))
-const returnLooseCandidates = computed(() => selectedReturnCandidates.value.filter(item => item.sourceType === 'RETURN_PARCEL'))
-const returnSkuOnly = computed(() => isReturnRelabelSource.value && returnLooseCandidates.value.length > 0 && returnBoxCandidates.value.length === 0)
+const currentRelabelCandidates = computed(() => relabelCandidates.value.map(item => returnRelabelCandidate(item, labelingMode.value)))
+const returnCartonQuery = ref(String(route.query.cartonMark || ''))
+const selectedReturnCandidates = computed(() => currentRelabelCandidates.value.filter(item => Boolean(item.returnCartonId)
+  && returnSourceNos(item).includes(selectedReturnOrderNo.value)
+  && (!returnCartonQuery.value.trim() || (item.cartonMark || '').toUpperCase().includes(returnCartonQuery.value.trim().toUpperCase()))))
+const availableReturnCandidates = computed(() => selectedReturnCandidates.value.filter(item => inventoryQuantity(item.availablePackages) > 0).map(item => ({ ...item, skuItems: (item.skuItems || []).filter(sku => inventoryQuantity(sku.quantity) > 0) })))
+const returnBoxCandidates = computed(() => availableReturnCandidates.value.filter(item => item.sourceType === 'RETURN_CARTON'))
+const returnLooseCandidates = computed(() => availableReturnCandidates.value.filter(item => item.sourceType === 'RETURN_PARCEL'))
 const requiresBothTotalFiles = computed(() => (props.service === 'labeling' || (props.service === 'transfer' && form.relabel)) && labelingMode.value === 'carton_and_sku')
 function inventoryQuantity(value: number | string | null | undefined) {
   const quantity = Number(value)
   return Number.isFinite(quantity) && quantity > 0 ? quantity : 0
 }
+const relabelInventorySearch = ref('')
+function returnSourceNos(candidate: RelabelInventoryCandidate): string[] {
+  return [...new Set((candidate.inboundOrderNo || '').split(',').map(value => value.trim()).filter(Boolean))]
+}
+function returnRelabelProgress(candidate: RelabelInventoryCandidate) {
+  const labels: Record<string, string> = { UNLABELLED: '未换标', BOUND: '处理中', PROCESSING: '处理中', PARTIALLY_COMPLETED: '部分完成', COMPLETED: '全部完成' }
+  return [labels[candidate.relabelStatus || ''] || '—', '实际完成 ' + (candidate.relabelledQuantity ?? '—') + ' 件', '处理中占用 ' + (candidate.relabelReservedQuantity ?? '—') + ' 件'].join('｜')
+}
+function returnInventoryState(candidate: RelabelInventoryCandidate) {
+  const labels: Record<string, string> = { AVAILABLE: '可选库存', RELABEL_PENDING: '换标占用', PACKING_RESERVED: '合箱计划预留', OUTBOUND_PENDING: '出库占用', DISCARD_PENDING: '废弃申请占用', OUTBOUNDED: '已出库', MERGED: '已合箱' }
+  return [...(returnSourceNos(candidate).length > 1 ? ['跨来源单合箱，数量为整箱内容'] : []), ...(candidate.mergedIntoCartonMarks?.length ? ['历史部分转入 ' + candidate.mergedIntoCartonMarks.join('、') + '（不代表当前库存位置）'] : []), labels[candidate.inventoryStatus || ''] || (inventoryQuantity(candidate.availablePackages) > 0 ? '可选库存' : '当前不可选'), candidate.occupiedRelabelNo].filter(Boolean).join(' · ')
+}
 const relabelInboundOptions = computed(() => {
-  const grouped = new Map<string, { value: string; inboundOrderNo: string; inboundCode: string; availablePackages: number; relabelledPackages: number; quantityUnit: '箱' | '件' }>()
-  for (const candidate of relabelCandidates.value) {
-    const returnOrderNo = candidate.inboundOrderNo || String(candidate.returnCartonId || '')
-    const value = candidate.returnCartonId ? `RETURN_ORDER:${returnOrderNo}` : String(candidate.inboundOrderId)
-    const current = grouped.get(value)
-    if (current) {
-      current.availablePackages += inventoryQuantity(candidate.availablePackages)
-      current.relabelledPackages += inventoryQuantity(candidate.relabelledPackages)
+  const grouped = new Map<string, { value: string; inboundOrderNo: string; inboundCode: string; availablePackages: number; quantityUnit: '箱' | '件'; stockQuantity: number | null; units: number; hasOutbound: boolean; reasons: string[] }>()
+  for (const candidate of currentRelabelCandidates.value) {
+    const sources = candidate.returnCartonId ? returnSourceNos(candidate) : [String(candidate.inboundOrderId)]
+    for (const sourceNo of sources) {
+      const value = candidate.returnCartonId ? 'RETURN_ORDER:' + sourceNo : sourceNo
+      const current = grouped.get(value)
+      if (current) {
+        current.hasOutbound ||= candidate.hasOutbound === true || candidate.inventoryStatus === 'OUTBOUNDED'
+        current.availablePackages += inventoryQuantity(candidate.availablePackages)
+        current.units += candidate.returnCartonId && Number(candidate.stockQuantity) === 0 ? 0 : 1
+        current.stockQuantity = current.stockQuantity == null || candidate.stockQuantity == null ? null : current.stockQuantity + inventoryQuantity(candidate.stockQuantity)
+        if (candidate.returnCartonId) current.reasons.push(returnInventoryState(candidate))
+      }
+      else grouped.set(value, {
+        value, inboundOrderNo: candidate.returnCartonId ? '退货单 ' + sourceNo : (candidate.inboundOrderNo || '—'),
+        inboundCode: candidate.returnCartonId ? '已签收退货库存（含合箱）' : (candidate.inboundCode || '—'),
+        availablePackages: inventoryQuantity(candidate.availablePackages),
+        quantityUnit: candidate.returnCartonId ? '件' : '箱',
+        stockQuantity: candidate.stockQuantity == null ? null : inventoryQuantity(candidate.stockQuantity), units: candidate.returnCartonId && Number(candidate.stockQuantity) === 0 ? 0 : 1, hasOutbound: candidate.hasOutbound === true || candidate.inventoryStatus === 'OUTBOUNDED', reasons: candidate.returnCartonId ? [returnInventoryState(candidate)] : [],
+      })
     }
-    else grouped.set(value, {
-      value,
-      inboundOrderNo: candidate.returnCartonId ? `退货单 ${candidate.inboundOrderNo || '—'}` : (candidate.inboundOrderNo || '—'),
-      inboundCode: candidate.returnCartonId ? '已签收退货库存' : (candidate.inboundCode || '—'),
-      availablePackages: inventoryQuantity(candidate.availablePackages),
-      relabelledPackages: inventoryQuantity(candidate.relabelledPackages),
-      quantityUnit: candidate.returnCartonId ? '件' : '箱',
-    })
   }
-  return [...grouped.values()]
+  return [...grouped.values()].map(option => ({ ...option, reasons: [...new Set(option.reasons)] }))
 })
+const visibleRelabelInboundOptions = computed(() => relabelInboundOptions.value.filter(option => option.availablePackages > 0))
+function relabelOptionLabel(option: typeof relabelInboundOptions.value[number]) {
+  if (option.quantityUnit === '箱') return option.inboundOrderNo + '｜' + option.inboundCode + '｜可选 ' + option.availablePackages + ' 箱'
+  return option.inboundOrderNo + '｜在仓 ' + option.units + ' 包裹/箱 · ' + (option.stockQuantity ?? '待查询') + ' 件' + (option.reasons.some(reason => reason.includes('跨来源单')) ? '（关联整箱数量，含其他来源）' : '') + (option.hasOutbound && Number(option.stockQuantity) > 0 ? '｜部分出库' : '')
+}
 const loading = ref(false)
 const saving = ref(false)
 const cartonTemplateInput = ref<HTMLInputElement | null>(null)
@@ -254,7 +297,7 @@ watch(() => [props.service, props.createPage, props.detailPage, detailNumber.val
   else if (props.detailPage && detailNumber.value) void loadDetailPage()
   else void loadPage()
 })
-watch(mode, (value) => { if (value !== 'detail') { clearCompletionPhotos(); clearMeasurementPhotos() } })
+watch(mode, (value) => { if (value !== 'detail') { clearCompletionPhotos(); clearMeasurementPhotos(); clearDiscardPhotos() } })
 watch(() => form.relabel, (value) => {
   if (props.service === 'transfer' && value) {
     labelingMode.value = 'carton_and_sku'
@@ -268,9 +311,8 @@ watch(() => cargoRows.value.map((row) => row.sku), (skus) => {
     if (sourceSku) row.sku = sourceSku
   })
 })
-watch([returnSkuOnly, labelingMode], ([skuOnly, value]) => {
-  if (skuOnly && value !== 'sku') { labelingMode.value = 'sku'; return }
-  if (value !== 'carton' && !skuRelabelRows.value.length) addSkuRelabelRow()
+watch(labelingMode, (value) => {
+  if (!isReturnRelabelSource.value && value !== 'carton' && !skuRelabelRows.value.length) addSkuRelabelRow()
 })
 watch(() => form.destination, (value) => {
   if (props.service !== 'labeling') return
@@ -298,7 +340,7 @@ onMounted(() => {
   else void loadPage()
   void nextTick(refreshWarehouseMarkLabels)
 })
-onBeforeUnmount(() => { clearCompletionPhotos(); clearMeasurementPhotos() })
+onBeforeUnmount(() => { clearCompletionPhotos(); clearMeasurementPhotos(); clearDiscardPhotos() })
 function resetFilters() { Object.assign(filters, { number: '', inboundNo: '', warehouse: '', destination: '', status: '', start: '', end: '', reviewStart: '', reviewEnd: '', completedStart: '', completedEnd: '', measuredStart: '', measuredEnd: '', outboundStart: '', outboundEnd: '' }) }
 function resetForm() {
   orderInfoCollapsed.value = false
@@ -499,10 +541,11 @@ function clearTransferRelabelRows() {
   transferRelabelRows.value = []
 }
 function addSkuRelabelRow() {
+  if (isReturnRelabelSource.value) { ElMessage.warning('请从上方实际包裹/箱库存选择 SKU'); return }
   const source = cargoRows.value[Math.min(skuRelabelRows.value.length, Math.max(0, cargoRows.value.length - 1))]
   skuRelabelRows.value.push({ id: ++skuRelabelSequence, sourceRowId: source?.id || null,
-    cartonMark: hideReturnSkuCartonMark.value ? source?.cartonMark || '' : '', originalSku: source?.sku || '', newSku: '', quantity: 1,
-    fbaCartonMark: '', destinationWarehouseId: form.destination, remark: '' })
+    cartonMark: '', originalSku: source?.sku || '', newSku: '', quantity: 1,
+    fbaCartonMark: '', shipmentNo: '', destinationWarehouseId: form.destination, remark: '' })
 }
 function removeSkuRelabelRow(id: number) { skuRelabelRows.value = skuRelabelRows.value.filter((row) => row.id !== id) }
 function applyExistingSkuBinding(row: SkuRelabelRow) {
@@ -519,6 +562,7 @@ function applyExistingCartonBinding(row: SkuRelabelRow) {
       && item.cartonMark.trim().toUpperCase() === cartonMark && item.fbaCartonMark.trim())
   if (!mapping) return
   if (!row.fbaCartonMark.trim()) row.fbaCartonMark = mapping.fbaCartonMark
+  if (!row.shipmentNo.trim()) row.shipmentNo = mapping.shipmentNo
   if (!row.destinationWarehouseId) row.destinationWarehouseId = mapping.destinationWarehouseId
 }
 function selectShippingLabel(event: Event) { shippingLabelFile.value = (event.target as HTMLInputElement).files?.[0] || null }
@@ -543,16 +587,6 @@ function chooseCreateTotalFile(scope: 'CARTON_TOTAL' | 'SKU_TOTAL') {
 function buildSkuRelabelItems(): RelabelCreate['items'] {
   const groups = new Map<string, SkuRelabelRow[]>()
   for (const row of skuRelabelRows.value) {
-    if (hideReturnSkuCartonMark.value) {
-      const source = cargoRows.value.find(item => item.id === row.sourceRowId)
-      const candidate = selectedReturnCandidates.value.find(item => String(item.returnCartonId) === source?.returnCartonId)
-      if (candidate?.skuItems?.some(item => item.skuCode === row.originalSku.trim())) row.cartonMark = source?.cartonMark || ''
-      else {
-        const matches = selectedReturnCandidates.value.filter(item => item.skuItems?.some(sku => sku.skuCode === row.originalSku.trim()))
-        if (matches.length !== 1) throw new Error(`请从上方库存明细选择 SKU ${row.originalSku} 的来源库存`)
-        row.cartonMark = matches[0].cartonMark || ''
-      }
-    }
     const cartonMark = row.cartonMark.trim().toUpperCase()
     if (!cartonMark) throw new Error('请填写每个箱子的我方箱唛')
     const rows = groups.get(cartonMark) || []
@@ -568,12 +602,12 @@ function buildSkuRelabelItems(): RelabelCreate['items'] {
   }
   return [...groups.entries()].map(([_, rows], groupIndex) => {
     const source = isReturnRelabelSource.value
-      ? cargoRows.value.find(item => item.cartonMark === rows[0].cartonMark.trim())
+      ? cargoRows.value.find(item => item.id === rows[0].sourceRowId && item.cartonMark === rows[0].cartonMark.trim())
       : cargoRows.value.find((item) => item.id === rows[0].sourceRowId) || anchors[groupIndex]
     if (isReturnRelabelSource.value && !source) throw new Error('请选择该退货单实际可用的来源箱号')
     if (isReturnRelabelSource.value) {
       const candidate = selectedReturnCandidates.value.find(item => String(item.returnCartonId) === source?.returnCartonId)
-      if (candidate?.sourceType === 'RETURN_PARCEL' && labelingMode.value !== 'sku') throw new Error('散件库存只能贴 SKU，请先合箱后申请箱唛或混贴')
+      if (rows.some(row => row.sourceRowId !== source?.id)) throw new Error('同一换标箱内的 SKU 必须选择相同的实际来源包裹/箱')
       const requested = new Map<string, number>()
       for (const row of rows) {
         const quantity = (requested.get(row.originalSku) || 0) + row.quantity
@@ -587,10 +621,14 @@ function buildSkuRelabelItems(): RelabelCreate['items'] {
     const cartonMark = rows[0].cartonMark.trim()
     const changeCarton = labelingMode.value === 'carton_and_sku'
     const fbaCartonMark = rows[0].fbaCartonMark.trim()
+    const shipmentNo = rows[0].shipmentNo.trim()
     if (changeCarton && (!fbaCartonMark || !form.destination
       || rows.some((row) => row.fbaCartonMark.trim() !== fbaCartonMark))) {
       throw new Error('同一我方箱唛的组合换标必须使用相同的新 FBA 箱唛，并选择整票 FBA 目的仓')
     }
+    if (changeCarton && (!shipmentNo || rows.some(row => row.shipmentNo.trim() !== shipmentNo))) {
+      throw new Error('同一我方箱唛的组合换标必须填写相同的 FBA 货件编号')
+    }
     return {
       sourceInventoryBalanceId: source.sourceInventoryBalanceId,
       sourceInventoryPositionId: source.sourceInventoryPositionId,
@@ -600,7 +638,7 @@ function buildSkuRelabelItems(): RelabelCreate['items'] {
       productNameZh: source.name,
       totalPackageCount: 1,
       notifiedPackageCount: 1,
-      shipmentNo: source.shipmentNo || cartonMark,
+      shipmentNo: changeCarton ? shipmentNo : source.shipmentNo || cartonMark,
       trackingCode: form.trackingNo || undefined,
       newSkuCode: rows[0].newSku,
       labelRequirement: form.requirement || undefined,
@@ -808,7 +846,7 @@ function importSelectedBindingsToDetails() {
     }
     labelingMode.value = 'carton'
   } else {
-    const importedRows = selected.map(({ templateType: _, selected: __, shipmentNo, ...item }) => item)
+    const importedRows = selected.map(({ templateType: _, selected: __, ...item }) => item)
     for (const item of importedRows) {
       skuRelabelRows.value = skuRelabelRows.value.filter((row) => !(row.cartonMark.trim().toUpperCase() === item.cartonMark.trim().toUpperCase()
         && row.originalSku.trim().toUpperCase() === item.originalSku.trim().toUpperCase()))
@@ -880,6 +918,19 @@ function statusLabel(value: string) {
   return labels[value] || value || '—'
 }
 type StatusTagType = 'primary' | 'success' | 'warning' | 'danger' | 'info'
+function labelingTypeLabels(value: unknown): string[] {
+  return typeof value === 'string' && value !== '—' ? [...new Set(value.split('、'))] : []
+}
+function labelingTypeTagType(label: string): StatusTagType {
+  if (label === '只换 SKU') return 'primary'
+  if (label === '只换箱唛') return 'warning'
+  return 'success'
+}
+function labelingStatusTagType(status: string): StatusTagType {
+  if (status === 'CANCELLED') return 'info'
+  if (!['READY_FOR_OUTBOUND', 'COMPLETED', 'REJECTED', 'WAIT_APPROVAL', 'PENDING_REVIEW', 'PENDING_PROCESSING', 'CUSTOMER_CONFIRM_PENDING', 'PROCESSING'].includes(status)) return 'info'
+  return relabelStatusTagType(status)
+}
 function relabelStatusTagType(status: string): StatusTagType {
   if (['READY_FOR_OUTBOUND', 'COMPLETED'].includes(status)) return 'success'
   if (['REJECTED', 'CANCELLED'].includes(status)) return 'danger'
@@ -953,7 +1004,7 @@ async function load() {
       total.value = Number.isFinite(Number(result.total)) ? Number(result.total) : result.records.length
       submittedRows.value = result.records.map((item) => {
         const destinationWarehouses = warehouseDisplay(item.overseasWarehouseId)
-        return { ...row([item.relabelNo, item.customerOrderNo, destinationWarehouses, '—', item.itemCount, item.totalPackageCount, statusLabel(item.status), formatDateTime(item.reviewedAt), formatDateTime(item.relabelCompletedAt), formatDateTime(item.outboundAt), formatDateTime(item.createdAt)]), __status: item.status, __confirmedAt: item.customerConfirmedAt || '' }
+        return { ...row([item.relabelNo, (item.relatedBusinessOrderNos || []).join('、') || '—', destinationWarehouses, new Set(item.skuCodes.split(',').map(code => code.trim()).filter(Boolean)).size, item.totalPackageCount, (item.operationTypes || []).map(type => ({ CARTON_LABEL: '只换箱唛', SKU_LABEL: '只换 SKU', RETURN_BULK_SKU_LABEL: '只换 SKU', CARTON_AND_SKU: 'SKU 和箱唛都换' }[type] || type)).join('、') || '—', statusLabel(item.status), formatDateTime(item.reviewedAt), formatDateTime(item.relabelCompletedAt), formatDateTime(item.outboundAt), formatDateTime(item.createdAt)]), __status: item.status, __confirmedAt: item.customerConfirmedAt || '' }
       })
     } else if (props.service === 'disposal') {
       const result = await listDiscards({ page: page.value, size: pageSize.value, discardNo: filters.number || undefined, inboundCode: filters.inboundNo || undefined, overseasWarehouseId: filters.warehouse || undefined, status: filters.status || undefined, createdFrom: dateTime(filters.start), createdTo: dateTime(filters.end, true), completedFrom: dateTime(filters.completedStart), completedTo: dateTime(filters.completedEnd, true) })
@@ -994,8 +1045,8 @@ async function submit(action: 'draft' | 'submit' = 'submit') {
     ? !selectedDiscardOrderId.value || cargoRows.value.every((item) => item.quantity < 1)
       || cargoRows.value.some((item) => item.quantity < 0 || item.quantity > Number(item.availableQuantity || 0))
     : (props.service === 'labeling' || props.service === 'relabel') && (relabelRows.length === 0 || (props.service === 'labeling' && labelingMode.value !== 'carton'
-      ? skuRelabelRows.value.some((item) => (!hideReturnSkuCartonMark.value && !item.cartonMark) || !item.originalSku || !item.newSku || item.quantity < 1
-        || (labelingMode.value === 'carton_and_sku' && !item.fbaCartonMark))
+      ? skuRelabelRows.value.some((item) => !item.cartonMark || !item.originalSku || !item.newSku || item.quantity < 1
+        || (labelingMode.value === 'carton_and_sku' && (!item.fbaCartonMark || !item.shipmentNo.trim())))
       : cargoRows.value.some((item) => (props.service !== 'labeling' && !item.sku) || !item.name
         || (props.service !== 'labeling' && item.quantity < 1))))
   if ((props.service === 'relabel' && !form.inboundNo) || !primaryWarehouse || invalidCargo) {
@@ -1007,8 +1058,8 @@ async function submit(action: 'draft' | 'submit' = 'submit') {
   if (props.service === 'labeling' && requiresBothTotalFiles.value && (!cartonTotalFile.value || !skuTotalFile.value)) {
     ElMessage.warning('SKU 和箱唛都换时，必须同时上传箱唛总文件和 SKU 总文件'); return
   }
-  if (props.service === 'labeling' && !requiresBothTotalFiles.value && !cartonTotalFile.value && !skuTotalFile.value) {
-    ElMessage.warning('请上传箱唛总文件或 SKU 总文件（二选一）'); return
+  if (props.service === 'labeling' && !requiresBothTotalFiles.value && (labelingMode.value === 'sku' ? !skuTotalFile.value : !cartonTotalFile.value)) {
+    ElMessage.warning(labelingMode.value === 'sku' ? '请上传 SKU 标签总文件' : '请上传箱唛总文件'); return
   }
   if (props.service === 'labeling' && labelingMode.value !== 'sku' && !form.deliveryMethod) {
     ElMessage.warning('请选择换标完成后的派送方式'); return
@@ -1154,6 +1205,7 @@ async function openDetail(value: Record<string, string>) {
     mode.value = 'detail'
     if (props.service === 'labeling') void loadCompletionPhotos()
     if (props.service === 'transfer') void loadMeasurementPhotos()
+    if (props.service === 'disposal') void loadDiscardPhotos()
   } catch (error) { selectedDetail.value = null; selectedRelabelDetail.value = null; detailError.value = error instanceof Error ? error.message : '详情加载失败'; mode.value = 'detail'; ElMessage.error(detailError.value) }
 }
 async function loadDetailPage() {
@@ -1403,15 +1455,13 @@ async function selectOperationWarehouse() {
 }
 function selectRelabelInventory(inboundOrderId: string) {
   const rows: CargoRow[] = []
-  const selectedCandidates = relabelCandidates.value.filter((item) => {
-    const returnOrderNo = item.inboundOrderNo || String(item.returnCartonId || '')
-    return (item.returnCartonId ? `RETURN_ORDER:${returnOrderNo}` : String(item.inboundOrderId)) === inboundOrderId
+  const selectedCandidates = currentRelabelCandidates.value.filter((item) => {
+    return item.returnCartonId ? returnSourceNos(item).includes(inboundOrderId.slice('RETURN_ORDER:'.length)) : String(item.inboundOrderId) === inboundOrderId
   })
   if (inboundOrderId.startsWith('RETURN_ORDER:')) {
-    labelingMode.value = 'sku'
     for (const candidate of selectedCandidates) rows.push({
       id: ++cargoSequence, sku: candidate.skuItems?.[0]?.skuCode || candidate.skuCode || '',
-      name: candidate.productNameZh || '退货库存', included: false, quantity: 1, availableQuantity: 1,
+      name: candidate.productNameZh || '', included: false, quantity: 1, availableQuantity: 1,
       returnCartonId: String(candidate.returnCartonId), sourceInboundOrderNo: candidate.inboundOrderNo,
       fnsku: '', shipmentNo: candidate.inboundOrderNo || '', newSkuCode: '', shippingMark: '', customerCartonMarks: '',
       cartonMark: candidate.cartonMark || '', fbaCartonMark: '', destinationWarehouseId: '', remark: '',
@@ -1443,7 +1493,7 @@ function addReturnSkuBinding(source: RelabelInventoryCandidate, skuCode: string)
   const row = skuRelabelRows.value.find(item => item.cartonMark === source.cartonMark && item.originalSku === skuCode)
   if (row) return
   const sourceRow = cargoRows.value.find(item => item.returnCartonId === String(source.returnCartonId))
-  skuRelabelRows.value.push({ id: ++skuRelabelSequence, sourceRowId: sourceRow?.id || null, cartonMark: source.cartonMark || '', originalSku: skuCode, newSku: '', quantity: Math.max(1, Number(sku.quantity)), fbaCartonMark: '', destinationWarehouseId: '', remark: '' })
+  skuRelabelRows.value.push({ id: ++skuRelabelSequence, sourceRowId: sourceRow?.id || null, cartonMark: source.cartonMark || '', originalSku: skuCode, newSku: '', quantity: Math.max(1, Number(sku.quantity)), fbaCartonMark: '', shipmentNo: '', destinationWarehouseId: '', remark: '' })
 }
 function addReturnBoxBinding(source: RelabelInventoryCandidate) {
   if (labelingMode.value !== 'carton') {
@@ -1451,19 +1501,21 @@ function addReturnBoxBinding(source: RelabelInventoryCandidate) {
     return
   }
   if (cartonDetailRows.value.some(item => item.cartonMark === source.cartonMark)) return
-  cargoRows.value.push({ id: ++cargoSequence, included: true, sku: source.skuItems?.map(item => item.skuCode).join(',') || '', name: source.productNameZh || '退货箱', shipmentNo: selectedReturnOrderNo.value, cartonMark: source.cartonMark || '', fbaCartonMark: '', remark: '', sourceInventoryBalanceId: undefined, sourceInventoryPositionId: undefined, sourceInboundOrderId: undefined, returnCartonId: String(source.returnCartonId), quantity: 1, fnsku: '', newSkuCode: '', shippingMark: '', customerCartonMarks: '', destinationWarehouseId: '' })
+  cargoRows.value.push({ id: ++cargoSequence, included: true, sku: source.skuItems?.map(item => item.skuCode).join(',') || '', name: source.productNameZh || '', shipmentNo: '', cartonMark: source.cartonMark || '', fbaCartonMark: '', remark: '', sourceInventoryBalanceId: undefined, sourceInventoryPositionId: undefined, sourceInboundOrderId: undefined, returnCartonId: String(source.returnCartonId), quantity: 1, fnsku: '', newSkuCode: '', shippingMark: '', customerCartonMarks: '', destinationWarehouseId: '' })
 }
 </script>
 
 <template>
   <section class="warehouse-service-page" :class="{ 'warehouse-service-page--detail': mode === 'detail', 'warehouse-service-page--return-relabel': isReturnRelabelSource }">
     <template v-if="mode === 'list'">
-      <QueryToolbar v-model="listQueryModel" layout="grid" :ariaLabel="`${config.title}筛选`" :fields="listQueryFields" :search-on-reset="false" @search="query" @reset="resetListQuery" />
+      <QueryToolbar v-model="listQueryModel" :class="{ 'labeling-query': props.service === 'labeling', 'transfer-query': props.service === 'transfer' || props.service === 'disposal', 'disposal-query': props.service === 'disposal' }" layout="grid" :ariaLabel="`${config.title}筛选`" :fields="listQueryFields" :search-on-reset="false" @search="query" @reset="resetListQuery" />
       <div class="warehouse-card warehouse-table-card">
         <DataTable v-model:page="page" v-model:page-size="pageSize" :data="submittedRows" :columns="listColumns" :loading="loading" :total="total" :page-sizes="[15, 30, 50, 100]" :row-actions="listRowActions" :empty-text="config.emptyText">
           <template #toolbar-actions><el-button v-if="canCreate" type="primary" @click="openCreate"><Plus :size="16" />{{ props.service === 'relabel' ? '新建退货换标单' : props.service === 'transfer' ? '新增订单' : `新增${config.title}` }}</el-button></template>
           <template v-if="props.service === 'transfer' && submittedRows.some((item) => item.__status === 'WAIT_CUSTOMER_CONFIRMATION')" #before-table><div class="warehouse-list-notice">部分入库完成订单已有 PDA 实测数据，请在对应行确认测量数据。</div></template>
           <template #transferRelabelStatus="{ row }"><el-tag :type="transferRelabelStatusTagType(row.__relabelStatus)" effect="light">{{ row.__relabelStatusLabel }}</el-tag></template>
+          <template #labelingType="{ row }"><span v-if="row['5'] === '—'">—</span><span v-else class="labeling-type-tags"><el-tag v-for="label in labelingTypeLabels(row['5'])" :key="label" :type="labelingTypeTagType(label)" size="small" effect="light">{{ label }}</el-tag></span></template>
+          <template #labelingStatus="{ row }"><el-tag :type="labelingStatusTagType(row.__status)" size="small" effect="light">{{ statusLabel(row.__status) }}</el-tag></template>
           <template #transferStatus="{ row }"><el-tag :type="transferStatusTagType(row.__status)" effect="light">{{ row.__statusLabel }}</el-tag></template>
         </DataTable>
       </div>
@@ -1489,9 +1541,9 @@ function addReturnBoxBinding(source: RelabelInventoryCandidate) {
             <label v-if="props.service === 'relabel'"><span><i>*</i>来源 FBA 仓库</span><el-select v-model="form.sourceWarehouse" :loading="fbaWarehousesLoading" :disabled="Boolean(fbaWarehousesError)" placeholder="请选择平台维护的 FBA 仓"><el-option v-for="warehouse in fbaWarehouses" :key="warehouse.id" :label="warehouseLabel(warehouse)" :value="warehouse.warehouseCode" /></el-select></label>
             <label v-else-if="props.service === 'disposal'" class="warehouse-disposal-field"><span><i>*</i>废弃原因</span><el-select v-model="form.reason" placeholder="请选择"><el-option label="客户退货" value="客户退货" /><el-option label="亚马逊移除" value="亚马逊移除" /><el-option label="残损不可售" value="残损不可售" /></el-select></label>
             <label v-else><span><i>*</i>{{ props.service === 'labeling' ? '海外操作仓（中转仓）' : props.service === 'transfer' ? '入库海外仓' : '操作仓' }}</span><el-select v-model="form.warehouse" :loading="fbaWarehousesLoading || operationWarehouseDetailLoading" :disabled="Boolean(operationWarehousesError)" clearable :placeholder="props.service === 'transfer' ? '请选择海外仓' : '请选择国外中转仓'" @change="props.service === 'labeling' ? selectOperationWarehouse() : props.service === 'transfer' && selectTransferWarehouse()"><el-option v-for="warehouse in operationWarehouses" :key="warehouse.id" :label="warehouseLabel(warehouse)" :value="String(warehouse.id)" /></el-select><small v-if="operationWarehousesError" class="warehouse-hint">{{ operationWarehousesError }}</small></label>
-            <label v-if="props.service === 'labeling'" class="warehouse-span-2"><span><i>*</i>选择有库存的入仓单或退货单</span><el-select v-model="selectedRelabelInboundOrderId" filterable clearable :loading="relabelCandidatesLoading" :disabled="!form.warehouse" no-data-text="当前中转仓暂无可用库存" placeholder="请选择当前仍有可用库存的入仓单或退货单" @change="selectRelabelInventory"><el-option v-for="option in relabelInboundOptions" :key="option.value" :label="`${option.inboundOrderNo}｜${option.inboundCode}｜可用 ${option.availablePackages} ${option.quantityUnit}${option.relabelledPackages > 0 ? `｜已换标 ${option.relabelledPackages} ${option.quantityUnit}` : ''}`" :value="option.value" /></el-select></label>
+            <label v-if="props.service === 'labeling'" class="warehouse-span-2"><span><i>*</i>选择入仓单或退货单</span><el-select v-model="selectedRelabelInboundOrderId" filterable clearable :filter-method="(value: string) => relabelInventorySearch = value" :loading="relabelCandidatesLoading" :disabled="!form.warehouse" no-data-text="暂无匹配的可选库存" placeholder="搜索单号或选择可用库存" @change="selectRelabelInventory"><el-option v-for="option in visibleRelabelInboundOptions.filter(item => !relabelInventorySearch.trim() || item.inboundOrderNo.toUpperCase().includes(relabelInventorySearch.trim().toUpperCase()) || item.inboundCode.toUpperCase().includes(relabelInventorySearch.trim().toUpperCase()))" :key="option.value" :label="relabelOptionLabel(option)" :value="option.value" :disabled="option.availablePackages <= 0" /></el-select><small class="warehouse-hint">在仓数量包含被占用货物；本次可选数量才可加入申请。合箱后的库存按当前包裹/箱展示，来源退货单保留。</small></label>
             <label v-if="props.service === 'transfer'"><span>库存转运来源（可选）</span><el-select v-model="selectedTransferInventory" filterable clearable :loading="relabelCandidatesLoading" :disabled="!form.warehouse" no-data-text="当前海外仓暂无可用库存" placeholder="不选则按新货转运；选择后免 PDA 测量" @change="selectTransferInventory"><el-option v-for="option in transferInventoryOptions" :key="option.value" :label="`${option.label}｜可用 ${option.packages} 箱`" :value="option.value" /></el-select><small class="warehouse-hint">库存转运可直接进入目的仓、换标和排车流程，PDA 可拆托、重打或同目的仓合托。</small></label>
-            <label v-if="props.service === 'labeling' && (isReturnRelabelSource || labelingMode !== 'sku')"><span><i>*</i>FBA 目的仓</span><el-select v-model="form.destination" :loading="fbaWarehousesLoading" :disabled="Boolean(fbaWarehousesError)" filterable placeholder="请选择本张申请统一的 FBA 目的仓"><el-option v-for="warehouse in fbaWarehouses" :key="warehouse.id" :label="warehouseLabel(warehouse)" :value="warehouse.warehouseCode" /></el-select></label>
+            <label v-if="props.service === 'labeling' && labelingMode !== 'sku'"><span><i>*</i>FBA 目的仓</span><el-select v-model="form.destination" :loading="fbaWarehousesLoading" :disabled="Boolean(fbaWarehousesError)" filterable placeholder="请选择本张申请统一的 FBA 目的仓"><el-option v-for="warehouse in fbaWarehouses" :key="warehouse.id" :label="warehouseLabel(warehouse)" :value="warehouse.warehouseCode" /></el-select></label>
             <div v-if="props.service === 'transfer'" class="warehouse-choice-field warehouse-span-2"><span><i>*</i>入仓方式</span><el-radio-group v-model="form.deliveryMethod" @change="selectTransferInboundMethod"><el-radio-button value="WAREHOUSE_PICKUP">仓库上门提货</el-radio-button><el-radio-button value="CUSTOMER_DELIVERY">客户送货到仓</el-radio-button></el-radio-group></div>
             <label v-if="props.service === 'transfer' && form.deliveryMethod === 'WAREHOUSE_PICKUP'" class="pickup-address-field"><span><i>*</i>提货地址</span><el-input v-model="form.address" placeholder="请输入仓库上门提货的详细地址" /></label>
             <label v-if="props.service === 'transfer' && form.deliveryMethod === 'WAREHOUSE_PICKUP'"><span><i>*</i>提货联系人</span><el-input v-model="form.pickupContact" placeholder="请输入提货联系人" maxlength="128" /></label>
@@ -1536,7 +1588,7 @@ function addReturnBoxBinding(source: RelabelInventoryCandidate) {
             </div>
             <div class="warehouse-file-groups warehouse-file-groups--compact">
               <section v-if="canManageRelabelFiles" class="warehouse-file-group warehouse-file-group--primary">
-                <div class="warehouse-file-group__heading"><div><strong><span>1</span>贴标总文件</strong></div><em>{{ requiresBothTotalFiles ? '必传 · 两份文件' : '必传 · 二选一' }}</em></div>
+                <div class="warehouse-file-group__heading"><div><strong><span>1</span>贴标总文件</strong></div><em>{{ requiresBothTotalFiles ? '必传 · 两份文件' : isReturnRelabelSource ? labelingMode === 'sku' ? '必传 · SKU 标签文件' : '必传 · 箱唛文件' : '必传 · 二选一' }}</em></div>
                 <div class="warehouse-file-options">
                   <div class="warehouse-file-option" :class="{ 'is-selected': Boolean(cartonTotalFile) }"><div class="warehouse-file-option__name"><strong>箱唛总文件</strong></div><el-button native-type="button" :type="cartonTotalFile ? 'primary' : 'default'" plain @click="chooseCreateTotalFile('CARTON_TOTAL')"><Upload :size="15" />{{ cartonTotalFile ? '重新上传' : '选择文件' }}</el-button><div class="warehouse-file-option__status" :class="{ 'is-empty': !cartonTotalFile }"><span>{{ cartonTotalFile?.name || '尚未选择文件' }}</span><button v-if="cartonTotalFile" type="button" class="warehouse-file-clear" title="清除箱唛总文件" aria-label="清除箱唛总文件" :disabled="saving" @click="clearCreateTotalFile('CARTON_TOTAL')"><X :size="14" /></button></div></div>
                   <div class="warehouse-file-choice-or" :class="{ 'is-both': requiresBothTotalFiles }">{{ requiresBothTotalFiles ? '和' : '或' }}</div>
@@ -1553,22 +1605,25 @@ function addReturnBoxBinding(source: RelabelInventoryCandidate) {
               </section>
             </div>
             <input ref="skuTemplateInput" class="warehouse-hidden-input" type="file" accept=".csv,text/csv" @change="importRelabelTemplate($event, 'sku')"><input ref="cartonTemplateInput" class="warehouse-hidden-input" type="file" accept=".csv,text/csv" @change="importRelabelTemplate($event, 'carton')"><input ref="mixedTemplateInput" class="warehouse-hidden-input" type="file" accept=".csv,text/csv" @change="importRelabelTemplate($event, 'mixed')"><input ref="cartonTotalCreateInput" class="warehouse-hidden-input" type="file" accept="application/pdf,.pdf" @change="selectCartonTotalFile"><input ref="skuTotalCreateInput" class="warehouse-hidden-input" type="file" accept="application/pdf,.pdf" @change="selectSkuTotalFile">
+            <p v-if="isReturnRelabelSource" class="warehouse-list-notice">仓库识别码用于定位实物，不代表商品已换标。SKU 换标完成后扣减旧 SKU、增加新 SKU，包裹/箱总件数不变；已换标件数不可重复申请，剩余未换标件数可继续选择。客户确认前新 SKU 保持占用。</p>
             <div v-if="isReturnRelabelSource" class="warehouse-table-scroll">
+              <el-input v-model="returnCartonQuery" clearable placeholder="按当前箱唛筛选贴标箱子" />
+              <p class="warehouse-hint">来源退货单用于查找；贴标选择当前实物箱。跨来源单箱内数量为整箱内容，同 SKU 部分贴标请先现场分拣确认。</p>
               <template v-if="returnLooseCandidates.length">
-              <div class="warehouse-section-heading"><h3>可用散件 SKU</h3><el-button text type="primary" native-type="button" :aria-expanded="!availableSkusCollapsed" aria-controls="return-available-skus" @click="availableSkusCollapsed = !availableSkusCollapsed">{{ availableSkusCollapsed ? '展开明细' : '收起明细' }}</el-button></div>
-              <table v-show="!availableSkusCollapsed" id="return-available-skus" class="warehouse-edit-table"><thead><tr><th>SKU</th><th>可用数量（件）</th><th>操作</th></tr></thead><tbody><template v-for="source in returnLooseCandidates" :key="source.returnCartonId"><tr v-for="sku in source.skuItems" :key="sku.skuCode"><td>{{ sku.skuCode }}</td><td>{{ sku.quantity }}</td><td><el-button size="small" :disabled="labelingMode !== 'sku'" @click="addReturnSkuBinding(source, sku.skuCode)">添加贴标</el-button></td></tr></template><tr v-if="!returnLooseCandidates.length"><td colspan="3">暂无可用散件库存</td></tr></tbody></table>
+              <div class="warehouse-section-heading"><h3>可用包裹</h3><el-button text type="primary" native-type="button" :aria-expanded="!availableSkusCollapsed" aria-controls="return-available-skus" @click="availableSkusCollapsed = !availableSkusCollapsed">{{ availableSkusCollapsed ? '展开明细' : '收起明细' }}</el-button></div>
+              <table v-show="!availableSkusCollapsed" id="return-available-skus" class="warehouse-edit-table"><thead><tr><th>包裹识别码</th><th>来源退货单</th><th>SKU</th><th>SKU 换标结果</th><th>剩余可换（件）</th><th>操作</th></tr></thead><tbody><template v-for="source in returnLooseCandidates" :key="source.returnCartonId"><tr v-for="sku in source.skuItems" :key="sku.skuCode"><td>{{ source.cartonMark }}</td><td>{{ source.inboundOrderNo }}</td><td>{{ sku.skuCode }}</td><td><div v-for="conversion in (source.skuConversions || []).filter(item => item.status !== 'REVERSED')" :key="`${conversion.relabelNo}-${conversion.oldSkuCode}-${conversion.newSkuCode}`">{{ conversion.oldSkuCode }} → {{ conversion.newSkuCode }}：已换 {{ conversion.quantity }} 件{{ conversion.status === 'APPLIED' ? '（待确认）' : '' }}</div><span v-if="!source.skuConversions?.some(item => item.status !== 'REVERSED')">尚未换标</span></td><td>{{ sku.quantity }}</td><td><el-button size="small" :disabled="inventoryQuantity(source.availablePackages) <= 0" @click="labelingMode === 'sku' ? addReturnSkuBinding(source, sku.skuCode) : addReturnBoxBinding(source)">添加贴标</el-button></td></tr></template><tr v-if="!returnLooseCandidates.length"><td colspan="6">暂无可用包裹库存</td></tr></tbody></table>
               </template>
               <template v-if="returnBoxCandidates.length">
               <div class="warehouse-section-heading"><h3>可用箱子（{{ returnBoxCandidates.length }} 箱）</h3><el-button text type="primary" native-type="button" :aria-expanded="!availableBoxesCollapsed" aria-controls="return-available-boxes" @click="availableBoxesCollapsed = !availableBoxesCollapsed">{{ availableBoxesCollapsed ? '展开明细' : '收起明细' }}</el-button></div>
-              <table v-show="!availableBoxesCollapsed" id="return-available-boxes" class="warehouse-edit-table"><thead><tr><th>系统箱唛号</th><th>箱内 SKU</th><th>可用数量（件）</th><th>操作</th></tr></thead><tbody><tr v-for="source in returnBoxCandidates" :key="source.returnCartonId"><td><strong>{{ source.cartonMark }}</strong></td><td><div v-for="sku in source.skuItems" :key="sku.skuCode">{{ sku.skuCode }}</div></td><td><div v-for="sku in source.skuItems" :key="sku.skuCode">{{ sku.quantity }}</div></td><td><el-button size="small" @click="addReturnBoxBinding(source)">添加贴标</el-button></td></tr><tr v-if="!returnBoxCandidates.length"><td colspan="4">暂无可用箱子库存</td></tr></tbody></table>
+              <table v-show="!availableBoxesCollapsed" id="return-available-boxes" class="warehouse-edit-table"><thead><tr><th>仓库箱识别码</th><th>来源退货单</th><th>箱内 SKU</th><th>SKU 换标结果</th><th>剩余可换（件）</th><th>操作</th></tr></thead><tbody><tr v-for="source in returnBoxCandidates" :key="source.returnCartonId"><td><strong>{{ source.cartonMark }}</strong></td><td>{{ source.inboundOrderNo }}</td><td><div v-for="sku in source.skuItems" :key="sku.skuCode">{{ sku.skuCode }}</div></td><td><div v-for="conversion in (source.skuConversions || []).filter(item => item.status !== 'REVERSED')" :key="`${conversion.relabelNo}-${conversion.oldSkuCode}-${conversion.newSkuCode}`">{{ conversion.oldSkuCode }} → {{ conversion.newSkuCode }}：已换 {{ conversion.quantity }} 件{{ conversion.status === 'APPLIED' ? '（待确认）' : '' }}</div><span v-if="!source.skuConversions?.some(item => item.status !== 'REVERSED')">尚未换标</span></td><td><div v-for="sku in source.skuItems" :key="sku.skuCode">{{ sku.quantity }}</div></td><td><el-button size="small" :disabled="inventoryQuantity(source.availablePackages) <= 0" @click="addReturnBoxBinding(source)">添加贴标</el-button></td></tr><tr v-if="!returnBoxCandidates.length"><td colspan="6">暂无可用箱子库存</td></tr></tbody></table>
               </template>
             </div>
             <div class="warehouse-labeling-mode">
               <span>换标类型</span>
               <el-radio-group v-model="labelingMode" aria-label="换标类型">
-                <el-radio-button value="carton" :disabled="returnSkuOnly">只换箱唛</el-radio-button>
+                <el-radio-button value="carton">只换箱唛</el-radio-button>
                 <el-radio-button value="sku">只换 SKU 标签</el-radio-button>
-                <el-radio-button value="carton_and_sku" :disabled="returnSkuOnly">SKU 和箱唛都换</el-radio-button>
+                <el-radio-button value="carton_and_sku">SKU 和箱唛都换</el-radio-button>
               </el-radio-group>
             </div>
             <div v-if="importedRelabelBindings.length" class="warehouse-import-preview">
@@ -1580,8 +1635,8 @@ function addReturnBoxBinding(source: RelabelInventoryCandidate) {
               <div v-if="labelingMode === 'carton'"><el-button type="primary" size="small" @click="addRelabelCargoRow"><Plus :size="15" />手动添加行</el-button><el-button size="small" @click="clearRelabelRows">清空</el-button></div>
               <div v-else><el-button type="primary" size="small" @click="addSkuRelabelRow"><Plus :size="15" />添加 SKU 明细</el-button><el-button size="small" @click="skuRelabelRows = []">清空</el-button></div>
             </div>
-            <div v-if="labelingMode === 'carton'" class="warehouse-table-scroll"><table class="warehouse-edit-table warehouse-label-table"><thead><tr><th>商品 SKU</th><th>中文品名 *</th><th>FBA 货件编号 *</th><th>箱数</th><th>仓库唛头 *</th><th>新 FBA 箱唛 *</th><th>备注</th><th>操作</th></tr></thead><tbody><tr v-for="row in cartonDetailRows" :key="row.id"><td><el-input v-model="row.sku" placeholder="选填" /></td><td><el-input v-model="row.name" placeholder="请输入中文品名" /></td><td><el-input v-model="row.shipmentNo" placeholder="请输入FBA货件编号" /></td><td><strong>1 箱</strong></td><td><el-input v-model="row.cartonMark" placeholder="请输入仓库唛头" /></td><td><el-input v-model="row.fbaCartonMark" placeholder="请输入新的 FBA 箱唛" /></td><td><el-input v-model="row.remark" type="textarea" :rows="2" maxlength="1000" show-word-limit placeholder="请输入明细备注" /></td><td><button type="button" class="warehouse-delete" title="移出本次明细" @click="removeCargoRow(row.id)"><Trash2 :size="16" />移出</button></td></tr><tr v-if="cartonDetailRows.length === 0"><td colspan="8"><div class="warehouse-empty">暂无本次换标明细，请上传关系后导入或手动添加</div></td></tr></tbody></table></div>
-            <div v-else class="warehouse-table-scroll"><table class="warehouse-edit-table warehouse-sku-label-table"><thead><tr><th v-if="!hideReturnSkuCartonMark">仓库唛头 *</th><th>旧 SKU *</th><th>新 SKU *</th><th>换标数量（件）*</th><th v-if="labelingMode === 'carton_and_sku'">新 FBA 箱唛 *</th><th>备注</th><th>操作</th></tr></thead><tbody><tr v-for="row in skuRelabelRows" :key="row.id"><td v-if="!hideReturnSkuCartonMark"><el-input v-model="row.cartonMark" placeholder="请输入仓库唛头" @change="applyExistingCartonBinding(row)" /></td><td><el-input v-model="row.originalSku" placeholder="请输入旧 SKU" @change="applyExistingSkuBinding(row)" /></td><td><el-input v-model="row.newSku" placeholder="请输入新 SKU" /></td><td><el-input-number v-model="row.quantity" :min="1" :precision="0" controls-position="right" placeholder="请输入件数" /></td><td v-if="labelingMode === 'carton_and_sku'"><el-input v-model="row.fbaCartonMark" placeholder="请输入新的 FBA 箱唛" /></td><td><el-input v-model="row.remark" placeholder="请输入备注" /></td><td><button type="button" class="warehouse-delete" title="删除" @click="removeSkuRelabelRow(row.id)"><Trash2 :size="16" />删除</button></td></tr><tr v-if="skuRelabelRows.length === 0"><td :colspan="hideReturnSkuCartonMark ? 5 : labelingMode === 'carton_and_sku' ? 7 : 6"><div class="warehouse-empty">暂无绑定明细，请点击“添加 SKU 明细”</div></td></tr></tbody></table></div>
+            <div v-if="labelingMode === 'carton'" class="warehouse-table-scroll"><table class="warehouse-edit-table warehouse-label-table"><thead><tr><th>商品 SKU</th><th>中文品名 *</th><th>FBA 货件编号 *</th><th>箱数</th><th>仓库唛头 *</th><th>新 FBA 箱唛 *</th><th>备注</th><th>操作</th></tr></thead><tbody><tr v-for="row in cartonDetailRows" :key="row.id"><td><el-input v-model="row.sku" placeholder="选填" /></td><td><el-input v-model="row.name" placeholder="请输入中文品名" /></td><td><el-input v-model="row.shipmentNo" placeholder="请输入FBA货件编号" /></td><td><strong>1 箱</strong></td><td><el-input v-model="row.cartonMark" :readonly="isReturnRelabelSource" placeholder="请输入仓库唛头" /></td><td><el-input v-model="row.fbaCartonMark" placeholder="请输入新的 FBA 箱唛" /></td><td><el-input v-model="row.remark" type="textarea" :rows="2" maxlength="1000" show-word-limit placeholder="请输入明细备注" /></td><td><button type="button" class="warehouse-delete" title="移出本次明细" @click="removeCargoRow(row.id)"><Trash2 :size="16" />移出</button></td></tr><tr v-if="cartonDetailRows.length === 0"><td colspan="8"><div class="warehouse-empty">暂无本次换标明细，请上传关系后导入或手动添加</div></td></tr></tbody></table></div>
+            <div v-else class="warehouse-table-scroll"><table class="warehouse-edit-table warehouse-sku-label-table"><thead><tr><th>仓库唛头 *</th><th>旧 SKU *</th><th>新 SKU *</th><th>换标数量（件）*</th><th v-if="labelingMode === 'carton_and_sku'">新 FBA 箱唛 *</th><th v-if="labelingMode === 'carton_and_sku'">FBA 货件编号 *</th><th>备注</th><th>操作</th></tr></thead><tbody><tr v-for="row in skuRelabelRows" :key="row.id"><td><el-input v-model="row.cartonMark" :readonly="isReturnRelabelSource" placeholder="请输入仓库唛头" @change="applyExistingCartonBinding(row)" /></td><td><el-input v-model="row.originalSku" :readonly="isReturnRelabelSource" placeholder="请输入旧 SKU" @change="applyExistingSkuBinding(row)" /></td><td><el-input v-model="row.newSku" placeholder="请输入新 SKU" /></td><td><el-input-number v-model="row.quantity" :min="1" :precision="0" controls-position="right" placeholder="请输入件数" /></td><td v-if="labelingMode === 'carton_and_sku'"><el-input v-model="row.fbaCartonMark" placeholder="请输入新的 FBA 箱唛" /></td><td v-if="labelingMode === 'carton_and_sku'"><el-input v-model="row.shipmentNo" placeholder="请输入 FBA 货件编号" /></td><td><el-input v-model="row.remark" placeholder="请输入备注" /></td><td><button type="button" class="warehouse-delete" title="删除" @click="removeSkuRelabelRow(row.id)"><Trash2 :size="16" />删除</button></td></tr><tr v-if="skuRelabelRows.length === 0"><td :colspan="labelingMode === 'carton_and_sku' ? 8 : 6"><div class="warehouse-empty">暂无绑定明细，请点击“添加 SKU 明细”</div></td></tr></tbody></table></div>
           </template>
           <template v-else>
             <div class="warehouse-section-heading" :class="{ 'warehouse-step-heading': props.service === 'transfer' }"><div><h3><span v-if="props.service === 'transfer'" class="warehouse-step-number">1</span>货物明细</h3></div><div v-if="props.service !== 'disposal'" class="warehouse-heading-actions"><el-button v-if="props.service === 'transfer'" size="small" :disabled="!cargoRows.some((row) => row.sku.trim() && row.quantity > 0)" @click="printTransferDraftCartonMarks"><Printer :size="15" />打印唛头</el-button><el-button type="primary" size="small" @click="addCargoRow"><Plus :size="15" />添加行</el-button><el-button size="small" @click="cargoRows = []">清空</el-button></div></div>
@@ -1625,7 +1680,10 @@ function addReturnBoxBinding(source: RelabelInventoryCandidate) {
       </header>
       <div v-if="detailError" class="warehouse-detail-error" role="alert"><strong>{{ detailError }}</strong><el-button @click="loadDetailPage">重新加载</el-button></div>
       <el-alert v-else-if="props.service === 'labeling' && selectedRelabelDetail?.application.status === 'REJECTED'" class="warehouse-rejected-alert" type="error" :closable="false" show-icon title="贴标单审核已驳回" :description="selectedRelabelDetail.application.reviewRemark || '平台未填写驳回备注'" />
-      <div v-else class="warehouse-card warehouse-form-section"><h3>订单概览</h3><div v-if="props.service === 'labeling'" class="warehouse-detail-grid"><div><span>操作仓</span><strong>{{ warehouseDisplay(selectedRelabelDetail?.application.overseasWarehouseId) }}</strong></div><div><span>客户参考号</span><strong>{{ selectedRelabelDetail?.application.customerOrderNo || '—' }}</strong></div><div><span>SKU 数</span><strong>{{ selectedRelabelDetail?.application.itemCount ?? '—' }}</strong></div><div><span>总箱数</span><strong>{{ selectedRelabelDetail?.application.totalPackageCount ?? '—' }}</strong></div><div><span>贴标截止时间</span><strong>{{ formatDateTime(selectedRelabelDetail?.application.labelDeadline) }}</strong></div><div><span>仓库联系人</span><strong>{{ selectedRelabelDetail?.application.contactName || '—' }}</strong></div><div><span>联系电话</span><strong>{{ selectedRelabelDetail?.application.contactPhone || '—' }}</strong></div><div><span>创建时间</span><strong>{{ formatDateTime(selectedRelabelDetail?.application.createdAt) }}</strong></div></div><div v-else-if="props.service === 'transfer'" class="warehouse-detail-grid warehouse-transfer-overview-grid"><div><span>状态</span><el-tag :type="transferStatusTagType(selectedDetail?.status || '')" effect="light">{{ statusLabel(selectedDetail?.status || '') }}</el-tag></div><div><span>目的去向</span><strong>{{ destinationTypeLabel(selectedDetail?.destinationType, selectedDetail?.fbaWarehouseCode) }}</strong></div><div v-if="selectedDetail?.destinationType !== 'PRIVATE'"><span>FBA 目的仓</span><strong>{{ selectedDetail?.destinationWarehouseName || warehouseDisplay(selectedDetail?.destinationWarehouseCode || selectedDetail?.fbaWarehouseCode) }}</strong></div><div v-if="selectedDetail?.destinationType !== 'PRIVATE'"><span>FBA 货件号</span><strong>{{ selectedDetail?.fbaShipmentNo || '—' }}</strong></div><div v-if="selectedDetail?.destinationType === 'PRIVATE'" class="warehouse-overview-wide"><span>私人仓地址</span><strong>{{ selectedDetail?.privateDestinationAddress || '—' }}</strong></div><div v-if="selectedDetail?.destinationType === 'PRIVATE'"><span>邮编</span><strong>{{ selectedDetail?.privateDestinationPostalCode || '—' }}</strong></div><div v-if="selectedDetail?.destinationType === 'PRIVATE'"><span>私人仓联系人</span><strong>{{ selectedDetail?.privateDestinationContactName || '—' }}</strong></div><div v-if="selectedDetail?.destinationType === 'PRIVATE'"><span>联系电话</span><strong>{{ selectedDetail?.privateDestinationContactPhone || '—' }}</strong></div><div><span>海外仓</span><strong>{{ warehouseDisplay(selectedDetail?.operatingWarehouseId) }}</strong></div><div><span>箱数</span><strong>{{ selectedDetail?.packageCount ?? '—' }}</strong></div><div><span>入仓方式</span><strong>{{ deliveryMethodLabel(selectedDetail?.deliveryMethod || '') }}</strong></div><div><span>期望发货时间</span><strong>{{ formatDateTime(selectedDetail?.estimatedShipAt) }}</strong></div><div><span>实际发货时间</span><strong>{{ formatDateTime(selectedDetail?.actualShipAt) }}</strong></div><div><span>是否换标</span><strong>{{ selectedDetail?.needRelabel ? '是' : '否' }}</strong></div><div><span>换标状态</span><el-tag :type="transferRelabelStatusTagType(transferRelabelStatus(selectedDetail || {}).code)" effect="light">{{ transferRelabelStatus(selectedDetail || {}).label }}</el-tag></div><div><span>换标单号</span><strong>{{ selectedDetail?.relabelNo || '—' }}</strong></div><div><span>创建时间</span><strong>{{ formatDateTime(selectedDetail?.createdAt) }}</strong></div><div><span>转运单号</span><strong>{{ selectedDetail?.transferNo || '—' }}</strong></div></div><div v-else class="warehouse-detail-grid"><div v-for="(column, index) in config.columns.slice(1)" :key="column"><span>{{ column }}</span><strong>{{ selectedDetail?.[String(index)] || '—' }}</strong></div></div></div>
+      <div v-else class="warehouse-card warehouse-form-section"><h3>订单概览</h3><div v-if="props.service === 'labeling'" class="warehouse-detail-grid"><div><span>操作仓</span><strong>{{ warehouseDisplay(selectedRelabelDetail?.application.overseasWarehouseId) }}</strong></div><div><span>客户参考号</span><strong>{{ selectedRelabelDetail?.application.customerOrderNo || '—' }}</strong></div><div><span>SKU 数（种）</span><strong>{{ selectedRelabelDetail ? relabelSkuCount(selectedRelabelDetail.items) : '—' }}</strong></div><div><span>总箱数</span><strong>{{ selectedRelabelDetail?.application.totalPackageCount ?? '—' }}</strong></div><div><span>贴标截止时间</span><strong>{{ formatDateTime(selectedRelabelDetail?.application.labelDeadline) }}</strong></div><div><span>仓库联系人</span><strong>{{ selectedRelabelDetail?.application.contactName || '—' }}</strong></div><div><span>联系电话</span><strong>{{ selectedRelabelDetail?.application.contactPhone || '—' }}</strong></div><div><span>创建时间</span><strong>{{ formatDateTime(selectedRelabelDetail?.application.createdAt) }}</strong></div></div><div v-else-if="props.service === 'transfer'" class="warehouse-detail-grid warehouse-transfer-overview-grid"><div><span>状态</span><el-tag :type="transferStatusTagType(selectedDetail?.status || '')" effect="light">{{ statusLabel(selectedDetail?.status || '') }}</el-tag></div><div><span>目的去向</span><strong>{{ destinationTypeLabel(selectedDetail?.destinationType, selectedDetail?.fbaWarehouseCode) }}</strong></div><div v-if="selectedDetail?.destinationType !== 'PRIVATE'"><span>FBA 目的仓</span><strong>{{ selectedDetail?.destinationWarehouseName || warehouseDisplay(selectedDetail?.destinationWarehouseCode || selectedDetail?.fbaWarehouseCode) }}</strong></div><div v-if="selectedDetail?.destinationType !== 'PRIVATE'"><span>FBA 货件号</span><strong>{{ selectedDetail?.fbaShipmentNo || '—' }}</strong></div><div v-if="selectedDetail?.destinationType === 'PRIVATE'" class="warehouse-overview-wide"><span>私人仓地址</span><strong>{{ selectedDetail?.privateDestinationAddress || '—' }}</strong></div><div v-if="selectedDetail?.destinationType === 'PRIVATE'"><span>邮编</span><strong>{{ selectedDetail?.privateDestinationPostalCode || '—' }}</strong></div><div v-if="selectedDetail?.destinationType === 'PRIVATE'"><span>私人仓联系人</span><strong>{{ selectedDetail?.privateDestinationContactName || '—' }}</strong></div><div v-if="selectedDetail?.destinationType === 'PRIVATE'"><span>联系电话</span><strong>{{ selectedDetail?.privateDestinationContactPhone || '—' }}</strong></div><div><span>海外仓</span><strong>{{ warehouseDisplay(selectedDetail?.operatingWarehouseId) }}</strong></div><div><span>箱数</span><strong>{{ selectedDetail?.packageCount ?? '—' }}</strong></div><div><span>入仓方式</span><strong>{{ deliveryMethodLabel(selectedDetail?.deliveryMethod || '') }}</strong></div><div><span>期望发货时间</span><strong>{{ formatDateTime(selectedDetail?.estimatedShipAt) }}</strong></div><div><span>实际发货时间</span><strong>{{ formatDateTime(selectedDetail?.actualShipAt) }}</strong></div><div><span>是否换标</span><strong>{{ selectedDetail?.needRelabel ? '是' : '否' }}</strong></div><div><span>换标状态</span><el-tag :type="transferRelabelStatusTagType(transferRelabelStatus(selectedDetail || {}).code)" effect="light">{{ transferRelabelStatus(selectedDetail || {}).label }}</el-tag></div><div><span>换标单号</span><strong>{{ selectedDetail?.relabelNo || '—' }}</strong></div><div><span>创建时间</span><strong>{{ formatDateTime(selectedDetail?.createdAt) }}</strong></div><div><span>转运单号</span><strong>{{ selectedDetail?.transferNo || '—' }}</strong></div></div><div v-else class="warehouse-detail-grid"><div v-for="(column, index) in config.columns.slice(1)" :key="column"><span>{{ column }}</span><strong>{{ selectedDetail?.[String(index)] || '—' }}</strong></div></div></div>
+      <div v-if="props.service === 'disposal'" class="warehouse-card warehouse-form-section">
+        <h3>废弃现场照片</h3><div v-if="selectedDetail?.photos?.length" class="warehouse-photo-grid"><div v-for="photo in selectedDetail.photos" :key="photo.fileId" class="warehouse-photo-item"><el-image v-if="discardPhotoUrls[photo.fileId]" :src="discardPhotoUrls[photo.fileId]" :preview-src-list="discardPhotoPreviewUrls" :initial-index="discardPhotoPreviewUrls.indexOf(discardPhotoUrls[photo.fileId])" fit="cover" preview-teleported /><div v-else-if="discardPhotoLoading[photo.fileId]" class="warehouse-photo-placeholder">照片加载中…</div><button v-else class="warehouse-photo-placeholder warehouse-photo-retry" type="button" @click="loadDiscardPhoto(photo.fileId)">{{ discardPhotoErrors[photo.fileId] ? '加载失败，点击重试' : '加载照片' }}</button><small>{{ formatDateTime(photo.submittedAt) }}</small></div></div><div v-else class="warehouse-empty">暂无已提交的废弃现场照片</div>
+      </div>
       <div v-if="props.service === 'transfer'" class="warehouse-card warehouse-form-section warehouse-transfer-measurement-card">
         <div class="warehouse-section-heading"><h3>PDA 打托实测数据</h3><span class="warehouse-hint">PDA 作业完成即显示入库完成，客户可确认仓库实测数据</span></div>
         <div v-if="selectedDetail?.pallets?.length" class="warehouse-table-scroll"><table><thead><tr><th>托盘号</th><th>库位</th><th>箱数</th><th>长 × 宽 × 高(cm)</th><th>毛重(kg)</th><th>体积(m³)</th><th>状态</th><th>完成时间</th></tr></thead><tbody><tr v-for="pallet in selectedDetail.pallets" :key="String(pallet.id || pallet.sequenceNo)"><td>{{ pallet.palletNo || `第${pallet.sequenceNo || '—'}托` }}</td><td>{{ pallet.warehouseLocationCode || '—' }}</td><td>{{ pallet.cartonCount ?? '—' }}</td><td>{{ [pallet.lengthCm, pallet.widthCm, pallet.heightCm].every((value) => value != null) ? `${pallet.lengthCm} × ${pallet.widthCm} × ${pallet.heightCm}` : '—' }}</td><td>{{ pallet.grossWeightKg ?? '—' }}</td><td>{{ pallet.volumeCbm ?? '—' }}</td><td>{{ statusLabel(pallet.status || '') }}</td><td>{{ formatDateTime(pallet.completedAt) }}</td></tr></tbody></table></div>
@@ -1654,14 +1712,14 @@ function addReturnBoxBinding(source: RelabelInventoryCandidate) {
         <div class="warehouse-section-heading"><h3>贴标明细资料</h3><input ref="relabelFileInput" class="warehouse-hidden-input" type="file" accept="application/pdf,.pdf" @change="uploadSelectedRelabelFile"></div>
         <div class="warehouse-hint">需要补充或替换资料时，可在对应明细行上传 SKU 或箱唛文件。</div>
         <div class="warehouse-table-scroll"><table class="warehouse-relabel-detail-table"><thead><tr><th>换标模式</th><th>仓库唛头</th><th>SKU</th><th>明细文件</th><th>操作</th></tr></thead><tbody>
-          <tr v-for="item in selectedRelabelDetail?.items || []" :key="item.id"><td>{{ item.operationType === 'CARTON_AND_SKU' ? '箱唛 + SKU 换标' : item.operationType === 'SKU_LABEL' ? 'SKU 换标' : '箱唛换标' }}</td><td>{{ item.cartonMark || '—' }}</td><td>{{ item.skuCode || '—' }}</td><td>{{ item.relabelFileName || '未上传' }}</td><td><el-button size="small" @click="chooseRelabelFile('ITEM', String(item.id))"><Upload :size="14" />上传明细文件</el-button></td></tr>
+          <tr v-for="item in selectedRelabelDetail?.items || []" :key="item.id"><td>{{ item.operationType === 'CARTON_AND_SKU' ? '箱唛 + SKU 换标' : item.operationType === 'SKU_LABEL' ? 'SKU 换标' : '箱唛换标' }}</td><td>{{ item.cartonMark || '—' }}</td><td>{{ relabelSkuCodes(item).join('、') || '—' }}</td><td>{{ item.relabelFileName || '未上传' }}</td><td><el-button size="small" @click="chooseRelabelFile('ITEM', String(item.id))"><Upload :size="14" />上传明细文件</el-button></td></tr>
           <tr v-if="!selectedRelabelDetail?.items?.length"><td colspan="5"><div class="warehouse-empty">暂无贴标明细</div></td></tr>
         </tbody></table></div>
       </div>
       <div v-if="props.service === 'labeling'" class="warehouse-card warehouse-form-section">
         <h3>换标任务明细</h3>
         <div class="warehouse-table-scroll"><table class="warehouse-relabel-detail-table"><thead><tr><th>换标模式</th><th>我方箱唛</th><th>新 FBA 箱唛</th><th>FBA 目的仓</th><th>任务箱数</th><th>商品 SKU</th><th>SKU 换标明细</th><th>FBA 货件编号</th><th>贴标要求</th><th>备注</th></tr></thead><tbody>
-          <tr v-for="item in selectedRelabelDetail?.items || []" :key="item.id"><td>{{ item.operationType === 'CARTON_AND_SKU' ? '箱唛 + SKU 换标' : item.operationType === 'SKU_LABEL' ? 'SKU 换标' : '箱唛换标' }}</td><td><strong>{{ item.cartonMark || '—' }}</strong></td><td><strong>{{ item.fbaCartonMark || '—' }}</strong></td><td>{{ warehouseDisplay(item.destinationFbaWarehouseCode) }}</td><td>{{ item.totalPackageCount }} 箱</td><td>{{ item.skuCode || '—' }}</td><td><template v-if="item.skuItems?.length"><div v-for="skuItem in item.skuItems" :key="`${skuItem.skuCode}-${skuItem.newSkuCode}-${skuItem.quantity}`">{{ skuItem.skuCode }} → {{ skuItem.newSkuCode }} × {{ skuItem.quantity }} 件</div></template><span v-else>{{ item.newSkuCode || '—' }}</span></td><td>{{ item.shipmentNo || '—' }}</td><td>{{ item.labelRequirement || '—' }}</td><td>{{ item.remark || '—' }}</td></tr>
+          <tr v-for="item in selectedRelabelDetail?.items || []" :key="item.id"><td>{{ item.operationType === 'CARTON_AND_SKU' ? '箱唛 + SKU 换标' : item.operationType === 'SKU_LABEL' ? 'SKU 换标' : '箱唛换标' }}</td><td><strong>{{ item.cartonMark || '—' }}</strong></td><td><strong>{{ item.fbaCartonMark || '—' }}</strong></td><td>{{ warehouseDisplay(item.destinationFbaWarehouseCode) }}</td><td>{{ item.totalPackageCount }} 箱</td><td>{{ relabelSkuCodes(item).join('、') || '—' }}</td><td><template v-if="item.skuItems?.length"><div v-for="skuItem in item.skuItems" :key="`${skuItem.skuCode}-${skuItem.newSkuCode}-${skuItem.quantity}`">{{ skuItem.skuCode }} → {{ skuItem.newSkuCode }} × {{ skuItem.quantity }} 件</div></template><span v-else>{{ item.newSkuCode || '—' }}</span></td><td>{{ item.shipmentNo || '—' }}</td><td>{{ item.labelRequirement || '—' }}</td><td>{{ item.remark || '—' }}</td></tr>
           <tr v-if="!selectedRelabelDetail?.items?.length"><td colspan="10"><div class="warehouse-empty">暂无换标任务明细</div></td></tr>
         </tbody></table></div>
       </div>
@@ -1670,6 +1728,33 @@ function addReturnBoxBinding(source: RelabelInventoryCandidate) {
 </template>
 
 <style scoped>
+.warehouse-table-card :deep(.related-business-number-cell .cell) { white-space:normal; overflow:visible; text-overflow:clip; overflow-wrap:anywhere; padding-top:6px; padding-bottom:6px; }
+.labeling-type-tags { display:inline-flex; flex-wrap:wrap; gap:4px; }
+.labeling-query.query-toolbar--grid { display:grid; grid-template-columns:repeat(4,minmax(0,320px)); gap:14px 18px; align-items:end; }
+.labeling-query :deep(.query-toolbar__filters) { display:contents; }
+.labeling-query :deep(.query-toolbar__field) { display:flex; flex-direction:column; align-items:stretch; gap:6px; }
+.labeling-query :deep(.query-toolbar__field:nth-child(-n+3)) { grid-row:1; }
+.labeling-query :deep(.query-toolbar__field:nth-child(n+4)) { grid-row:2; }
+.labeling-query :deep(.query-toolbar__label) { line-height:18px; }
+.labeling-query :deep(.query-toolbar__actions) { grid-column:4; grid-row:1; margin:0; padding:0; border:0; align-self:end; }
+.transfer-query.query-toolbar--grid { display:grid; grid-template-columns:repeat(5,minmax(0,280px)); gap:14px 18px; align-items:end; }
+.transfer-query :deep(.query-toolbar__filters) { display:contents; }
+.transfer-query :deep(.query-toolbar__field) { display:flex; flex-direction:column; align-items:stretch; gap:6px; }
+.transfer-query :deep(.query-toolbar__field:nth-child(-n+5)) { grid-row:1; }
+.transfer-query :deep(.query-toolbar__field:nth-child(n+6)) { grid-row:2; }
+.transfer-query :deep(.query-toolbar__label) { line-height:18px; }
+.transfer-query :deep(.query-toolbar__actions) { grid-column:5; grid-row:2; margin:0; padding:0; border:0; align-self:end; }
+.disposal-query :deep(.query-toolbar__field:nth-child(5)) { grid-column:1; grid-row:2; }
+.disposal-query :deep(.query-toolbar__actions) { grid-column:2; }
+@media(max-width:1200px) {
+  .labeling-query.query-toolbar--grid { grid-template-columns:repeat(2,minmax(0,320px)); }
+  .labeling-query :deep(.query-toolbar__field:nth-child(n)) { grid-row:auto; }
+  .labeling-query :deep(.query-toolbar__actions) { grid-column:auto; grid-row:auto; }
+  .transfer-query.query-toolbar--grid { grid-template-columns:repeat(2,minmax(0,320px)); }
+  .transfer-query :deep(.query-toolbar__field:nth-child(n)) { grid-row:auto; }
+  .disposal-query :deep(.query-toolbar__field:nth-child(5)) { grid-column:auto; }
+  .transfer-query :deep(.query-toolbar__actions) { grid-column:auto; grid-row:auto; }
+}
 .warehouse-order-info-heading { display: flex; align-items: center; justify-content: space-between; max-width: 1296px; margin-bottom: 16px; border-bottom: 1px solid #edf0f4; padding-bottom: 10px; }
 .warehouse-form-section .warehouse-order-info-heading h3 { margin: 0; padding: 0; border: 0; }
 .warehouse-order-info-summary { display: flex; flex-wrap: wrap; gap: 10px 24px; color: #64748b; font-size: 12px; }

src/modules/overseas-warehouse/views/discardPhotos.test.mjs

@@ -0,0 +1,29 @@
+import test from 'node:test'
+import assert from 'node:assert/strict'
+import { readFileSync } from 'node:fs'
+const source = readFileSync(new URL('./WarehouseServiceView.vue', import.meta.url), 'utf8')
+function loader(downloadDiscardPhoto) {
+  const section = source.slice(source.indexOf('let discardPhotoGeneration = 0'), source.indexOf('const fbaWarehouses = ref'))
+    .replace('loadDiscardPhoto(fileId: string)', 'loadDiscardPhoto(fileId)')
+  const maps = { discardPhotoUrls: {}, discardPhotoLoading: {}, discardPhotoErrors: {} }
+  const selectedDetail = { value: { discardNo: 'CD/1', photos: [{ fileId: '101' }] } }
+  const mode = { value: 'detail' }; const revoked = []
+  const URL = { createObjectURL: () => 'blob:photo', revokeObjectURL: url => revoked.push(url) }
+  const functions = new Function('selectedDetail', 'mode', 'downloadDiscardPhoto', 'URL', ...Object.keys(maps), section + ';return { loadDiscardPhotos, loadDiscardPhoto, clearDiscardPhotos }')(selectedDetail, mode, downloadDiscardPhoto, URL, ...Object.values(maps))
+  return { ...functions, ...maps, selectedDetail, mode, revoked }
+}
+test('client detail loads submitted discard photos and frees preview URLs on close', async () => {
+  const calls = []; const state = loader(async (...args) => { calls.push(args); return {} })
+  await state.loadDiscardPhotos()
+  assert.deepEqual(calls, [['CD/1', '101']]); assert.equal(state.discardPhotoUrls['101'], 'blob:photo')
+  state.clearDiscardPhotos(); assert.deepEqual(state.revoked, ['blob:photo']); assert.deepEqual(state.discardPhotoUrls, {})
+})
+test('photo failures offer retry and delayed responses cannot populate a closed detail', async () => {
+  let reject = true
+  const state = loader(async () => { if (reject) throw new Error('offline'); return {} })
+  await state.loadDiscardPhotos(); assert.equal(state.discardPhotoErrors['101'], true)
+  reject = false; await state.loadDiscardPhoto('101'); assert.equal(state.discardPhotoErrors['101'], false)
+  let resolve; const slow = loader(() => new Promise(done => { resolve = done }))
+  const pending = slow.loadDiscardPhotos(); slow.mode.value = 'list'; slow.clearDiscardPhotos(); resolve({}); await pending
+  assert.deepEqual(slow.discardPhotoUrls, {}); assert.deepEqual(slow.discardPhotoLoading, {})
+})

src/modules/overseas-warehouse/views/relabelAttachments.test.mjs

@@ -40,9 +40,9 @@ test('贴标申请移除操作项下方的解释文字，保留必要状态', ()
 
 test('贴标申请可从当前客户仍有库存的入仓单或退货单选择来源', () => {
   assert.match(view, /海外操作仓（中转仓）/)
-  assert.match(view, /选择有库存的入仓单或退货单/)
+  assert.match(view, /选择入仓单或退货单/)
   assert.match(view, /quantityUnit: candidate\.returnCartonId \? '件' : '箱'/)
-  assert.match(view, /当前中转仓暂无可用库存/)
+  assert.match(view, /暂无匹配的可选库存/)
   assert.match(view, /relabelInboundOptions/)
   assert.match(view, /listRelabelInventoryCandidates\(form\.warehouse\)/)
   assert.match(api, /relabel-applications\/inventory-candidates/)
@@ -137,12 +137,12 @@ test('箱唛相关换标必须选择四选一派送方式', () => {
 
 test('一次申请单选库存来源且退货库存按退货单汇总', () => {
   assert.doesNotMatch(view, /multiple filterable collapse-tags/)
-  assert.match(view, /RETURN_ORDER:\$\{returnOrderNo\}/)
+  assert.match(view, /returnSourceNos\(item\)\.includes\(selectedReturnOrderNo\.value\)/)
   assert.match(view, /current\.availablePackages \+= inventoryQuantity\(candidate\.availablePackages\)/)
   assert.match(view, /availablePackages: inventoryQuantity\(candidate\.availablePackages\)/)
   assert.match(view, /const quantity = Number\(value\)/)
-  assert.match(view, /可用散件 SKU/)
-  assert.match(view, /系统箱唛号/)
+  assert.match(view, /可用包裹<\/h3>/)
+  assert.match(view, /仓库箱识别码/)
   assert.match(view, /箱内 SKU/)
   assert.match(view, /returnLooseCandidates/)
   assert.match(view, /returnBoxCandidates/)

src/modules/overseas-warehouse/views/returnRelabelSources.test.mjs

@@ -0,0 +1,90 @@
+import assert from 'node:assert/strict'
+import { readFileSync } from 'node:fs'
+import test from 'node:test'
+import ts from 'typescript'
+const view = readFileSync(new URL('./WarehouseServiceView.vue', import.meta.url), 'utf8')
+const source = view.slice(view.indexOf('function returnSourceNos'), view.indexOf('const relabelInboundOptions'))
+const compiled = ts.transpileModule(source + '\nexports.sourceNos = returnSourceNos; exports.progress = returnRelabelProgress', { compilerOptions: { target: ts.ScriptTarget.ES2022, module: ts.ModuleKind.CommonJS } }).outputText
+const exports = {}
+new Function('exports', compiled)(exports)
+test('合箱来源按单号集合精确匹配并去重，不能用子串匹配', () => {
+  const sources = exports.sourceNos({ inboundOrderNo: ' RETURN-1,RETURN-10, RETURN-1 ' })
+  assert.deepEqual(sources, ['RETURN-1', 'RETURN-10'])
+  assert.equal(sources.includes('RETURN'), false)
+  assert.deepEqual(exports.sourceNos({}), [])
+})
+test('实际完成和处理中占用分别展示，缺失投影保持未知', () => {
+  assert.equal(exports.progress({ relabelStatus: 'PARTIALLY_COMPLETED', relabelledQuantity: 3, relabelReservedQuantity: 2 }), '部分完成｜实际完成 3 件｜处理中占用 2 件')
+  assert.equal(exports.progress({}), '—｜实际完成 — 件｜处理中占用 — 件')
+  assert.equal(exports.progress({ relabelStatus: 'PROCESSING', relabelledQuantity: 0, relabelReservedQuantity: 4 }), '处理中｜实际完成 0 件｜处理中占用 4 件')
+})
+test('退货 SKU 申请按实物箱选择，来源标识只读，部分数量转换库存', () => {
+  assert.match(view, /item.id === rows\[0\].sourceRowId/)
+  assert.match(view, /row.sourceRowId !== source\?\.id/)
+  assert.match(view, /:readonly="isReturnRelabelSource"/)
+  assert.match(view, /SKU 换标完成后扣减旧 SKU、增加新 SKU/)
+  assert.match(view, /labelingMode.value === 'sku' \? !skuTotalFile.value : !cartonTotalFile.value/)
+})
+
+test('整包裹支持SKU和混贴提交，实物数为1且各SKU数量仍按件', () => {
+  const builder = view.slice(view.indexOf('function buildSkuRelabelItems'), view.indexOf('function addRelabelCargoRow'))
+  const compiledBuilder = ts.transpileModule(builder, { compilerOptions: { target: ts.ScriptTarget.ES2022 } }).outputText
+  const cargo = { id: 1, returnCartonId: 'PARCEL-ID', cartonMark: 'RP-1', sku: 'SKU-A', availableQuantity: 1 }
+  const rows = [{ sourceRowId: 1, cartonMark: 'RP-1', originalSku: 'SKU-A', newSku: 'NEW-A', quantity: 3, fbaCartonMark: 'FBA-NEW', shipmentNo: 'FBA-SHIP-NEW' }, { sourceRowId: 1, cartonMark: 'RP-1', originalSku: 'SKU-B', newSku: 'NEW-B', quantity: 2, fbaCartonMark: 'FBA-NEW', shipmentNo: 'FBA-SHIP-NEW' }]
+  const candidate = { returnCartonId: 'PARCEL-ID', sourceType: 'RETURN_PARCEL', skuItems: [{ skuCode: 'SKU-A', quantity: 3 }, { skuCode: 'SKU-B', quantity: 2 }] }
+  for (const mode of ['sku', 'carton_and_sku']) {
+    const build = new Function('skuRelabelRows', 'cargoRows', 'isReturnRelabelSource', 'selectedReturnCandidates', 'labelingMode', 'form', compiledBuilder + '; return buildSkuRelabelItems')({ value: rows }, { value: [cargo] }, { value: true }, { value: [candidate] }, { value: mode }, { destination: 'FBA-WH' })
+    const [item] = build()
+    assert.equal(item.returnCartonId, 'PARCEL-ID')
+    assert.equal(item.operationType, mode === 'sku' ? 'SKU_LABEL' : 'CARTON_AND_SKU')
+    assert.equal(item.totalPackageCount, 1)
+    assert.equal(item.notifiedPackageCount, 1)
+    assert.deepEqual(item.skuItems.map(sku => sku.quantity), [3, 2])
+    if (mode === 'carton_and_sku') {
+      assert.equal(item.fbaCartonMark, 'FBA-NEW')
+      assert.equal(item.destinationFbaWarehouseCode, 'FBA-WH')
+      assert.equal(item.shipmentNo, 'FBA-SHIP-NEW')
+      rows[1].shipmentNo = 'OTHER-SHIPMENT'
+      assert.throws(build, /相同的 FBA 货件编号/)
+      rows[1].shipmentNo = 'FBA-SHIP-NEW'
+    } else {
+      assert.equal(item.fbaCartonMark, undefined)
+      assert.equal(item.destinationFbaWarehouseCode, undefined)
+      const buildWithoutDestination = new Function('skuRelabelRows', 'cargoRows', 'isReturnRelabelSource', 'selectedReturnCandidates', 'labelingMode', 'form', compiledBuilder + '; return buildSkuRelabelItems')({ value: rows }, { value: [cargo] }, { value: true }, { value: [candidate] }, { value: mode }, { destination: '' })
+      assert.equal(buildWithoutDestination()[0].operationType, 'SKU_LABEL')
+    }
+    rows[0].quantity = 4
+    assert.throws(build, /超过来源箱可用数量/)
+    rows[0].quantity = 3
+  }
+})
+
+test('包裹箱唛添加保持一个实物并去重，三种类型不再禁用', () => {
+  const binding = view.slice(view.indexOf('function addReturnBoxBinding'), view.indexOf('</script>'))
+  const compiledBinding = ts.transpileModule(binding, { compilerOptions: { target: ts.ScriptTarget.ES2022 } }).outputText
+  const cargoRows = { value: [] }
+  const bind = new Function('labelingMode', 'cartonDetailRows', 'cargoRows', 'selectedReturnOrderNo', 'addReturnSkuBinding', 'let cargoSequence = 0; ' + compiledBinding + '; return addReturnBoxBinding')({ value: 'carton' }, { value: cargoRows.value }, cargoRows, { value: 'RETURN-1' }, () => assert.fail('箱唛模式不添加SKU行'))
+  const parcel = { returnCartonId: 'PARCEL-ID', sourceType: 'RETURN_PARCEL', cartonMark: 'RP-1', productNameZh: '测试商品中文名', skuItems: [{ skuCode: 'SKU-A', quantity: 80 }] }
+  bind(parcel)
+  bind(parcel)
+  assert.equal(cargoRows.value.length, 1)
+  assert.equal(cargoRows.value[0].returnCartonId, 'PARCEL-ID')
+  assert.equal(cargoRows.value[0].quantity, 1)
+  assert.equal(cargoRows.value[0].shipmentNo, '')
+  assert.equal(cargoRows.value[0].name, '测试商品中文名')
+  assert.doesNotMatch(view, /returnSkuOnly|散件库存只能贴 SKU/)
+  assert.match(view, /labelingMode === 'sku' \? addReturnSkuBinding\(source, sku.skuCode\) : addReturnBoxBinding\(source\)/)
+})
+
+test('部分换标明细显示实物来源、旧新SKU、实际件数和待确认状态', () => {
+  for (const id of ['return-available-skus', 'return-available-boxes']) {
+    const start = view.indexOf('id="' + id + '"')
+    const table = view.slice(start, view.indexOf('</table>', start))
+    assert.match(table, /SKU 换标结果/)
+    assert.match(table, /剩余可换（件）/)
+    assert.match(table, /conversion.oldSkuCode/)
+    assert.match(table, /conversion.newSkuCode/)
+    assert.match(table, /conversion.quantity/)
+    assert.match(table, /item.status !== 'REVERSED'/)
+  }
+})

src/modules/overseas-warehouse/views/returnStockDisplay.test.mjs

@@ -0,0 +1,54 @@
+import test from 'node:test'
+import assert from 'node:assert/strict'
+import { readFileSync } from 'node:fs'
+import ts from 'typescript'
+const view = readFileSync(new URL('./WarehouseServiceView.vue', import.meta.url), 'utf8')
+const source = view.slice(view.indexOf('function returnSourceNos'), view.indexOf('const loading = ref(false)'))
+function setup(candidates) {
+ const output = ts.transpileModule(source + '\nexports.options = relabelInboundOptions; exports.visible = visibleRelabelInboundOptions; exports.label = relabelOptionLabel', { compilerOptions: { target: ts.ScriptTarget.ES2022, module: ts.ModuleKind.CommonJS } }).outputText
+ const exports = {}, show = { value: false }, search = { value: '' }, selected = { value: '' }
+ new Function('exports', 'computed', 'currentRelabelCandidates', 'showOccupiedRelabelInventory', 'relabelInventorySearch', 'selectedRelabelInboundOrderId', 'inventoryQuantity', output)(exports, fn => ({ get value() { return fn() } }), { value: candidates }, show, search, selected, value => Math.max(0, Number(value) || 0))
+ return { ...exports, show, search, selected }
+}
+test('occupied return keeps stock facts but remains hidden when searched', () => {
+ const context=setup([{ returnCartonId:'C', inboundOrderNo:'RT-1', availablePackages:0, stockQuantity:10, inventoryStatus:'RELABEL_PENDING', occupiedRelabelNo:'RL-1' }])
+ assert.equal(context.visible.value.length,0)
+ context.search.value='RT-1'; assert.equal(context.visible.value.length,0)
+ const label=context.label(context.options.value[0]); assert.match(label,/在仓 1 包裹\/箱 · 10 件/); assert.equal(label,'退货单 RT-1｜在仓 1 包裹/箱 · 10 件'); assert.match(context.options.value[0].reasons.join('；'),/换标占用 · RL-1/)
+ context.search.value=''; assert.equal(context.visible.value.length,0)
+})
+test('merged empty source adds history reason without inflating physical stock count', () => {
+ const context=setup([{ returnCartonId:'OLD', inboundOrderNo:'RT-1', availablePackages:0, stockQuantity:0, inventoryStatus:'MERGED', mergedIntoCartonMarks:['NEW'] },{ returnCartonId:'NEW', inboundOrderNo:'RT-1', availablePackages:10, stockQuantity:10, inventoryStatus:'AVAILABLE' }])
+ assert.equal(context.options.value[0].units,1); assert.equal(context.options.value[0].stockQuantity,10); assert.equal(context.options.value[0].availablePackages,10)
+ assert.match(context.options.value[0].reasons.join('；'),/历史部分转入 NEW（不代表当前库存位置）/)
+})
+test('missing stock projection stays unknown and outbound history does not count in-warehouse units', () => {
+ const context=setup([{returnCartonId:'C',inboundOrderNo:'RT-1',availablePackages:0},{returnCartonId:'D',inboundOrderNo:'RT-2',availablePackages:0,stockQuantity:0,inventoryStatus:'OUTBOUNDED'}])
+ assert.match(context.label(context.options.value[0]),/待查询/)
+ assert.equal(context.options.value[1].units,0);assert.match(context.options.value[1].reasons.join('；'),/已出库/)
+})
+
+test('fully outbound orders stay hidden even in history search; mixed remaining stock marks partial outbound', () => {
+ const context=setup([{returnCartonId:'D',inboundOrderNo:'RT-D',availablePackages:0,stockQuantity:0,inventoryStatus:'OUTBOUNDED'}, {returnCartonId:'A',inboundOrderNo:'RT-P',availablePackages:0,stockQuantity:0,inventoryStatus:'OUTBOUNDED'}, {returnCartonId:'B',inboundOrderNo:'RT-P',availablePackages:2,stockQuantity:2,inventoryStatus:'AVAILABLE'}])
+ context.show.value=true
+ assert.deepEqual(context.visible.value.map(item=>item.inboundOrderNo),['退货单 RT-P'])
+ context.search.value='RT-D';assert.equal(context.visible.value.some(item=>item.inboundOrderNo==='退货单 RT-D'),false)
+ assert.equal(context.label(context.options.value[1]),'退货单 RT-P｜在仓 1 包裹/箱 · 2 件｜部分出库')
+})
+
+test('partially shipped contents within one physical box show partial outbound', () => {
+ const context=setup([{returnCartonId:'B',inboundOrderNo:'RT-P',availablePackages:3,stockQuantity:3,inventoryStatus:'AVAILABLE',hasOutbound:true}])
+ assert.match(context.label(context.options.value[0]),/3 件｜部分出库$/)
+})
+
+test('available box and parcel lists remove zero-quantity sources and zero SKU rows', () => {
+ const block=view.slice(view.indexOf('const availableReturnCandidates'),view.indexOf('const requiresBothTotalFiles'))
+ const output=ts.transpileModule(block+'\nexports.boxes=returnBoxCandidates; exports.parcels=returnLooseCandidates',{compilerOptions:{target:ts.ScriptTarget.ES2022,module:ts.ModuleKind.CommonJS}}).outputText
+ const exports={}
+ const sources=[{sourceType:'RETURN_CARTON',cartonMark:'EMPTY',availablePackages:0,skuItems:[{skuCode:'A',quantity:0}]},{sourceType:'RETURN_CARTON',cartonMark:'BOX',availablePackages:3,skuItems:[{skuCode:'A',quantity:0},{skuCode:'B',quantity:3}]},{sourceType:'RETURN_PARCEL',cartonMark:'P0',availablePackages:0},{sourceType:'RETURN_PARCEL',cartonMark:'P1',availablePackages:2,skuItems:[{skuCode:'C',quantity:2}]}]
+ new Function('exports','computed','selectedReturnCandidates','inventoryQuantity',output)(exports,fn=>({get value(){return fn()}}),{value:sources},value=>Math.max(0,Number(value)||0))
+ assert.deepEqual(exports.boxes.value.map(item=>item.cartonMark),['BOX'])
+ assert.deepEqual(exports.boxes.value[0].skuItems,[{skuCode:'B',quantity:3}])
+ assert.deepEqual(exports.parcels.value.map(item=>item.cartonMark),['P1'])
+ assert.doesNotMatch(view,/显示占用及历史单据|showOccupiedRelabelInventory/)
+})

src/modules/overseas-warehouse/views/warehouseTransferForm.test.mjs

@@ -6,7 +6,9 @@ const view = readFileSync(new URL('./WarehouseServiceView.vue', import.meta.url)
 const api = readFileSync(new URL('../api/warehouseServices.ts', import.meta.url), 'utf8')
 
 test('贴标总文件与关联模板保持左右分组，退货来源使用专用明细', () => {
-  assert.match(view, /class="warehouse-file-groups" :class="\{ 'warehouse-file-groups--single': isReturnRelabelSource \}"/)
+  assert.match(view, /class="warehouse-file-groups(?:\s[^"]*)?"/)
+  assert.match(view, /\.warehouse-file-groups--compact\s*\{[^}]*grid-template-columns:\s*minmax\(0, 1fr\) minmax\(0, 1fr\)/)
+  assert.match(view, /v-if="isReturnRelabelSource" class="warehouse-table-scroll"/)
   assert.match(view, /warehouse-service-page--return-relabel/)
   assert.match(view, /const sourceValue = `RETURN_ORDER:\$\{requestedReturnNo\}`/)
 })
@@ -136,7 +138,7 @@ test('仓储转运需要换标时上传总文件并挂到关联换标单', () =>
 })
 
 test('仓储转运换标总文件与明细模板在桌面端左右排列', () => {
-  assert.match(view, /class="warehouse-transfer-file-groups"/)
+  assert.match(view, /class="warehouse-transfer-file-groups(?:\s[^"]*)?"/)
   assert.match(view, /\.warehouse-transfer-file-groups\{display:grid;grid-template-columns:minmax\(0,1\.15fr\) minmax\(360px,\.85fr\)/)
   assert.match(view, /\.warehouse-transfer-total-files,\.warehouse-transfer-template-group\{height:100%;margin:0\}/)
   assert.match(view, /@media\(max-width:1180px\)\{\.warehouse-transfer-file-groups\{grid-template-columns:minmax\(0,1fr\)\}\}/)
@@ -303,7 +305,7 @@ test('仓储转运详情自动加载 PDA 测量照片并释放 Blob URL', () =>
   assert.match(view, /加载失败，点击重试/)
   assert.match(view, /URL\.createObjectURL\(blob\)/)
   assert.match(view, /URL\.revokeObjectURL\(url\)/)
-  assert.match(view, /onBeforeUnmount\(\(\) => \{ clearCompletionPhotos\(\); clearMeasurementPhotos\(\) \}\)/)
+  assert.match(view, /onBeforeUnmount\(\(\) => \{ clearCompletionPhotos\(\); clearMeasurementPhotos\(\); clearDiscardPhotos\(\) \}\)/)
 })
 
 test('PDA 完成后主单显示入库完成并保留客户确认测量入口', () => {