2026-10-12 10:21:08 +08:00
46 changed files with 1493 additions and 338 deletions
@@ -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 |

@@ -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']
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { computed, ref, watch } from 'vue'
+import { computed, onBeforeUnmount, onMounted, ref, watch } from 'vue'
 import ClientSidebarMenuNode from '@/components/ClientSidebarMenuNode.vue'
 import {
  clientNavigation,
@@ -7,6 +7,7 @@ import {
  getNavigationParentKeys,
 } from '@/navigation/clientNavigation'
 import { useAuthStore } from '@/modules/auth/public'
+import { useCustomsPendingStore } from '@/modules/first-leg/public'

 const props = defineProps<{
  activePath: string
@@ -16,6 +17,28 @@ const emit = defineEmits<{
  navigate: [path: string]
 }>()
 const auth = useAuthStore()
+const customsPending = useCustomsPendingStore()
+const badges = computed(() => ({ 'first-leg-customs-documents': { count: customsPending.count, error: customsPending.error } }))
+watch(() => auth.isAuthenticated && auth.hasPermission('order:first-leg:customs-list') ? auth.user?.id ?? '' : '', scope => {
+  customsPending.setScope(scope)
+  if (scope) void customsPending.refresh()
+}, { immediate: true, flush: 'sync' })
+function refreshCustomsPending() {
+  if (document.visibilityState === 'visible') void customsPending.refresh()
+}
+let refreshTimer: ReturnType<typeof setInterval> | undefined
+onMounted(() => {
+  refreshTimer = setInterval(refreshCustomsPending, 60_000)
+  window.addEventListener('focus', refreshCustomsPending)
+  document.addEventListener('visibilitychange', refreshCustomsPending)
+})
+onBeforeUnmount(() => {
+  clearInterval(refreshTimer)
+  window.removeEventListener('focus', refreshCustomsPending)
+  document.removeEventListener('visibilitychange', refreshCustomsPending)
+  customsPending.setScope('')
+})
+
 const visibleNavigation = computed(() => filterNavigationByPermissions(clientNavigation, auth.permissionCodes))

 const activeParentKeys = computed(() => new Set(getNavigationParentKeys(visibleNavigation.value, props.activePath)))
@@ -47,6 +70,7 @@ function handleSelect(path: string) {
      v-for="node in visibleNavigation"
      :key="node.key"
      :node="node"
+      :badges="badges"
      :active-path="activePath"
      :opened-keys="openedKeys"
      :active-parent-keys="activeParentKeys"
@@ -8,6 +8,7 @@ const props = defineProps<{
  activePath: string
  openedKeys: ReadonlySet<string>
  activeParentKeys: ReadonlySet<string>
+  badges?: Readonly<Record<string, { count: number | null; error: string }>>
  level?: number
 }>()

@@ -16,6 +17,9 @@ const emit = defineEmits<{
  toggle: [key: string]
 }>()

+const badge = computed(() => props.badges?.[props.node.key])
+const badgeTitle = computed(() => badge.value?.error || `${badge.value?.count ?? 0} 个柜次待上传资料或确认回执`)
+
 const groupId = computed(() => `client-nav-group-${props.node.key}`)
 </script>

@@ -54,6 +58,7 @@ const groupId = computed(() => `client-nav-group-${props.node.key}`)
        v-for="child in node.children"
        :key="child.key"
        :node="child"
+        :badges="badges"
        :active-path="activePath"
        :opened-keys="openedKeys"
        :active-parent-keys="activeParentKeys"
@@ -78,6 +83,14 @@ const groupId = computed(() => `client-nav-group-${props.node.key}`)
        aria-hidden="true"
      />
      <span>{{ node.title }}</span>
+      <span v-if="badge?.error || (badge?.count != null && badge.count > 0)" class="client-nav-badge"
+        :title="badgeTitle" :aria-label="badgeTitle" role="status">
+        {{ badge?.error ? '!' : badge!.count! > 99 ? '99+' : badge?.count }}
+      </span>
    </RouterLink>
  </li>
 </template>
+
+<style scoped>
+.client-sidebar-link .client-nav-badge { display: inline-flex; flex: 0 0 auto; min-width: 23px; height: 23px; align-items: center; justify-content: center; margin-left: auto; padding: 0 5px; border: 2px solid #fff; border-radius: 999px; background: #ef4444; color: #fff; box-shadow: 0 3px 9px rgb(239 68 68 / 24%); font-size: 12px; font-weight: 700; line-height: 1; }
+</style>
@@ -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 })
 }
@@ -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 })
+}
@@ -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; \}/)
@@ -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>
@@ -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>
@@ -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() }
+})
@@ -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 }
+}
@@ -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('')}`
+}
@@ -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>
@@ -283,3 +283,11 @@ export function merchantCustomsErrorMessage(error: unknown, fallback: string) {
 export function isMerchantCustomsUnavailable(error: unknown) {
  return error instanceof ApiError && (error.status === 404 || error.code === 'A0404')
 }
+
+
+export async function getMerchantCustomsPendingCount() {
+  const result = await apiRequest<{ pendingCount: string | number }>({ method: 'GET', url: '/merchant/v1/customs/pending-summary' })
+  const count = Number(result.pendingCount)
+  if (result.pendingCount == null || result.pendingCount === '' || !Number.isSafeInteger(count) || count < 0) throw new Error('报关待办数量返回不完整')
+  return count
+}
@@ -177,6 +177,11 @@ export interface MerchantUnifiedOrderQuery {

 const unifiedOrderBaseUrl = '/merchant/v1/orders'

+export type OrderQueue = 'all' | 'fee' | 'customs' | 'draft' | 'loaded' | 'declared' | 'cleared' | 'scheduled' | 'delivering' | 'delivered'
+export type OrderProgressStage = 'none' | 'loaded' | 'declared' | 'cleared' | 'scheduled' | 'delivering' | 'delivered'
+export interface MerchantOrderProgress { orderId: string | number; stage: OrderProgressStage; partial: boolean }
+export type OrderQueueCounts = Record<OrderQueue, number>
+
 export interface MerchantOrderWorkbenchQuery {
  cargoKeyword?: string
  receivingWarehouseId?: string
@@ -186,14 +191,15 @@ export interface MerchantOrderWorkbenchQuery {
  mainStatus?: string
  createdFrom?: string
  createdTo?: string
-  queue?: 'all' | 'fee' | 'customs' | 'draft'
+  queue?: OrderQueue
  page?: number
  size?: number
 }

 export interface MerchantOrderWorkbench {
  page: PageResult<MerchantUnifiedOrderRow>
-  queues: { all: number; fee: number; customs: number; draft: number }
+  queues: OrderQueueCounts
+  progress: MerchantOrderProgress[]
  channelNames: string[]
 }

@@ -10,7 +10,7 @@ function harness(t) {
  const code = ts.transpileModule(source + '\nexport { loadDetail, detail, clearanceResults, loading, errorMessage, selectedInboundIds, clearanceError, clearanceLoading, retryClearanceResults, close }', { compilerOptions: { module: ts.ModuleKind.CommonJS, target: ts.ScriptTarget.ES2022 } }).outputText
  const props = vue.reactive({ modelValue: false, orderId: 'A', canEdit: true }), requests = [], clearances = [], updates = [], view = {}
  const unmounts = []
-  const dependencies = { vue: { ...vue, onBeforeUnmount: fn => unmounts.push(fn) }, 'element-plus': { ElMessage: {} }, '@/modules/first-leg/api/customs': {
+  const dependencies = { '../store/customsPending': { useCustomsPendingStore: () => ({ refresh: async () => {} }) }, vue: { ...vue, onBeforeUnmount: fn => unmounts.push(fn) }, 'element-plus': { ElMessage: {} }, '@/modules/first-leg/api/customs': {
    getMerchantCustomsForOrder: id => { const pending = deferred(); requests.push({ id, ...pending }); return pending.promise },
    getMerchantClearanceResults: id => { const pending = deferred(); clearances.push({ id, ...pending }); return pending.promise },
    merchantCustomsErrorMessage: error => error.message,
@@ -22,6 +22,9 @@ import {
  type MerchantClearanceResult,
 } from '@/modules/first-leg/api/customs'

+import { useCustomsPendingStore } from '../store/customsPending'
+
+const customsPending = useCustomsPendingStore()
 const props = defineProps<{
  modelValue: boolean
  orderId: string
@@ -104,6 +107,7 @@ async function retryClearanceResults() {

 async function loadDetail() {
  if (disposed || !props.modelValue || !props.orderId) return
+  void customsPending.refresh(true)
  const request = ++detailRequest
  resetClearanceResults()
  const orderId = props.orderId
@@ -5,3 +5,4 @@ export { getMerchantWarehouses, type MerchantWarehouse } from './api/firstLeg'
 export { getFirstLegStatusLabel, getFirstLegStatusTone } from './utils/firstLegOrder'
 export { default as InboundCodeAssociationDialog } from './components/InboundCodeAssociationDialog.vue'
 export { default as FirstLegOrdersView } from './views/FirstLegOrdersView.vue'
+export { useCustomsPendingStore } from './store/customsPending'
@@ -0,0 +1,39 @@
+import assert from 'node:assert/strict'
+import test from 'node:test'
+import { readFileSync } from 'node:fs'
+import ts from 'typescript'
+import * as vue from 'vue'
+import * as pinia from 'pinia'
+const source = readFileSync(new URL('./customsPending.ts', import.meta.url), 'utf8')
+const code = ts.transpileModule(source, { compilerOptions: { module: ts.ModuleKind.CommonJS, target: ts.ScriptTarget.ES2022 } }).outputText
+function deferred() { let resolve, reject; const promise = new Promise((a,b) => { resolve=a; reject=b }); return { promise, resolve, reject } }
+function harness(t, read) {
+  const context=pinia.createPinia();pinia.setActivePinia(context);t.after(()=>pinia.disposePinia(context))
+  const deps={vue,pinia,'../api/customs':{getMerchantCustomsPendingCount:read}}, exports={}
+  new Function('require','exports',code)(id=>{assert.ok(id in deps,id);return deps[id]},exports)
+  return exports.useCustomsPendingStore()
+}
+test('does not request without a permitted identity; preserves counts while refreshing and accepts zero',async t=>{
+  const pending=deferred();let calls=0
+  const store=harness(t,()=>++calls===1?Promise.resolve(2):pending.promise)
+  await store.refresh();assert.equal(calls,0)
+  store.setScope('customer-a');await store.refresh();assert.equal(store.count,2)
+  const load=store.refresh();await store.refresh();assert.equal(calls,2);assert.equal(store.count,2)
+  pending.resolve(0);await load;assert.equal(store.count,0);assert.equal(store.loading,false)
+})
+test('logout, permission removal and account switches discard old in-flight responses',async t=>{
+  const pending=deferred();const store=harness(t,()=>pending.promise)
+  store.setScope('a');const load=store.refresh();store.setScope('')
+  pending.resolve(9);await load;assert.equal(store.count,null);assert.equal(store.error,'')
+  store.setScope('b');assert.equal(store.count,null)
+})
+test('successful mutation can force a newer refresh without being overwritten by an older query',async t=>{
+  const a=deferred(),b=deferred();let calls=0;const store=harness(t,()=>++calls===1?a.promise:b.promise)
+  store.setScope('a');const first=store.refresh();const second=store.refresh(true)
+  b.resolve(1);await second;a.resolve(2);await first;assert.equal(store.count,1)
+})
+test('failure is distinguishable from zero and retry restores authoritative count',async t=>{
+  let fail=true;const store=harness(t,()=>fail?Promise.reject(new Error('offline')):Promise.resolve(3))
+  store.setScope('a');await store.refresh();assert.equal(store.count,null);assert.notEqual(store.error,'')
+  fail=false;await store.refresh();assert.equal(store.count,3);assert.equal(store.error,'')
+})
@@ -0,0 +1,40 @@
+import { ref } from 'vue'
+import { defineStore } from 'pinia'
+import { getMerchantCustomsPendingCount } from '../api/customs'
+
+export const useCustomsPendingStore = defineStore('client-customs-pending', () => {
+  const count = ref<number | null>(null)
+  const loading = ref(false)
+  const error = ref('')
+  let scope = ''
+  let requestVersion = 0
+
+  function setScope(value: string) {
+    if (scope === value) return
+    scope = value
+    requestVersion++
+    count.value = null
+    error.value = ''
+    loading.value = false
+  }
+
+  async function refresh(force = false) {
+    if (!scope || (loading.value && !force)) return
+    const request = ++requestVersion
+    loading.value = true
+    try {
+      const result = await getMerchantCustomsPendingCount()
+      if (request !== requestVersion) return
+      count.value = result
+      error.value = ''
+    } catch {
+      if (request !== requestVersion) return
+      count.value = null
+      error.value = '报关待办数量加载失败，请进入报关资料刷新'
+    } finally {
+      if (request === requestVersion) loading.value = false
+    }
+  }
+
+  return { count, loading, error, setScope, refresh }
+})
@@ -236,5 +236,5 @@ test('keeps failed order loads distinct from empty results', () => {
  assert.match(storeSource, /const loadError = ref\(''\)/)
  assert.match(storeSource, /orderResult\.reason instanceof Error/)
  assert.match(storeSource, /warehouseLoadError/)
-  assert.match(storeSource, /return \{ orders, orderDetails, total, queueCounts, queryChannelNames, warehouses, loading, loadedFromApi, loadError, warehouseLoadError/)
+  assert.match(storeSource, /return \{ orders, orderDetails, total, queueCounts, orderProgress, queryChannelNames, warehouses, loading, loadedFromApi, loadError, warehouseLoadError/)
 })
@@ -22,6 +22,8 @@ import {
  getMerchantOrderWorkbench,
  type MerchantUnifiedOrderDetail,
  type MerchantOrderWorkbenchQuery,
+  type MerchantOrderProgress,
+  type OrderQueueCounts,
  type MerchantUnifiedOrderRow,
 } from '@/modules/first-leg/api/unifiedOrders'
 import type { MerchantTenantStatus } from '@/modules/tenant-management/public'
@@ -396,7 +398,8 @@ export const useFirstLegOrdersStore = defineStore('client-first-leg-orders', ()
  const orders = ref<FirstLegOrder[]>([])
  const orderDetails = ref<Record<string, FirstLegOrder>>({})
  const total = ref(0)
-  const queueCounts = ref({ all: 0, fee: 0, customs: 0, draft: 0 })
+  const queueCounts = ref<OrderQueueCounts>({ all: 0, fee: 0, customs: 0, draft: 0, loaded: 0, declared: 0, cleared: 0, scheduled: 0, delivering: 0, delivered: 0 })
+  const orderProgress = ref<Record<string, MerchantOrderProgress>>({})
  const queryChannelNames = ref<string[]>([])
  let listRequest = 0
  const pendingSubmissions = new Map<string, { key: string; payload: { expectedVersion: number } }>()
@@ -451,7 +454,8 @@ export const useFirstLegOrdersStore = defineStore('client-first-leg-orders', ()
    loadError.value = ''
    orders.value = []
    total.value = 0
-    queueCounts.value = { all: 0, fee: 0, customs: 0, draft: 0 }
+    // Keep the last confirmed category counts while refreshing; replace them only after validation.
+    orderProgress.value = {}
    const [orderResult, warehouseResult] = await Promise.allSettled([
      getMerchantOrderWorkbench(query), loadWarehouseType('DOMESTIC'),
    ])
@@ -466,18 +470,26 @@ export const useFirstLegOrdersStore = defineStore('client-first-leg-orders', ()
          || Number(result.page.size) !== size || Number(result.page.pages) !== pages
          || result.page.records.length !== Math.min(size, Math.max(0, count - (expectedPage - 1) * size))
          || new Set(result.page.records.map(row => String(row.orderId))).size !== result.page.records.length
-          || ['all', 'fee', 'customs', 'draft'].some(key => { const value = result.queues[key as keyof typeof result.queues]; return !Number.isSafeInteger(Number(value)) || Number(value) < 0 })
+          || ['all', 'fee', 'customs', 'draft', 'loaded', 'declared', 'cleared', 'scheduled', 'delivering', 'delivered'].some(key => { const value = result.queues[key as keyof typeof result.queues]; return !Number.isSafeInteger(Number(value)) || Number(value) < 0 })
          || Number(result.queues[query.queue ?? 'all']) !== count
+          || !Array.isArray(result.progress) || result.progress.length !== result.page.records.length
+          || new Set(result.progress.map(p => String(p.orderId))).size !== result.progress.length
+          || result.progress.some(p => !result.page.records.some(row => String(row.orderId) === String(p.orderId))
+            || !['none', 'loaded', 'declared', 'cleared', 'scheduled', 'delivering', 'delivered'].includes(p.stage) || typeof p.partial !== 'boolean')
          || !Array.isArray(result.channelNames)) {
          loadError.value = '订单分页数据不完整，请重新加载'
        } else {
          orders.value = result.page.records.map(item => mapUnifiedOrderRow(item, warehouses.value))
          total.value = count
-          queueCounts.value = { all: Number(result.queues.all), fee: Number(result.queues.fee), customs: Number(result.queues.customs), draft: Number(result.queues.draft) }
+          queueCounts.value = Object.fromEntries(Object.entries(result.queues).map(([key, value]) => [key, Number(value)])) as OrderQueueCounts
+          orderProgress.value = Object.fromEntries(result.progress.map(p => [String(p.orderId), p]))
          queryChannelNames.value = result.channelNames
        }
      } catch { loadError.value = '订单分页数据不完整，请重新加载' }
    } else loadError.value = orderResult.reason instanceof Error ? orderResult.reason.message : '订单数据加载失败'
+    if (loadError.value) {
+    queueCounts.value = { all: 0, fee: 0, customs: 0, draft: 0, loaded: 0, declared: 0, cleared: 0, scheduled: 0, delivering: 0, delivered: 0 }
+    }
    loading.value = false
    return orders.value.length
  }
@@ -629,5 +641,5 @@ export const useFirstLegOrdersStore = defineStore('client-first-leg-orders', ()
    return loadOrderAggregate(id)
  }

-  return { orders, orderDetails, total, queueCounts, queryChannelNames, warehouses, loading, loadedFromApi, loadError, warehouseLoadError, getById, load, loadDetail, loadDraftDetail, loadWarehouseDetail, loadWarehouseType, beginDraftEdit, saveDraft, prepareCancellation, cancelOrder, saveDraftBatch, submitSaved, hasPendingSubmission, isSubmissionRetry, beginNewSubmissionEdit, saveDraftForSubmission }
+  return { orders, orderDetails, total, queueCounts, orderProgress, queryChannelNames, warehouses, loading, loadedFromApi, loadError, warehouseLoadError, getById, load, loadDetail, loadDraftDetail, loadWarehouseDetail, loadWarehouseType, beginDraftEdit, saveDraft, prepareCancellation, cancelOrder, saveDraftBatch, submitSaved, hasPendingSubmission, isSubmissionRetry, beginNewSubmissionEdit, saveDraftForSubmission }
 })
@@ -11,7 +11,8 @@ const row = (id, mainStatus = 'LOADED') => ({ orderId: String(id), orderNo: `FL-
 function result(page = 1, size = 10, total = 215) {
  return {
    page: { page, size, total, pages: Math.ceil(total / size), records: Array.from({ length: Math.min(size, Math.max(0, total - (page - 1) * size)) }, (_, i) => row((page - 1) * size + i + 1)) },
-    queues: { all: total, fee: 2, customs: 1, draft: 3 }, channelNames: ['AIR', 'SEA'],
+    queues: { all: total, fee: 2, customs: 1, draft: 3, loaded: 0, declared: 0, cleared: 0, scheduled: 0, delivering: 0, delivered: 0 }, channelNames: ['AIR', 'SEA'],
+    progress: Array.from({ length: Math.min(size, Math.max(0, total - (page - 1) * size)) }, (_, i) => ({ orderId: String((page - 1) * size + i + 1), stage: 'loaded', partial: false })),
  }
 }
 function deferred() { let resolve, reject; const promise = new Promise((a, b) => { resolve = a; reject = b }); return { promise, resolve, reject } }
@@ -44,7 +45,7 @@ test('loads beyond 200 with server totals and forwards every filter using one re
  assert.equal(h.store.orders[0].id, '201')
  assert.equal(h.store.total, 215)
  assert.deepEqual(h.calls, [query])
-  assert.deepEqual(h.store.queueCounts, { all: 215, fee: 2, customs: 1, draft: 3 })
+  assert.deepEqual(h.store.queueCounts, { all: 215, fee: 2, customs: 1, draft: 3, loaded: 0, declared: 0, cleared: 0, scheduled: 0, delivering: 0, delivered: 0 })
  assert.deepEqual(h.store.queryChannelNames, ['AIR', 'SEA'])
  await h.store.load({ page: 22, size: 10 })
  assert.deepEqual(h.store.orders.map(item => item.id), ['211', '212', '213', '214', '215'])
@@ -109,9 +110,61 @@ test('draft and cancelled rows retain authoritative versions; off-page detail ca

 test('queue total is checked against the selected queue rather than all orders', async t => {
  const response = result(1, 10, 2)
-  response.queues = { all: 215, fee: 2, customs: 1, draft: 3 }
+  response.queues = { all: 215, fee: 2, customs: 1, draft: 3, loaded: 0, declared: 0, cleared: 0, scheduled: 0, delivering: 0, delivered: 0 }
  const h = harness(t, () => response)
  await h.store.load({ queue: 'fee' })
  assert.equal(h.store.total, 2); assert.equal(h.store.queueCounts.all, 215)
  assert.equal(h.store.loadError, '')
 })
+
+
+test('retains server progress and rejects missing or foreign progress without inferring milestones', async t => {
+  let response = result()
+  response.progress[0] = { orderId: '1', stage: 'scheduled', partial: true }
+  const h = harness(t, () => response)
+  await h.store.load()
+  assert.deepEqual(h.store.orderProgress['1'], response.progress[0])
+  response = result(); response.progress[0].orderId = 'foreign'
+  await h.store.load()
+  assert.match(h.store.loadError, /分页数据不完整/)
+  assert.deepEqual(h.store.orderProgress, {})
+  response = result(); delete response.queues.cleared
+  await h.store.load(); assert.match(h.store.loadError, /分页数据不完整/)
+})
+
+
+test('category counts remain visible throughout refresh and update together after the response is validated', async t => {
+  const pending = deferred()
+  let refreshing = false
+  const h = harness(t, () => refreshing ? pending.promise : result())
+  await h.store.load()
+  const counts = h.store.queueCounts
+  refreshing = true
+  const request = h.store.load({ queue: 'fee' })
+  assert.equal(h.store.loading, true)
+  assert.equal(h.store.queueCounts, counts)
+  assert.equal(h.store.queueCounts.fee, 2)
+  const updated = result(1, 10, 3)
+  updated.queues = { ...updated.queues, all: 216, fee: 3 }
+  pending.resolve(updated)
+  await request
+  assert.equal(h.store.queueCounts.all, 216)
+  assert.equal(h.store.queueCounts.fee, 3)
+  assert.equal(h.store.loading, false)
+})
+
+test('rapid category switches preserve counts and ignore an older response while the newest request is pending', async t => {
+  const older = deferred(), latest = deferred()
+  const h = harness(t, q => q.queue === 'fee' ? older.promise : q.queue === 'customs' ? latest.promise : result())
+  await h.store.load()
+  const oldRequest = h.store.load({ queue: 'fee' })
+  const newRequest = h.store.load({ queue: 'customs' })
+  const oldResult = result(1, 10, 2); oldResult.queues.all = 999
+  older.resolve(oldResult); await oldRequest
+  assert.equal(h.store.queueCounts.all, 215)
+  assert.equal(h.store.loading, true)
+  const newResult = result(1, 10, 1); newResult.queues.all = 216
+  latest.resolve(newResult); await newRequest
+  assert.equal(h.store.queueCounts.all, 216)
+  assert.equal(h.store.total, 1)
+})
@@ -0,0 +1,15 @@
+import assert from 'node:assert/strict'
+import test from 'node:test'
+import { readFileSync } from 'node:fs'
+import ts from 'typescript'
+const source = readFileSync(new URL('./orderProgress.ts', import.meta.url), 'utf8')
+const code = ts.transpileModule(source, { compilerOptions: { module: ts.ModuleKind.CommonJS } }).outputText
+const exports = {}
+new Function('exports', code)(exports)
+test('prototype queues preserve order and distinguish partial progress from completion', () => {
+  assert.deepEqual(exports.ORDER_QUEUES.slice(0, 7).map(q => q.key), ['all','fee','loaded','declared','cleared','scheduled','delivering'])
+  assert.equal(exports.orderProgressLabel({ stage: 'scheduled', partial: true }), '部分已排车')
+  assert.equal(exports.orderProgressLabel({ stage: 'cleared', partial: false }), '已清关')
+  assert.equal(exports.orderProgressLabel({ stage: 'none', partial: false }), '—')
+  assert.equal(exports.orderProgressLabel(), '—')
+})
@@ -0,0 +1,20 @@
+import type { MerchantOrderProgress, OrderQueue } from '../api/unifiedOrders'
+
+export const ORDER_QUEUES: ReadonlyArray<{ key: OrderQueue; label: string; todo?: boolean }> = [
+  { key: 'all', label: '全部' },
+  { key: 'fee', label: '确认计费重', todo: true },
+  { key: 'loaded', label: '装柜完成' },
+  { key: 'declared', label: '已报关' },
+  { key: 'cleared', label: '已清关' },
+  { key: 'scheduled', label: '已排车' },
+  { key: 'delivering', label: '派送中' },
+  { key: 'delivered', label: '派送完成' },
+  { key: 'customs', label: '上传资料', todo: true },
+  { key: 'draft', label: '草稿' },
+]
+
+export function orderProgressLabel(progress?: MerchantOrderProgress) {
+  if (!progress || progress.stage === 'none') return '—'
+  const label = ORDER_QUEUES.find(q => q.key === progress.stage)?.label ?? '—'
+  return `${progress.partial ? '部分' : ''}${label}`
+}
@@ -46,6 +46,7 @@ function harness(t, orders, getDetail = async id => detail(id)) {
    vue: { ...vue, onMounted() {} },
    '../utils/customsDocumentsReader': reader,
    '../api/customs': customsApi,
+    '../store/customsPending': { useCustomsPendingStore: () => ({ refresh: async () => {} }) },
  }))
  t.after(() => scope.stop())
  return { view, store, calls, pageCalls }
@@ -8,6 +8,9 @@ import { MERCHANT_CUSTOMS_STATUS_LABELS, type MerchantCustomsContainer } from '.
 import { readCustomsDocuments, type CustomsDocumentRow } from '../utils/customsDocumentsReader'
 import CustomsDocumentsDialog from '../components/CustomsDocumentsDialog.vue'

+import { useCustomsPendingStore } from '../store/customsPending'
+
+const customsPending = useCustomsPendingStore()
 const loading = ref(false)
 const errorMessage = ref('')
 const queryModel = ref<QueryModel>({ orderNo: '', inboundCode: '', containerNo: '', status: '' })
@@ -68,6 +71,7 @@ function statusType(detail: MerchantCustomsContainer) {
 }
 async function load() {
  if (loading.value) return
+  void customsPending.refresh(true)
  loading.value = true; errorMessage.value = ''
  try {
    const { records: loadedRecords, failedCount } = await readCustomsDocuments()
@@ -176,7 +176,7 @@ test('exports every visible order field with normalized dates', () => {
 test('matches the prototype with selectable dense order-list columns', () => {
  assert.match(source, /aria-label="设置订单列表显示列"/)
  assert.match(source, /显示字段筛选/)
-  assert.match(source, /const defaultVisibleColumnKeys = \['status', 'channel', 'transportMode', 'pickupMethod', 'receivingWarehouse', 'createdAt'\]/)
+  assert.match(source, /const defaultVisibleColumnKeys = \['status', 'progress', 'channel', 'transportMode', 'pickupMethod', 'receivingWarehouse', 'createdAt'\]/)
  assert.match(source, /key: 'inboundCode', label: '入仓码', width: 230, fixed: 'left'/)
  assert.match(source, /<SlidersHorizontal :size="18"/)
  assert.match(source, /<el-checkbox-group v-model="visibleColumnKeys"/)
@@ -272,7 +272,7 @@ test('keeps all progress stages and business summary usable on mobile', () => {
 test('keeps the first viewport compact and moves create into the table toolbar', () => {
  const tableToolbarSource = source.slice(source.indexOf('#toolbar-actions'), source.indexOf('class="order-eligibility is-pending"'))
  assert.match(source, /#toolbar-actions/)
-  assert.match(source, /class="order-queue-tabs"[\s\S]*确认计费重[\s\S]*上传资料[\s\S]*草稿/)
+  assert.match(source, /class="order-queue-tabs"[\s\S]*v-for="queue in ORDER_QUEUES"[\s\S]*orderQueueCounts\[queue.key\]/)
  assert.match(source, /activeOrderQueue\.value === 'draft'[\s\S]*order\.status === 'DRAFT'/)
  assert.doesNotMatch(source, /共 \{\{ filteredOrders\.length \}\} 条/)
  assert.match(source, /#toolbar-actions[\s\S]*order:first-leg:create[\s\S]*创建订单[\s\S]*class="order-eligibility is-pending"/)
@@ -59,6 +59,8 @@ import {
  summarizeFirstLegCargo,
  validateFirstLegOrderDraft,
 } from '@/modules/first-leg/utils/firstLegOrder'
+import { ORDER_QUEUES, orderProgressLabel } from '../utils/orderProgress'
+import type { OrderQueue } from '../api/unifiedOrders'
 import { validateProductImageFile } from '@/modules/first-leg/utils/productImage'
 import { createPriceEstimateBreakdown } from '@/modules/first-leg/utils/priceEstimate'

@@ -168,6 +170,7 @@ const fixedOrderColumns: DataTableColumn[] = [
 ]
 const selectableOrderColumns: DataTableColumn[] = [
  { key: 'status', label: '当前订单状态', width: 126, align: 'center', headerAlign: 'center', slotName: 'status' },
+  { key: 'progress', label: '履约进度', width: 142, align: 'center', headerAlign: 'center', slotName: 'progress' },
  { key: 'channel', label: '渠道', width: 150, align: 'left', headerAlign: 'left', showOverflowTooltip: true, slotName: 'channel' },
  { key: 'transportMode', label: '运输方式', width: 104, align: 'center', headerAlign: 'center', slotName: 'transportMode' },
  { key: 'pickupMethod', label: '交货方式', width: 112, align: 'center', headerAlign: 'center', slotName: 'pickupMethod' },
@@ -198,7 +201,7 @@ const selectableOrderColumns: DataTableColumn[] = [
  { key: 'updatedAt', label: '更新时间', width: 164, align: 'center', headerAlign: 'center', slotName: 'updatedAt' },
 ]
 const allSelectableColumnKeys = selectableOrderColumns.map((column) => String(column.key))
-const defaultVisibleColumnKeys = ['status', 'channel', 'transportMode', 'pickupMethod', 'receivingWarehouse', 'createdAt']
+const defaultVisibleColumnKeys = ['status', 'progress', 'channel', 'transportMode', 'pickupMethod', 'receivingWarehouse', 'createdAt']
 const visibleColumnKeys = ref<string[]>([...defaultVisibleColumnKeys])
 const orderedColumnKeys = ref<string[]>([...allSelectableColumnKeys])
 const draggedColumnKey = ref('')
@@ -243,7 +246,6 @@ const selectedOrders = ref<FirstLegOrder[]>([])
 const selectedOrderCount = computed(() => selectedOrders.value.length)
 const selectedDraftOrders = computed(() => selectedOrders.value.filter((order) => order.status === 'DRAFT'))
 const orderTableVersion = ref(0)
-type OrderQueue = 'all' | 'fee' | 'customs' | 'draft'
 const activeOrderQueue = ref<OrderQueue>('all')
 const editorOpen = ref(false)
 const orderFormRef = ref<FormInstance>()
@@ -505,6 +507,7 @@ const orderQueueCounts = computed(() => store.queueCounts)
 const pagedOrders = computed(() => store.orders)

 async function selectOrderQueue(queue: OrderQueue) {
+  if (activeOrderQueue.value === queue && !store.loadError) return
  activeOrderQueue.value = queue
  tablePage.value = 1
  await loadOrderPage()
@@ -638,6 +641,7 @@ const emptyDescription = computed(() => {
  if (activeOrderQueue.value === 'customs') return '暂无需要上传报关资料的订单'
  if (activeOrderQueue.value === 'fee') return '暂无需要确认计费重的订单'
  if (activeOrderQueue.value === 'draft') return '暂无草稿订单'
+  if (activeOrderQueue.value !== 'all') return `暂无${ORDER_QUEUES.find(q => q.key === activeOrderQueue.value)?.label ?? ''}的订单`
  return '还没有订单'
 })

@@ -1812,6 +1816,7 @@ function exportOrderInformation() {
      displayListValue(order.destinationWarehouseName),
      destinationTypeLabels[order.destinationType],
      getFirstLegStatusLabel(order.status),
+      orderProgressLabel(store.orderProgress[order.id]),
      formatListMetric(orderPackageCount(order)),
      displayListValue(order.expressCompanyName),
      displayListValue(order.trackingNumber),
@@ -1830,7 +1835,7 @@ function exportOrderInformation() {
      formatExportDateTime(order.createdAt),
    ])
    downloadCsv('订单信息.csv', [[
-      '入仓码', '渠道', '运输方式', '交货方式', '预约提货时间', '目的仓', '目的仓类型', '当前订单状态', '箱数', '快递公司', '快递单号', 'SKUS',
+      '入仓码', '渠道', '运输方式', '交货方式', '预约提货时间', '目的仓', '目的仓类型', '当前订单状态', '履约进度', '箱数', '快递公司', '快递单号', 'SKUS',
      '总毛重', '总净重', '总体积', '总数量', '计费单价', '计费体积', '计费重量', '备注',
      '货件编号', '跟踪编号', '国内仓入库时间', '创建时间',
    ], ...rows])
@@ -2106,10 +2111,12 @@ async function searchOrders(model: QueryModel) {
        <DataTable :page="tablePage" :page-size="tablePageSize" @update:page="changeOrderPage" @update:page-size="changeOrderPageSize" :data="pagedOrders" :columns="visibleOrderColumns" :key="orderTableVersion" :loading="store.loading" :total="store.total" :page-sizes="[10, 20, 50]" row-key="id" empty-text="暂无订单" class="prototype-order-table" :row-actions="getOrderRowActions" @selection-change="handleOrderSelectionChange">
          <template #toolbar>
            <nav class="order-queue-tabs" aria-label="订单事项分类">
-              <button type="button" :class="{ active: activeOrderQueue === 'all' }" @click="selectOrderQueue('all')">全部</button>
-              <button type="button" :class="{ active: activeOrderQueue === 'fee' }" @click="selectOrderQueue('fee')">确认计费重<span v-if="orderQueueCounts.fee" class="queue-count">{{ orderQueueCounts.fee }}</span></button>
-              <button type="button" :class="{ active: activeOrderQueue === 'customs' }" @click="selectOrderQueue('customs')">上传资料<span v-if="orderQueueCounts.customs" class="queue-count">{{ orderQueueCounts.customs }}</span></button>
-              <button type="button" :class="{ active: activeOrderQueue === 'draft' }" @click="selectOrderQueue('draft')">草稿<span v-if="orderQueueCounts.draft" class="queue-count">{{ orderQueueCounts.draft }}</span></button>
+              <button v-for="queue in ORDER_QUEUES" :key="queue.key" type="button"
+                :class="{ active: activeOrderQueue === queue.key }" :aria-pressed="activeOrderQueue === queue.key"
+                @click="selectOrderQueue(queue.key)">
+                {{ queue.label }}<span v-if="queue.key !== 'all' && orderQueueCounts[queue.key]"
+                  :class="queue.todo ? 'queue-count' : 'queue-stage-count'">{{ queue.todo ? orderQueueCounts[queue.key] : `（${orderQueueCounts[queue.key]}）` }}</span>
+              </button>
            </nav>
            <span v-if="selectedOrderCount">已选 {{ selectedOrderCount }} 条</span>
          </template>
@@ -2185,6 +2192,7 @@ async function searchOrders(model: QueryModel) {
          <template #receivingWarehouse="{ row }"><span class="table-ellipsis" :title="displayListValue((row as FirstLegOrder).receivingWarehouseName)">{{ displayListValue((row as FirstLegOrder).receivingWarehouseName) }}</span></template>
          <template #destinationWarehouse="{ row }"><span class="table-ellipsis" :title="displayListValue((row as FirstLegOrder).destinationWarehouseName)">{{ displayListValue((row as FirstLegOrder).destinationWarehouseName) }}</span></template>
          <template #destinationType="{ row }">{{ destinationTypeLabels[(row as FirstLegOrder).destinationType] }}</template>
+          <template #progress="{ row }">{{ orderProgressLabel(store.orderProgress[row.id]) }}</template>
          <template #status="{ row }"><span class="client-status" :data-tone="getFirstLegStatusTone((row as FirstLegOrder).status)">{{ getFirstLegStatusLabel((row as FirstLegOrder).status) }}</span></template>
          <template #packageCount="{ row }">{{ formatListMetric(orderPackageCount(row as FirstLegOrder)) }}</template>
          <template #expressCompany="{ row }"><span class="table-ellipsis" :title="displayListValue((row as FirstLegOrder).expressCompanyName)">{{ displayListValue((row as FirstLegOrder).expressCompanyName) }}</span></template>
@@ -2570,7 +2578,12 @@ async function searchOrders(model: QueryModel) {
 .supporting-data-error span { overflow-wrap: anywhere; color: var(--muted); font-size: 11px; line-height: 1.55; }
 .order-row-actions, .editor-actions { display: flex; justify-content: flex-end; gap: 8px; }
 .order-table-card { padding: 0; overflow: hidden; border: 1px solid var(--client-border); border-radius: var(--client-radius); box-shadow: none; }
-.order-queue-tabs { display: flex; align-items: center; gap: 4px; }
+.prototype-order-table :deep(.data-table__toolbar) { flex-wrap: nowrap; }
+.prototype-order-table :deep(.data-table__toolbar-heading) { min-width: 0; flex: 1; flex-wrap: nowrap; }
+.prototype-order-table :deep(.data-table__toolbar-actions) { flex-shrink: 0; }
+.order-queue-tabs { display: flex; min-width: 0; align-items: center; gap: 4px; overflow-x: auto; padding: 7px 0 10px; scrollbar-width: thin; }
+.order-queue-tabs button { flex-shrink: 0; white-space: nowrap; }
+.queue-stage-count { margin-left: 3px; }
 .order-queue-tabs button { position: relative; min-height: 34px; padding: 0 12px; border: 1px solid transparent; border-radius: 7px; background: transparent; color: #667085; cursor: pointer; font: inherit; font-weight: 600; }
 .order-queue-tabs button:hover { color: var(--client-action); }
 .order-queue-tabs button.active { border-color: #cfe0ff; background: #f3f7ff; color: var(--client-action); }
@@ -49,3 +49,13 @@ test('old same-page response cannot clamp a newer query or clear its current sel
  assert.deepEqual(h.selectedOrders.value, ['new-selection'])
  assert.equal(h.orderTableVersion.value, 1)
 })
+
+
+test('clicking the current category does not reload or reset its page, but an error can be retried', async () => {
+  const h = harness(); h.tablePage.value = 3
+  await h.selectOrderQueue('all')
+  assert.equal(h.calls.length, 0); assert.equal(h.tablePage.value, 3)
+  h.store.loadError = 'failed'
+  await h.selectOrderQueue('all')
+  assert.equal(h.calls.length, 1); assert.equal(h.tablePage.value, 1)
+})
@@ -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"/)
@@ -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, '')
+})
@@ -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 {
@@ -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>
@@ -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 {
@@ -16,10 +16,11 @@ export interface ReturnReceipt {
  labels?: Array<{ cartonMark: string; printableHtml: string }>
  labelRepairRequired?: boolean
 }
-export interface ReturnPallet { palletCode: string; unitType: 'PALLET' | 'BOX'; unitCode: string; skuTypes: number; totalQuantity: number; totalBoxCount: number; items: Array<{ skuCode: string; productNameZh?: string; quantity: number; boxCount: number }> }
+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 ReturnOrderDetail { order: ReturnOrderSummary; remark?: string; items: ReturnOrderItem[]; receipts: ReturnReceipt[]; pallets: ReturnPallet[]; photos: ReturnPhoto[]; packingDetails?: ReturnPackingDetail[] }
+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 ReturnOrderCreate {
  overseasWarehouseId: string; warehouseContactName: string; warehouseContactPhone: string; customerReferenceNo?: string; remark?: string; needRelabel: boolean; idempotencyKey: string
  items: Array<{ skuCode: string; productNameZh?: string; expectedQuantity: number }>
@@ -33,7 +33,7 @@ export interface RelabelInventoryCandidate {
  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'; returnCartonId?: string; cartonMark?: string
+  sourceType?: 'INBOUND' | 'RETURN_CARTON' | 'RETURN_PARCEL'; returnCartonId?: string; cartonMark?: string
  skuItems?: Array<{ skuCode: string; newSkuCode?: string; quantity: number; remark?: string }>; relabelledPackages?: number
 }

@@ -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', () => {
@@ -0,0 +1,22 @@
+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('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('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' }), '')
+})
@@ -0,0 +1,21 @@
+import type { ReturnReceipt } from '../api/returnOrders'
+
+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')}`
+}
@@ -37,7 +37,7 @@ const warehouses = ref<MerchantWarehouse[]>([])
 const warehouseError = ref('')
 const warehousesLoading = ref(false)
 function formatInventoryTime(value?: string) { return value ? value.replace('T', ' ').slice(0, 19) : '—' }
-function cartonStatusLabel(value: string) { return ({ AVAILABLE: '可用', MERGED: '已合箱', OUTBOUNDED: '已出库' } as Record<string, string>)[value] || '—' }
+function cartonStatusLabel(value: string) { return ({ PENDING_COUNT: '箱内待清点', AVAILABLE: '可用', MERGED: '已合箱', OUTBOUNDED: '已出库' } as Record<string, string>)[value] || '—' }
 function warehouseLabel(warehouseId: string) {
  const warehouse = warehouses.value.find(item => String(item.id) === String(warehouseId))
  return warehouse ? `${warehouse.warehouseName} · ${warehouse.warehouseCode}` : '—'
@@ -81,7 +81,7 @@ const queryFields = computed<QueryField[]>(() => {
  if (activeTab.value === 'cartons') fields.push(
    { key: 'cartonMark', label: '箱号 / 箱唛', type: 'input', placeholder: '请输入箱号或箱唛' },
    { key: 'returnNo', label: '退货单号', type: 'input', placeholder: '请输入退货单号' },
-    { key: 'status', label: '箱状态', type: 'select', options: [{ label: '可用', value: 'AVAILABLE' }, { label: '已合箱', value: 'MERGED' }] },
+    { key: 'status', label: '箱状态', type: 'select', options: [{ label: '箱内待清点', value: 'PENDING_COUNT' }, { label: '可用', value: 'AVAILABLE' }, { label: '已合箱', value: 'MERGED' }] },
  )
  return fields
 })
@@ -5,6 +5,45 @@ import test from 'node:test'
 const view = readFileSync(new URL('./ReturnOrdersView.vue', import.meta.url), 'utf8')
 const api = readFileSync(new URL('../api/returnOrders.ts', import.meta.url), 'utf8')

+function submitHarness(failure) {
+  const source = view.slice(view.indexOf('async function submit()'), view.indexOf('\nfunction statusType('))
+  const state = { requests: [], loads: 0, routes: [], errors: [], successes: [] }
+  const form = { overseasWarehouseId: 'WH-1', warehouseContactName: 'Contact', warehouseContactPhone: '123', customerReferenceNo: 'REF-NEW', remark: 'edited', needRelabel: true, items: [{ skuCode: 'SKU-NEW', productNameZh: 'Product', expectedQuantity: 25 }] }
+  const editingReturnNo = { value: 'RT-TEST' }, showCreate = { value: true }, creating = { value: false }
+  const submit = new Function('form', 'duplicateSkuIds', 'creating', 'editingReturnNo', 'showCreate', 'props', 'ElMessage', 'updateReturnOrder', 'createReturnOrder', 'createIdempotencyKey', 'resetForm', 'router', 'load', `${source}; return submit`)(
+    form, { value: new Set() }, creating, editingReturnNo, showCreate, { createPage: false, detailPage: false },
+    { warning() {}, success(message) { state.successes.push(message) }, error(message) { state.errors.push(message) } },
+    async (returnNo, payload) => { state.requests.push({ returnNo, payload }); if (failure) throw failure },
+    async () => assert.fail('Editing must use update'), () => 'edit-test', () => {},
+    { async push(route) { state.routes.push(route) } }, async () => { state.loads++ },
+  )
+  return { submit, state, editingReturnNo, showCreate, creating }
+}
+
+test('编辑退货保存提交修改后的字段，并重新读取当前列表', async () => {
+  const { submit, state, editingReturnNo, showCreate, creating } = submitHarness()
+  await submit()
+  assert.equal(state.requests[0].returnNo, 'RT-TEST')
+  assert.equal(state.requests[0].payload.customerReferenceNo, 'REF-NEW')
+  assert.equal(state.requests[0].payload.items[0].expectedQuantity, 25)
+  assert.equal(state.loads, 1)
+  assert.deepEqual(state.routes, [])
+  assert.equal(showCreate.value, false)
+  assert.equal(editingReturnNo.value, '')
+  assert.equal(creating.value, false)
+})
+
+test('编辑退货保存失败显示接口错误并保留编辑内容供重试', async () => {
+  const { submit, state, editingReturnNo, showCreate, creating } = submitHarness(new Error('只有待审核退货预报可以修改'))
+  await submit()
+  assert.deepEqual(state.errors, ['只有待审核退货预报可以修改'])
+  assert.deepEqual(state.successes, [])
+  assert.equal(state.loads, 0)
+  assert.equal(showCreate.value, true)
+  assert.equal(editingReturnNo.value, 'RT-TEST')
+  assert.equal(creating.value, false)
+})
+
 test('退货签收照片通过客户鉴权下载接口加载并释放对象 URL', () => {
  assert.match(api, /\/return-orders\/\$\{encodeURIComponent\(returnNo\)\}\/photos\/files\/\$\{encodeURIComponent\(String\(fileId\)\)\}\/download/)
  assert.match(api, /apiBlobRequest/)
@@ -81,7 +120,7 @@ const labelHtml = mark => `<!doctype html><html><head>${labelStyle}</head><body>

 function printHarness() {
  const source = view.slice(view.indexOf('async function printReturnLabel('), view.indexOf('\nfunction openDetail('))
-    .replace('receipt: ReturnReceipt', 'receipt')
+    .replace('receipt: ReturnReceipt | ReturnReceipt[]', 'receipt')
  const calls = { opened: 0, printed: 0, html: '', warnings: [], errors: [], fetched: [] }
  const popup = {
    document: { open() {}, write(html) { calls.html = html }, close() {} },
@@ -119,7 +158,7 @@ test('退货多箱打印保留统一模板尺寸和每箱条码，并按箱分
  assert.equal(calls.printed, 1)
  assert.deepEqual(calls.fetched, [])
  assert.deepEqual(calls.errors, [])
-  assert.match(view, /打印全部箱唛（\{\{ receipt\.labels\?\.length \|\| receipt\.boxCount \|\| 1 \}\} 箱）/)
+  assert.match(view, /打印全部箱唛（\{\{ printableBoxCount \}\} 箱）/)
 })

 test('缺少内嵌模板时读取鉴权箱唛模板，待修复箱记录禁止打印', async () => {
@@ -136,6 +175,22 @@ test('缺少内嵌模板时读取鉴权箱唛模板，待修复箱记录禁止
  assert.deepEqual(calls.errors, [])
 })

+test('两托各两箱合并为一次四页打印，每箱条码保留且模板样式不重复', async () => {
+  const { print, calls } = printHarness()
+  const receipts = [1, 2].map(pallet => ({
+    cartonMark: `PALLET-${pallet}`, boxCount: 2,
+    labels: [1, 2].map(box => ({ cartonMark: `SKU-${pallet}#2-${box}`, printableHtml: labelHtml(`SKU-${pallet}#2-${box}`) })),
+    printableHtml: `batch-${pallet}`,
+  }))
+  await print(receipts)
+  assert.equal(calls.opened, 1)
+  assert.equal(calls.printed, 1)
+  assert.equal((calls.html.match(/<section class="return-label">/g) || []).length, 4)
+  assert.equal(calls.html.split(labelStyle).length - 1, 1)
+  for (const receipt of receipts) for (const label of receipt.labels) assert.ok(calls.html.includes(`data-barcode="${label.cartonMark}"`))
+  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\)/)
@@ -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, receiptTrackingNo } from '../utils/returnReceiptDisplay'

 const props = withDefaults(defineProps<{ createPage?: boolean; detailPage?: boolean; returnNo?: string }>(), { createPage: false, detailPage: false, returnNo: '' })
 const router = useRouter()
@@ -24,6 +25,9 @@ const creating = ref(false)
 const showCreate = ref(false)
 const editingReturnNo = ref('')
 const selected = ref<ReturnOrderDetail>()
+const showCartons = ref(false)
+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 photoUrls = reactive<Record<string, string>>({})
 const rows = ref<ReturnOrderSummary[]>([])
 const total = ref(0)
@@ -64,7 +68,7 @@ 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 },
@@ -175,18 +179,21 @@ function previewPhoto(fileId: string | number) {
  const url = photoUrls[String(fileId)]
  if (url) window.open(url, '_blank', 'noopener')
 }
-async function printReturnLabel(receipt: ReturnReceipt) {
-  if (receipt.labelRepairRequired) { ElMessage.warning('签收箱数与当前箱记录不一致，请联系仓库核实并修复后打印'); return }
-  if (!receipt.cartonMark) return
+async function printReturnLabel(receipt: ReturnReceipt | ReturnReceipt[]) {
+  const receipts = Array.isArray(receipt) ? receipt : [receipt]
+  if (receipts.some(item => item.labelRepairRequired)) { ElMessage.warning('签收箱数与当前箱记录不一致，请联系仓库核实并修复后打印'); return }
+  if (!receipts.length) return
  const popup = window.open('', '_blank')
  if (!popup) { ElMessage.warning('请允许浏览器打开打印窗口'); return }
  popup.opener = null
  try {
-    const labels = receipt.labels?.length
-      ? receipt.labels
-      : [{ cartonMark: receipt.cartonMark, printableHtml: receipt.printableHtml || (await getReturnInventoryLabel(receipt.cartonMark)).printableHtml }]
+    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 labels = [...new Map(groups.flat().map(label => [label.cartonMark, label])).values()]
+    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 = receipt.printableHtml || `<!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]?.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
@@ -221,7 +228,12 @@ async function submit() {
    const payload = { overseasWarehouseId: form.overseasWarehouseId, warehouseContactName: form.warehouseContactName.trim(), warehouseContactPhone: form.warehouseContactPhone.trim(), customerReferenceNo: form.customerReferenceNo || undefined, remark: form.remark || undefined, needRelabel: form.needRelabel, idempotencyKey: createIdempotencyKey(), items: items.map(item => ({ ...item, productNameZh: item.productNameZh || undefined })) }
    if (editingReturnNo.value) await updateReturnOrder(editingReturnNo.value, payload)
    else await createReturnOrder(payload)
-    ElMessage.success(editingReturnNo.value ? '退货预报已更新' : '退货预报已创建'); showCreate.value = false; editingReturnNo.value = ''; resetForm(); await router.push({ name: 'overseas-return-relabel' })
+    const wasEditing = Boolean(editingReturnNo.value)
+    ElMessage.success(wasEditing ? '退货预报已更新' : '退货预报已创建'); showCreate.value = false; editingReturnNo.value = ''; resetForm()
+    if (props.createPage || props.detailPage) await router.push({ name: 'overseas-return-relabel' })
+    else await load()
+  } catch (error) {
+    ElMessage.error(error instanceof Error ? error.message : '保存退货预报失败')
  } finally { creating.value = false }
 }
 function statusType(status: string, needRelabel = false) {
@@ -367,11 +379,19 @@ onBeforeUnmount(clearPhotoUrls)
            <el-table-column prop="createdAt" label="合箱时间" min-width="160" />
          </el-table>
        </section>
-        <section class="return-detail-section">
-          <h3 class="section-heading-with-action"><span>实物明细（{{ selected.pallets?.length || 0 }} 个托盘/箱）</span><span v-if="selected.receipts?.some(item => item.unitType !== 'PARCEL' && item.cartonMark)" class="return-label-actions"><el-button v-for="receipt in selected.receipts.filter(item => item.unitType !== 'PARCEL' && item.cartonMark)" :key="receipt.receiptNo" type="primary" size="small" @click="printReturnLabel(receipt)">打印全部箱唛（{{ receipt.labels?.length || receipt.boxCount || 1 }} 箱）</el-button></span></h3>
+        <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>
+            <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>
+          </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 }} 箱</span></template>
+              <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" />
                <el-table-column prop="productNameZh" label="中文品名" min-width="180"><template #default="{ row }">{{ row.productNameZh || '—' }}</template></el-table-column>
@@ -382,6 +402,27 @@ 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>
+          <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">
+              <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>
+              <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" />
+                <el-table-column prop="quantity" label="实际签收数量" width="130" />
+              </el-table>
+              <div v-else class="return-pallet-measurements">{{ box.countStatus === 'PENDING' ? '箱内数量待仓库清点确认' : '未留存原始箱内明细，不以当前库存代替签收数量' }}</div>
+            </el-collapse-item>
+          </el-collapse>
+          <el-empty v-else description="暂无签收箱号明细，包裹签收请查看下方 SKU 明细" :image-size="64" />
+          </div>
+          <template #footer><el-button @click="showCartons = false">关闭</el-button></template>
+          </el-dialog>
+        </section>
        <section class="return-detail-section">
          <h3>退货打托照片（{{ selected.photos?.length || 0 }} 张）</h3>
          <div v-if="selected.photos?.length" class="return-photo-grid">
@@ -397,14 +438,12 @@ onBeforeUnmount(clearPhotoUrls)
          <h3>签收批次</h3>
          <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 v-for="receipt in (selected.receipts || []).filter(item => item.unitType === 'PARCEL')" :key="`${receipt.receiptNo}-items`" class="return-parcel-items">
-            <strong>包裹 {{ receipt.unitCode || receipt.trackingNo || receipt.receiptNo }} SKU 明细</strong>
-            <span v-for="item in receipt.items" :key="item.skuCode">{{ item.skuCode }} × {{ item.quantity }}</span>
-          </div>
+
        </section>
      </template>
    </article>
@@ -461,11 +500,21 @@ onBeforeUnmount(clearPhotoUrls)
 .return-detail-section :deep(.el-table .cell) { padding:0 8px; line-height:18px; }
 .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; }
 .return-pallet-summary { margin-left:12px; color:#7c899c; font-size:12px; font-weight:400; }
+.return-pallet-measurements { margin-bottom:8px; color:#7c899c; font-size:12px; }
 .return-photo-grid { display:grid; grid-template-columns:repeat(5,minmax(0,1fr)); gap:12px; padding:0 16px 16px; }
 .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__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-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; } }
@media (max-width: 1100px) { .return-detail-grid { grid-template-columns:repeat(2,minmax(0,1fr)); } }
@media (max-width: 900px) { .return-photo-grid { grid-template-columns:repeat(3,minmax(0,1fr)); } }
@@ -26,16 +26,14 @@ import {
 } from '@/modules/first-leg/api/firstLeg'
 import { loadAllWarehouseRecords } from '@/modules/first-leg/utils/warehousePagination'
 import { createIdempotencyKey } from '@/utils/idempotencyKey'
-import { createReturnRelabel, uploadReturnRelabelFile } from '../api/returnOrders'

 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'; 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 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 ImportedRelabelBinding extends SkuRelabelRow { templateType: RelabelTemplateType; selected: boolean; shipmentNo: string }
-interface ReturnRelabelSkuRow { skuCode: string; productNameZh: string; availableQuantity: number; selected: boolean; quantity: number }
 interface ServiceConfig { title: string; createTitle: string; numberLabel: string; emptyText: string; columns: string[] }
 interface TransferCarton { cartonMark: string; customerCartonMark?: string; cartonIndex: number; totalCartons: number; status: string }

@@ -189,16 +187,23 @@ const selectedDiscardOrderId = ref('')
 const discardCandidatesLoading = ref(false)
 const relabelCandidates = ref<RelabelInventoryCandidate[]>([])
 const selectedRelabelInboundOrderId = ref('')
+const orderInfoCollapsed = ref(false)
+const availableBoxesCollapsed = ref(false)
+const availableSkusCollapsed = ref(false)
 const relabelCandidatesLoading = ref(false)
 const transferInventoryCandidates = ref<RelabelInventoryCandidate[]>([])
 const selectedTransferInventory = ref('')
 // Snowflake IDs exceed JavaScript's safe integer range. Keep them as strings
 // all the way to JSON so the backend receives the exact source order ID.
 const selectedTransferSourceOrderIds = ref<string[]>([])
-const returnRelabelSkuRows = ref<ReturnRelabelSkuRow[]>([])
 const isReturnRelabelSource = computed(() => props.service === 'labeling' && selectedRelabelInboundOrderId.value.startsWith('RETURN_ORDER:'))
 const selectedReturnOrderNo = computed(() => isReturnRelabelSource.value ? selectedRelabelInboundOrderId.value.slice('RETURN_ORDER:'.length) : '')
-const requiresBothTotalFiles = computed(() => (props.service === 'labeling' || (props.service === 'transfer' && form.relabel)) && !isReturnRelabelSource.value && labelingMode.value === 'carton_and_sku')
+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 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
@@ -207,7 +212,7 @@ 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.sourceType === 'RETURN_CARTON' ? `RETURN_ORDER:${returnOrderNo}` : String(candidate.inboundOrderId)
+    const value = candidate.returnCartonId ? `RETURN_ORDER:${returnOrderNo}` : String(candidate.inboundOrderId)
    const current = grouped.get(value)
    if (current) {
      current.availablePackages += inventoryQuantity(candidate.availablePackages)
@@ -215,11 +220,11 @@ const relabelInboundOptions = computed(() => {
    }
    else grouped.set(value, {
      value,
-      inboundOrderNo: candidate.sourceType === 'RETURN_CARTON' ? `退货单 ${candidate.inboundOrderNo || '—'}` : (candidate.inboundOrderNo || '—'),
-      inboundCode: candidate.sourceType === 'RETURN_CARTON' ? '已签收退货库存' : (candidate.inboundCode || '—'),
+      inboundOrderNo: candidate.returnCartonId ? `退货单 ${candidate.inboundOrderNo || '—'}` : (candidate.inboundOrderNo || '—'),
+      inboundCode: candidate.returnCartonId ? '已签收退货库存' : (candidate.inboundCode || '—'),
      availablePackages: inventoryQuantity(candidate.availablePackages),
      relabelledPackages: inventoryQuantity(candidate.relabelledPackages),
-      quantityUnit: candidate.sourceType === 'RETURN_CARTON' ? '件' : '箱',
+      quantityUnit: candidate.returnCartonId ? '件' : '箱',
    })
  }
  return [...grouped.values()]
@@ -263,7 +268,10 @@ watch(() => cargoRows.value.map((row) => row.sku), (skus) => {
    if (sourceSku) row.sku = sourceSku
  })
 })
-watch(labelingMode, (value) => { if (value !== 'carton' && !skuRelabelRows.value.length) addSkuRelabelRow() })
+watch([returnSkuOnly, labelingMode], ([skuOnly, value]) => {
+  if (skuOnly && value !== 'sku') { labelingMode.value = 'sku'; return }
+  if (value !== 'carton' && !skuRelabelRows.value.length) addSkuRelabelRow()
+})
 watch(() => form.destination, (value) => {
  if (props.service !== 'labeling') return
  for (const row of cargoRows.value) row.destinationWarehouseId = value
@@ -293,6 +301,9 @@ onMounted(() => {
 onBeforeUnmount(() => { clearCompletionPhotos(); clearMeasurementPhotos() })
 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
+  availableBoxesCollapsed.value = false
+  availableSkusCollapsed.value = false
  Object.assign(form, { customerNo: '', inboundNo: '', sourceWarehouse: '', warehouse: '', destination: '', privateDestinationAddress: '', privateDestinationPostalCode: '', privateDestinationContact: '', privateDestinationPhone: '', address: '', contact: '', phone: '', pickupContact: '', pickupPhone: '', relabelContact: '', relabelPhone: '', deliveryMethod: '', relabelDeliveryMethod: '', trackingNo: '', reason: '', requirement: '', relabel: false, remark: '', labelDeadline: '', estimatedArrivalAt: '', estimatedShipAt: '', fbaShipmentNo: '', volumeCbm: 0.01 })
  cargoRows.value = []
  transferRelabelRows.value = []
@@ -490,7 +501,7 @@ function clearTransferRelabelRows() {
 function addSkuRelabelRow() {
  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: '', originalSku: source?.sku || '', newSku: '', quantity: 1,
+    cartonMark: hideReturnSkuCartonMark.value ? source?.cartonMark || '' : '', originalSku: source?.sku || '', newSku: '', quantity: 1,
    fbaCartonMark: '', destinationWarehouseId: form.destination, remark: '' })
 }
 function removeSkuRelabelRow(id: number) { skuRelabelRows.value = skuRelabelRows.value.filter((row) => row.id !== id) }
@@ -532,6 +543,16 @@ 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) || []
@@ -546,7 +567,20 @@ function buildSkuRelabelItems(): RelabelCreate['items'] {
    throw new Error('填写的箱唛数量超过当前入仓单可用库存箱数')
  }
  return [...groups.entries()].map(([_, rows], groupIndex) => {
-    const source = cargoRows.value.find((item) => item.id === rows[0].sourceRowId) || anchors[groupIndex]
+    const source = isReturnRelabelSource.value
+      ? cargoRows.value.find(item => 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，请先合箱后申请箱唛或混贴')
+      const requested = new Map<string, number>()
+      for (const row of rows) {
+        const quantity = (requested.get(row.originalSku) || 0) + row.quantity
+        requested.set(row.originalSku, quantity)
+        if (quantity > Number(candidate?.skuItems?.find(item => item.skuCode === row.originalSku)?.quantity || 0)) throw new Error(`SKU ${row.originalSku} 超过来源箱可用数量`)
+      }
+    }
    if (!source?.returnCartonId && (!source?.sourceInventoryBalanceId || !source.sourceInventoryPositionId || !source.sourceInboundOrderId)) {
      throw new Error('来源库存已变化，请重新选择有库存的历史入仓单')
    }
@@ -949,48 +983,18 @@ function listRowActions(candidate: object): TableAction[] {
  if (canConfirmRelabel.value && props.service === 'labeling' && item.__status === 'CUSTOMER_CONFIRM_PENDING' && !item.__confirmedAt) actions.push({ key: 'confirm-relabel', label: '确认换标', run: () => confirmRelabelFromList(item['0']) })
  return actions
 }
-async function submitReturnRelabel() {
-  const items = returnRelabelSkuRows.value.filter(item => item.selected)
-    .map(item => ({ skuCode: item.skuCode, quantity: Number(item.quantity) }))
-  if (!selectedReturnOrderNo.value || !items.length) { ElMessage.warning('请至少选择一个需要贴标的 SKU'); return }
-  if (items.some(item => item.quantity < 1 || item.quantity > (returnRelabelSkuRows.value.find(row => row.skuCode === item.skuCode)?.availableQuantity || 0))) {
-    ElMessage.warning('本次贴标数量必须大于 0，且不能超过该 SKU 的库存总数'); return
-  }
-  const destination = fbaWarehouses.value.find(warehouse => warehouse.warehouseCode === form.destination)
-  if (!destination) { ElMessage.warning('请选择 FBA 目的仓'); return }
-  const selectedFile = cartonTotalFile.value || skuTotalFile.value
-  const fileScope = cartonTotalFile.value ? 'CARTON_TOTAL' as const : 'SKU_TOTAL' as const
-  if (!selectedFile) { ElMessage.warning('请上传箱唛总文件或 SKU 总文件（二选一）'); return }
-  try { await ElMessageBox.confirm(`确认提交退货单 ${selectedReturnOrderNo.value} 的贴标申请吗？`, '提交确认', { confirmButtonText: '提交', cancelButtonText: '取消' }) } catch { return }
-  saving.value = true
-  try {
-    const created = await createReturnRelabel(selectedReturnOrderNo.value, {
-      items,
-      fileScope,
-      destinationFbaWarehouseId: String(destination.id),
-      destinationFbaWarehouseCode: destination.warehouseCode,
-      cartonRemark: form.remark.trim() || undefined,
-      idempotencyKey: createIdempotencyKey(),
-    })
-    await uploadReturnRelabelFile(created.relabelNo, fileScope, selectedFile)
-    ElMessage.success(`贴标申请 ${created.relabelNo} 已提交，等待审核`)
-    await router.push({ name: 'overseas-labeling' })
-  } catch (error) { ElMessage.error(error instanceof Error ? error.message : '退货贴标申请提交失败，请重试') }
-  finally { saving.value = false }
-}
 watch([page, pageSize], ([nextPage, nextSize], [previousPage, previousSize]) => {
  if (nextSize !== previousSize && nextPage !== 1) { page.value = 1; return }
  void load()
 })
 async function submit(action: 'draft' | 'submit' = 'submit') {
-  if (isReturnRelabelSource.value) { await submitReturnRelabel(); return }
  const primaryWarehouse = props.service === 'relabel' ? form.sourceWarehouse : form.warehouse
  const relabelRows = labelingMode.value === 'carton' ? cartonDetailRows.value : skuRelabelRows.value
  const invalidCargo = props.service === 'disposal'
    ? !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) => !item.cartonMark || !item.originalSku || !item.newSku || item.quantity < 1
+      ? skuRelabelRows.value.some((item) => (!hideReturnSkuCartonMark.value && !item.cartonMark) || !item.originalSku || !item.newSku || item.quantity < 1
        || (labelingMode.value === 'carton_and_sku' && !item.fbaCartonMark))
      : cargoRows.value.some((item) => (props.service !== 'labeling' && !item.sku) || !item.name
        || (props.service !== 'labeling' && item.quantity < 1))))
@@ -1019,7 +1023,7 @@ async function submit(action: 'draft' | 'submit' = 'submit') {
  if (props.service === 'labeling' && labelingMode.value === 'carton' && cartonDetailRows.value.some((item) => !item.shipmentNo || !item.cartonMark || !item.fbaCartonMark)) {
    ElMessage.warning('请上传关联面单，确保每箱的我方箱唛和 FBA 箱唛完整'); return
  }
-  if (props.service === 'labeling' && labelingMode.value === 'carton' && cartonDetailRows.value.some((item) => !item.sourceInventoryPositionId)) {
+  if (props.service === 'labeling' && labelingMode.value === 'carton' && cartonDetailRows.value.some((item) => !item.returnCartonId && !item.sourceInventoryPositionId)) {
    ElMessage.warning('请选择有库存的历史入仓单'); return
  }
  if (props.service === 'disposal' && !form.reason) {
@@ -1061,6 +1065,8 @@ async function submit(action: 'draft' | 'submit' = 'submit') {
      const items = labelingMode.value === 'carton'
        ? cartonDetailRows.value.map((item) => ({ sourceInventoryBalanceId: item.sourceInventoryBalanceId, sourceInventoryPositionId: item.sourceInventoryPositionId, sourceInboundOrderId: item.sourceInboundOrderId, returnCartonId: item.returnCartonId, skuCode: item.sku, productNameZh: item.name, totalPackageCount: 1, notifiedPackageCount: 1, shipmentNo: item.shipmentNo, trackingCode: form.trackingNo || undefined, newSkuCode: undefined, labelRequirement: form.requirement || undefined, cartonMark: item.cartonMark, fbaCartonMark: item.fbaCartonMark, destinationFbaWarehouseCode: form.destination, operationType: 'CARTON_LABEL' as const, skuItems: [], remark: item.remark || undefined }))
        : buildSkuRelabelItems()
+      const selectedOperationType = labelingMode.value === 'carton' ? 'CARTON_LABEL' : labelingMode.value === 'sku' ? 'SKU_LABEL' : 'CARTON_AND_SKU'
+      if (items.some(item => item.operationType !== selectedOperationType)) throw new Error('一张申请只能选择一种换标类型，请核对绑定明细')
      const created = await createRelabel({ customerOrderNo: sourceInboundOrders || '贴标申请', operationWarehouseId: form.warehouse, labelDeadline: form.labelDeadline, contactName: form.contact, contactPhone: form.phone, remark: form.remark || undefined, idempotencyKey, items,
        deliveryMethod: labelingMode.value === 'sku' ? undefined : form.deliveryMethod as 'TRUCK' | 'EXPRESS' | 'TRUCK_PICKUP' | 'EXPRESS_PICKUP',
        printShippingLabel: labelingMode.value !== 'sku' && (form.deliveryMethod === 'EXPRESS' || form.deliveryMethod === 'EXPRESS_PICKUP') && form.relabel })
@@ -1399,34 +1405,17 @@ function selectRelabelInventory(inboundOrderId: string) {
  const rows: CargoRow[] = []
  const selectedCandidates = relabelCandidates.value.filter((item) => {
    const returnOrderNo = item.inboundOrderNo || String(item.returnCartonId || '')
-    return (item.sourceType === 'RETURN_CARTON' ? `RETURN_ORDER:${returnOrderNo}` : String(item.inboundOrderId)) === inboundOrderId
+    return (item.returnCartonId ? `RETURN_ORDER:${returnOrderNo}` : String(item.inboundOrderId)) === inboundOrderId
  })
-  returnRelabelSkuRows.value = []
  if (inboundOrderId.startsWith('RETURN_ORDER:')) {
-    const grouped = new Map<string, ReturnRelabelSkuRow>()
-    for (const candidate of selectedCandidates) {
-      const skuItems = candidate.skuItems?.length
-        ? candidate.skuItems
-        : candidate.skuCode ? [{ skuCode: candidate.skuCode, quantity: inventoryQuantity(candidate.availablePackages) }] : []
-      for (const item of skuItems) {
-        const skuCode = item.skuCode.trim()
-        if (!skuCode) continue
-        const key = skuCode.toUpperCase()
-        const current = grouped.get(key)
-        const quantity = inventoryQuantity(item.quantity)
-        if (current) current.availableQuantity += quantity
-        else grouped.set(key, {
-          skuCode,
-          productNameZh: candidate.skuCode?.trim().toUpperCase() === key ? (candidate.productNameZh || '') : '',
-          availableQuantity: quantity,
-          selected: false,
-          // 可贴库存和本次申请数量是两个概念；重复换标时默认不应自动带入上次/首个箱子的数量。
-          quantity: 0,
-        })
-      }
-    }
-    returnRelabelSkuRows.value = [...grouped.values()]
    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,
+      returnCartonId: String(candidate.returnCartonId), sourceInboundOrderNo: candidate.inboundOrderNo,
+      fnsku: '', shipmentNo: candidate.inboundOrderNo || '', newSkuCode: '', shippingMark: '', customerCartonMarks: '',
+      cartonMark: candidate.cartonMark || '', fbaCartonMark: '', destinationWarehouseId: '', remark: '',
+    })
  } else for (const candidate of selectedCandidates) {
    for (const position of candidate.positions) rows.push(...Array.from({ length: Math.min(inventoryQuantity(position.availablePackages), 500) }, () => ({
        id: ++cargoSequence, sku: candidate.skuCode || '', name: candidate.productNameZh || '库存货物',
@@ -1440,7 +1429,7 @@ function selectRelabelInventory(inboundOrderId: string) {
      })))
  }
  cargoRows.value = rows.slice(0, 500)
-  if (cargoRows.value.length) cargoRows.value[0].included = true
+  if (cargoRows.value.length && !inboundOrderId.startsWith('RETURN_ORDER:')) cargoRows.value[0].included = true
  skuRelabelRows.value = []
  importedRelabelBindings.value = []
  shippingLabelFile.value = null
@@ -1448,6 +1437,22 @@ function selectRelabelInventory(inboundOrderId: string) {
  skuTotalFile.value = null
  if (!isReturnRelabelSource.value && labelingMode.value !== 'carton') addSkuRelabelRow()
 }
+function addReturnSkuBinding(source: RelabelInventoryCandidate, skuCode: string) {
+  const sku = source.skuItems?.find(item => item.skuCode === skuCode)
+  if (!sku) return
+  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: '' })
+}
+function addReturnBoxBinding(source: RelabelInventoryCandidate) {
+  if (labelingMode.value !== 'carton') {
+    for (const sku of source.skuItems || []) addReturnSkuBinding(source, sku.skuCode)
+    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: '' })
+}
 </script>

 <template>
@@ -1467,8 +1472,17 @@ function selectRelabelInventory(inboundOrderId: string) {
    <template v-else-if="mode === 'create' || mode === 'edit'">
      <div class="warehouse-page-heading"><h2>{{ mode === 'edit' ? `编辑转运草稿 ${editingTransferNo}` : config.createTitle }}</h2><el-button @click="returnToList"><ArrowLeft :size="16" />返回列表</el-button></div>
      <form :class="{ 'warehouse-transfer-form': props.service === 'transfer', 'warehouse-transfer-form--relabel': props.service === 'transfer' && form.relabel }" @submit.prevent="submit('submit')">
-        <div class="warehouse-card warehouse-form-section warehouse-transfer-main-card"><h3>{{ props.service === 'transfer' ? '转运信息' : props.service === 'relabel' ? '退货信息' : props.service === 'labeling' ? '订单信息' : '基础信息' }}</h3>
-          <div class="warehouse-form-grid">
+        <div class="warehouse-card warehouse-form-section warehouse-transfer-main-card">
+          <div v-if="props.service === 'labeling'" class="warehouse-order-info-heading">
+            <h3>订单信息</h3>
+            <el-button text type="primary" native-type="button" :aria-expanded="!orderInfoCollapsed" @click="orderInfoCollapsed = !orderInfoCollapsed">{{ orderInfoCollapsed ? '展开信息' : '收起信息' }}</el-button>
+          </div>
+          <h3 v-else>{{ props.service === 'transfer' ? '转运信息' : props.service === 'relabel' ? '退货信息' : '基础信息' }}</h3>
+          <div v-if="props.service === 'labeling' && orderInfoCollapsed" class="warehouse-order-info-summary">
+            <span>{{ operationWarehouses.find(item => String(item.id) === form.warehouse)?.warehouseName || '未选择操作仓' }}</span>
+            <span>{{ relabelInboundOptions.find(item => item.value === selectedRelabelInboundOrderId)?.inboundOrderNo || '未选择来源单据' }}</span>
+          </div>
+          <div v-show="props.service !== 'labeling' || !orderInfoCollapsed" class="warehouse-form-grid">
            <label v-if="props.service === 'disposal'" class="warehouse-disposal-field"><span><i>*</i>操作仓</span><el-select v-model="form.warehouse" filterable clearable :loading="fbaWarehousesLoading" :disabled="Boolean(operationWarehousesError)" placeholder="请选择海外仓" @change="selectDiscardWarehouse"><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><small v-else class="warehouse-hint">请先选择本次废弃货物所在的海外仓。</small></label>
            <label v-if="props.service === 'disposal'" class="warehouse-disposal-field"><span><i>*</i>选择入库单</span><el-select v-model="selectedDiscardOrderId" filterable clearable :loading="discardCandidatesLoading" :disabled="!form.warehouse" no-data-text="当前海外仓暂无可废弃库存" placeholder="请先选择操作仓，再选择有可用库存的入库单" @change="selectDiscardInbound"><el-option v-for="candidate in discardCandidates" :key="candidate.orderId" :label="candidate.sourceType === 'RETURN_CARTON' ? `退货｜${candidate.inboundOrderNo || '—'}｜${candidate.cartonMark || '—'}｜可用 ${candidate.availablePackages}` : `${candidate.inboundOrderNo || candidate.inboundCode || '—'}｜${candidate.inboundCode || '—'}｜可用 ${candidate.availablePackages} 箱`" :value="candidate.orderId" /></el-select><small class="warehouse-hint">显示当前操作仓内有可用数量的普通入库库存和退货库存。</small></label>
            <label v-if="props.service === 'relabel'"><span><i>*</i>进仓编号</span><el-input v-model="form.inboundNo" placeholder="请输入已有入仓编号" /></label>
@@ -1520,7 +1534,7 @@ function selectRelabelInventory(inboundOrderId: string) {
            <div class="warehouse-section-heading warehouse-labeling-heading">
              <div><h3>货物明细</h3></div>
            </div>
-            <div class="warehouse-file-groups" :class="{ 'warehouse-file-groups--single': isReturnRelabelSource }">
+            <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-options">
@@ -1529,7 +1543,7 @@ function selectRelabelInventory(inboundOrderId: string) {
                  <div class="warehouse-file-option" :class="{ 'is-selected': Boolean(skuTotalFile) }"><div class="warehouse-file-option__name"><strong>SKU 总文件</strong></div><el-button native-type="button" :type="skuTotalFile ? 'primary' : 'default'" plain @click="chooseCreateTotalFile('SKU_TOTAL')"><Upload :size="15" />{{ skuTotalFile ? '重新上传' : '选择文件' }}</el-button><div class="warehouse-file-option__status" :class="{ 'is-empty': !skuTotalFile }"><span>{{ skuTotalFile?.name || '尚未选择文件' }}</span><button v-if="skuTotalFile" type="button" class="warehouse-file-clear" title="清除 SKU 总文件" aria-label="清除 SKU 总文件" :disabled="saving" @click="clearCreateTotalFile('SKU_TOTAL')"><X :size="14" /></button></div></div>
                </div>
              </section>
-              <section v-if="!isReturnRelabelSource" class="warehouse-file-group">
+              <section class="warehouse-file-group">
                <div class="warehouse-file-group__heading"><div><strong><span>2</span>明细关联模板</strong></div><em>按需使用</em></div>
                <div class="warehouse-template-list">
                  <div><span><strong>SKU 关联</strong></span><el-button size="small" :disabled="!cargoRows.length" @click="downloadRelabelTemplate('sku')"><Download :size="15" />下载模板</el-button><el-button type="primary" plain size="small" :disabled="!cargoRows.length" @click="skuTemplateInput?.click()"><Upload :size="15" />上传文件</el-button></div>
@@ -1540,30 +1554,34 @@ function selectRelabelInventory(inboundOrderId: string) {
            </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">
            <div v-if="isReturnRelabelSource" class="warehouse-table-scroll">
-              <table class="warehouse-edit-table warehouse-return-relabel-table">
-                <thead><tr><th>选择</th><th>SKU</th><th>中文品名</th><th>库存总数</th><th>本次贴标数量</th></tr></thead>
-                <tbody><tr v-for="row in returnRelabelSkuRows" :key="row.skuCode"><td><el-checkbox :model-value="row.selected" @change="row.selected = Boolean($event)" /></td><td><strong>{{ row.skuCode }}</strong></td><td>{{ row.productNameZh || '—' }}</td><td><strong>{{ row.availableQuantity }}</strong></td><td><el-input-number v-model="row.quantity" :disabled="!row.selected" :min="1" :max="row.availableQuantity" :precision="0" controls-position="right" placeholder="请输入贴标数量" /></td></tr><tr v-if="returnRelabelSkuRows.length === 0"><td colspan="5"><div class="warehouse-empty">该退货单暂无可申请贴标的 SKU 库存</div></td></tr></tbody>
-              </table>
+              <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>
+              </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>
+              </template>
            </div>
-            <div v-if="!isReturnRelabelSource" class="warehouse-labeling-mode">
+            <div class="warehouse-labeling-mode">
              <span>换标类型</span>
              <el-radio-group v-model="labelingMode" aria-label="换标类型">
-                <el-radio-button value="carton">只换箱唛</el-radio-button>
+                <el-radio-button value="carton" :disabled="returnSkuOnly">只换箱唛</el-radio-button>
                <el-radio-button value="sku">只换 SKU 标签</el-radio-button>
-                <el-radio-button value="carton_and_sku">SKU 和箱唛都换</el-radio-button>
+                <el-radio-button value="carton_and_sku" :disabled="returnSkuOnly">SKU 和箱唛都换</el-radio-button>
              </el-radio-group>
            </div>
-            <div v-if="!isReturnRelabelSource && importedRelabelBindings.length" class="warehouse-import-preview">
+            <div v-if="importedRelabelBindings.length" class="warehouse-import-preview">
              <div class="warehouse-section-heading"><div><strong>待导入绑定关系</strong><p>可只勾选本次需要换标的部分，也可以全选后一次导入。</p></div><div><el-checkbox :model-value="importedRelabelBindings.every((item) => item.selected)" @change="selectAllImportedBindings(Boolean($event))">全选</el-checkbox><el-button type="primary" size="small" @click="importSelectedBindingsToDetails">导入到明细</el-button></div></div>
              <div class="warehouse-table-scroll"><table class="warehouse-binding-preview-table"><thead><tr><th>选择</th><th>关系类型</th><th>仓库唛头</th><th>旧 SKU</th><th>新 SKU</th><th>数量</th><th>新 FBA 箱唛</th></tr></thead><tbody><tr v-for="item in importedRelabelBindings" :key="item.id"><td><el-checkbox v-model="item.selected" /></td><td>{{ item.templateType === 'mixed' ? 'SKU 混箱换标' : item.templateType === 'carton' ? '箱号关联' : 'SKU 关联' }}</td><td>{{ item.cartonMark }}</td><td>{{ item.originalSku || '—' }}</td><td>{{ item.newSku || '—' }}</td><td>{{ item.quantity }}</td><td>{{ item.fbaCartonMark || '—' }}</td></tr></tbody></table></div>
            </div>
-            <div v-if="!isReturnRelabelSource" class="warehouse-section-heading warehouse-tab-actions">
+            <div class="warehouse-section-heading warehouse-tab-actions">
              <div><strong>绑定明细</strong></div>
              <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="!isReturnRelabelSource && 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>仓库唛头 *</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><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="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" 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>
          </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>
@@ -1574,7 +1592,7 @@ function selectRelabelInventory(inboundOrderId: string) {
          <div class="warehouse-section-heading warehouse-labeling-heading warehouse-step-heading"><div><h3><span class="warehouse-step-number">2</span>换标申请</h3></div></div>
          <div class="warehouse-form-grid warehouse-transfer-relabel-fields"><label><span><i>*</i>换标截止时间</span><el-date-picker v-model="form.labelDeadline" type="datetime" value-format="YYYY-MM-DDTHH:mm:ss" placeholder="请选择截止时间" /></label><label><span><i>*</i>换标联系人</span><el-input v-model="form.relabelContact" placeholder="选择海外仓后自动带出，也可手动填写" maxlength="128" /></label><label><span><i>*</i>换标联系人电话</span><el-input v-model="form.relabelPhone" placeholder="选择海外仓后自动带出，也可手动填写" maxlength="64" /></label><label v-if="labelingMode !== 'sku'"><span><i>*</i>换标后派送方式</span><el-select v-model="form.relabelDeliveryMethod" placeholder="请选择派送方式"><el-option label="卡车派送" value="TRUCK" /><el-option label="快递派送" value="EXPRESS" /><el-option label="卡车自提" value="TRUCK_PICKUP" /><el-option label="快递自提" value="EXPRESS_PICKUP" /></el-select></label><label class="warehouse-span-2"><span><i>*</i>整票换标货物目的 FBA 仓</span><el-select v-model="transferRelabelDefaultDestination" :loading="fbaWarehousesLoading" :disabled="Boolean(fbaWarehousesError)" filterable placeholder="请选择整票货物的目的仓"><el-option v-for="warehouse in fbaWarehouses" :key="warehouse.id" :label="warehouseLabel(warehouse)" :value="warehouse.warehouseCode" /></el-select><small class="warehouse-hint">本票所有换标货物统一前往该目的仓，暂不支持一票多个目的仓。</small></label><label class="warehouse-span-2"><span>贴标要求</span><el-input v-model="form.requirement" type="textarea" :rows="2" maxlength="1000" show-word-limit placeholder="请输入贴标要求（选填）" /></label></div>
          <div class="warehouse-labeling-mode"><span>换标类型</span><el-radio-group v-model="labelingMode" aria-label="换标类型"><el-radio-button value="carton">只换箱唛</el-radio-button><el-radio-button value="sku">只换 SKU 标签</el-radio-button><el-radio-button value="carton_and_sku">SKU 和箱唛都换</el-radio-button></el-radio-group></div>
-          <div class="warehouse-transfer-file-groups">
+          <div class="warehouse-transfer-file-groups warehouse-file-groups--compact">
          <section v-if="canManageRelabelFiles" class="warehouse-file-group warehouse-transfer-total-files">
            <div class="warehouse-file-group__heading"><div><strong>贴标总文件</strong></div><em>{{ requiresBothTotalFiles ? '必传 · 两份文件' : '必传 · 二选一' }}</em></div>
            <div class="warehouse-file-options">
@@ -1652,6 +1670,65 @@ function selectRelabelInventory(inboundOrderId: string) {
 </template>

 <style scoped>
+.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; }
+.warehouse-service-page--return-relabel .warehouse-transfer-cargo-card .warehouse-labeling-mode {
+  width: fit-content;
+  max-width: 1296px;
+  box-sizing: border-box;
+  border: 1px solid #e2e8f0;
+  border-radius: 8px;
+  background: #f8fafc;
+  padding: 8px 12px;
+  gap: 14px;
+  margin: 20px 0 22px;
+}
+.warehouse-service-page--return-relabel .warehouse-transfer-cargo-card .warehouse-labeling-mode > span {
+  color: #475569;
+  font-size: 12px;
+}
+.warehouse-service-page--return-relabel .warehouse-transfer-cargo-card .warehouse-table-scroll th {
+  background: #f0f5fc;
+  color: #385579;
+  border-bottom: 1px solid #dce6f2;
+  height: 38px;
+  font-weight: 600;
+}
+.warehouse-service-page--return-relabel .warehouse-labeling-mode :deep(.el-radio-button) {
+  --el-color-primary: #2563eb;
+  --el-radio-button-checked-bg-color: #2563eb;
+  --el-radio-button-checked-border-color: #2563eb;
+}
+.warehouse-service-page--return-relabel .warehouse-labeling-mode :deep(.el-radio-button:not(.is-disabled) .el-radio-button__inner) {
+  border-color: #cbdaf0;
+}
+.warehouse-service-page--return-relabel .warehouse-labeling-mode :deep(.el-radio-group) { gap: 6px; }
+.warehouse-service-page--return-relabel .warehouse-labeling-mode :deep(.el-radio-button .el-radio-button__inner) {
+  padding: 8px 12px;
+  border: 1px solid #dce3ec;
+  border-radius: 5px;
+  box-shadow: none;
+  font-size: 12px;
+}
+.warehouse-service-page--return-relabel .warehouse-labeling-mode :deep(.el-radio-button.is-disabled .el-radio-button__inner) {
+  color: #a3adbb;
+  background: #f1f4f8;
+  border-color: #e5eaf0;
+}
+.warehouse-service-page--return-relabel .warehouse-transfer-cargo-card .warehouse-table-scroll td { padding: 10px 12px; }
+.warehouse-service-page--return-relabel .warehouse-transfer-cargo-card .warehouse-table-scroll h3 {
+  font-size: 14px;
+  margin-bottom: 12px;
+  padding-bottom: 10px;
+}
+.warehouse-service-page--return-relabel .warehouse-transfer-cargo-card .warehouse-sku-label-table :deep(.el-input__wrapper) {
+  min-height: 30px;
+  box-shadow: 0 0 0 1px #dce3ec inset;
+  border-radius: 5px;
+}
+.warehouse-service-page--return-relabel .warehouse-transfer-cargo-card .warehouse-sku-label-table :deep(.el-input-number) { width: 120px; }
+.warehouse-service-page--return-relabel .warehouse-transfer-cargo-card .warehouse-tab-actions { margin-bottom: 10px; }
 .warehouse-service-page{display:grid;gap:12px;color:#25324a}.warehouse-breadcrumb{display:flex;align-items:center;gap:9px;margin:0 0 14px;color:#9aa3b2;font-size:12px}.warehouse-breadcrumb b{font-weight:400}.warehouse-breadcrumb strong{color:#606b7c}.warehouse-breadcrumb button{padding:0;border:0;background:transparent;color:#4376b8;cursor:pointer}.warehouse-page-heading{display:flex;align-items:center;justify-content:space-between;margin-bottom:16px}.warehouse-page-heading h2{margin:0;color:#17233a;font-size:22px;letter-spacing:0}.warehouse-card{margin-bottom:0;border:1px solid var(--client-border);border-radius:var(--client-radius);background:#fff;box-shadow:none}.warehouse-filter-card{padding:20px 22px 16px}.warehouse-filter-grid{display:grid;grid-template-columns:repeat(4,minmax(180px,1fr));gap:16px 20px}.warehouse-filter-grid label,.warehouse-form-grid label{display:flex;min-width:0;flex-direction:column;gap:7px}.warehouse-filter-grid label>span,.warehouse-form-grid label>span{color:#596579;font-size:12px}.warehouse-filter-actions{display:flex;justify-content:flex-end;gap:8px;margin-top:18px}.warehouse-table-card{overflow:hidden}.warehouse-list-notice{padding:8px 12px;border-bottom:1px solid var(--client-border);background:#fff8e8;color:#8a6116;font-size:12px}.warehouse-table-scroll{overflow-x:auto}table{width:100%;min-width:940px;border-collapse:collapse;font-size:12px}th{height:44px;padding:0 14px;border-bottom:1px solid #e8edf3;background:#f7f9fc;color:#4d5a6e;font-weight:650;text-align:left;white-space:nowrap}td{height:48px;padding:8px 14px;border-bottom:1px solid #eef1f5;color:#526176;white-space:nowrap}.warehouse-empty{display:grid;height:72px;color:#a0a9b7;place-items:center}.warehouse-link,.warehouse-delete{display:inline-flex;align-items:center;gap:5px;padding:4px;border:0;background:transparent;color:#2176d2;cursor:pointer}.warehouse-delete{color:#d64545}.warehouse-pagination{display:flex;align-items:center;justify-content:flex-end;gap:8px;padding:14px 18px;color:#778398;font-size:12px}.warehouse-pagination span{margin-right:8px}.warehouse-page-number{width:28px;height:28px;border:1px solid #2176d2;border-radius:3px;background:#2176d2;color:#fff}.warehouse-form-section{padding:22px}.warehouse-form-section h3{margin:0 0 18px;padding-bottom:12px;border-bottom:1px solid #edf0f4;color:#26364f;font-size:15px;letter-spacing:0}.warehouse-form-grid{display:grid;grid-template-columns:repeat(2,minmax(240px,1fr));gap:18px 28px}.warehouse-form-grid i{margin-right:3px;color:#e24b4b;font-style:normal}.warehouse-span-2{grid-column:1/-1}.warehouse-section-heading{display:flex;align-items:center;justify-content:space-between}.warehouse-section-heading h3{flex:1}.warehouse-edit-table td{padding:9px 10px}.warehouse-edit-table :deep(.el-input-number){width:130px}.warehouse-hint{margin:12px 0 0;color:#8792a2;font-size:12px}.warehouse-submit-bar{display:flex;justify-content:center;gap:10px;padding:12px 0 30px}.warehouse-detail-grid{display:grid;grid-template-columns:repeat(3,1fr);gap:24px}.warehouse-detail-grid div{display:flex;flex-direction:column;gap:7px}.warehouse-detail-grid span{color:#8a95a5;font-size:12px}.warehouse-detail-grid strong{color:#334157;font-size:13px}:deep(.el-button){border-radius:4px}:deep(.el-button span){display:inline-flex;align-items:center;gap:6px}:deep(.el-select),:deep(.el-date-editor.el-input){width:100%}@media(max-width:1100px){.warehouse-filter-grid{grid-template-columns:repeat(2,1fr)}.warehouse-detail-grid{grid-template-columns:repeat(2,1fr)}}
 .warehouse-service-page--detail{display:block;overflow:hidden;border:1px solid var(--client-border);border-radius:var(--client-radius);background:#fff}.warehouse-detail-header{display:grid;grid-template-columns:auto minmax(0,1fr) auto;align-items:center;gap:14px;min-height:64px;padding:10px 16px;border-bottom:1px solid var(--client-border)}.warehouse-detail-back{display:inline-flex;align-items:center;gap:5px;padding:5px 0;border:0;background:transparent;color:var(--el-color-primary);cursor:pointer}.warehouse-detail-title{display:flex;min-width:0;flex-direction:column;gap:3px}.warehouse-detail-title strong{overflow:hidden;color:#1f2d45;font-size:18px;text-overflow:ellipsis;white-space:nowrap}.warehouse-detail-title span{color:#7c899c;font-size:12px}.warehouse-detail-actions{display:flex;align-items:center;gap:8px}.warehouse-service-page--detail>.warehouse-card{border:0;border-top:1px solid var(--client-border);border-radius:0}.warehouse-service-page--detail>.warehouse-detail-header+.warehouse-card{border-top:0}.warehouse-service-page--detail>.warehouse-form-section{padding:0}.warehouse-service-page--detail .warehouse-form-section h3{min-height:40px;margin:0;padding:11px 16px 9px;border-bottom:1px solid #edf1f5;font-size:14px}.warehouse-service-page--detail .warehouse-detail-grid{grid-template-columns:repeat(4,minmax(0,1fr));gap:0;margin:0}.warehouse-service-page--detail .warehouse-detail-grid>div{min-height:48px;flex-direction:row;align-items:center;gap:10px;padding:8px 14px;border-right:1px solid #edf1f5;border-bottom:1px solid #edf1f5}.warehouse-service-page--detail .warehouse-detail-grid span{flex:0 0 90px}.warehouse-service-page--detail .warehouse-detail-grid strong{min-width:0;overflow-wrap:anywhere}.warehouse-service-page--detail .warehouse-fulfillment-grid{margin-bottom:0}.warehouse-service-page--detail .warehouse-evidence{margin:12px 14px}.warehouse-service-page--detail .warehouse-completion-remark,.warehouse-service-page--detail .warehouse-hint{margin:10px 14px}.warehouse-service-page--detail .warehouse-table-scroll table{margin:0}.warehouse-service-page--detail .warehouse-empty{height:64px}@media(max-width:1100px){.warehouse-service-page--detail .warehouse-detail-grid{grid-template-columns:repeat(2,minmax(0,1fr))}}@media(max-width:720px){.warehouse-detail-header{grid-template-columns:1fr auto}.warehouse-detail-back{grid-column:1/-1}.warehouse-detail-actions{justify-content:flex-end}}
 .warehouse-detail-error{display:flex;min-height:220px;align-items:center;justify-content:center;gap:12px;color:#b42318}
@@ -1667,7 +1744,42 @@ function selectRelabelInventory(inboundOrderId: string) {
 .warehouse-unmaintained{margin-left:8px;color:#e6a23c;font-size:12px;font-style:normal}
 .warehouse-labeling-tabs{margin-top:-8px}.warehouse-labeling-heading{align-items:flex-start}.warehouse-labeling-heading h3{margin-bottom:16px}.warehouse-template-actions{display:flex;gap:8px;padding-bottom:12px}.warehouse-tab-actions{align-items:center;margin:2px 0 14px}.warehouse-tab-actions p{margin:0;color:#7d8797;font-size:12px}.warehouse-tab-actions>div{display:flex;gap:8px}.warehouse-sku-notice{margin:0 0 14px;padding:10px 12px;border:1px solid #f2d39b;border-radius:4px;background:#fff8e8;color:#8a6116;font-size:12px}.warehouse-sku-label-table{min-width:980px}.warehouse-sku-label-table :deep(.el-input-number){width:160px}:deep(.warehouse-labeling-tabs>.el-tabs__header){margin-bottom:18px}:deep(.warehouse-labeling-tabs .el-tabs__item){height:42px;padding:0 26px;font-weight:600}.warehouse-labeling-mode{display:flex;align-items:center;gap:14px;margin:0 0 16px;padding:14px 16px;border:1px solid #dce5f5;border-radius:5px;background:#f7f9ff}.warehouse-labeling-mode>span{color:#34445c;font-size:13px;font-weight:650;white-space:nowrap}.warehouse-labeling-mode p{margin:0;color:#71809a;font-size:12px}.warehouse-labeling-mode :deep(.el-radio-group){display:flex;flex-shrink:0}.warehouse-labeling-mode :deep(.el-radio-button__inner){padding:8px 14px}
 .warehouse-relabel-detail-table{min-width:1420px}.warehouse-relabel-detail-table td strong{color:#253f67}
-.warehouse-service-page--return-relabel .warehouse-table-scroll:has(> .warehouse-return-relabel-table)~.warehouse-table-scroll{display:none}
+.warehouse-file-groups--compact {
+  width: 100%;
+  max-width: 1296px;
+  grid-template-columns: minmax(0, 1fr) minmax(0, 1fr);
+  gap: 16px;
+  align-items: stretch;
+}
+.warehouse-file-groups--compact .warehouse-file-group__heading {
+  padding: 10px 12px;
+  align-items: center;
+}
+.warehouse-file-groups--compact .warehouse-file-options {
+  padding: 10px;
+  grid-template-columns: minmax(0, 1fr) 20px minmax(0, 1fr);
+}
+.warehouse-file-groups--compact .warehouse-file-option {
+  padding: 8px;
+  gap: 8px;
+}
+.warehouse-file-groups--compact .warehouse-file-option__name strong { font-size: 12px; }
+.warehouse-file-groups--compact .warehouse-file-option :deep(.el-button) {
+  padding: 6px 8px;
+  font-size: 12px;
+}
+.warehouse-file-groups--compact .warehouse-template-list { padding: 4px 12px; }
+.warehouse-file-groups--compact .warehouse-template-list > div {
+  grid-template-columns: minmax(0, 1fr) auto auto;
+  padding: 7px 0;
+}
+@media (max-width: 1180px) {
+  .warehouse-file-groups--compact { grid-template-columns: minmax(0, 1fr); }
+}
+@media (max-width: 720px) {
+  .warehouse-file-groups--compact .warehouse-file-options { grid-template-columns: minmax(0, 1fr); }
+  .warehouse-file-groups--compact .warehouse-template-list > div { grid-template-columns: minmax(0, 1fr) auto; }
+}
 .warehouse-native-file{min-height:32px;padding:5px 8px;border:1px solid #dcdfe6;border-radius:4px;background:#fff;color:#606266}.warehouse-fulfillment-grid{margin-bottom:18px}.warehouse-evidence{display:flex;align-items:flex-start;gap:16px;padding:14px;border:1px solid #e7ebf1;border-radius:4px;background:#f8fafc}.warehouse-evidence>span{padding-top:6px;color:#71809a;font-size:12px;white-space:nowrap}.warehouse-evidence>strong{padding-top:6px;color:#8a95a5;font-size:12px;font-weight:400}.warehouse-photo-grid{display:grid;grid-template-columns:repeat(4,140px);gap:12px}.warehouse-photo-item{width:140px;height:105px;overflow:hidden;border:1px solid #dce3ed;border-radius:5px;background:#fff}.warehouse-photo-item :deep(.el-image){display:block;width:100%;height:100%;cursor:zoom-in}.warehouse-photo-placeholder{display:flex;width:100%;height:100%;align-items:center;justify-content:center;padding:10px;border:0;background:#f4f7fb;color:#8792a2;font-size:12px;text-align:center}.warehouse-photo-retry{cursor:pointer}.warehouse-completion-remark{margin:10px 0 0;color:#596579;font-size:12px}
 .warehouse-measurement-evidence{margin-top:16px}
 .warehouse-measurement-photo-grid{flex:1;grid-template-columns:repeat(auto-fill,minmax(240px,1fr))}
@@ -41,7 +41,7 @@ test('贴标申请移除操作项下方的解释文字，保留必要状态', ()
 test('贴标申请可从当前客户仍有库存的入仓单或退货单选择来源', () => {
  assert.match(view, /海外操作仓（中转仓）/)
  assert.match(view, /选择有库存的入仓单或退货单/)
-  assert.match(view, /quantityUnit: candidate\.sourceType === 'RETURN_CARTON' \? '件' : '箱'/)
+  assert.match(view, /quantityUnit: candidate\.returnCartonId \? '件' : '箱'/)
  assert.match(view, /当前中转仓暂无可用库存/)
  assert.match(view, /relabelInboundOptions/)
  assert.match(view, /listRelabelInventoryCandidates\(form\.warehouse\)/)
@@ -96,7 +96,7 @@ test('上传关系支持部分或全量选择后导入本次换标明细', () =>
 })

 test('箱唛换标一行固定代表一箱', () => {
-  const cartonTable = view.match(/<div v-if="!isReturnRelabelSource && labelingMode === 'carton'" class="warehouse-table-scroll">.+?(?=<div v-else class="warehouse-table-scroll">)/s)?.[0]
+  const cartonTable = view.match(/<div v-if="labelingMode === 'carton'" class="warehouse-table-scroll">.+?(?=<div v-else class="warehouse-table-scroll">)/s)?.[0]
  assert.ok(cartonTable)
  assert.match(cartonTable, /<th>箱数<\/th>/)
  assert.match(cartonTable, /<td><strong>1 箱<\/strong><\/td>/)
@@ -141,13 +141,12 @@ test('一次申请单选库存来源且退货库存按退货单汇总', () => {
  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, /interface ReturnRelabelSkuRow/)
-  assert.match(view, /current\.availableQuantity \+= quantity/)
-  assert.match(view, /库存总数/)
-  assert.match(view, /本次贴标数量/)
-  assert.match(view, /returnRelabelSkuRows\.value = \[\.\.\.grouped\.values\(\)\]/)
-  assert.match(view, /createReturnRelabel\(selectedReturnOrderNo\.value/)
-  assert.match(view, /uploadReturnRelabelFile\(created\.relabelNo, fileScope, selectedFile\)/)
+  assert.match(view, /可用散件 SKU/)
+  assert.match(view, /系统箱唛号/)
+  assert.match(view, /箱内 SKU/)
+  assert.match(view, /returnLooseCandidates/)
+  assert.match(view, /returnBoxCandidates/)
+  assert.doesNotMatch(view, /submitReturnRelabel/)
  assert.doesNotMatch(view, /candidate\.sourceType === 'RETURN_CARTON'\) rows\.push\(\.\.\.Array\.from/)
  assert.match(view, /sourceInventoryBalanceId: String\(candidate\.inventoryBalanceId\)/)
  assert.match(view, /sourceInventoryPositionId: String\(position\.positionId\)/)
@@ -155,11 +154,11 @@ test('一次申请单选库存来源且退货库存按退货单汇总', () => {
  assert.match(api, /sourceInventoryBalanceId\?: string; sourceInventoryPositionId\?: string; sourceInboundOrderId\?: string; returnCartonId\?: string/)
 })

-test('退货贴标总文件二选一且提交使用退货专用链路', () => {
+test('退货贴标复用普通申请，混贴要求两份总文件', () => {
  assert.match(view, /cartonTotalFile\.value && !requiresBothTotalFiles\.value\) clearCreateTotalFile\('SKU_TOTAL'\)/)
  assert.match(view, /skuTotalFile\.value && !requiresBothTotalFiles\.value\) clearCreateTotalFile\('CARTON_TOTAL'\)/)
-  assert.match(view, /fileScope = cartonTotalFile\.value \? 'CARTON_TOTAL' as const : 'SKU_TOTAL' as const/)
-  assert.match(view, /destinationFbaWarehouseId: String\(destination\.id\)/)
+  assert.match(view, /const created = await createRelabel/)
+  assert.doesNotMatch(view, /&& !isReturnRelabelSource.value && labelingMode.value === 'carton_and_sku'/)
 })

 test('SKU 和箱唛都换时两份总文件必须同时上传', () => {
@@ -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\)\}\}/)