Merge branch 'release/test' of http://8.163.30.128:10082/html/client-web into release/test

优化
精简采购下单提示并压缩模块间距
2026-10-29 13:37:30 +08:00 · 2026-10-29 13:37:28 +08:00 · 2026-10-29 12:03:31 +08:00 · 2026-10-29 11:39:01 +08:00 · 2026-10-29 10:53:47 +08:00 · 2026-10-28 16:56:33 +08:00
29 changed files with 1012 additions and 354 deletions
@@ -23,10 +23,10 @@
 | 统一订单展示 | `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`、`views/ProcurementView.vue`、`components/ProcurementDetailPanel.vue`、`api/procurement.ts` | 独立列表、新建及详情路由；客户范围只取 Token，创建的 `customerName` 只取认证会话企业名称。详情消费独立客户投影，展示履约、已确认箱明细、实际运单和费用结果，不开放内部文件或平台操作。Backend `lastleg-service/procurement/` |
+| 海外采购 | `src/modules/cross-border/routes.ts`、`views/ProcurementView.vue`、`components/ProcurementDetailPanel.vue`、`api/procurement.ts` | 独立列表、新建及详情路由；客户范围只取 Token，创建的 `customerName` 只取认证会话企业名称。七状态简化流程展示分批收货、分批出库与费用，待客户确认时提供当前客户确认动作；不开放内部文件或平台操作。Backend `lastleg-service/procurement/`；规则见 `baiyue-firstleg/lastleg-service/docs/procurement-workflow.md`（工作区路径） |
 | 美国本土卡与美本土散板 | `src/modules/cross-border/routes.ts`、`components/BusinessOrdersView.vue`、`api/businessOrders.ts` | 两个运输业务共用列表/表单组件，客户范围只取 Token；不消费采购字段或状态。Backend `lastleg-service/` 的 `trucking/`、`looseboard/` 客户接口 |
 | 海外仓入库订单 | `src/modules/order-management/routes.ts`、`views/InboundOrdersView.vue`、`api/inboundPlans.ts` | `orders/inbound` 为只读列表/详情，权限 `merchant:warehouse:inbound:list`；不展示或提交内部 ID |
-| 海外仓贴标、仓储转运、货物废弃 | `src/modules/overseas-warehouse/routes.ts`、`views/WarehouseServiceView.vue`、`api/warehouseServices.ts` | 三个路由均为 `active`；退货预报另见本节独立入口；贴标申请先选国外中转仓和有库存历史入仓单，换标类型为只换 SKU、只换箱唛、SKU+箱唛。涉及箱唛换标时，整张贴标申请只选择一个 FBA 目的仓，全部箱级明细统一提交该目的仓，模板和明细不再逐行选择目的仓。箱唛换标明细一行固定代表一箱，箱数不可编辑，提交也固定为 1。货物明细外层始终提供“SKU 关联”“箱号关联”“SKU 混箱换标”三套模板的下载、上传，不随换标类型切换；上传只进入待导入关系区，客户可勾选部分或全选后导入本次明细，只有进入明细的库存才随申请提交和冻结。明细也支持手动新增编辑，组合换标以仓库唛头连接旧/新 SKU 和新 FBA 箱唛关系。涉及箱唛换标时必须选择卡车、自提或快递；快递可选择打印面单并上传 PDF/图片。PDA 逐箱换标、上传照片并由仓库复核后，客户详情展示完工照片和“换标完成确认”；客户确认前不得继续出库，确认后卡车进入预排车，自提/快递进入换标出库待创建。历史库存位置不能解释成箱唛与具体托盘快照，客户页面不暴露托盘、库位和内部库存 ID |
+| 海外仓贴标、仓储转运、货物废弃 | `src/modules/overseas-warehouse/routes.ts`、`views/WarehouseServiceView.vue`、`api/warehouseServices.ts` | 三个路由均为 `active`；退货预报另见本节独立入口；贴标申请先选国外中转仓和有库存历史入仓单，换标类型为只换 SKU、只换箱唛、SKU+箱唛。涉及箱唛换标时，整张贴标申请只选择一个 FBA 目的仓，全部箱级明细统一提交该目的仓，模板和明细不再逐行选择目的仓。箱唛换标明细一行固定代表一箱，箱数不可编辑，提交也固定为 1。货物明细外层提供统一贴标明细模板，使用“贴标类型”列区分只换箱唛、只换 SKU 标签和 SKU+箱唛三种模式；上传只进入待导入关系区，客户可勾选部分或全选后导入本次明细，同一份文件不得混用多种类型，只有进入明细的库存才随申请提交和冻结。明细也支持手动新增编辑，组合换标以仓库唛头连接旧/新 SKU 和新 FBA 箱唛关系。涉及箱唛换标时必须选择卡车、自提或快递；快递可选择打印面单并上传 PDF/图片。PDA 逐箱换标、上传照片并由仓库复核后，客户详情展示完工照片和“换标完成确认”；客户确认前不得继续出库，确认后卡车进入预排车，自提/快递进入换标出库待创建。历史库存位置不能解释成箱唛与具体托盘快照，客户页面不暴露托盘、库位和内部库存 ID |

 ## Client 全量验收快速索引

@@ -21,7 +21,7 @@
 - 三条线都是客户自助下单，提交后由平台审核；客户侧不提供审核、改价或内部作业动作。
 - 客户与仓库范围只取服务端当前租户上下文，不从前端参数推断；跨客户查询一律拒绝。
 - 提交需要幂等键、提交中状态与可恢复失败反馈；失败保留已填内容。
- 海外采购的购买、装箱、面单、交寄与国内核费是一条独立链路，改节点前先读 `docs/海外仓业务/采购订单样品履约流程变更需求.md`（工作区路径）。
+- 海外采购按 `baiyue-firstleg/lastleg-service/docs/procurement-workflow.md`（工作区路径）的七状态流程执行；详情展示分批收货、出库与费用，待客户确认时由当前客户确认，不恢复旧装箱与两段核费节点。
 - 页面承载方式按已确认原型：列表 + 独立建单/详情路由，不改为弹框或抽屉。

 ## 验证
@@ -32,3 +32,6 @@
 | 两类业务 | 列表、详情、承运安排 | 既有独立路由及只读承运摘要 | 本轮不改变承载；Client 不新增编辑路由 | 既有行为回归 |

 统一表单组件和转换逻辑各自位于应用内部，运行时不跨应用引用。两端业务组件源码一致性另作定向检查；下单数据不允许混入客户标识，Admin 在 API 参数显式选择客户，Client 由认证会话确定客户。
+
+
+2026-10-29 用户截图调整：采购待确认支持确认或必填原因驳回；四张实收/库存数量卡片置顶，商品及收件信息置底。本土卡车数量改托数，托数及预算须为正数。采购及卡车先等待Finance余额/授信冻结成功，再以同一幂等键建单；不足保留表单并提示原因。自动检查与人工视觉验收分别记录；待人工1920×1080、100%截图确认。
@@ -95,7 +95,7 @@ export interface TruckCreate {
  destinationContactPhone: string
  pickupAt: string
  deliveryAt: string
-  packageCount: number
+  palletCount: number
  totalWeightKg: number
  totalVolumeCbm: number
  budgetAmount?: number
@@ -0,0 +1,13 @@
+import { apiRequest } from '@/api/http'
+interface BudgetResult { status: string; usable: boolean; amountCny: number | string; message: string; orderNo: string | null }
+const base = '/merchant/v1/last-leg/order-budgets'
+// 资金回执成功才继续下单；超时保留当前幂等键，允许用户再次核对。
+export async function requireOrderBudget(kind: 'procurement' | 'trucking', key: string, amount: number, currency: string) {
+  const url = `${base}/${kind}/${encodeURIComponent(key)}`
+  let result = await apiRequest<BudgetResult>({ method: 'POST', url, data: { amount, currency } })
+  for (let attempt = 0; result.status === 'FREEZE_PENDING' && attempt < 12; attempt++) {
+    await new Promise(resolve => setTimeout(resolve, 1000))
+    result = await apiRequest<BudgetResult>({ method: 'GET', url })
+  }
+  if (!result.usable) throw new Error(result.message || '余额及授信校验未完成，请稍后重试')
+}
@@ -1,8 +1,9 @@
-import { apiRequest } from '@/api/http'
+import { apiBlobRequest, apiRequest } from '@/api/http'
 import type { PageResult } from './businessOrders'

 export type Amount = number | string
 export interface ProcurementSummary {
+  procurementDirection?: import('../procurementPresentation').ProcurementDirection
  orderNo: string
  purchaseCategory: string
  productName: string
@@ -73,6 +74,7 @@ export interface ProcurementDetail {
  exceptionSummaries: string[]
 }
 export interface ProcurementCreate {
+  procurementDirection?: import('../procurementPresentation').ProcurementDirection
  customerName: string
  purchaseCategory: string
  productName: string
@@ -95,6 +97,37 @@ export interface ProcurementQuery {
  purchaseCategory?: string
  status?: string
 }
+export interface ProcurementWorkflowFile { fileId: string; fileName: string; contentType: string }
+export interface ProcurementReceipt {
+  id: string
+  quantity: number
+  fileIds: string[]
+  receivedAt: string
+}
+export interface ProcurementOutbound {
+  id: string
+  outboundNo: string
+  quantity: number
+  trackingNo: string
+  status: string
+  fileIds: string[]
+  createdAt: string
+  completedAt: string | null
+}
+export interface ProcurementWorkflow {
+  orderNo: string
+  version: number
+  status: string
+  rejectionReason: string | null
+  photosNeedUpdate: boolean
+  receivedQuantity: number
+  stockQuantity: number
+  reservedQuantity: number
+  availableQuantity: number
+  files: ProcurementWorkflowFile[]
+  receipts: ProcurementReceipt[]
+  outbounds: ProcurementOutbound[]
+}
 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 })
@@ -106,3 +139,16 @@ export function getProcurement(orderNo: string) {
 export function createProcurement(data: ProcurementCreate) {
  return apiRequest<ProcurementDetail>({ method: 'POST', url: endpoint, data })
 }
+export function getProcurementWorkflow(orderNo: string) {
+  return apiRequest<ProcurementWorkflow>({ method: 'GET', url: `${endpoint}/${encodeURIComponent(orderNo)}/workflow` })
+}
+export function confirmProcurement(orderNo: string, data: { version: number; idempotencyKey: string }) {
+  return apiRequest<ProcurementWorkflow>({ method: 'POST', url: `${endpoint}/${encodeURIComponent(orderNo)}/confirm`, data })
+}
+
+export function rejectProcurement(orderNo: string, data: { version: number; idempotencyKey: string; reason: string }) {
+  return apiRequest<ProcurementWorkflow>({ method: 'POST', url: `${endpoint}/${encodeURIComponent(orderNo)}/reject`, data })
+}
+export function getProcurementFile(orderNo: string, fileId: string) {
+  return apiBlobRequest({ method: 'GET', url: `${endpoint}/${encodeURIComponent(orderNo)}/files/${encodeURIComponent(fileId)}/content` })
+}
@@ -32,7 +32,7 @@ test('renders unknown pallet service and container type as dashes while preservi
 test('shows merchant-owned arrangement facts without a pool request or editable status control', () => {
  assert.match(api, /fleetArrangement: import\('\.\.\/fleetArrangement'\)\.FleetArrangement \| null/)
  assert.match(view, /aria-label="承运安排"/)
-  for (const field of ['signedPackages', 'unsignedPackages', 'returnedPackages', 'readOnlyReason']) assert.ok(view.includes(`fleetArrangement.${field}`))
+  for (const field of ['signedPackages', 'unsignedPackages', 'returnedPackages']) assert.ok(view.includes(`fleetArrangement.${field}`))
  assert.doesNotMatch(api, /capacity-offers|fleet\/trips/)
  assert.match(view, /if \(query\.page !== 1\) query\.page = 1\s+else void load\(\)/)
  assert.match(view, /if \(reloadDirectly\) void load\(\)/)
@@ -119,7 +119,7 @@ test('uses the shared dense order-list and detail visual language', () => {
  assert.match(view, /\.detail-grid div \{[^}]*min-height: 34px;[^}]*grid-template-columns: 76px minmax\(0, 1fr\)/)
 })

-function transportHarness(kind = 'trucking', failFirst = false) {
+function transportHarness(kind = 'trucking', failFirst = false, budgetCheck = async () => {}) {
  const calls = []
  const script = view.match(/<script setup lang="ts">([\s\S]*?)<\/script>/)[1]
  const compiled = ts.transpileModule(script, { compilerOptions: { target: ts.ScriptTarget.ES2022, module: ts.ModuleKind.ESNext } }).outputText
@@ -130,7 +130,7 @@ function transportHarness(kind = 'trucking', failFirst = false) {
    computed: getter => ({ get value() { return typeof getter === 'function' ? getter() : getter.get() } }),
    reactive: value => value, ref: value => ({ value }), onMounted: () => {}, watch: () => {},
    useAuthStore: () => ({ hasPermission: () => true }), useRouter: () => ({ push: async () => {} }), useRoute: () => ({ params: {} }),
-    ...demandHelpers, poolOrderStatusLabels: {},
+    ...demandHelpers, poolOrderStatusLabels: {}, requireOrderBudget: budgetCheck,
    ElMessage: { success: () => {}, error: () => {} },
    createTransport: async (business, payload) => { calls.push({ business, payload: { ...payload } }); if (failFirst && calls.length === 1) throw new Error('retry'); },
  })
@@ -150,12 +150,12 @@ test('truck requires both contacts vehicle and minute times without inheriting l
  truck.form.pickupAt = '2026-10-20T09:30:00'
  let failure
  truck.rules.value.deliveryAt[1].validator({}, '2026-10-20T09:29:00', error => { failure = error })
-  assert.equal(failure.message, '送货时间不能早于取货时间')
+  assert.equal(failure.message, '送达时间不能早于取货时间')
 })

 test('truck retry submits the complete new contract with identical local times and idempotency key', async () => {
  const current = transportHarness('trucking', true)
-  Object.assign(current.form, { vehicleType: 'PALLET_30', origin: 'Los Angeles', destination: 'Ontario', originContactName: 'A', originContactPhone: '+1-555-0100', destinationContactName: 'B', destinationContactPhone: '+1-555-0101', pickupAt: '2026-10-20T09:30:00', deliveryAt: '2026-10-20T15:45:00' })
+  Object.assign(current.form, { vehicleType: 'PALLET_30', estimatedPalletCount: 3, budgetAmount: 100, origin: 'Los Angeles', destination: 'Ontario', originContactName: 'A', originContactPhone: '+1-555-0100', destinationContactName: 'B', destinationContactPhone: '+1-555-0101', pickupAt: '2026-10-20T09:30:00', deliveryAt: '2026-10-20T15:45:00' })
  await current.submit()
  assert.equal(current.form.destinationContactName, 'B')
  await current.submit()
@@ -164,11 +164,12 @@ test('truck retry submits the complete new contract with identical local times a
  const second = current.calls[1].payload
  assert.equal(first.idempotencyKey, second.idempotencyKey)
  assert.equal(second.vehicleType, 'PALLET_30')
+  assert.equal(second.palletCount, 3)
  assert.equal(second.originContactPhone, '+1-555-0100')
  assert.equal(second.destinationContactName, 'B')
  assert.equal(second.pickupAt, '2026-10-20T09:30:00')
  assert.equal(second.deliveryAt, '2026-10-20T15:45:00')
-  for (const field of ['transportType', 'containerType', 'palletCount', 'contactName', 'contactInfo', 'requestedDate']) assert.equal(Object.hasOwn(second, field), false)
+  for (const field of ['transportType', 'containerType', 'packageCount', 'contactName', 'contactInfo', 'requestedDate']) assert.equal(Object.hasOwn(second, field), false)
 })

 test('truck details render saved minute times and unknown pool demand without timezone conversion', () => {
@@ -177,7 +178,7 @@ test('truck details render saved minute times and unknown pool demand without ti
  const fields = new Map(current.detailFields.value)
  assert.equal(fields.get('车辆类型'), '—')
  assert.equal(fields.get('取货时间'), '2026-10-20 09:30')
-  assert.equal(fields.get('送货时间'), '—')
+  assert.equal(fields.get('送达时间'), '—')
  assert.equal(fields.has('柜型'), false)
  assert.equal(fields.has('托盘数'), false)
 })
@@ -208,3 +209,17 @@ test('looseboard requires both times and rejects backwards schedule', () => {
  current.rules.value.deliveryAt[1].validator({}, '2026-10-20T10:29:00', error => { failure = error })
  assert.ok(failure)
 })
+
+
+test('truck creation waits for budget freeze and never submits after insufficient funds', async () => {
+  let release
+  const gate = new Promise(resolve => { release = resolve })
+  const current = transportHarness('trucking', false, () => gate)
+  Object.assign(current.form, { vehicleType: 'PALLET_30', estimatedPalletCount: 3, budgetAmount: 100, origin: 'LA', destination: 'ONT', originContactName: 'A', originContactPhone: '1', destinationContactName: 'B', destinationContactPhone: '2', pickupAt: '2026-10-20T09:00:00', deliveryAt: '2026-10-20T15:00:00' })
+  const pending = current.submit(); await Promise.resolve(); await Promise.resolve()
+  assert.equal(current.calls.length, 0)
+  release(); await pending; assert.equal(current.calls.length, 1)
+  const failed = transportHarness('trucking', false, async () => { throw new Error('余额及授信不足') })
+  Object.assign(failed.form, { ...current.form, vehicleType: 'PALLET_30', estimatedPalletCount: 3, budgetAmount: 100, origin: 'LA', destination: 'ONT', originContactName: 'A', originContactPhone: '1', destinationContactName: 'B', destinationContactPhone: '2', pickupAt: '2026-10-20T09:00:00', deliveryAt: '2026-10-20T15:00:00' })
+  await failed.submit(); assert.equal(failed.calls.length, 0); assert.equal(failed.form.budgetAmount, 100)
+})
@@ -3,6 +3,7 @@ import { computed, onMounted, reactive, ref, watch } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import { ElMessage, type FormInstance } from 'element-plus'
 import TransportDemandForm from './TransportDemandForm.vue'
+import { requireOrderBudget } from '../api/orderBudgets'
 import { createTransportDemandForm, transportDemandError, buildTransportDemand, type TransportDemandForm as DemandFormModel } from '../transportDemandForm'
 import DataTable, { type DataTableColumn } from '@/components/common/DataTable.vue'
 import QueryToolbar, { type QueryField, type QueryModel } from '@/components/common/QueryToolbar.vue'
@@ -38,7 +39,7 @@ type BusinessForm = DemandFormModel

 const configuration = computed(() => ({
  trucking: {
-    title: '美国本土卡',
+    title: '美国本土卡车',
    description: '查询并管理美国本土卡订单',
    columns: transportColumns(false),
  },
@@ -50,16 +51,20 @@ const configuration = computed(() => ({
 })[props.kind])

 function transportColumns(looseboard: boolean): ColumnDefinition[] {
+  const originLabel = looseboard ? '起运地' : '取货地'
+  const destinationLabel = looseboard ? '目的地' : '送达地'
+  const pickupLabel = looseboard ? '取货时间' : '取货时间'
+  const deliveryLabel = looseboard ? '送货时间' : '送达时间'
  return [
    { key: 'orderNo', label: '订单编号', width: 180 },
    ...(!looseboard ? [{ key: 'vehicleType', label: '车辆类型', width: 110 }] : []),
-    { key: 'origin', label: '起运地', width: 150 },
-    { key: 'destination', label: '目的地', width: 150 },
+    { key: 'origin', label: originLabel, width: 150 },
+    { key: 'destination', label: destinationLabel, width: 150 },
    ...(looseboard ? [{ key: 'productName', label: '商品名称', width: 150 }, { key: 'estimatedPalletCount', label: '预计托数', width: 100 }] : []),
    { key: 'totalWeightKg', label: '总重量(kg)', width: 120 },
    { key: 'budgetAmount', label: '预算总价', width: 110 },
    ...([
-      { key: 'pickupAt', label: '取货时间', width: 165 }, { key: 'deliveryAt', label: '送货时间', width: 165 },
+      { key: 'pickupAt', label: pickupLabel, width: 165 }, { key: 'deliveryAt', label: deliveryLabel, width: 165 },
    ]),
    { key: 'status', label: '状态', width: 130 },
    { key: 'fleetArrangement', label: '承运安排', width: 190 },
@@ -93,7 +98,7 @@ const queryModel = computed<QueryModel>({

 const queryFields = computed<QueryField[]>(() => [
  { key: 'orderNo', label: '订单号', type: 'input', placeholder: '请输入订单号' },
-  { key: 'routeKeyword', label: '运输路线', type: 'input', placeholder: '请输入起运地或目的地' },
+  { key: 'routeKeyword', label: '运输路线', type: 'input', placeholder: props.kind === 'trucking' ? '请输入 B 点或 C 点' : '请输入起运地或目的地' },
  {
    key: 'status',
    label: '状态',
@@ -114,6 +119,7 @@ const queryFields = computed<QueryField[]>(() => [
 ])

 const form = reactive<BusinessForm>(emptyForm())
+watch(() => JSON.stringify(form), () => { submitKey.value = '' })

 const detailFields = computed(() => {
  if (!detail.value) return []
@@ -123,13 +129,13 @@ const detailFields = computed(() => {
    ...(props.kind === 'looseboard' ? [
      ['商品名称', summary.productName], ['预计托数', summary.estimatedPalletCount],
    ] : [['车辆类型', vehicleTypeLabel(summary.vehicleType)]]),
-    ['起运地', read(summary, 'origin')], ['起运地址', current.originAddress],
-    ['目的地', read(summary, 'destination')], ['目的地址', current.destinationAddress],
+    [props.kind === 'trucking' ? '取货地' : '起运地', read(summary, 'origin')], [props.kind === 'trucking' ? '取货地址' : '起运地址', current.originAddress],
+    [props.kind === 'trucking' ? '送达地' : '目的地', read(summary, 'destination')], [props.kind === 'trucking' ? '送达地址' : '目的地址', current.destinationAddress],
    ['件数', read(summary, 'packageCount')], ['总重量(kg)', read(summary, 'totalWeightKg')],
    ['总体积(m³)', read(summary, 'totalVolumeCbm')], ['预算总价', money(read(summary, 'budgetAmount'), read(summary, 'currency'))],
-    ['起运地联系人', summary.originContactName], ['起运地联系电话', summary.originContactPhone],
-    ['目的地联系人', summary.destinationContactName], ['目的地联系电话', summary.destinationContactPhone],
-    ['取货时间', localMinute(summary.pickupAt)], ['送货时间', localMinute(summary.deliveryAt)], ['备注', current.remark],
+    [props.kind === 'trucking' ? '取货联系人' : '起运地联系人', summary.originContactName], [props.kind === 'trucking' ? '取货联系电话' : '起运地联系电话', summary.originContactPhone],
+    [props.kind === 'trucking' ? '送达联系人' : '目的地联系人', summary.destinationContactName], [props.kind === 'trucking' ? '送达联系电话' : '目的地联系电话', summary.destinationContactPhone],
+    [props.kind === 'trucking' ? '取货时间' : '取货时间', localMinute(summary.pickupAt)], [props.kind === 'trucking' ? '送达时间' : '送货时间', localMinute(summary.deliveryAt)], ['备注', current.remark],
  ]
 })

@@ -212,7 +218,7 @@ function getRowActions(candidate: object): TableAction[] {
 }

 function detailFieldClass(label: unknown) {
-  return ['备注', '起运地址', '目的地址'].includes(String(label)) ? 'is-wide' : ''
+  return ['备注', props.kind === 'trucking' ? '取货地址' : '起运地址', props.kind === 'trucking' ? '送达地址' : '目的地址'].includes(String(label)) ? 'is-wide' : ''
 }

 const listRouteName = computed(() => ({
@@ -248,6 +254,7 @@ async function loadDetail() {
 }

 async function submit() {
+  if (submitting.value) return
  const failure = transportDemandError(props.kind === 'trucking' ? 'truck' : 'looseboard', form)
  if (failure) { ElMessage.error(failure); return }
  if (!await formRef.value?.validate().catch(() => false)) return
@@ -255,13 +262,17 @@ async function submit() {
  const stableSubmitKey = submitKey.value || idempotencyKey()
  submitKey.value = stableSubmitKey
  try {
-    if (props.kind === 'trucking') await createTransport('trucking', { ...buildTransportDemand('truck', form), idempotencyKey: stableSubmitKey })
+    if (props.kind === 'trucking') {
+      const payload = { ...buildTransportDemand('truck', form), idempotencyKey: stableSubmitKey }
+      await requireOrderBudget('trucking', stableSubmitKey, payload.budgetAmount!, payload.currency)
+      await createTransport('trucking', payload)
+    }
    else await createTransport('looseboard', { ...buildTransportDemand('looseboard', form), idempotencyKey: stableSubmitKey })
    ElMessage.success('订单提交成功')
    resetForm()
    if (props.createPage) await router.push({ name: listRouteName.value })
    else { mode.value = 'list'; await load() }
-  } catch (cause) { ElMessage.error(errorMessage(cause)) }
+  } catch (cause) { if (/已释放|已过期/.test(errorMessage(cause))) submitKey.value = ''; ElMessage.error(errorMessage(cause)) }
  finally { submitting.value = false }
 }

@@ -294,7 +305,7 @@ onMounted(() => { if (props.detailPage) void loadDetail(); else if (!props.creat

    <section v-else-if="mode === 'detail'" class="business-detail-page" aria-label="订单详情">
      <header class="business-detail-heading">
-        <div class="business-detail-heading-main"><el-button link type="primary" @click="returnToList">← 返回列表</el-button><div><h2>{{ detail?.summary.orderNo || '订单详情' }}</h2><p>{{ configuration.title }}订单</p></div></div>
+        <div class="business-detail-heading-main"><el-button link type="primary" @click="returnToList">← 返回列表</el-button><div><h2>{{ detail?.summary.orderNo || '订单详情' }}</h2></div></div>
        <el-tag :type="statusTone(detail?.summary.status)" effect="light">{{ detailStatus }}</el-tag>
      </header>
      <div v-if="error" class="business-detail-error" role="alert"><strong>{{ error }}</strong><el-button size="small" @click="loadDetail">重新加载</el-button></div>
@@ -305,7 +316,7 @@ onMounted(() => { if (props.detailPage) void loadDetail(); else if (!props.creat
        </dl>
      </section>
      <section v-if="!error && fleetArrangement" class="business-detail-section" aria-label="承运安排">
-        <h3>承运安排</h3><p>{{ fleetArrangement.readOnlyReason }}</p>
+        <h3>承运安排</h3>
        <dl class="detail-grid arrangement-grid">
          <div><dt>预订号</dt><dd>{{ fleetArrangement.bookingNo }}</dd></div>
          <div><dt>计划发车</dt><dd>{{ dateTime(fleetArrangement.plannedDepartureAt) }}</dd></div>
@@ -1,106 +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 }>()
+import { computed, onBeforeUnmount, ref } from 'vue'
+import { getProcurementFile, type ProcurementDetail, type ProcurementFee, type ProcurementWorkflow } from '../api/procurement'
+import { directionLabel, dateTime, feeStatus, feeTone, feeTotals, money, productHref, statusLabel, text } from '../procurementPresentation'
+const props = defineProps<{ detail: ProcurementDetail; workflow: ProcurementWorkflow }>()
+const previewUrl = ref(''), previewName = ref(''), previewImage = ref(false), fileLoading = ref(''), fileError = ref('')
+let active = true
+function clearPreview() { if (previewUrl.value) URL.revokeObjectURL(previewUrl.value); previewUrl.value = '' }
+function fileName(fileId: string, index: string | number) { return props.workflow.files.find(file => file.fileId === fileId)?.fileName || '附件 ' + (Number(index) + 1) }
+async function openFile(fileId: string) {
+  if (fileLoading.value) return
+  fileLoading.value = fileId; fileError.value = ''
+  try {
+    const blob = await getProcurementFile(props.workflow.orderNo, fileId)
+    if (!active) return
+    clearPreview(); previewUrl.value = URL.createObjectURL(blob)
+    previewName.value = props.workflow.files.find(file => file.fileId === fileId)?.fileName || '附件'
+    previewImage.value = /^image\/(png|jpeg|gif|webp|bmp)$/i.test(blob.type)
+  } catch (cause) { if (active) fileError.value = cause instanceof Error ? cause.message : '附件加载失败' }
+  finally { fileLoading.value = '' }
+}
+onBeforeUnmount(() => { active = false; clearPreview() })
 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>
+  <el-alert v-if="fileError" :title="fileError" type="error" :closable="false" />
+  <section class="procurement-section" aria-label="采购数量统计">
+    <dl class="procurement-grid money-grid">
+      <div><dt>累计收货</dt><dd>{{ workflow.receivedQuantity }} 件</dd></div>
+      <div><dt>采购库存</dt><dd>{{ workflow.stockQuantity }} 件</dd></div>
+      <div><dt>出库处理中</dt><dd>{{ workflow.reservedQuantity }} 件</dd></div>
+      <div><dt>可出库</dt><dd>{{ workflow.availableQuantity }} 件</dd></div>
+    </dl>
+  </section>
+  <section class="procurement-section" aria-label="分批收货">
+    <h3>收货记录</h3>
+
+    <el-table :data="workflow.receipts" border stripe empty-text="暂无收货记录" row-key="id">
+      <el-table-column label="批次" width="80" align="center"><template #default="{ $index }">{{ $index + 1 }}</template></el-table-column>
+      <el-table-column prop="quantity" label="收货数量（件）" width="145" align="right" />
+      <el-table-column label="收货时间" width="185"><template #default="{ row }">{{ dateTime(row.receivedAt) }}</template></el-table-column>
+      <el-table-column label="收货照片" min-width="160"><template #default="{ row }"><span v-if="!row.fileIds.length">—</span><el-button v-for="(fileId, index) in row.fileIds" :key="fileId" link type="primary" :loading="fileLoading === fileId" :disabled="!!fileLoading" @click="openFile(fileId)">{{ fileName(fileId, index) }}</el-button></template></el-table-column>
+    </el-table>
+  </section>
+  <section class="procurement-section" aria-label="分批出库">
+    <h3>出库记录</h3>
+    <el-table :data="workflow.outbounds.filter(row => row.status !== 'IN_TRANSIT' && row.status !== 'CANCELLED')" border stripe empty-text="暂无出库记录" row-key="id">
+      <el-table-column prop="outboundNo" label="出库单号" min-width="180" />
+      <el-table-column prop="quantity" label="出库数量（件）" width="145" align="right" />
+      <el-table-column prop="trackingNo" label="物流跟踪号" min-width="160" />
+      <el-table-column label="状态" width="100" align="center"><template #default="{ row }">{{ statusLabel(row.status) }}</template></el-table-column>
+      <el-table-column label="创建时间" width="185"><template #default="{ row }">{{ dateTime(row.createdAt) }}</template></el-table-column>
+      <el-table-column label="签收时间" width="185"><template #default="{ row }">{{ dateTime(row.completedAt) }}</template></el-table-column>
+      <el-table-column label="签收凭证" min-width="220"><template #default="{ row }"><span v-if="!row.fileIds.length">—</span><el-button v-for="(fileId, index) in row.fileIds" :key="fileId" link type="primary" :loading="fileLoading === fileId" :disabled="!!fileLoading" @click="openFile(fileId)">{{ fileName(fileId, index) }}</el-button></template></el-table-column>
+    </el-table>
+  </section>
+  <section class="procurement-section" aria-label="费用明细">
+    <h3>费用明细 <span class="fee-total">已扣款 {{ money(totals?.net) }}</span></h3>
+    <el-table :data="detail.fees" border stripe empty-text="暂无费用" row-key="feeNo">
+      <el-table-column prop="name" label="费用名称" min-width="180" />
+      <el-table-column label="原币金额" min-width="145" align="right"><template #default="{ row }">{{ money(row.originalAmount, row.originalCurrency) }}</template></el-table-column>
+      <el-table-column label="人民币金额" min-width="145" align="right"><template #default="{ row }">{{ money(row.amount) }}</template></el-table-column>
+      <el-table-column label="扣款结果" min-width="160" align="center"><template #default="{ row }"><el-tag :type="feeTone(row as ProcurementFee)" size="small">{{ feeStatus(row as ProcurementFee) }}</el-tag></template></el-table-column>
+    </el-table>
  </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>{{ directionLabel(detail.order.procurementDirection) }}</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>{{ text(detail.order.purchaseCategory) }}</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>{{ 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>{{ detail.order.actualWarehouseName || detail.order.plannedWarehouseName || '待审核指定' }}<span v-if="detail.order.actualWarehouseCode">（{{ detail.order.actualWarehouseCode }}）</span></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>
+      <div class="wide"><dt>收货地址</dt><dd>{{ detail.order.receivingAddress }}</dd></div>
+      <div v-if="detail.order.productUrl" class="full"><dt>商品链接</dt><dd><a v-if="productHref(detail.order.productUrl)" :href="productHref(detail.order.productUrl)" target="_blank" rel="noopener noreferrer">查看商品</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>
-
-  </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>
+  <el-dialog :model-value="!!previewUrl" :title="previewName" width="800px" append-to-body @close="clearPreview">
+    <img v-if="previewImage" :src="previewUrl" :alt="previewName" style="display: block; max-width: 100%; max-height: 70vh; margin: auto" />
+    <a v-else :href="previewUrl" :download="previewName">下载 {{ previewName }}</a>
+  </el-dialog>
 </template>

 <style scoped>
 .procurement-section { margin-top: 18px; min-width: 0; }
+.fee-total { margin-left: 14px; font-weight: 400; font-size: 12px; color: var(--muted); }
 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; }
+.procurement-grid .wide { grid-column: span 2; }.money-grid { gap: 16px; border: 0; }.money-grid > div { grid-template-columns: minmax(0, 1fr); padding: 18px; border: 1px solid var(--border); border-radius: 8px; background: #f8fbff; }.money-grid dd { font-size: 16px; font-weight: 600; }
+.procurement-grid .full { grid-column: 1 / -1; }
+.procurement-section :deep(.el-table .cell) { overflow-wrap: anywhere; font-variant-numeric: tabular-nums; }
+.procurement-section :deep(.el-table .el-button.is-link) { display: flex; justify-content: flex-start; max-width: 100%; height: auto; margin: 0; padding: 3px 0; white-space: normal; text-align: left; }
+.procurement-section :deep(.el-table .el-button.is-link > span) { min-width: 0; overflow-wrap: anywhere; }
+a { color: var(--client-action); }
@media (max-width: 767px) {
-  .procurement-progress, .procurement-grid { grid-template-columns: 1fr; }.procurement-grid .wide { grid-column: auto; }
+  .procurement-grid { grid-template-columns: 1fr; }.procurement-grid .wide { grid-column: auto; }
 }
 </style>
@@ -29,14 +29,14 @@ defineExpose({
        <el-form-item v-if="kind === 'truck'" class="transport-demand-wide" label="车辆类型" prop="vehicleType">
          <el-select v-model="model.vehicleType" placeholder=""><el-option label="15拖" value="PALLET_15" /><el-option label="30拖" value="PALLET_30" /></el-select>
        </el-form-item>
-        <el-form-item label="起运地" prop="origin"><el-input v-model.trim="model.origin" maxlength="255" placeholder="城市 / 港口 / 州" /></el-form-item>
-        <el-form-item label="目的地" prop="destination"><el-input v-model.trim="model.destination" maxlength="255" placeholder="城市 / 州" /></el-form-item>
-        <el-form-item label="起运地联系人" prop="originContactName"><el-input v-model.trim="model.originContactName" maxlength="128" placeholder="" /></el-form-item>
-        <el-form-item label="目的地联系人" prop="destinationContactName"><el-input v-model.trim="model.destinationContactName" maxlength="128" placeholder="" /></el-form-item>
-        <el-form-item label="起运地联系电话" prop="originContactPhone"><el-input v-model.trim="model.originContactPhone" type="tel" maxlength="128" placeholder="" /></el-form-item>
-        <el-form-item label="目的地联系电话" prop="destinationContactPhone"><el-input v-model.trim="model.destinationContactPhone" type="tel" maxlength="128" placeholder="" /></el-form-item>
-        <el-form-item label="起运详细地址"><el-input v-model.trim="model.originAddress" maxlength="500" placeholder="街道 / 门牌等补充信息（选填）" /></el-form-item>
-        <el-form-item label="目的详细地址"><el-input v-model.trim="model.destinationAddress" maxlength="500" placeholder="街道 / 门牌等补充信息（选填）" /></el-form-item>
+        <el-form-item :label="kind === 'truck' ? '取货地' : '起运地'" prop="origin"><el-input v-model.trim="model.origin" maxlength="255" placeholder="城市 / 港口 / 州" /></el-form-item>
+        <el-form-item :label="kind === 'truck' ? '送达地' : '目的地'" prop="destination"><el-input v-model.trim="model.destination" maxlength="255" placeholder="城市 / 州" /></el-form-item>
+        <el-form-item :label="kind === 'truck' ? '取货联系人' : '起运地联系人'" prop="originContactName"><el-input v-model.trim="model.originContactName" maxlength="128" placeholder="" /></el-form-item>
+        <el-form-item :label="kind === 'truck' ? '送达联系人' : '目的地联系人'" prop="destinationContactName"><el-input v-model.trim="model.destinationContactName" maxlength="128" placeholder="" /></el-form-item>
+        <el-form-item :label="kind === 'truck' ? '取货联系电话' : '起运地联系电话'" prop="originContactPhone"><el-input v-model.trim="model.originContactPhone" type="tel" maxlength="128" placeholder="" /></el-form-item>
+        <el-form-item :label="kind === 'truck' ? '送达联系电话' : '目的地联系电话'" prop="destinationContactPhone"><el-input v-model.trim="model.destinationContactPhone" type="tel" maxlength="128" placeholder="" /></el-form-item>
+        <el-form-item :label="kind === 'truck' ? '取货地址' : '起运详细地址'"><el-input v-model.trim="model.originAddress" maxlength="500" placeholder="街道 / 门牌等补充信息（选填）" /></el-form-item>
+        <el-form-item :label="kind === 'truck' ? '送达地址' : '目的详细地址'"><el-input v-model.trim="model.destinationAddress" maxlength="500" placeholder="街道 / 门牌等补充信息（选填）" /></el-form-item>
      </div>
    </section>
    <section class="transport-demand-section">
@@ -44,7 +44,7 @@ defineExpose({
      <div class="transport-demand-grid" :class="kind === 'looseboard' ? 'transport-demand-cargo-four' : 'transport-demand-cargo-three'">
        <el-form-item v-if="kind === 'looseboard'" label="商品名称"><el-input v-model.trim="model.productName" maxlength="255" placeholder="" /></el-form-item>
        <el-form-item v-if="kind === 'looseboard'" label="预计托数" prop="estimatedPalletCount"><el-input-number v-model="model.estimatedPalletCount" :min="0" :precision="0" controls-position="right" placeholder="" /></el-form-item>
-        <el-form-item v-if="kind === 'truck'" label="件数" prop="packageCount"><el-input-number v-model="model.packageCount" :min="0" :precision="0" controls-position="right" placeholder="" /></el-form-item>
+        <el-form-item v-if="kind === 'truck'" label="托数" prop="estimatedPalletCount"><el-input-number v-model="model.estimatedPalletCount" :min="1" :precision="0" controls-position="right" placeholder="" /></el-form-item>
        <el-form-item label="总重量 (kg)" prop="totalWeightKg"><el-input-number v-model="model.totalWeightKg" :min="0" :precision="3" controls-position="right" placeholder="" /></el-form-item>
        <el-form-item label="总体积 (m³)" prop="totalVolumeCbm"><el-input-number v-model="model.totalVolumeCbm" :min="0" :precision="6" controls-position="right" placeholder="" /></el-form-item>
        <el-form-item v-if="kind === 'looseboard'" label="件数" prop="packageCount"><el-input-number v-model="model.packageCount" :min="0" :precision="0" controls-position="right" placeholder="" /></el-form-item>
@@ -58,8 +58,8 @@ defineExpose({
          <el-select v-model="model.currency" aria-label="预算币种" placeholder=""><el-option label="USD" value="USD" /><el-option label="CNY" value="CNY" /></el-select>
        </div></el-form-item>
        <div />
-        <el-form-item label="取货时间" prop="pickupAt"><el-date-picker v-model="model.pickupAt" type="datetime" format="YYYY-MM-DD HH:mm" time-format="HH:mm" value-format="YYYY-MM-DDTHH:mm:ss" placeholder="" @change="formRef?.validateField('deliveryAt').catch(() => undefined)" /></el-form-item>
-        <el-form-item label="送货时间" prop="deliveryAt"><el-date-picker v-model="model.deliveryAt" type="datetime" format="YYYY-MM-DD HH:mm" time-format="HH:mm" value-format="YYYY-MM-DDTHH:mm:ss" placeholder="" /></el-form-item>
+        <el-form-item :label="kind === 'truck' ? '取货时间' : '取货时间'" prop="pickupAt"><el-date-picker v-model="model.pickupAt" type="datetime" format="YYYY-MM-DD HH:mm" time-format="HH:mm" value-format="YYYY-MM-DDTHH:mm:ss" placeholder="" @change="formRef?.validateField('deliveryAt').catch(() => undefined)" /></el-form-item>
+        <el-form-item :label="kind === 'truck' ? '送达时间' : '送货时间'" prop="deliveryAt"><el-date-picker v-model="model.deliveryAt" type="datetime" format="YYYY-MM-DD HH:mm" time-format="HH:mm" value-format="YYYY-MM-DDTHH:mm:ss" placeholder="" /></el-form-item>
        <el-form-item class="transport-demand-wide" label="备注"><el-input v-model="model.remark" type="textarea" :rows="3" maxlength="1000" show-word-limit placeholder="" /></el-form-item>
      </div>
    </section>
@@ -65,17 +65,18 @@ function viewHarness({ createPage = false, detailPage = false, api = {}, storage
  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 defaults = { getProcurementWorkflow: async orderNo => ({ orderNo, version: 1, status: 'WAIT_CUSTOMER_CONFIRM', receipts: [], outbounds: [] }), confirmProcurement: async () => ({ orderNo: 'PO-1', version: 2, status: 'CONFIRMED' }), 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 === 'element-plus') return { ElMessage: { success: () => {} }, ElMessageBox: { confirm: async () => {}, prompt: async (...args) => { const value = api.rejectionReason ?? '照片不清晰'; const valid = args[2].inputValidator(value); if (valid !== true) throw new Error(valid); return { value } } } }
      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/orderBudgets') return { requireOrderBudget: api.requireOrderBudget || (async () => {}) }
      if (name === '../api/procurement') return { ...defaults, ...api }
      if (name === '../procurementPresentation') return presentation
      if (name === '../procurementSubmission') return submission
@@ -88,6 +89,54 @@ function viewHarness({ createPage = false, detailPage = false, api = {}, storage
  return { state, props, route, auth, pushes, storage, dispose: () => dispose.forEach(callback => callback()) }
 }

+test('create summary follows the current form, preserves cents and clears with the draft', () => {
+  const harness = viewHarness({ createPage: true })
+  try {
+    assert.equal(harness.state.summaryQuantity.value, '1')
+    assert.equal(harness.state.summaryUnitPrice.value, '—')
+    assert.equal(harness.state.budgetTotal.value, null)
+    assert.equal(harness.state.summaryCurrencyName.value, '美元')
+    Object.assign(harness.state.form, draft())
+    assert.equal(harness.state.summaryQuantity.value, '3')
+    assert.equal(harness.state.summaryUnitPrice.value, '0.29')
+    assert.equal(harness.state.budgetTotal.value, '0.87')
+    harness.state.form.currency = 'CNY'
+    assert.equal(harness.state.summaryCurrencyName.value, '人民币')
+    assert.equal(presentation.money(harness.state.budgetTotal.value, harness.state.form.currency), 'CNY 0.87')
+    harness.state.form.budgetUnitPrice = '0'
+    assert.equal(harness.state.summaryUnitPrice.value, '0.00')
+    assert.equal(harness.state.budgetTotal.value, '0.00')
+    harness.state.resetForm()
+    assert.equal(harness.state.summaryQuantity.value, '1')
+    assert.equal(harness.state.summaryUnitPrice.value, '—')
+    assert.equal(harness.state.budgetTotal.value, null)
+    assert.equal(harness.state.summaryCurrencyName.value, '美元')
+  } finally { harness.dispose() }
+})
+
+test('create summary never retains a stale budget when quantity or price becomes invalid', () => {
+  const harness = viewHarness({ createPage: true })
+  try {
+    Object.assign(harness.state.form, draft())
+    for (const quantity of ['', '0', '-1', '1.5', '9007199254740992']) {
+      harness.state.form.purchaseQuantity = quantity
+      assert.equal(harness.state.summaryQuantity.value, '—')
+      assert.equal(harness.state.budgetTotal.value, null)
+      assert.equal(harness.state.form.purchaseQuantity, quantity)
+    }
+    harness.state.form.purchaseQuantity = '3'
+    assert.equal(harness.state.budgetTotal.value, '0.87')
+    for (const price of ['', '-1', '1.001', 'invalid']) {
+      harness.state.form.budgetUnitPrice = price
+      assert.equal(harness.state.summaryUnitPrice.value, '—')
+      assert.equal(harness.state.budgetTotal.value, null)
+      assert.equal(harness.state.form.budgetUnitPrice, price)
+    }
+    harness.state.form.budgetUnitPrice = '0.29'
+    assert.equal(harness.state.budgetTotal.value, '0.87')
+  } finally { harness.dispose() }
+})
+
 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)) } } })
@@ -154,3 +203,90 @@ test('purchase category is optional while its length remains bounded', () => {
  assert.equal(payload.purchaseCategory, '')
  assert.throws(() => presentation.buildProcurementCreate({ ...draft(), purchaseCategory: 'x'.repeat(129) }, 'Company', 'key'), /品类/)
 })
+
+
+test('domestic purchase creates an export order and displays the actual origin and destination regions', () => {
+  const payload = presentation.buildProcurementCreate({ ...draft(), procurementDirection: 'DOMESTIC_TO_OVERSEAS', receivingAddress: 'US, CA, Los Angeles, test destination' }, 'Authenticated Company', 'export-key')
+  assert.equal(payload.procurementDirection, 'DOMESTIC_TO_OVERSEAS')
+  assert.equal(payload.receivingAddress, 'US, CA, Los Angeles, test destination')
+  assert.equal(presentation.statusLabel('RECEIVING', payload.procurementDirection), '收货中')
+  assert.equal(presentation.statusLabel('DELIVERING', payload.procurementDirection), '派送中')
+  assert.equal(presentation.statusLabel('WAIT_CUSTOMER_CONFIRM', payload.procurementDirection), '待客户确认')
+  assert.equal(presentation.statusLabel('COMPLETED'), '签收完成')
+  assert.throws(() => presentation.buildProcurementCreate({ ...draft(), procurementDirection: 'INVALID' }, 'Company', 'key'), /采购方向/)
+  const source = readFileSync(new URL('./views/ProcurementView.vue', import.meta.url), 'utf8')
+  assert.match(source, /v-model="form.procurementDirection"/)
+  assert.match(source, /regionText\('最终国内收件资料', form.procurementDirection\)/)
+})
+
+
+test('customer confirms with current workflow version and double-click only sends once', async () => {
+  let resolve, calls = []
+  const harness = viewHarness({ detailPage: true, api: { confirmProcurement: (orderNo, payload) => {
+    calls.push({ orderNo, ...payload }); return new Promise(done => { resolve = done })
+  } } })
+  try {
+    await flush()
+    const first = harness.state.confirmReceived(); await flush(); await harness.state.confirmReceived()
+    assert.equal(calls.length, 1); assert.equal(calls[0].version, 1); assert.equal(calls[0].orderNo, 'PO-1')
+    assert.ok(calls[0].idempotencyKey)
+    resolve({ orderNo: 'PO-1', version: 2, status: 'CONFIRMED' }); await first
+    assert.equal(harness.state.workflow.value.status, 'CONFIRMED'); assert.equal(harness.state.canConfirm.value, false)
+  } finally { harness.dispose() }
+})
+
+test('failed customer confirmation preserves receipt context for recovery', async () => {
+  const harness = viewHarness({ detailPage: true, api: { confirmProcurement: async () => { throw new ApiError('版本已更新，请刷新', 'A0409') } } })
+  try {
+    await flush(); await harness.state.confirmReceived()
+    assert.equal(harness.state.workflow.value.status, 'WAIT_CUSTOMER_CONFIRM')
+    assert.equal(harness.state.confirming.value, false); assert.equal(harness.state.confirmError.value, '版本已更新，请刷新')
+  } finally { harness.dispose() }
+})
+
+
+test('unknown create and confirmation results reuse idempotency keys for unchanged retries', async () => {
+  const creates = [], confirms = []
+  const create = viewHarness({ createPage: true, api: { createProcurement: async payload => { creates.push(payload); throw new ApiError('timeout', 'TIMEOUT') } } })
+  const confirm = viewHarness({ detailPage: true, api: { confirmProcurement: async (_, payload) => { confirms.push(payload); throw new ApiError('timeout', 'TIMEOUT') } } })
+  try {
+    Object.assign(create.state.form, draft()); await create.state.submit(); await create.state.submit()
+    assert.equal(creates[0].idempotencyKey, creates[1].idempotencyKey)
+    await flush(); await confirm.state.confirmReceived(); await confirm.state.confirmReceived()
+    assert.equal(confirms[0].idempotencyKey, confirms[1].idempotencyKey)
+  } finally { create.dispose(); confirm.dispose() }
+})
+
+
+test('bill-settled manual fees show review results without counting a balance debit', () => {
+  const bill = determination => ({ ...fee('OTHER', 'NOT_REQUIRED', '100'), determination })
+  assert.equal(presentation.feeStatus(bill('PENDING')), '账单结算 · 待审核')
+  assert.equal(presentation.feeStatus(bill('APPROVED')), '账单结算 · 已确认')
+  assert.equal(presentation.feeStatus(bill('REJECTED')), '账单结算 · 已拒绝')
+  assert.equal(presentation.feeTone(bill('REJECTED')), 'danger')
+  assert.equal(presentation.feeTotals([bill('PENDING'), bill('APPROVED'), bill('REJECTED')]).paid, '0.00')
+})
+
+
+test('insufficient balance and credit blocks procurement creation and preserves the draft', async () => {
+  let creates = 0
+  const harness = viewHarness({ createPage: true, api: { requireOrderBudget: async () => { throw new Error('余额及授信不足') }, createProcurement: async () => { creates++ } } })
+  try {
+    Object.assign(harness.state.form, draft()); await harness.state.submit()
+    assert.equal(creates, 0); assert.equal(harness.state.submitError.value, '余额及授信不足')
+    assert.equal(harness.state.form.productName, draft().productName)
+  } finally { harness.dispose() }
+})
+
+test('customer rejection requires a reason and carries current order version', async () => {
+  const calls = []
+  const harness = viewHarness({ detailPage: true, api: { rejectProcurement: async (orderNo, command) => { calls.push({ orderNo, ...command }); return { orderNo, status: 'RECEIVING', version: 2, rejectionReason: command.reason } } } })
+  try {
+    await flush(); await harness.state.rejectReceived()
+    assert.equal(calls.length, 1); assert.equal(calls[0].orderNo, 'PO-1'); assert.equal(calls[0].version, 1)
+    assert.equal(calls[0].reason, '照片不清晰'); assert.equal(harness.state.workflow.value.status, 'RECEIVING')
+  } finally { harness.dispose() }
+  const blank = viewHarness({ detailPage: true, api: { rejectionReason: '   ', rejectProcurement: async () => { throw new Error('不得发送空原因') } } })
+  try { await flush(); await blank.state.rejectReceived(); assert.match(blank.state.confirmError.value, /请填写驳回原因/) }
+  finally { blank.dispose() }
+})
@@ -1,21 +1,20 @@
 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: '已寄客户',
+  PENDING_REVIEW: '待审核', RECEIVING: '收货中', WAIT_CUSTOMER_CONFIRM: '待客户确认', CONFIRMED: '已确认',
+  IN_TRANSIT: '运输中', DELIVERING: '派送中', COMPLETED: '签收完成',
  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 statusLabel(status: string | null | undefined, direction?: string | null) { return regionText(status ? procurementStatuses[status] || '待核对进度' : '—', direction) }
 export function statusTone(status: string | null | undefined): 'success' | 'warning' | 'danger' | 'info' | 'primary' {
-  if (status === 'SHIPPED_TO_CUSTOMER') return 'success'
+  if (status === 'COMPLETED' || status === 'CONFIRMED') return 'success'
  if (status === 'REJECTED' || status === 'EXCEPTION_CLOSED') return 'danger'
  if (status === 'CANCELLED') return 'info'
-  if (status === 'INTERNATIONAL_TRANSIT') return 'primary'
+  if (status === 'IN_TRANSIT' || status === 'DELIVERING') return 'primary'
  return 'warning'
 }
 function cents(value: Amount | null | undefined): bigint | null {
@@ -46,6 +45,12 @@ export function productHref(value: string | null | 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.walletStatus === 'NOT_REQUIRED') {
+    if (fee.determination === 'PENDING') return '账单结算 · 待审核'
+    if (fee.determination === 'APPROVED') return '账单结算 · 已确认'
+    if (fee.determination === 'REJECTED') return '账单结算 · 已拒绝'
+    return '账单结算'
+  }
  if (fee.purpose === 'INTERNATIONAL_ESTIMATE') {
    const label: Record<string, string> = { FROZEN: '已冻结，未扣款', ZERO: '零预估已确认', SETTLED: '原预估已结清', RELEASED: '预估已释放' }
    if (fee.walletStatus && label[fee.walletStatus]) return label[fee.walletStatus]
@@ -58,6 +63,8 @@ export function feeStatus(fee: ProcurementFee) {
  return fee.walletStatus ? labels[fee.walletStatus] || '待核定' : '待核定'
 }
 export function feeTone(fee: ProcurementFee): 'success' | 'warning' | 'danger' | 'info' {
+  if (fee.determination === 'REJECTED') return 'danger'
+  if (fee.walletStatus === 'NOT_REQUIRED' && fee.determination === 'APPROVED') return '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'
@@ -79,6 +86,7 @@ export function feeTotals(fees: ProcurementFee[]) {
  return { paid: decimal(paid), refunded: decimal(refunded), net: decimal(paid - refunded), estimatedHold: decimal(estimatedHold) }
 }
 export interface ProcurementDraft {
+  procurementDirection?: ProcurementDirection
  purchaseCategory: string
  productName: string
  productSpecification: string
@@ -92,7 +100,7 @@ export interface ProcurementDraft {
  remark: string
 }
 export function emptyProcurementDraft(): ProcurementDraft {
-  return { purchaseCategory: '', productName: '', productSpecification: '', productUrl: '', purchaseQuantity: '1', budgetUnitPrice: '', currency: 'USD', receivingAddress: '', contactName: '', contactPhone: '', remark: '' }
+  return { procurementDirection: 'OVERSEAS_TO_DOMESTIC', purchaseCategory: '', productName: '', productSpecification: '', productUrl: '', purchaseQuantity: '1', budgetUnitPrice: '', currency: 'USD', receivingAddress: '', contactName: '', contactPhone: '', remark: '' }
 }
 export function draftBudgetTotal(draft: ProcurementDraft) {
  const price = cents(draft.budgetUnitPrice)
@@ -101,7 +109,7 @@ export function draftBudgetTotal(draft: ProcurementDraft) {
 }
 export function buildProcurementCreate(draft: ProcurementDraft, customerName: string, key: string): ProcurementCreate {
  for (const [field, label, max] of [
-    ['productName', '商品名称', 255], ['receivingAddress', '完整国内收货地址', 1000],
+    ['productName', '商品名称', 255], ['receivingAddress', '完整目的地收货地址', 1000],
    ['contactName', '最终收件人', 128], ['contactPhone', '联系电话', 64],
  ] as const) {
    if (!draft[field].trim() || draft[field].trim().length > max) throw new Error(`请填写有效的${label}`)
@@ -116,9 +124,20 @@ export function buildProcurementCreate(draft: ProcurementDraft, customerName: st
  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(),
+  if (draft.procurementDirection && !['OVERSEAS_TO_DOMESTIC', 'DOMESTIC_TO_OVERSEAS'].includes(draft.procurementDirection)) throw new Error('请选择有效采购方向')
+  return { procurementDirection: draft.procurementDirection || 'OVERSEAS_TO_DOMESTIC', 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 }
 }
+
+export type ProcurementDirection = 'OVERSEAS_TO_DOMESTIC' | 'DOMESTIC_TO_OVERSEAS'
+export const procurementDirections: Record<ProcurementDirection, string> = {
+  OVERSEAS_TO_DOMESTIC: '海外采购，发往国内', DOMESTIC_TO_OVERSEAS: '国内采购，发往海外',
+}
+export function directionLabel(direction?: string | null) { return direction === 'DOMESTIC_TO_OVERSEAS' ? procurementDirections.DOMESTIC_TO_OVERSEAS : procurementDirections.OVERSEAS_TO_DOMESTIC }
+// 两个历史段编码表示起运段和目的地段，展示区域按订单方向转换。
+export function regionText(text: string, direction?: string | null) {
+  return direction === 'DOMESTIC_TO_OVERSEAS' ? text.replaceAll('海外', '__ORIGIN__').replaceAll('国内', '海外').replaceAll('__ORIGIN__', '国内') : text
+}
@@ -7,7 +7,7 @@ import ts from 'typescript'
 const source = readFileSync(new URL('./transportDemandForm.ts', import.meta.url), 'utf8')
 const code = ts.transpileModule(source, { compilerOptions: { target: ts.ScriptTarget.ES2022, module: ts.ModuleKind.ESNext } }).outputText.replace(/^export /gm, '')
 const { createTransportDemandForm, transportDemandError, buildTransportDemand } = runInNewContext(`${code}\n({ createTransportDemandForm, transportDemandError, buildTransportDemand })`)
-const valid = () => ({ ...createTransportDemandForm(), vehicleType: 'PALLET_15', origin: ' LA ', destination: ' ONT ', originContactName: ' 发货人 ', originContactPhone: ' +1-555-0100 ', destinationContactName: ' 收货人 ', destinationContactPhone: ' +1-555-0101 ', pickupAt: '2026-10-20T09:30:45', deliveryAt: '2026-10-20T15:45:12' })
+const valid = () => ({ ...createTransportDemandForm(), vehicleType: 'PALLET_15', estimatedPalletCount: 3, budgetAmount: 100, origin: ' LA ', destination: ' ONT ', originContactName: ' 发货人 ', originContactPhone: ' +1-555-0100 ', destinationContactName: ' 收货人 ', destinationContactPhone: ' +1-555-0101 ', pickupAt: '2026-10-20T09:30:45', deliveryAt: '2026-10-20T15:45:12' })

 test('initial form leaves contacts and times blank, zeroes cargo and distinguishes blank budget from zero', () => {
  const form = createTransportDemandForm()
@@ -15,8 +15,8 @@ test('initial form leaves contacts and times blank, zeroes cargo and distinguish
  for (const key of ['estimatedPalletCount', 'packageCount', 'totalWeightKg', 'totalVolumeCbm']) assert.equal(form[key], 0)
  assert.equal(form.budgetAmount, undefined)
  assert.equal(form.currency, 'USD')
-  assert.equal(buildTransportDemand('truck', valid()).budgetAmount, undefined)
-  assert.equal(buildTransportDemand('truck', { ...valid(), budgetAmount: 0 }).budgetAmount, 0)
+  assert.throws(() => buildTransportDemand('truck', { ...valid(), budgetAmount: undefined }), /预算/)
+  assert.throws(() => buildTransportDemand('truck', { ...valid(), budgetAmount: 0 }), /预算/)
 })

 for (const kind of ['truck', 'looseboard']) {
@@ -53,6 +53,8 @@ test('truck accepts only the two vehicle types and does not submit looseboard ca
  const truck = buildTransportDemand('truck', { ...valid(), productName: 'cargo', estimatedPalletCount: 3 })
  assert.equal(Object.hasOwn(truck, 'productName'), false)
  assert.equal(Object.hasOwn(truck, 'estimatedPalletCount'), false)
+  assert.equal(truck.palletCount, 3)
+  assert.equal(Object.hasOwn(truck, 'packageCount'), false)
  const loose = buildTransportDemand('looseboard', { ...valid(), vehicleType: '', productName: ' cargo ', estimatedPalletCount: 3, packageCount: 8 })
  assert.equal(Object.hasOwn(loose, 'vehicleType'), false)
  assert.equal(loose.productName, 'cargo')
@@ -32,10 +32,14 @@ export function createTransportDemandForm(): TransportDemandForm {
  }
 }

-const requiredText = {
-  origin: '起运地', destination: '目的地', originContactName: '起运地联系人',
-  originContactPhone: '起运地联系电话', destinationContactName: '目的地联系人', destinationContactPhone: '目的地联系电话',
-} as const
+const requiredText = (kind: TransportDemandKind) => ({
+  origin: kind === 'truck' ? '取货地' : '起运地',
+  destination: kind === 'truck' ? '送达地' : '目的地',
+  originContactName: kind === 'truck' ? '取货联系人' : '起运地联系人',
+  originContactPhone: kind === 'truck' ? '取货联系电话' : '起运地联系电话',
+  destinationContactName: kind === 'truck' ? '送达联系人' : '目的地联系人',
+  destinationContactPhone: kind === 'truck' ? '送达联系电话' : '目的地联系电话',
+} as const)

 export function localMinuteInput(value: unknown) {
  return typeof value === 'string' && value ? `${value.slice(0, 16)}:00` : ''
@@ -43,36 +47,42 @@ export function localMinuteInput(value: unknown) {

 export function transportDemandRules(kind: TransportDemandKind, form: TransportDemandForm): FormRules<TransportDemandForm> {
  const rules: FormRules<TransportDemandForm> = {}
-  for (const [field, label] of Object.entries(requiredText)) {
-    rules[field as keyof typeof requiredText] = [{ required: true, whitespace: true, message: `请输入${label}`, trigger: 'blur' }]
+  const labels = requiredText(kind)
+  for (const [field, label] of Object.entries(labels)) {
+    rules[field as keyof typeof labels] = [{ required: true, whitespace: true, message: `请输入${label}`, trigger: 'blur' }]
  }
  if (kind === 'truck') rules.vehicleType = [{ required: true, message: '请选择车辆类型', trigger: 'change' }]
  for (const [field, label] of [['packageCount', '件数'], ['estimatedPalletCount', '预计托数'], ['totalWeightKg', '总重量'], ['totalVolumeCbm', '总体积']] as const) {
-    if (field === 'estimatedPalletCount' && kind !== 'looseboard') continue
+    if (field === 'packageCount' && kind === 'truck') continue
    rules[field] = [{ required: true, type: 'number', min: 0, message: `${label}须为不小于 0 的数字`, trigger: 'change' }]
  }
-  rules.budgetAmount = [{ type: 'number', min: 0, message: '预算总价不能小于 0', trigger: 'change' }]
-  rules.pickupAt = [{ required: true, message: '请选择取货时间', trigger: 'change' }]
-  rules.deliveryAt = [{ required: true, message: '请选择送货时间', trigger: 'change' }, {
-    validator: (_rule, value, callback) => callback(value && form.pickupAt && localMinuteInput(value) < localMinuteInput(form.pickupAt) ? new Error('送货时间不能早于取货时间') : undefined), trigger: 'change',
+  rules.budgetAmount = [{ required: kind === 'truck', type: 'number', min: kind === 'truck' ? 0.01 : 0, message: '请输入大于 0 的预算总价', trigger: 'change' }]
+  const pickupLabel = kind === 'truck' ? '取货时间' : '取货时间', deliveryLabel = kind === 'truck' ? '送达时间' : '送货时间'
+  rules.pickupAt = [{ required: true, message: `请选择${pickupLabel}`, trigger: 'change' }]
+  rules.deliveryAt = [{ required: true, message: `请选择${deliveryLabel}`, trigger: 'change' }, {
+    validator: (_rule, value, callback) => callback(value && form.pickupAt && localMinuteInput(value) < localMinuteInput(form.pickupAt) ? new Error(`${deliveryLabel}不能早于${pickupLabel}`) : undefined), trigger: 'change',
  }]
  return rules
 }

 export function transportDemandError(kind: TransportDemandKind, form: TransportDemandForm): string | undefined {
  if (kind === 'truck' && !['PALLET_15', 'PALLET_30'].includes(form.vehicleType)) return '请选择车辆类型'
-  for (const [field, label] of Object.entries(requiredText)) {
-    if (!String(form[field as keyof typeof requiredText] || '').trim()) return `请输入${label}`
+  const labels = requiredText(kind)
+  for (const [field, label] of Object.entries(labels)) {
+    if (!String(form[field as keyof typeof labels] || '').trim()) return `请输入${label}`
  }
-  for (const [field, label] of [['pickupAt', '取货时间'], ['deliveryAt', '送货时间']] as const) {
+  const pickupLabel = kind === 'truck' ? '取货时间' : '取货时间', deliveryLabel = kind === 'truck' ? '送达时间' : '送货时间'
+  for (const [field, label] of [['pickupAt', pickupLabel], ['deliveryAt', deliveryLabel]] as const) {
    if (!form[field]) return `请选择${label}`
    if (!/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}(?::\d{2}(?:\.\d+)?)?$/.test(form[field])) return `请选择有效的${label}`
  }
-  if (localMinuteInput(form.deliveryAt) < localMinuteInput(form.pickupAt)) return '送货时间不能早于取货时间'
+  if (localMinuteInput(form.deliveryAt) < localMinuteInput(form.pickupAt)) return `${deliveryLabel}不能早于${pickupLabel}`
  for (const [field, label] of [['packageCount', '件数'], ['totalWeightKg', '总重量'], ['totalVolumeCbm', '总体积'], ...(kind === 'looseboard' ? [['estimatedPalletCount', '预计托数'] as const] : [])] as const) {
    if (!Number.isFinite(form[field]) || form[field] < 0) return `${label}须为不小于 0 的数字`
  }
  if (!Number.isInteger(form.packageCount) || kind === 'looseboard' && !Number.isInteger(form.estimatedPalletCount)) return '件数和预计托数须为整数'
+  if (kind === 'truck' && (!Number.isSafeInteger(form.estimatedPalletCount) || form.estimatedPalletCount <= 0)) return '请输入大于 0 的托数'
+  if (kind === 'truck' && (form.budgetAmount == null || !Number.isFinite(form.budgetAmount) || form.budgetAmount <= 0)) return '请输入大于 0 的预算总价'
  if (form.budgetAmount != null && (!Number.isFinite(form.budgetAmount) || form.budgetAmount < 0)) return '预算总价不能小于 0'
  if (!['USD', 'CNY'].includes(form.currency)) return '请选择预算币种'
  return undefined
@@ -91,7 +101,7 @@ function commonPayload(form: TransportDemandForm) {
 }

 type CommonPayload = ReturnType<typeof commonPayload>
-type TruckPayload = CommonPayload & { vehicleType: 'PALLET_15' | 'PALLET_30' }
+type TruckPayload = Omit<CommonPayload, 'packageCount'> & { palletCount: number; vehicleType: 'PALLET_15' | 'PALLET_30' }
 type LooseboardPayload = CommonPayload & { productName: string | undefined; estimatedPalletCount: number }

 export function buildTransportDemand(kind: 'truck', form: TransportDemandForm): TruckPayload
@@ -101,6 +111,6 @@ export function buildTransportDemand(kind: TransportDemandKind, form: TransportD
  if (failure) throw new Error(failure)
  const common = commonPayload(form)
  return kind === 'truck'
-    ? { ...common, vehicleType: form.vehicleType as 'PALLET_15' | 'PALLET_30' }
+    ? { ...(({ packageCount: _packages, ...rest }) => rest)(common), palletCount: form.estimatedPalletCount, vehicleType: form.vehicleType as 'PALLET_15' | 'PALLET_30' }
    : { ...common, productName: form.productName.trim() || undefined, estimatedPalletCount: form.estimatedPalletCount }
 }
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { computed, onBeforeUnmount, reactive, ref, shallowRef, watch } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
-import { ElMessage } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
 import { ApiError } from '@/api/types'
 import { accessTokenIdentity } from '@/api/session'
 import { useAuthStore } from '@/modules/auth/public'
@@ -9,8 +9,9 @@ import DataTable, { type DataTableColumn } from '@/components/common/DataTable.v
 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 ProcurementDetail, type ProcurementSummary } from '../api/procurement'
-import { buildProcurementCreate, dateTime, draftBudgetTotal, emptyProcurementDraft, money, procurementStatuses, statusLabel, statusTone } from '../procurementPresentation'
+import { rejectProcurement, confirmProcurement, createProcurement, getProcurement, getProcurementWorkflow, listProcurements, type ProcurementDetail, type ProcurementSummary, type ProcurementWorkflow } from '../api/procurement'
+import { procurementDirections, directionLabel, regionText, buildProcurementCreate, dateTime, draftBudgetTotal, emptyProcurementDraft, money, procurementStatuses, statusLabel, statusTone } from '../procurementPresentation'
+import { requireOrderBudget } from '../api/orderBudgets'
 import { procurementRequestKey } from '../procurementSubmission'

 const props = withDefaults(defineProps<{ createPage?: boolean; detailPage?: boolean }>(), { createPage: false, detailPage: false })
@@ -22,12 +23,21 @@ const canList = computed(() => auth.hasPermission('merchant:cross-border:procure
 const identity = computed(() => auth.token ? accessTokenIdentity(auth.token) : null)
 const companyName = computed(() => auth.profile.tenantName || (auth.user?.tenantName && !/^企业租户 \d+$/.test(auth.user.tenantName) ? auth.user.tenantName : ''))
 const form = reactive(emptyProcurementDraft())
+const summaryQuantity = computed(() => /^\d+$/.test(form.purchaseQuantity) && Number.isSafeInteger(Number(form.purchaseQuantity)) && Number(form.purchaseQuantity) > 0 ? String(Number(form.purchaseQuantity)) : '—')
+const summaryUnitPrice = computed(() => draftBudgetTotal({ ...form, purchaseQuantity: '1' }) ?? '—')
+const summaryCurrencyName = computed(() => form.currency === 'USD' ? '美元' : '人民币')
+const budgetTotal = computed(() => summaryQuantity.value === '—' ? null : draftBudgetTotal(form))
 const submitError = ref(''), submittedOrder = ref('')
 const submitting = ref(false), loading = ref(false), error = ref('')
 const detail = shallowRef<ProcurementDetail | null>(null)
+const workflow = shallowRef<ProcurementWorkflow | null>(null)
+const confirming = ref(false), confirmError = ref('')
+const canConfirm = computed(() => canCreate.value && workflow.value?.status === 'WAIT_CUSTOMER_CONFIRM')
 const rows = ref<ProcurementSummary[]>([]), total = ref(0)
 const query = reactive({ page: 1, size: 20, orderNo: '', purchaseCategory: '', productName: '', status: '' })
 let requestSequence = 0, active = true, inFlight = ''
+let createAttempt: { fingerprint: string; key: string } | null = null
+let confirmAttempt: { fingerprint: string; key: string } | null = null
 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] || '') },
@@ -39,6 +49,7 @@ const queryFields: QueryField[] = [
 ]
 const columns: DataTableColumn[] = [
  { key: 'actions', label: '操作', width: 90, fixed: 'left', slotName: 'actions' },
+  { prop: 'procurementDirection', label: '采购方向', minWidth: 170, slotName: 'direction' },
  { 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 },
@@ -65,28 +76,70 @@ 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 }
+  const sequence = ++requestSequence; inFlight = key; loading.value = true; error.value = ''; detail.value = null; workflow.value = null
+  try {
+    const [result, currentWorkflow] = await Promise.all([getProcurement(orderNo.value), getProcurementWorkflow(orderNo.value)])
+    if (sequence === requestSequence) { detail.value = result; workflow.value = currentWorkflow }
+  }
  catch (cause) { if (sequence === requestSequence) error.value = message(cause) }
  finally { if (sequence === requestSequence) { loading.value = false; inFlight = '' } }
 }
+async function confirmReceived() {
+  if (!canConfirm.value || confirming.value || !workflow.value) return
+  const owner = identity.value, targetOrder = orderNo.value, version = workflow.value.version
+  confirming.value = true; confirmError.value = ''
+  try {
+    await ElMessageBox.confirm('确认本单收货数量及照片，确认后平台将安排出库。', '确认采购结果', { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' })
+    if (!active || owner !== identity.value || targetOrder !== orderNo.value) return
+    const fingerprint = JSON.stringify([owner, targetOrder, version])
+    if (confirmAttempt?.fingerprint !== fingerprint) confirmAttempt = { fingerprint, key: procurementRequestKey() }
+    const result = await confirmProcurement(targetOrder, { version, idempotencyKey: confirmAttempt.key })
+    if (!active || owner !== identity.value || targetOrder !== orderNo.value) return
+    workflow.value = result; confirmAttempt = null
+    if (detail.value) detail.value = { ...detail.value, order: { ...detail.value.order, status: result.status, version: result.version } }
+    ElMessage.success('采购结果已确认')
+  } catch (cause) {
+    if (cause !== 'cancel' && cause !== 'close' && active && owner === identity.value && targetOrder === orderNo.value) confirmError.value = message(cause)
+  } finally { confirming.value = false }
+}
+// 驳回携带当前版本和必填原因，失败保留当前采购详情。
+async function rejectReceived() {
+  if (!canConfirm.value || confirming.value || !workflow.value) return
+  const owner = identity.value, targetOrder = orderNo.value
+  confirming.value = true; confirmError.value = ''
+  try {
+    const answer = await ElMessageBox.prompt('请说明采购结果不符合要求的原因，平台将重新上传照片。', '驳回采购结果', { inputType: 'textarea', inputValidator: value => !!value?.trim() && value.trim().length <= 1000 || '请填写驳回原因，最多1000字', confirmButtonText: '提交驳回', cancelButtonText: '取消' })
+    if (!active || owner !== identity.value || targetOrder !== orderNo.value || !workflow.value) return
+    const result = await rejectProcurement(targetOrder, { version: workflow.value.version, idempotencyKey: procurementRequestKey(), reason: answer.value.trim() })
+    if (!active || owner !== identity.value || targetOrder !== orderNo.value) return
+    workflow.value = result; ElMessage.success('已驳回，等待平台重新上传照片')
+  } catch (cause) {
+    if (cause !== 'cancel' && cause !== 'close' && active && owner === identity.value && targetOrder === orderNo.value) confirmError.value = message(cause)
+  } finally { confirming.value = false }
+}
 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 resetForm() { submitError.value = ''; submittedOrder.value = ''; Object.assign(form, emptyProcurementDraft()) }
+function resetForm() { submitError.value = ''; submittedOrder.value = ''; Object.assign(form, emptyProcurementDraft()); createAttempt = null }
 async function submit() {
  if (submitting.value || !canCreate.value || !identity.value || submittedOrder.value) return
  const owner = identity.value; submitting.value = true; submitError.value = ''
  try {
-    const result = await createProcurement(buildProcurementCreate(form, companyName.value, procurementRequestKey()))
+    const payload = buildProcurementCreate(form, companyName.value, '')
+    const fingerprint = JSON.stringify([owner, payload])
+    if (createAttempt?.fingerprint !== fingerprint) createAttempt = { fingerprint, key: procurementRequestKey() }
+    await requireOrderBudget('procurement', createAttempt.key, Number((payload.budgetUnitPrice * payload.purchaseQuantity).toFixed(2)), payload.currency)
    if (!active || owner !== identity.value) return
-    submittedOrder.value = result.order.orderNo; ElMessage.success('采购订单已提交')
+    const result = await createProcurement({ ...payload, idempotencyKey: createAttempt.key })
+    if (!active || owner !== identity.value) return
+    createAttempt = 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) submitError.value = message(cause) }
+  } catch (cause) { if (/已释放|已过期/.test(message(cause))) createAttempt = null; if (active && owner === identity.value) submitError.value = 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 (values[4] !== previous?.[4]) { rows.value = []; total.value = 0; createAttempt = null }
+  if (values[4] !== previous?.[4] || values[1] !== previous?.[1]) confirmAttempt = null
+  ++requestSequence; inFlight = ''; loading.value = false; error.value = ''; detail.value = null; workflow.value = null; confirmError.value = ''
  if (mode.value === 'create') resetForm()
  else if (mode.value === 'detail') void loadDetail()
  else void loadList()
@@ -95,7 +148,7 @@ onBeforeUnmount(() => { active = false; ++requestSequence })
 </script>

 <template>
-  <section class="procurement-page client-ui" :aria-busy="loading || submitting">
+  <section class="procurement-page client-ui" :class="{ 'procurement-page--create': mode === 'create' }" :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">
@@ -104,40 +157,80 @@ onBeforeUnmount(() => { active = false; ++requestSequence })
          <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 #direction="{ row }">{{ directionLabel((row as ProcurementSummary).procurementDirection) }}</template>
+          <template #status="{ row }"><el-tag :type="statusTone((row as ProcurementSummary).status)" size="small">{{ statusLabel((row as ProcurementSummary).status, (row as ProcurementSummary).procurementDirection) }}</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>
+      <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(workflow?.status || detail.order.status)">{{ statusLabel(workflow?.status || detail.order.status, detail.order.procurementDirection) }}</el-tag><el-button v-if="canConfirm" type="danger" :disabled="confirming" @click="rejectReceived">驳回</el-button><el-button v-if="canConfirm" type="primary" :loading="confirming" @click="confirmReceived">确认采购结果</el-button><el-button :disabled="loading || confirming" @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 />
+      <template v-else-if="detail && workflow"><el-alert v-if="confirmError" :title="confirmError" type="error" :closable="false" /><el-alert v-if="workflow.rejectionReason" title="采购结果驳回原因" :description="workflow.rejectionReason" type="warning" :closable="false" /><ProcurementDetailPanel :detail="detail" :workflow="workflow" /></template><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>
+      <header class="procurement-create-heading">
+        <div><h1>海外采购下单</h1></div>
+        <el-button v-if="canList" :disabled="submitting" @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="resetForm">新建另一单</el-button></template></el-result>
      <template v-else>
        <el-alert v-if="submitError" class="submit-error" :title="submitError" type="error" :closable="false" />
+        <section class="procurement-summary" aria-label="采购预算概览">
+          <article class="procurement-summary-card">
+            <div class="procurement-summary-title">
+              <span class="procurement-summary-icon procurement-summary-icon--quantity" aria-hidden="true"><svg viewBox="0 0 24 24"><path d="M12 3l8 4.5v9L12 21l-8-4.5v-9z" /><path d="M4 7.5l8 4.5 8-4.5M12 12v9" /></svg></span>
+              <h2>采购数量</h2>
+            </div>
+            <div class="procurement-summary-value">{{ summaryQuantity }}<small>件</small></div>
+          </article>
+          <article class="procurement-summary-card">
+            <div class="procurement-summary-title">
+              <span class="procurement-summary-icon procurement-summary-icon--price" aria-hidden="true"><svg viewBox="0 0 24 24"><path d="M3 12h4l3-8 4 16 3-8h4" /></svg></span>
+              <h2>预算单价</h2>
+            </div>
+            <div class="procurement-summary-value">{{ summaryUnitPrice }}</div>
+          </article>
+          <article class="procurement-summary-card">
+            <div class="procurement-summary-title">
+              <span class="procurement-summary-icon procurement-summary-icon--currency" aria-hidden="true"><svg viewBox="0 0 24 24"><circle cx="12" cy="12" r="9" /><path d="M12 7v10M9 9.5c0-1 1.3-1.7 3-1.7s3 .7 3 1.7-1.3 1.5-3 2-3 1-3 2.2 1.3 1.8 3 1.8 3-.8 3-1.8" /></svg></span>
+              <h2>预算币种</h2>
+            </div>
+            <div class="procurement-summary-value">{{ form.currency }}<small>{{ summaryCurrencyName }}</small></div>
+          </article>
+        </section>
        <el-form :model="form" label-position="top" :disabled="submitting" @submit.prevent="submit">
-          <h3>商品与预算</h3><div class="procurement-form-grid">
-            <el-form-item label="采购品类"><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 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>
+          <section class="procurement-form-section" aria-labelledby="procurement-product-heading">
+            <h3 id="procurement-product-heading"><span class="procurement-section-dot" aria-hidden="true" />商品与预算</h3>
+            <div class="procurement-form-card">
+              <el-form-item class="procurement-direction" label="采购方向" for="procurement-direction" required><el-select id="procurement-direction" v-model="form.procurementDirection" popper-class="procurement-create-select"><el-option v-for="(label, value) in procurementDirections" :key="value" :label="label" :value="value" /></el-select></el-form-item>
+              <div class="procurement-form-grid">
+                <el-form-item label="采购品类" for="procurement-category"><el-input id="procurement-category" v-model.trim="form.purchaseCategory" maxlength="128" placeholder="请输入品类" /></el-form-item>
+                <el-form-item label="商品名称" for="procurement-product" required><el-input id="procurement-product" v-model.trim="form.productName" maxlength="255" placeholder="请输入商品名称" /></el-form-item>
+                <el-form-item label="商品规格" for="procurement-specification"><el-input id="procurement-specification" v-model.trim="form.productSpecification" maxlength="500" placeholder="规格、型号" /></el-form-item>
+                <el-form-item label="采购数量（件）" for="procurement-quantity" required><el-input id="procurement-quantity" v-model.trim="form.purchaseQuantity" inputmode="numeric" maxlength="18" placeholder="正整数" /></el-form-item>
+                <el-form-item label="预算单价" for="procurement-price" required><el-input id="procurement-price" v-model.trim="form.budgetUnitPrice" inputmode="decimal" maxlength="20" placeholder="请明确填写；免费样品填 0" /></el-form-item>
+                <el-form-item label="预算币种" for="procurement-currency" required><el-select id="procurement-currency" v-model="form.currency" popper-class="procurement-create-select"><el-option label="美元 USD" value="USD" /><el-option label="人民币 CNY" value="CNY" /></el-select></el-form-item>
+                <el-form-item class="full" label="商品链接" for="procurement-url"><el-input id="procurement-url" v-model.trim="form.productUrl" maxlength="2000" placeholder="https://..." /></el-form-item>
+              </div>
+              <div class="procurement-budget-total">货款预算总上限：{{ money(budgetTotal, form.currency) }}</div>
+            </div>
+          </section>
+          <section class="procurement-form-section" aria-labelledby="procurement-recipient-heading">
+            <h3 id="procurement-recipient-heading"><span class="procurement-section-dot procurement-section-dot--recipient" aria-hidden="true" />{{ regionText('最终国内收件资料', form.procurementDirection) }}</h3>
+            <div class="procurement-form-card procurement-form-grid">
+              <el-form-item label="收件人" for="procurement-contact" required><el-input id="procurement-contact" v-model.trim="form.contactName" maxlength="128" placeholder="实际收件人姓名" /></el-form-item>
+              <el-form-item label="联系电话" for="procurement-phone" required><el-input id="procurement-phone" v-model.trim="form.contactPhone" maxlength="64" type="tel" placeholder="快递可联系的电话" /></el-form-item>
+              <el-form-item class="full" :label="regionText('完整国内地址', form.procurementDirection)" for="procurement-address" required><el-input id="procurement-address" v-model.trim="form.receivingAddress" maxlength="1000" :placeholder="form.procurementDirection === 'DOMESTIC_TO_OVERSEAS' ? '国家、州/省、市、邮编及详细地址' : '省、市、区县、街道及详细门牌'" /></el-form-item>
+              <el-form-item class="full" label="采购要求" for="procurement-requirements">
+                <el-input id="procurement-requirements" v-model="form.remark" type="textarea" :rows="4" maxlength="1000" resize="vertical" aria-describedby="procurement-requirements-count" />
+                <div id="procurement-requirements-count" class="procurement-character-count">{{ form.remark.length }} / 1000</div>
+              </el-form-item>
+            </div>
+          </section>
        </el-form>
-        <footer class="procurement-form-actions"><el-button type="primary" :loading="submitting" :disabled="!companyName || !identity" @click="submit">提交采购订单</el-button></footer>
+        <footer class="procurement-form-actions"><el-button v-if="canList" :disabled="submitting" @click="returnToList">返回列表</el-button><el-button type="primary" :loading="submitting" :disabled="!companyName || !identity" @click="submit">提交采购订单</el-button></footer>
      </template>
    </section>
  </section>
@@ -145,17 +238,70 @@ onBeforeUnmount(() => { active = false; ++requestSequence })

 <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-table-card, .procurement-detail { min-width: 0; border: 1px solid var(--client-border); border-radius: var(--client-radius); background: #fff; }
+.procurement-table-card { overflow: hidden; }.procurement-detail { 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-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; }
+.procurement-page--create { width: 100%; background: #f4f7fc; }
+.procurement-create {
+  --client-action: #2f7bff;
+  --client-action-hover: #1d5fe0;
+  --client-border: #d5dce8;
+  --client-control-height: 44px;
+  --client-font-size: 14px;
+  --el-color-primary: #2f7bff;
+  --el-text-color-regular: #1f2937;
+  --el-text-color-placeholder: #6b7280;
+  min-width: 0;
+  color: #1f2937;
+  font: 14px/1.5 "PingFang SC", "Microsoft YaHei", "Noto Sans SC", sans-serif;
+}
+.procurement-create-heading { display: flex; justify-content: space-between; align-items: center; flex-wrap: wrap; gap: 16px; margin-bottom: 12px; }
+.procurement-create-heading h1 { margin: 0; font-size: 26px; line-height: 1.4; font-weight: 700; }
+.procurement-summary { display: grid; grid-template-columns: repeat(3, minmax(0, 1fr)); gap: 16px; margin-bottom: 12px; }
+.procurement-summary-card { display: flex; flex-direction: column; gap: 8px; min-width: 0; padding: 12px 16px; border: 1px solid #e3e8f0; border-radius: 10px; background: #fff; }
+.procurement-summary-title { display: flex; align-items: center; gap: 12px; }
+.procurement-summary-title h2 { margin: 0; font-size: 15px; font-weight: 600; }
+.procurement-summary-icon { display: grid; width: 44px; height: 44px; flex: 0 0 44px; place-items: center; border-radius: 8px; }
+.procurement-summary-icon--quantity { color: #2f7bff; background: #eaf2ff; }
+.procurement-summary-icon--price { color: #16a34a; background: #e8f8f0; }
+.procurement-summary-icon--currency { color: #d97706; background: #fff5e0; }
+.procurement-summary-icon svg { width: 20px; height: 20px; fill: none; stroke: currentColor; stroke-width: 1.8; stroke-linecap: round; stroke-linejoin: round; }
+.procurement-summary-value { color: #1d5fe0; font-size: 30px; font-weight: 700; line-height: 1.2; font-variant-numeric: tabular-nums; overflow-wrap: anywhere; }
+.procurement-summary-value small { margin-left: 4px; color: #6b7280; font-size: 14px; font-weight: 500; }
+.procurement-form-section { margin-bottom: 12px; }
+.procurement-form-section h3 { display: flex; align-items: center; gap: 10px; margin: 0 0 10px; font-size: 18px; font-weight: 700; }
+.procurement-section-dot { width: 9px; height: 9px; flex: 0 0 9px; border-radius: 50%; background: #2f7bff; }
+.procurement-section-dot--recipient { background: #0ea5a4; }
+.procurement-form-card { padding: 16px; border: 1px solid #e3e8f0; border-radius: 10px; background: #fff; }
+.procurement-form-grid { display: grid; grid-template-columns: repeat(3, minmax(0, 1fr)); gap: 12px 20px; }
+.procurement-form-grid .full { grid-column: 1 / -1; }
+.procurement-create :deep(.el-form-item) { min-width: 0; margin: 0; }
+.procurement-create :deep(.el-form-item__label) { height: auto; margin-bottom: 6px; padding: 0; color: #374151; font-size: 14px; font-weight: 600; line-height: 20px; }
+.procurement-create :deep(.el-form-item.is-required .el-form-item__label::before) { color: #e5484d; }
+.procurement-create :deep(.el-form-item__content) { min-width: 0; line-height: 20px; }
+.procurement-create :deep(.procurement-direction) { width: calc((100% - 40px) / 3); margin-bottom: 12px; }
+.procurement-create :deep(.el-select) { width: 100%; }
+.procurement-create :deep(.el-input__wrapper), .procurement-create :deep(.el-select__wrapper), .procurement-create :deep(.el-textarea__inner) { border: 1px solid #d5dce8; border-radius: 6px; background: #fff; box-shadow: none; font-family: inherit; font-size: 14px; }
+.procurement-create :deep(.el-input__wrapper), .procurement-create :deep(.el-select__wrapper) { min-height: 44px; padding: 10px 14px; }
+.procurement-create :deep(.el-input__inner) { height: 22px; color: #1f2937; line-height: 22px; }
+.procurement-create :deep(.el-textarea__inner) { min-height: 110px !important; padding: 11px 14px; color: #1f2937; line-height: 20px; }
+.procurement-create :deep(.el-input__inner::placeholder), .procurement-create :deep(.el-textarea__inner::placeholder) { color: #6b7280; }
+.procurement-create :deep(.el-input__wrapper.is-focus), .procurement-create :deep(.el-select__wrapper.is-focused), .procurement-create :deep(.el-textarea__inner:focus) { outline: 2px solid #2f7bff; outline-offset: 0; }
+.procurement-create :deep(.el-input.is-disabled .el-input__wrapper), .procurement-create :deep(.el-select__wrapper.is-disabled), .procurement-create :deep(.el-textarea.is-disabled .el-textarea__inner) { background: #f6f9ff; }
+.procurement-character-count { width: 100%; margin-top: 4px; color: #6b7280; font-size: 13px; text-align: right; }
+.procurement-budget-total { margin-top: 10px; color: #6b7280; font-size: 13px; line-height: 20px; overflow-wrap: anywhere; }
+.procurement-form-actions { display: flex; justify-content: flex-end; flex-wrap: wrap; gap: 12px; }
+.procurement-create :deep(.el-button) { margin-left: 0; padding: 10px 18px; border-radius: 6px; color: #1d5fe0; box-shadow: none; }
+.procurement-create :deep(.el-button--primary) { height: auto; min-height: 44px; padding: 12px 28px; color: #fff; }
+.procurement-create :deep(.el-button.is-disabled) { color: #98a2b3; }
+.submit-error { margin: 0 0 20px; }
+:global(.procurement-create-select.el-popper) { border: 1px solid #d5dce8; box-shadow: none; }
@media (max-width: 767px) {
-  .procurement-form-grid { grid-template-columns: 1fr; }.procurement-heading, .procurement-heading > div { flex-wrap: wrap; }
+  .procurement-form-grid, .procurement-summary { grid-template-columns: 1fr; }.procurement-heading, .procurement-heading > div { flex-wrap: wrap; }
+  .procurement-create :deep(.procurement-direction) { width: 100%; }
 }
 </style>
@@ -443,18 +443,16 @@ function clearanceResultStatusLabel(value: MerchantClearanceResult) {
        </div>
      </section>
    </template>
-    <template #footer><el-button @click="close">关闭</el-button></template>
  </el-dialog>
 </template>

 <style scoped>
 :global(.customs-documents-dialog.el-dialog) { display: flex; max-height: 70vh; flex-direction: column; overflow: hidden; padding: 0; border: 1px solid var(--client-border); border-radius: var(--client-radius); }
-:global(.customs-documents-dialog .el-dialog__header), :global(.customs-documents-dialog .el-dialog__footer) { flex: 0 0 auto; }
+:global(.customs-documents-dialog .el-dialog__header) { flex: 0 0 auto; }
 :global(.customs-documents-dialog .el-dialog__header) { margin: 0; padding: 18px 48px 18px 20px; border-bottom: 1px solid var(--client-border); }
 :global(.customs-documents-dialog .el-dialog__title) { color: var(--client-text); font-size: 16px; font-weight: 600; line-height: 24px; }
 :global(.customs-documents-dialog .el-dialog__headerbtn) { top: 8px; right: 8px; }
 :global(.customs-documents-dialog .el-dialog__body) { min-height: 0; flex: 1 1 auto; overflow-y: auto; padding: 20px; color: var(--client-text); line-height: 1.6; overscroll-behavior: contain; }
-:global(.customs-documents-dialog .el-dialog__footer) { padding: 14px 20px; border-top: 1px solid var(--client-border); background: var(--client-header-bg); }
 .customs-error { display: grid; gap: 10px; justify-items: start; padding: 22px; border: 1px solid #f1b8b8; background: #fff7f7; color: #9f2d2d; }
 .customs-error span { overflow-wrap: anywhere; font-size: 12px; }
 .customs-summary { display: grid; grid-template-columns: minmax(0, 1.6fr) repeat(2, minmax(0, 1fr)) auto; align-items: center; gap: 18px; padding: 16px; border: 1px solid var(--client-border); border-radius: var(--client-radius); background: var(--client-header-bg); }
@@ -1,8 +1,39 @@
 import assert from 'node:assert/strict'
 import { readFileSync } from 'node:fs'
 import test from 'node:test'
+import { compile, computed, createSSRApp, h, inject, provide } from 'vue'
+import { renderToString } from 'vue/server-renderer'
+import ts from 'typescript'

 const source = readFileSync(new URL('./InboundBillingPanel.vue', import.meta.url), 'utf8')
+const confirmationBody = source.slice(source.indexOf('<dl class="fee-dialog-summary"'), source.indexOf('<div class="fee-confirm-notice"'))
+const formatterSource = readFileSync(new URL('../utils/inboundBilling.ts', import.meta.url), 'utf8')
+const formatters = await import(`data:text/javascript;base64,${Buffer.from(ts.transpileModule(formatterSource, {
+  compilerOptions: { module: ts.ModuleKind.ESNext, target: ts.ScriptTarget.ES2022 },
+}).outputText).toString('base64')}`)
+
+async function renderConfirmation(data) {
+  const app = createSSRApp({
+    render: compile(`<div>${confirmationBody}</div>`),
+    setup: () => ({ props: { data }, ...formatters }),
+  })
+  app.component('ElTable', {
+    props: ['data'],
+    setup(tableProps, { slots }) {
+      provide('billingRows', computed(() => tableProps.data))
+      return () => h('table', slots.default?.())
+    },
+  })
+  app.component('ElTableColumn', {
+    props: ['label', 'prop'],
+    setup(columnProps, { slots }) {
+      const rows = inject('billingRows')
+      return () => h('tr', [h('th', columnProps.label), ...rows.value.map(row =>
+        h('td', slots.default?.({ row }) ?? row[columnProps.prop] ?? ''))])
+    },
+  })
+  return renderToString(app)
+}

 test('renders loading, pending, isolated error, and published states', () => {
  assert.match(source, /v-if="props\.loading"/)
@@ -37,25 +68,60 @@ test('shows the published merchant inbound, measurement details and customer con
  assert.match(source, /measurementItems/)
  assert.doesNotMatch(source, /调整费用|发送费用|下载照片/)
  assert.doesNotMatch(source, /internalNotes|statusHistory|files/)
-  assert.match(source, /latestFee\.ruleCode/)
-  assert.match(source, /latestFee\.rateCode/)
-  assert.match(source, /latestFee\.chargeRuleVersion/)
-  assert.match(source, /latestFee\.carrierRateVersion/)
+  assert.doesNotMatch(source, /latestFee\.(feeVersion|ruleCode|rateCode|chargeRuleVersion|carrierRateVersion|sentAt)/)
  assert.match(source, /箱规规则/)
  assert.match(source, /getCalculationRuleLabel\(row\.calculationRuleVersion\)/)
 })

-test('matches the confirmed billing prototype summary, table, notice and footer', () => {
+test('keeps the billing summary, confirmation table, notice and footer', () => {
  assert.match(source, /width="min\(1180px, calc\(100vw - 40px\)\)"/)
  assert.match(source, /class="fee-dialog-summary" aria-label="计费汇总"/)
-  for (const label of ['计算重', '单价', '总金额', '箱规长(cm)', '箱规宽(cm)', '箱规高(cm)', '每箱体积', '总体积', '总材积重']) assert.ok(source.includes(label), `missing prototype label: ${label}`)
+  for (const label of ['计算重', '单价', '总金额', '计费毛重', '计费体积', '计费方式', '最终计费量']) assert.ok(confirmationBody.includes(label), `missing billing label: ${label}`)
  assert.match(source, /class="fee-confirm-notice"/)
-  assert.match(source, /请核对计算重、单价和总金额。确认后当前费用版本将锁定。/)
+  assert.match(source, /请核对计费毛重、计费体积、计费量、单价和总金额。确认后当前费用版本将锁定。/)
  assert.match(source, /确认计费量和费用/)
  assert.match(source, /\.fee-dialog-summary \{ display:grid; grid-template-columns:repeat\(3,minmax\(0,1fr\)\)/)
  assert.match(source, /\.fee-dialog-table :deep\(\.el-table__body td\.el-table__cell\)/)
 })

+test('confirms the selected billing weight and volume even when outer carton totals differ', async () => {
+  const html = await renderConfirmation({
+    latestFee: {
+      actualWeightKg: 570.5, actualVolumeCbm: 3.6894,
+      chargeableQuantity: 616.1298, chargeMode: 'KG', chargeUnit: 'KG',
+      unitPrice: 13.6, totalAmount: 8379.37, currency: 'CNY',
+    },
+    billingBasis: { chargeableWeightKg: 650.298 },
+    measurementItems: [{ lengthCm: 63, widthCm: 53, heightCm: 53, packageCount: 22,
+      unitVolumeCbm: 0.177, totalVolumeCbm: 3.894, volumeWeightKg: 650.298 }],
+  })
+
+  assert.match(html, /570\.5 kg/)
+  assert.match(html, /3\.6894 m³/)
+  assert.match(html, /616\.13 kg/)
+  assert.match(html, /8,379\.37/)
+  assert.doesNotMatch(html, /3\.894|650\.298|0\.177/)
+  assert.doesNotMatch(confirmationBody, /measurementItems|billingBasis|箱规长|每箱体积/)
+})
+
+test('uses the published volume charge quantity and retains six decimal places', async () => {
+  const html = await renderConfirmation({
+    latestFee: {
+      actualWeightKg: 600, actualVolumeCbm: 1.234567,
+      chargeableQuantity: 1.652893, chargeMode: 'CBM', chargeUnit: 'CBM',
+      unitPrice: 100, totalAmount: 165.29, currency: 'CNY',
+    },
+    billingBasis: { chargeableWeightKg: 600 }, measurementItems: [],
+  })
+
+  assert.match(html, /计费量/)
+  assert.match(html, /按体积计费/)
+  assert.match(html, /600 kg/)
+  assert.match(html, /1\.234567 m³/)
+  assert.match(html, /1\.652893 m³/)
+  assert.doesNotMatch(html, /1\.652893 kg/)
+})
+
 test('stacks core information for 720 and 360 pixel layouts', () => {
  assert.match(source, /@media \(max-width: 720px\)/)
  assert.match(source, /\.inbound-overview, \.inbound-measurements, \.fee-calculation-grid \{ grid-template-columns: 1fr;/)
@@ -160,7 +160,7 @@ async function confirmFee() {
      <div class="inbound-result-section fee-result">
        <div class="inbound-section-title">
          <h4>费用结果</h4>
-          <span>{{ props.data.latestFee.feeNo }} · 第 {{ props.data.latestFee.feeVersion }} 版</span>
+          <span>{{ props.data.latestFee.feeNo }}</span>
        </div>
        <dl class="fee-calculation-grid">
          <div><dt>计费方式</dt><dd>{{ getChargeModeLabel(props.data.latestFee.chargeMode) }} · {{ getTaxModeLabel(props.data.latestFee.taxMode) }}</dd></div>
@@ -172,8 +172,8 @@ async function confirmFee() {
              props.data.latestFee.roundingMode,
            ) }}</dd>
          </div>
-          <div><dt>实际重量</dt><dd>{{ formatInboundMeasure(props.data.latestFee.actualWeightKg, 'kg') }}</dd></div>
-          <div><dt>实际体积</dt><dd>{{ formatInboundMeasure(props.data.latestFee.actualVolumeCbm, 'm³') }}</dd></div>
+          <div><dt>计费毛重</dt><dd>{{ formatInboundMeasure(props.data.latestFee.actualWeightKg, 'kg') }}</dd></div>
+          <div><dt>计费体积</dt><dd>{{ formatInboundMeasure(props.data.latestFee.actualVolumeCbm, 'm³', 6) }}</dd></div>
          <div><dt>体积重量</dt><dd>{{ formatInboundMeasure(props.data.latestFee.convertedQuantity, props.data.latestFee.chargeUnit) }}</dd></div>
          <div><dt>最终计费量</dt><dd>{{ formatInboundMeasure(props.data.latestFee.chargeableQuantity, props.data.latestFee.chargeUnit) }}</dd></div>
          <div><dt>单价</dt><dd>{{ formatInboundMoney(props.data.latestFee.unitPrice, props.data.latestFee.currency) }} / {{ props.data.latestFee.chargeUnit }}</dd></div>
@@ -183,11 +183,9 @@ async function confirmFee() {
        <div class="fee-total">
          <div>
            <span>费用合计</span>
-            <small>{{ props.data.latestFee.ruleCode }} v{{ props.data.latestFee.chargeRuleVersion }} · {{ props.data.latestFee.rateCode }} v{{ props.data.latestFee.carrierRateVersion }}</small>
          </div>
          <strong>{{ formatInboundMoney(props.data.latestFee.totalAmount, props.data.latestFee.currency) }}</strong>
        </div>
-        <p class="fee-sent-time">发布于 {{ formatInboundDateTime(props.data.latestFee.sentAt) }}</p>
      </div>

      <div v-if="props.data.inbound.publicRemark" class="inbound-public-remark">
@@ -214,26 +212,20 @@ async function confirmFee() {
      </div>
      <template v-else>
      <dl class="fee-dialog-summary" aria-label="计费汇总">
-        <div><dt>计算重</dt><dd>{{ formatInboundMeasure(props.data.billingBasis.chargeableWeightKg, 'kg') }}</dd></div>
+        <div><dt>{{ props.data.latestFee.chargeUnit === 'KG' ? '计算重' : '计费量' }}</dt><dd>{{ formatInboundMeasure(props.data.latestFee.chargeableQuantity, props.data.latestFee.chargeUnit === 'KG' ? 'kg' : 'm³', props.data.latestFee.chargeUnit === 'KG' ? 3 : 6) }}</dd></div>
        <div><dt>单价</dt><dd>{{ formatInboundMoney(props.data.latestFee.unitPrice, props.data.latestFee.currency) }} / {{ props.data.latestFee.chargeUnit.toUpperCase() }}</dd></div>
        <div><dt>总金额</dt><dd>{{ formatInboundMoney(props.data.latestFee.totalAmount, props.data.latestFee.currency) }}</dd></div>
      </dl>
-      <el-table class="measurement-detail-table fee-dialog-table" :data="props.data.measurementItems" border empty-text="暂无箱规测量明细">
-        <el-table-column type="index" label="#" width="54" />
-        <el-table-column prop="lengthCm" label="箱规长(cm)" min-width="105" />
-        <el-table-column prop="widthCm" label="箱规宽(cm)" min-width="105" />
-        <el-table-column prop="heightCm" label="箱规高(cm)" min-width="105" />
-        <el-table-column prop="packageCount" label="箱数" min-width="76" />
-        <el-table-column label="每箱体积" min-width="105"><template #default="{ row }">{{ formatInboundMeasure(row.unitVolumeCbm, 'm³') }}</template></el-table-column>
-        <el-table-column label="总体积" min-width="105"><template #default="{ row }">{{ formatInboundMeasure(row.totalVolumeCbm, 'm³') }}</template></el-table-column>
-        <el-table-column label="总材积重" min-width="105"><template #default="{ row }">{{ formatInboundMeasure(row.volumeWeightKg, 'kg') }}</template></el-table-column>
-        <el-table-column label="箱规规则" min-width="170"><template #default="{ row }">{{ getCalculationRuleLabel(row.calculationRuleVersion) }}</template></el-table-column>
-        <el-table-column prop="boxSpecification" label="备注" min-width="130" />
+      <el-table class="measurement-detail-table fee-dialog-table" :data="[props.data.latestFee]" border>
+        <el-table-column label="计费毛重" min-width="180"><template #default="{ row }">{{ formatInboundMeasure(row.actualWeightKg, 'kg') }}</template></el-table-column>
+        <el-table-column label="计费体积" min-width="180"><template #default="{ row }">{{ formatInboundMeasure(row.actualVolumeCbm, 'm³', 6) }}</template></el-table-column>
+        <el-table-column label="计费方式" min-width="150"><template #default="{ row }">{{ getChargeModeLabel(row.chargeMode) }}</template></el-table-column>
+        <el-table-column label="最终计费量" min-width="180"><template #default="{ row }">{{ formatInboundMeasure(row.chargeableQuantity, row.chargeUnit === 'KG' ? 'kg' : 'm³', row.chargeUnit === 'KG' ? 3 : 6) }}</template></el-table-column>
      </el-table>
      <div class="fee-confirm-notice" :class="{ 'is-confirmed': props.data.latestFee.customerConfirmationStatus === 'CONFIRMED' }" role="status">
        <CircleAlert :size="21" aria-hidden="true" />
        <span v-if="props.data.latestFee.customerConfirmationStatus === 'CONFIRMED'">客户已于 {{ formatInboundDateTime(props.data.latestFee.customerConfirmedAt) }} 确认，费用已锁定，不允许修改。</span>
-        <span v-else>请核对计算重、单价和总金额。确认后当前费用版本将锁定。</span>
+        <span v-else>请核对计费毛重、计费体积、计费量、单价和总金额。确认后当前费用版本将锁定。</span>
      </div>
      </template>
      <template #footer>
@@ -283,7 +275,7 @@ async function confirmFee() {
 .fee-dialog-table { margin-top:16px; overflow:hidden; border-radius:10px; box-shadow:0 5px 18px rgba(51,65,85,.04); }
 .fee-dialog-table :deep(.el-table__header th.el-table__cell) { height:42px; padding:9px 0; background:linear-gradient(180deg,#f8f9fc,#f3f5f9); color:#697386; font-size:13px; font-weight:650; }
 .fee-dialog-table :deep(.el-table__body td.el-table__cell) { height:82px; padding:9px 0; color:#515a6c; font-size:14px; font-variant-numeric:tabular-nums; }
-.fee-dialog-table :deep(.el-table__body td:nth-child(7)), .fee-dialog-table :deep(.el-table__body td:nth-child(8)) { color:#34466b; font-weight:650; }
+.fee-dialog-table :deep(.el-table__body td:nth-child(2)), .fee-dialog-table :deep(.el-table__body td:nth-child(4)) { color:#34466b; font-weight:650; }
 .fee-dialog-table :deep(.cell) { line-height:1.6; }
 .fee-confirm-notice { display:flex; align-items:center; gap:10px; margin-top:14px; padding:10px 14px; border:1px solid #f5dfba; border-radius:9px; background:linear-gradient(90deg,#fff9ef,#fffaf2); color:#c6790c; font-size:14px; font-weight:500; }
 .fee-confirm-notice > svg { flex:0 0 auto; fill:#eda332; color:#fff; filter:drop-shadow(0 2px 3px rgba(233,154,37,.25)); }
@@ -305,9 +297,7 @@ async function confirmFee() {
 .fee-total { padding: 15px 0 0; }
 .fee-total > div { display: flex; min-width: 0; flex-direction: column; gap: 4px; }
 .fee-total span { color: var(--navy); font-size: 12px; font-weight: 650; }
-.fee-total small, .fee-sent-time { color: var(--muted); font-size: 10px; }
 .fee-total strong { flex: 0 0 auto; color: var(--primary); font-size: 21px; }
-.fee-sent-time { margin: 5px 0 0; text-align: right; }
 .inbound-public-remark { margin-top: 16px; padding: 13px 14px; background: #f2f7f6; }
 .inbound-public-remark strong { color: var(--navy); font-size: 11px; }
 .inbound-public-remark p { margin: 5px 0 0; overflow-wrap: anywhere; color: var(--muted); font-size: 11px; line-height: 1.55; white-space: pre-wrap; }
@@ -345,6 +335,5 @@ async function confirmFee() {
  .inbound-billing-heading { align-items: flex-start; flex-direction: column; }
  .fee-total { align-items: flex-start; flex-direction: column; }
  .fee-total strong { font-size: 19px; }
-  .fee-sent-time { text-align: left; }
 }
 </style>
@@ -0,0 +1,134 @@
+import assert from 'node:assert/strict'
+import { readFileSync } from 'node:fs'
+import test from 'node:test'
+import ts from 'typescript'
+import { computed, effectScope, ref, watch } from 'vue'
+import { readOrderColumnPreferences, saveOrderColumnPreferences } from './orderColumnPreferences.ts'
+
+const page = readFileSync(new URL('../views/FirstLegOrdersView.vue', import.meta.url), 'utf8')
+const columnSource = page.slice(page.indexOf('const fixedOrderColumns:'), page.indexOf('const tablePage ='))
+const columnScript = ts.transpileModule(columnSource, { compilerOptions: { target: ts.ScriptTarget.ES2022 } }).outputText
+const createColumns = new Function('auth', 'ref', 'computed', 'watch', 'readOrderColumnPreferences', 'saveOrderColumnPreferences', `${columnScript}
+  return { visibleColumnKeys, orderedColumnKeys, visibleOrderColumns, draggedColumnKey, moveOrderColumn, dropOrderColumn, resetOrderColumns }
+`)
+
+function mockStorage(t) {
+  const original = Object.getOwnPropertyDescriptor(globalThis, 'localStorage')
+  const entries = new Map()
+  const storage = {
+    getItem: key => entries.get(key) ?? null,
+    setItem: (key, value) => entries.set(key, value),
+  }
+  Object.defineProperty(globalThis, 'localStorage', { configurable: true, value: storage })
+  t.after(() => {
+    if (original) Object.defineProperty(globalThis, 'localStorage', original)
+    else delete globalThis.localStorage
+  })
+  return storage
+}
+
+function openColumns(t, ownerId = 'customer-one') {
+  const scope = effectScope()
+  const columns = scope.run(() => createColumns({ user: { id: ownerId } }, ref, computed, watch, readOrderColumnPreferences, saveOrderColumnPreferences))
+  t.after(() => scope.stop())
+  return { ...columns, close: () => scope.stop() }
+}
+
+test('restores checked fields and both arrow and drag ordering after a fresh page setup', t => {
+  mockStorage(t)
+  const columns = openColumns(t)
+  columns.visibleColumnKeys.value.push('destinationWarehouse', 'grossWeight', 'volume')
+  columns.visibleColumnKeys.value.splice(columns.visibleColumnKeys.value.indexOf('createdAt'), 1)
+  columns.moveOrderColumn('destinationWarehouse', -1)
+  columns.draggedColumnKey.value = 'grossWeight'
+  columns.dropOrderColumn('status')
+  const visibleKeys = [...columns.visibleColumnKeys.value]
+  const orderedKeys = [...columns.orderedColumnKeys.value]
+  const renderedKeys = columns.visibleOrderColumns.value.map(column => column.key)
+  columns.close()
+
+  const refreshed = openColumns(t)
+  assert.deepEqual(refreshed.visibleColumnKeys.value, visibleKeys)
+  assert.deepEqual(refreshed.orderedColumnKeys.value, orderedKeys)
+  assert.deepEqual(refreshed.visibleOrderColumns.value.map(column => column.key), renderedKeys)
+  assert.deepEqual(renderedKeys.slice(0, 3), ['selection', 'actions', 'inboundCode'])
+  assert.equal(renderedKeys[3], 'grossWeight')
+})
+
+test('persists restore-default and intentionally hiding every selectable field', t => {
+  mockStorage(t)
+  const columns = openColumns(t)
+  const defaults = [...columns.visibleColumnKeys.value]
+  const defaultOrder = [...columns.orderedColumnKeys.value]
+  columns.visibleColumnKeys.value = []
+  columns.close()
+  const refreshed = openColumns(t)
+  assert.deepEqual(refreshed.visibleColumnKeys.value, [])
+  assert.deepEqual(refreshed.visibleOrderColumns.value.map(column => column.key), ['selection', 'actions', 'inboundCode'])
+
+  refreshed.moveOrderColumn('grossWeight', -1)
+  refreshed.resetOrderColumns()
+  refreshed.close()
+  const reset = openColumns(t)
+  assert.deepEqual(reset.visibleColumnKeys.value, defaults)
+  assert.deepEqual(reset.orderedColumnKeys.value, defaultOrder)
+})
+
+test('keeps the field selection separate for each signed-in account', t => {
+  mockStorage(t)
+  const first = openColumns(t)
+  first.visibleColumnKeys.value = ['volume']
+  first.close()
+  const second = openColumns(t, 'customer-two')
+  assert.notDeepEqual(second.visibleColumnKeys.value, ['volume'])
+  second.visibleColumnKeys.value = ['grossWeight']
+  second.close()
+  assert.deepEqual(openColumns(t).visibleColumnKeys.value, ['volume'])
+  assert.deepEqual(openColumns(t, 'customer-two').visibleColumnKeys.value, ['grossWeight'])
+})
+
+test('discards unknown, duplicate and invalid keys and includes newly available fields in ordering', t => {
+  mockStorage(t)
+  saveOrderColumnPreferences('customer-one', {
+    visibleColumnKeys: ['volume', 'removed', 'volume', null, 3],
+    orderedColumnKeys: ['volume', 'removed', 'volume', false],
+  })
+  assert.deepEqual(readOrderColumnPreferences('customer-one', ['status', 'volume', 'newField'], ['status']), {
+    visibleColumnKeys: ['volume'],
+    orderedColumnKeys: ['volume', 'status', 'newField'],
+  })
+})
+
+test('uses the original defaults for missing or damaged saved preferences', t => {
+  const storage = mockStorage(t)
+  const defaults = { visibleColumnKeys: ['status'], orderedColumnKeys: ['status', 'volume'] }
+  assert.deepEqual(readOrderColumnPreferences('customer-one', ['status', 'volume'], ['status']), defaults)
+  saveOrderColumnPreferences('customer-one', defaults)
+  const realGetItem = storage.getItem
+  for (const saved of ['{invalid', 'null', '[]', '42', '{"visibleColumnKeys":"status","orderedColumnKeys":[]}']) {
+    storage.getItem = () => saved
+    assert.deepEqual(readOrderColumnPreferences('customer-one', ['status', 'volume'], ['status']), defaults)
+  }
+  storage.getItem = realGetItem
+})
+
+test('keeps column controls usable when browser storage is blocked', t => {
+  const storage = mockStorage(t)
+  storage.getItem = () => { throw new Error('Storage denied') }
+  storage.setItem = () => { throw new Error('Storage denied') }
+  const columns = openColumns(t)
+  assert.ok(columns.visibleColumnKeys.value.includes('status'))
+  assert.doesNotThrow(() => { columns.visibleColumnKeys.value.push('volume') })
+  assert.doesNotThrow(() => columns.resetOrderColumns())
+})
+
+test('does not read or save preferences without an account', t => {
+  const storage = mockStorage(t)
+  let storageCalls = 0
+  storage.getItem = () => { storageCalls++; return null }
+  storage.setItem = () => { storageCalls++ }
+  const columns = openColumns(t, '')
+  columns.visibleColumnKeys.value = ['volume']
+  assert.equal(openColumns(t, '').visibleColumnKeys.value.includes('status'), true)
+  assert.equal(storageCalls, 0)
+})
@@ -0,0 +1,35 @@
+interface OrderColumnPreferences {
+  visibleColumnKeys: string[]
+  orderedColumnKeys: string[]
+}
+
+function storageKey(ownerId: string) {
+  return `cc:client:first-leg:order-columns:${ownerId}`
+}
+
+export function readOrderColumnPreferences(ownerId: string, selectableKeys: string[], defaultVisibleKeys: string[]): OrderColumnPreferences {
+  const defaults = { visibleColumnKeys: [...defaultVisibleKeys], orderedColumnKeys: [...selectableKeys] }
+  if (!ownerId) return defaults
+  try {
+    const saved: unknown = JSON.parse(localStorage.getItem(storageKey(ownerId)) ?? 'null')
+    if (!saved || typeof saved !== 'object') return defaults
+    const preferences = saved as Partial<OrderColumnPreferences>
+    if (!Array.isArray(preferences.visibleColumnKeys) || !Array.isArray(preferences.orderedColumnKeys)) return defaults
+    const validKeys = (keys: unknown[]) => [...new Set(keys.filter((key): key is string => typeof key === 'string' && selectableKeys.includes(key)))]
+    return {
+      visibleColumnKeys: validKeys(preferences.visibleColumnKeys),
+      orderedColumnKeys: [...new Set([...validKeys(preferences.orderedColumnKeys), ...selectableKeys])],
+    }
+  } catch {
+    return defaults
+  }
+}
+
+export function saveOrderColumnPreferences(ownerId: string, preferences: OrderColumnPreferences) {
+  if (!ownerId) return
+  try {
+    localStorage.setItem(storageKey(ownerId), JSON.stringify(preferences))
+  } catch {
+    // Column selection remains usable when browser storage is unavailable.
+  }
+}
@@ -64,6 +64,7 @@ import { orderBillingMetric } from '../utils/orderDetailSummary'
 import type { OrderQueue } from '../api/unifiedOrders'
 import { validateProductImageFile } from '@/modules/first-leg/utils/productImage'
 import { createPriceEstimateBreakdown } from '@/modules/first-leg/utils/priceEstimate'
+import { readOrderColumnPreferences, saveOrderColumnPreferences } from '@/modules/first-leg/utils/orderColumnPreferences'

 const store = useFirstLegOrdersStore()
 const tenantStore = useTenantAdministrationStore()
@@ -182,8 +183,13 @@ const selectableOrderColumns: DataTableColumn[] = [
 ]
 const allSelectableColumnKeys = selectableOrderColumns.map((column) => String(column.key))
 const defaultVisibleColumnKeys = ['status', 'progress', 'channel', 'transportMode', 'pickupMethod', 'receivingWarehouse', 'createdAt']
-const visibleColumnKeys = ref<string[]>([...defaultVisibleColumnKeys])
-const orderedColumnKeys = ref<string[]>([...allSelectableColumnKeys])
+const columnPreferencesOwnerId = auth.user?.id ?? ''
+const savedColumnPreferences = readOrderColumnPreferences(columnPreferencesOwnerId, allSelectableColumnKeys, defaultVisibleColumnKeys)
+const visibleColumnKeys = ref<string[]>(savedColumnPreferences.visibleColumnKeys)
+const orderedColumnKeys = ref<string[]>(savedColumnPreferences.orderedColumnKeys)
+watch([visibleColumnKeys, orderedColumnKeys], ([visibleKeys, orderedKeys]) => {
+  saveOrderColumnPreferences(columnPreferencesOwnerId, { visibleColumnKeys: visibleKeys, orderedColumnKeys: orderedKeys })
+}, { deep: true, flush: 'sync' })
 const draggedColumnKey = ref('')
 const orderedSelectableColumns = computed(() => orderedColumnKeys.value
  .map((key) => selectableOrderColumns.find((column) => String(column.key) === key))
@@ -2381,7 +2387,7 @@ async function searchOrders(model: QueryModel) {
        <div class="order-detail-heading">
          <div class="detail-heading-main">
            <el-button link type="primary" class="detail-back-action" @click="router.push({ name: 'first-leg-orders' })">← 返回列表</el-button>
-            <div><h2>{{ detailOrder.businessSummary.inboundCode || (detailOrder.status === 'CANCELLED' ? (detailOrder.orderNo || '—') : detailOrder.status === 'DRAFT' ? '入仓码提交后生成' : '入仓码待生成') }}</h2><p v-if="detailOrder.status === 'CANCELLED'">订单已取消。</p><p v-else>{{ getFirstLegTransportModeLabel(detailOrder.transportMode) }} · {{ detailOrder.origin || '起运地待更新' }} → {{ detailOrder.destination || '目的地待更新' }}</p></div>
+            <div><h2>{{ detailOrder.businessSummary.inboundCode || (detailOrder.status === 'CANCELLED' ? (detailOrder.orderNo || '—') : detailOrder.status === 'DRAFT' ? '入仓码提交后生成' : '入仓码待生成') }}</h2></div>
          </div>
          <div class="detail-heading-actions"><el-tag :type="getFirstLegStatusTone(detailOrder.status)" effect="light">{{ getFirstLegStatusLabel(detailOrder.status) }}</el-tag><el-button v-if="canEditOrder && canClientEditFirstLegOrder(detailOrder.status)" type="primary" plain :loading="openingEditor" @click="openEdit(detailOrder)"><Pencil :size="16" />编辑草稿</el-button><el-button v-if="canOfferCancellation(detailOrder)" type="danger" plain :loading="cancellingOrderId === detailOrder.id" :disabled="!!cancellingOrderId" @click="cancelOrder(detailOrder)">取消订单</el-button></div>
        </div>
@@ -2794,7 +2800,6 @@ async function searchOrders(model: QueryModel) {
 .detail-heading-main > div { min-width: 0; }
 .detail-back-action, .detail-heading-actions { flex: 0 0 auto; }
 .order-detail-heading h2 { margin: 0; overflow: hidden; color: var(--navy); font-size: 18px; text-overflow: ellipsis; white-space: nowrap; }
-.order-detail-heading p { margin: 3px 0 0; overflow: hidden; color: var(--muted); font-size: 11px; text-overflow: ellipsis; white-space: nowrap; }
 .order-detail-grid { display: grid; grid-template-columns: repeat(4, minmax(0, 1fr)); gap: 0; margin: 0; border-top: 1px solid var(--border); border-left: 1px solid var(--border); }
 .order-detail-grid div { display: grid; min-width: 0; min-height: 34px; grid-template-columns: 78px minmax(0, 1fr); align-items: center; gap: 7px; padding: 3px 8px; border-right: 1px solid var(--border); border-bottom: 1px solid var(--border); }
 .order-detail-grid dt { color: var(--muted); font-size: 10px; white-space: nowrap; }
@@ -35,4 +35,4 @@ watch(() => props.transferNo, load, { immediate: true }); onBeforeUnmount(() =>
    <div v-if="progress?.evidence.length" class="pickup-files"><span>取货凭证</span><el-button v-for="file in progress.evidence" :key="file.fileId" link type="primary" @click="download(file)">{{ file.fileName }}</el-button></div>
  </section>
 </template>
-<style scoped>.pickup-progress{padding:16px;border:1px solid var(--border,#e5e7eb);border-radius:6px;margin:16px 0}.pickup-heading{display:flex;justify-content:space-between;align-items:center}.pickup-heading h3{margin:0;font-size:15px}.pickup-fields{display:grid;grid-template-columns:repeat(4,minmax(0,1fr));gap:12px 20px;margin:16px 0 0}.pickup-fields>div{display:flex;gap:10px}.pickup-fields dt{color:var(--muted,#64748b);flex-shrink:0}.pickup-fields dd{margin:0;overflow-wrap:anywhere}.pickup-files{display:flex;gap:12px;align-items:center;flex-wrap:wrap;margin-top:14px}</style>
+<style scoped>.pickup-progress{padding:0 16px 10px;border:1px solid var(--border,#e5e7eb);border-radius:6px;margin:16px 0}.pickup-heading{display:flex;min-height:40px;justify-content:space-between;align-items:center}.pickup-heading h3{margin:0;font-size:14px}.pickup-fields{display:grid;max-width:1408px;grid-template-columns:repeat(4,minmax(0,1fr));gap:4px 18px;margin:8px 0 0}.pickup-fields>div{display:flex;min-height:24px;align-items:center;gap:8px;padding:1px 0}.pickup-fields dt{flex:0 0 84px;min-width:0;color:#8a95a5;font-size:12px}.pickup-fields dd{min-width:0;margin:0;overflow-wrap:anywhere;color:#334157;font-size:13px;font-weight:700}.pickup-files{display:flex;gap:12px;align-items:center;flex-wrap:wrap;margin-top:8px}.pickup-files>span{color:#8a95a5;font-size:12px}@media(max-width:1100px){.pickup-fields{grid-template-columns:repeat(2,minmax(0,1fr))}}@media(max-width:720px){.pickup-fields{grid-template-columns:1fr;gap:2px}}</style>
@@ -9,7 +9,8 @@ const escapeHtml = (value: string) => value.replace(/[&<>"']/g, char => ({ '&':

 /** Generate labels in memory only. The later order request carries these same identities. */
 export function prepareTransferCartonLabels(rows: PrintableCargoRow[], newMark: () => string = () => {
-  const bytes = crypto.getRandomValues(new Uint8Array(16))
+  // 采用短箱码，业务前缀保留 BX，SKU/品名等业务信息继续单独打印，避免把业务字段拼进唯一箱码。
+  const bytes = crypto.getRandomValues(new Uint8Array(6))
  return `BX-${Array.from(bytes, byte => byte.toString(16).padStart(2, '0')).join('').toUpperCase()}`
 }) {
  const total = rows.reduce((sum, row) => sum + Number(row.expectedPackageCount || 0), 0)
@@ -289,7 +289,7 @@ onMounted(() => { if (props.detailPage) void Promise.all([loadCartonDetail(), lo
    </template>
    <article v-else v-loading="loading" class="carton-detail-surface">
      <template v-if="cartonDetail">
-        <header class="carton-detail-header"><button type="button" class="carton-detail-back" @click="returnToCartons"><ArrowLeft :size="16" />返回列表</button><div><strong>{{ cartonDetail.cartonMark }}</strong><span>{{ warehouseLabel(cartonDetail.overseasWarehouseId) }} · 退货箱明细</span></div><div class="carton-detail-actions"><el-tag effect="light">{{ cartonStatusLabel(cartonDetail.status) }}</el-tag><el-button type="primary" @click="printLabel(cartonDetail.cartonMark)"><Printer :size="16" />打印箱唛</el-button></div></header>
+        <header class="carton-detail-header"><button type="button" class="carton-detail-back" @click="returnToCartons"><ArrowLeft :size="16" />返回列表</button><div><strong>{{ cartonDetail.cartonMark }}</strong><span>{{ warehouseLabel(cartonDetail.overseasWarehouseId) }}</span></div><div class="carton-detail-actions"><el-tag effect="light">{{ cartonStatusLabel(cartonDetail.status) }}</el-tag><el-button type="primary" @click="printLabel(cartonDetail.cartonMark)"><Printer :size="16" />打印箱唛</el-button></div></header>
        <section class="carton-detail-section"><h3>箱号概览</h3><dl class="carton-detail-grid"><div><dt>来源退货单</dt><dd>{{ cartonDetail.sourceReturnNo || '—' }}</dd></div><div><dt>签收批次</dt><dd>{{ cartonDetail.sourceBatchNo || '—' }}</dd></div><div><dt>SKU 种类</dt><dd>{{ cartonDetail.skuTypes }}</dd></div><div><dt>箱内总件数</dt><dd>{{ cartonDetail.totalQuantity }}</dd></div><div><dt>箱规</dt><dd>{{ cartonDetail.length && cartonDetail.width && cartonDetail.height ? `${cartonDetail.length} × ${cartonDetail.width} × ${cartonDetail.height} cm` : '—' }}</dd></div><div><dt>重量</dt><dd>{{ cartonDetail.weight ? `${cartonDetail.weight} kg` : '—' }}</dd></div><div><dt>换标进度</dt><dd>{{ returnRelabelStatusLabel(cartonDetail.relabelStatus) }}</dd></div><div><dt>实际完成（件）</dt><dd>{{ cartonDetail.relabelledQuantity ?? '—' }}</dd></div><div><dt>处理中占用（件）</dt><dd>{{ cartonDetail.relabelReservedQuantity ?? '—' }}</dd></div><div><dt>签收时间</dt><dd>{{ formatInventoryTime(cartonDetail.receivedAt) }}</dd></div></dl></section>
        <section class="carton-detail-section"><h3>箱内 SKU</h3><DataTable :data="cartonDetail.items" :columns="cartonItemColumns" row-key="skuCode" empty-text="暂无箱内 SKU" /></section>
        <section class="carton-detail-section"><h3>SKU 换标明细</h3><DataTable :data="cartonDetail.skuConversions" :columns="conversionColumns" empty-text="暂无 SKU 换标记录"><template #conversionStatus="{ row }">{{ conversionStatusLabel(row.status) }}</template></DataTable></section>
@@ -378,7 +378,7 @@ onBeforeUnmount(clearPhotoUrls)
      <template v-if="selected">
        <header class="return-detail-header">
          <button type="button" class="return-back" @click="returnToList"><ArrowLeft :size="16" />返回列表</button>
-          <div class="return-detail-title"><strong>{{ selected.order.returnNo }}</strong><span>{{ operationWarehouseLabel(selected.order.overseasWarehouseId) }} · 退货签收</span></div>
+          <div class="return-detail-title"><strong>{{ selected.order.returnNo }}</strong><span>{{ operationWarehouseLabel(selected.order.overseasWarehouseId) }}</span></div>
          <div class="return-detail-actions"><el-button v-if="canCreateRelabel && canApplyRelabel(selected.order)" type="primary" plain @click="openRelabel(selected.order)">贴标申请</el-button><el-tag :type="statusType(selected.order.status, selected.order.needRelabel)" :class="statusClass(selected.order.status, selected.order.needRelabel)" effect="light">{{ statusLabel(selected.order.status, selected.order.needRelabel) }}</el-tag></div>
        </header>
        <ReviewRejectionNotice :status="selected.order.status" :reason="selected.remark" />
@@ -1,5 +1,4 @@
 <script setup lang="ts">
-import RelabelQuantityPanel from '../components/RelabelQuantityPanel.vue'
 import { getRelabelQuantities, type RelabelQuantity } from '../api/relabelQuantities'
 import TransferPickupProgressPanel from '../components/TransferPickupProgressPanel.vue'
 import TransferPaneDivider from '../components/TransferPaneDivider.vue'
@@ -429,9 +428,7 @@ function relabelOptionLabel(option: typeof relabelInboundOptions.value[number])
 }
 const loading = ref(false)
 const saving = ref(false)
-const cartonTemplateInput = ref<HTMLInputElement | null>(null)
-const skuTemplateInput = ref<HTMLInputElement | null>(null)
-const mixedTemplateInput = ref<HTMLInputElement | null>(null)
+const unifiedTemplateInput = ref<HTMLInputElement | null>(null)
 const transferCartonMarkInput = ref<HTMLInputElement | null>(null)
 const relabelFileInput = ref<HTMLInputElement | null>(null)
 const relabelFileScope = ref<'CARTON_TOTAL' | 'SKU_TOTAL' | 'ITEM'>('CARTON_TOTAL')
@@ -828,110 +825,62 @@ async function importTransferCartonMarks(event: Event) {
  for (const row of cargoRows.value) row.customerCartonMarks = imported.filter((item) => item.SKU.trim().toUpperCase() === row.sku.trim().toUpperCase()).map((item) => item['客户箱唛号'].trim()).join('\n')
  ElMessage.success(`已导入 ${imported.length} 个客户箱唛`)
 }
-function downloadRelabelTemplate(templateType: RelabelTemplateType) {
+function relabelTemplateTypeForMode(mode: LabelingMode): RelabelTemplateType {
+  return mode === 'carton' ? 'carton' : mode === 'sku' ? 'sku' : 'mixed'
+}
+function relabelTemplateTypeLabel(type: RelabelTemplateType) {
+  return type === 'carton' ? '只换箱唛' : type === 'sku' ? '只换 SKU 标签' : 'SKU 和箱唛都换'
+}
+function parseRelabelTemplateType(value: string): RelabelTemplateType | null {
+  const normalized = value.trim().toUpperCase().replaceAll(' ', '')
+  if (['只换箱唛', '箱号关联', '箱唛换标', 'CARTON', 'CARTON_LABEL'].includes(normalized)) return 'carton'
+  if (['只换SKU标签', 'SKU关联', 'SKU换标', 'SKU', 'SKU_LABEL'].includes(normalized)) return 'sku'
+  if (['SKU和箱唛都换', 'SKU混箱', 'SKU混箱换标', '混箱', 'MIXED', 'CARTON_AND_SKU'].includes(normalized)) return 'mixed'
+  return null
+}
+function downloadRelabelTemplate() {
  if (!cargoRows.value.length) { ElMessage.warning('请先选择有库存的历史入仓单'); return }
-  const cartonTemplate = templateType === 'carton'
-  const mixedTemplate = templateType === 'mixed'
-  const includeDestination = false
+  const templateType = relabelTemplateTypeForMode(labelingMode.value)
  const cartonMarkHeader = props.service === 'transfer' ? '客户箱唛号' : '仓库唛头'
-  const header = cartonTemplate
-    ? ['明细行标识', cartonMarkHeader, '新FBA箱唛', ...(includeDestination ? ['FBA目的仓'] : []), 'FBA货件编号', '备注']
-    : ['明细行标识', cartonMarkHeader, '旧SKU标签', '新SKU标签', '换标数量（件）',
-        ...(mixedTemplate ? ['新FBA箱唛', ...(includeDestination ? ['FBA目的仓'] : []), 'FBA货件编号'] : []), '备注']
-  const rows = cargoRows.value.map((item) => cartonTemplate
-    ? [item.id, item.cartonMark, item.fbaCartonMark, ...(includeDestination ? [item.destinationWarehouseId] : []), item.shipmentNo, item.remark]
-    : [item.id, item.cartonMark, item.sku, '', 1,
-        ...(mixedTemplate ? [item.fbaCartonMark, ...(includeDestination ? [item.destinationWarehouseId] : []), item.shipmentNo] : []), item.remark])
+  const header = ['明细行标识', '贴标类型', cartonMarkHeader, '旧SKU标签', '新SKU标签', '换标数量（件）', '新FBA箱唛', 'FBA货件编号', '备注']
+  const rows = cargoRows.value.map((item) => [item.id, relabelTemplateTypeLabel(templateType), props.service === 'transfer' ? item.customerCartonMarks : item.cartonMark, item.sku, '', 1, '', item.shipmentNo, item.remark])
  const blob = new Blob([`\uFEFF${[header, ...rows].map((row) => row.map(csvCell).join(',')).join('\r\n')}\r\n`], { type: 'text/csv;charset=utf-8' })
-  const url = URL.createObjectURL(blob)
-  const anchor = document.createElement('a')
-  anchor.href = url
-  anchor.download = cartonTemplate ? '贴标申请-箱号关联模板.csv'
-    : mixedTemplate ? '贴标申请-SKU混箱换标模板.csv' : '贴标申请-SKU关联模板.csv'
-  anchor.click(); URL.revokeObjectURL(url)
+  const url = URL.createObjectURL(blob); const anchor = document.createElement('a'); anchor.href = url; anchor.download = '贴标申请-统一明细关联模板.csv'; anchor.click(); URL.revokeObjectURL(url)
 }
 function parseCsvLine(line: string) {
  const values: string[] = []; let value = ''; let quoted = false
-  for (let index = 0; index < line.length; index += 1) {
-    const char = line[index]
-    if (char === '"') { if (quoted && line[index + 1] === '"') { value += '"'; index += 1 } else quoted = !quoted }
-    else if (char === ',' && !quoted) { values.push(value.trim()); value = '' }
-    else value += char
-  }
+  for (let index = 0; index < line.length; index += 1) { const char = line[index]; if (char === '"') { if (quoted && line[index + 1] === '"') { value += '"'; index += 1 } else quoted = !quoted } else if (char === ',' && !quoted) { values.push(value.trim()); value = '' } else value += char }
  values.push(value.trim()); return values
 }
-async function importRelabelTemplate(event: Event, templateType: RelabelTemplateType) {
-  const input = event.target as HTMLInputElement; const file = input.files?.[0]; input.value = ''
-  if (!file) return
+async function importRelabelTemplate(event: Event) {
+  const input = event.target as HTMLInputElement; const file = input.files?.[0]; input.value = ''; if (!file) return
  const lines = (await file.text()).replace(/^\uFEFF/, '').split(/\r?\n/).filter((line) => line.trim())
  if (lines.length < 2) { ElMessage.error('模板中没有可导入的明细'); return }
-  // Accept both the current display name and legacy template header while keeping the internal key stable.
  const headers = parseCsvLine(lines[0]).map((name) => name === '仓库唛头' || name === '客户箱唛号' || name === '旧唛头' ? '旧箱唛' : name)
-  if (templateType !== 'carton') {
-    const mixedTemplate = templateType === 'mixed'
-    const required = ['明细行标识', '旧箱唛', '旧SKU标签', '新SKU标签', '换标数量（件）',
-      ...(mixedTemplate ? ['新FBA箱唛', 'FBA货件编号'] : [])]
-    if (required.some((name) => !headers.includes(name))) {
-      ElMessage.error('SKU 关联模板格式不正确，请重新下载 SKU 关联模板'); return
-    }
-    const imported = lines.slice(1).map(parseCsvLine)
-      .map((values) => Object.fromEntries(headers.map((key, index) => [key, values[index] || ''])))
-      .filter((item) => item['旧箱唛'] || item['新SKU标签'] || item['新FBA箱唛'])
-    if (!imported.length || imported.some((item) => required.some((key) => !item[key]))) {
-      ElMessage.error('仓库唛头、旧 SKU 标签、新 SKU 标签和换标数量必须填写完整'); return
-    }
-    const rows: ImportedRelabelBinding[] = []
-    for (const item of imported) {
-      const quantity = Number(item['换标数量（件）'])
-      if (!Number.isInteger(quantity) || quantity < 1) {
-        ElMessage.error(`仓库唛头 ${item['旧箱唛']} 的换标数量必须是大于 0 的整数`); return
-      }
-      const source = cargoRows.value.find((row) => String(row.id) === item['明细行标识'])
-      if (!source) { ElMessage.error(`明细行 ${item['明细行标识']} 不属于当前库存，请重新下载模板`); return }
-      rows.push({
-        id: ++skuRelabelSequence,
-        sourceRowId: source.id,
-        cartonMark: item['旧箱唛'].trim(),
-        originalSku: item['旧SKU标签'].trim(),
-        newSku: item['新SKU标签'].trim(),
-        quantity,
-        fbaCartonMark: mixedTemplate ? item['新FBA箱唛'].trim() : '',
-        destinationWarehouseId: form.destination,
-        remark: item['备注'] || '',
-        templateType,
-        selected: true,
-        shipmentNo: mixedTemplate ? item['FBA货件编号'].trim() : '',
-      })
-    }
-    importedRelabelBindings.value = rows
-    ElMessage.success(`已读取 ${rows.length} 条绑定关系，请选择后导入到明细`)
-    return
+  const requiredHeaders = ['明细行标识', '贴标类型', '旧箱唛', '旧SKU标签', '新SKU标签', '换标数量（件）', '新FBA箱唛', 'FBA货件编号', '备注']
+  if (requiredHeaders.some((name) => !headers.includes(name))) { ElMessage.error('统一明细关联模板格式不正确，请重新下载模板'); return }
+  const imported = lines.slice(1).map(parseCsvLine).map((values) => Object.fromEntries(headers.map((key, index) => [key, values[index] || '']))).filter((item) => item['明细行标识'] || item['贴标类型'] || item['旧箱唛'] || item['新SKU标签'] || item['新FBA箱唛'])
+  if (!imported.length) { ElMessage.error('模板中没有可导入的明细'); return }
+  const rows: ImportedRelabelBinding[] = []; let detectedType: RelabelTemplateType | null = null
+  for (const item of imported) {
+    const templateType = parseRelabelTemplateType(item['贴标类型']); if (!templateType) { ElMessage.error(`明细行 ${item['明细行标识']} 的贴标类型无效`); return }
+    if (detectedType && detectedType !== templateType) { ElMessage.error('同一份明细文件只能包含一种贴标类型，请拆分后分别提交换标单'); return }
+    detectedType = templateType
+    const source = cargoRows.value.find((row) => String(row.id) === item['明细行标识']); if (!source) { ElMessage.error(`明细行 ${item['明细行标识']} 不属于当前库存，请重新下载模板`); return }
+    const quantity = Number(item['换标数量（件）']); const requiresSku = templateType !== 'carton'; const requiresCarton = templateType !== 'sku'
+    if (!item['旧箱唛'] || (requiresSku && (!item['旧SKU标签'] || !item['新SKU标签'])) || !Number.isInteger(quantity) || quantity < 1 || (requiresCarton && (!item['新FBA箱唛'] || !item['FBA货件编号']))) { ElMessage.error(`明细行 ${item['明细行标识']} 未按“${relabelTemplateTypeLabel(templateType)}”填写完整`); return }
+    rows.push({ id: ++skuRelabelSequence, sourceRowId: source.id, cartonMark: item['旧箱唛'].trim(), originalSku: (item['旧SKU标签'] || source.sku).trim(), newSku: item['新SKU标签'].trim(), quantity: templateType === 'carton' ? 1 : quantity, fbaCartonMark: item['新FBA箱唛'].trim(), destinationWarehouseId: form.destination, remark: item['备注'] || '', templateType, selected: true, shipmentNo: item['FBA货件编号'].trim() })
  }
-  const required = ['明细行标识', '旧箱唛', '新FBA箱唛', 'FBA货件编号']
-  if (required.some((name) => !headers.includes(name))) { ElMessage.error('箱号关联模板格式不正确，请重新下载箱号关联模板'); return }
-  const imported = lines.slice(1).map(parseCsvLine)
-    .map((values) => Object.fromEntries(headers.map((key, index) => [key, values[index] || ''])))
-    .filter((item) => item['旧箱唛'] || item['新FBA箱唛'])
-  if (!imported.length || imported.some((item) => required.some((key) => !item[key]))) {
-    ElMessage.error('模板中的明细行、仓库唛头、新 FBA 箱唛和货件编号必须填写完整'); return
+  const keys = rows.map((row) => detectedType === 'carton' ? String(row.sourceRowId) : `${row.cartonMark.toUpperCase()}|${row.originalSku.toUpperCase()}`)
+  if (new Set(keys).size !== keys.length) { ElMessage.error('存在重复箱明细或重复的箱内 SKU，请合并后重新上传'); return }
+  const cartonTargets = new Map<string, string>()
+  for (const row of rows) {
+    const key = row.cartonMark.toUpperCase()
+    const target = `${row.fbaCartonMark}|${row.shipmentNo}`
+    if (detectedType === 'mixed' && cartonTargets.has(key) && cartonTargets.get(key) !== target) { ElMessage.error('同一箱内的 SKU 必须填写相同的新 FBA 箱唛和货件编号'); return }
+    cartonTargets.set(key, target)
  }
-  if (new Set(imported.map((item) => item['明细行标识'])).size !== imported.length) {
-    ElMessage.error('模板中的明细行标识不能重复'); return
-  }
-  const importedByRow = new Map(imported.map((item) => [item['明细行标识'], item]))
-  if (importedByRow.size !== imported.length || [...importedByRow.keys()].some((id) => !cargoRows.value.some((row) => String(row.id) === id))) {
-    ElMessage.error('模板存在重复或不属于当前库存的明细行，请重新下载模板'); return
-  }
-  const bindings: ImportedRelabelBinding[] = []
-  for (const [rowId, item] of importedByRow) {
-    const row = cargoRows.value.find((candidate) => String(candidate.id) === rowId)!
-    bindings.push({ id: ++skuRelabelSequence, sourceRowId: row.id, cartonMark: item['旧箱唛'],
-      originalSku: row.sku, newSku: '', quantity: 1, fbaCartonMark: item['新FBA箱唛'],
-      destinationWarehouseId: form.destination, remark: item['备注'] || '', templateType,
-      selected: true, shipmentNo: item['FBA货件编号'] })
-  }
-  importedRelabelBindings.value = bindings
-  ElMessage.success(`已读取 ${bindings.length} 条箱号关联，请选择后导入到明细`)
+  importedRelabelBindings.value = rows; ElMessage.success(`已读取 ${rows.length} 条绑定关系，请选择后导入到明细`)
 }
 function selectAllImportedBindings(value: boolean) {
  for (const item of importedRelabelBindings.value) item.selected = value
@@ -1796,13 +1745,11 @@ function addReturnBoxBinding(source: RelabelInventoryCandidate) {
              <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>
-                  <div><span><strong>箱号关联</strong></span><el-button size="small" :disabled="!cargoRows.length" @click="downloadRelabelTemplate('carton')"><Download :size="15" />下载模板</el-button><el-button type="primary" plain size="small" :disabled="!cargoRows.length" @click="cartonTemplateInput?.click()"><Upload :size="15" />上传文件</el-button></div>
-                  <div><span><strong>SKU 混箱</strong></span><el-button size="small" :disabled="!cargoRows.length" @click="downloadRelabelTemplate('mixed')"><Download :size="15" />下载模板</el-button><el-button type="primary" plain size="small" :disabled="!cargoRows.length" @click="mixedTemplateInput?.click()"><Upload :size="15" />上传文件</el-button></div>
+                  <div><span><strong>统一贴标明细</strong></span><el-button size="small" :disabled="!cargoRows.length" @click="downloadRelabelTemplate()"><Download :size="15" />下载模板</el-button><el-button type="primary" plain size="small" :disabled="!cargoRows.length" @click="unifiedTemplateInput?.click()"><Upload :size="15" />上传文件</el-button></div>
                </div>
              </section>
            </div>
-            <input ref="skuTemplateInput" class="warehouse-hidden-input" type="file" accept=".csv,text/csv" @change="importRelabelTemplate($event, 'sku')"><input ref="cartonTemplateInput" class="warehouse-hidden-input" type="file" accept=".csv,text/csv" @change="importRelabelTemplate($event, 'carton')"><input ref="mixedTemplateInput" class="warehouse-hidden-input" type="file" accept=".csv,text/csv" @change="importRelabelTemplate($event, 'mixed')"><input ref="cartonTotalCreateInput" class="warehouse-hidden-input" type="file" accept="application/pdf,.pdf" @change="selectCartonTotalFile"><input ref="skuTotalCreateInput" class="warehouse-hidden-input" type="file" accept="application/pdf,.pdf" @change="selectSkuTotalFile">
            <div v-if="isReturnRelabelSource" class="warehouse-table-scroll">
+            <input ref="unifiedTemplateInput" class="warehouse-hidden-input" type="file" accept=".csv,text/csv" @change="importRelabelTemplate"><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">
              <el-input v-model="returnCartonQuery" clearable placeholder="" />
              <template v-if="returnLooseCandidates.length">
              <div class="warehouse-section-heading"><h3>可用包裹</h3><el-button text type="primary" native-type="button" :aria-expanded="!availableSkusCollapsed" aria-controls="return-available-skus" @click="availableSkusCollapsed = !availableSkusCollapsed">{{ availableSkusCollapsed ? '展开明细' : '收起明细' }}</el-button></div>
              <table v-show="!availableSkusCollapsed" id="return-available-skus" class="warehouse-edit-table"><thead><tr><th>包裹识别码</th><th>来源退货单</th><th>SKU</th><th>SKU 换标结果</th><th>剩余可换（件）</th><th>操作</th></tr></thead><tbody><template v-for="source in returnLooseCandidates" :key="source.returnCartonId"><tr v-for="sku in source.skuItems" :key="sku.skuCode"><td>{{ source.cartonMark }}</td><td>{{ source.inboundOrderNo }}</td><td>{{ sku.skuCode }}</td><td><div v-for="conversion in (source.skuConversions || []).filter(item => item.status !== 'REVERSED')" :key="`${conversion.relabelNo}-${conversion.oldSkuCode}-${conversion.newSkuCode}`">{{ conversion.oldSkuCode }} → {{ conversion.newSkuCode }}：已换 {{ conversion.quantity }} 件{{ conversion.status === 'APPLIED' ? '（待确认）' : '' }}</div><span v-if="!source.skuConversions?.some(item => item.status !== 'REVERSED')">尚未换标</span></td><td>{{ sku.quantity }}</td><td><el-button size="small" :disabled="inventoryQuantity(source.availablePackages) <= 0" @click="labelingMode === 'sku' ? addReturnSkuBinding(source, sku.skuCode) : addReturnBoxBinding(source)">添加贴标</el-button></td></tr></template><tr v-if="!returnLooseCandidates.length"><td colspan="6">暂无可用包裹库存</td></tr></tbody></table>
@@ -1872,8 +1819,8 @@ function addReturnBoxBinding(source: RelabelInventoryCandidate) {
            <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">
          </section>
          <section class="warehouse-file-group warehouse-transfer-template-group">
-            <div class="warehouse-file-group__heading"><div><strong><span>3</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><div><span><strong>箱号关联</strong></span><el-button size="small" :disabled="!cargoRows.length" @click="downloadRelabelTemplate('carton')"><Download :size="15" />下载模板</el-button><el-button type="primary" plain size="small" :disabled="!cargoRows.length" @click="cartonTemplateInput?.click()"><Upload :size="15" />上传文件</el-button></div><div><span><strong>SKU 混箱</strong></span><el-button size="small" :disabled="!cargoRows.length" @click="downloadRelabelTemplate('mixed')"><Download :size="15" />下载模板</el-button><el-button type="primary" plain size="small" :disabled="!cargoRows.length" @click="mixedTemplateInput?.click()"><Upload :size="15" />上传文件</el-button></div></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')">
+            <div class="warehouse-file-group__heading"><div><strong><span>3</span>明细关联模板</strong></div><em>按需使用</em></div><div class="warehouse-template-list"><div><span><strong>统一贴标明细</strong></span><el-button size="small" :disabled="!cargoRows.length" @click="downloadRelabelTemplate()"><Download :size="15" />下载模板</el-button><el-button type="primary" plain size="small" :disabled="!cargoRows.length" @click="unifiedTemplateInput?.click()"><Upload :size="15" />上传文件</el-button></div></div>
+            <input ref="unifiedTemplateInput" class="warehouse-hidden-input" type="file" accept=".csv,text/csv" @change="importRelabelTemplate">
          </section>
          </div>
          <div v-if="importedRelabelBindings.length" class="warehouse-import-preview"><div class="warehouse-section-heading"><div><strong>待导入绑定关系</strong></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>
@@ -1889,7 +1836,7 @@ function addReturnBoxBinding(source: RelabelInventoryCandidate) {
    <template v-else>
      <header class="warehouse-detail-header">
        <button type="button" class="warehouse-detail-back" @click="returnToList"><ArrowLeft :size="16" />返回列表</button>
-        <div class="warehouse-detail-title"><strong>{{ props.service === 'labeling' ? selectedRelabelDetail?.application.relabelNo : selectedDetail?.transferNo || selectedDetail?.['0'] || `${config.title}详情` }}</strong><span>{{ config.title }}详情</span></div>
+        <div class="warehouse-detail-title"><strong>{{ props.service === 'labeling' ? selectedRelabelDetail?.application.relabelNo : selectedDetail?.transferNo || selectedDetail?.['0'] || `${config.title}详情` }}</strong></div>
        <div class="warehouse-detail-actions"><el-button v-if="canCreate && props.service === 'labeling' && selectedRelabelDetail?.application.status === 'REJECTED'" type="primary" @click="resubmitRejectedRelabel">修改后重新提交</el-button><el-button v-if="canConfirmRelabel && props.service === 'labeling' && selectedRelabelDetail?.application.status === 'CUSTOMER_CONFIRM_PENDING' && !selectedRelabelDetail?.application.customerConfirmedAt" type="primary" @click="confirmSelectedRelabel">确认换标完成</el-button><el-button v-if="canConfirmDiscard && props.service === 'disposal' && selectedDetail?.status === 'PDA_COMPLETED'" type="primary" @click="openCompletionConfirmation(String(selectedDetail?.discardNo || ''), 'disposal')">废弃确认</el-button><el-button v-if="canCancelDiscard && props.service === 'disposal' && selectedDetail?.status === 'PENDING_REVIEW'" type="danger" @click="cancelSelectedDiscard">取消申请</el-button><el-button v-if="canCreate && props.service === 'transfer' && ['DRAFT', 'REJECTED'].includes(selectedDetail?.status || '')" type="primary" @click="openEdit(String(selectedDetail?.transferNo || selectedDetail?.['0'] || ''))">编辑</el-button><el-button v-if="canConfirmTransfer && props.service === 'transfer' && selectedDetail?.status === 'WAIT_CUSTOMER_CONFIRMATION'" type="primary" @click="confirmTransferMeasurements">确认测量数据</el-button><el-tag v-if="props.service !== 'transfer'" :type="props.service === 'labeling' ? relabelStatusTagType(selectedRelabelDetail?.application.status || '') : undefined" effect="light">{{ statusLabel(props.service === 'labeling' ? selectedRelabelDetail?.application.status || '' : String(selectedDetail?.status || '')) }}</el-tag></div>
      </header>
      <div v-if="detailError" class="warehouse-detail-error" role="alert"><strong>{{ detailError }}</strong><el-button @click="loadDetailPage">重新加载</el-button></div>
@@ -1898,13 +1845,13 @@ function addReturnBoxBinding(source: RelabelInventoryCandidate) {
      <TransferPickupProgressPanel v-if="!detailError && props.service === 'transfer' && selectedDetail?.deliveryMethod === 'WAREHOUSE_PICKUP'" :transfer-no="String(selectedDetail.transferNo || '')" />
      <div v-if="props.service === 'disposal'" class="warehouse-card warehouse-form-section">
        <h3>本次废弃箱子</h3><div class="warehouse-table-scroll"><table class="warehouse-edit-table"><thead><tr><th>入仓码</th><th>SKU</th><th>品名</th><th>申请数量</th><th>所选箱唛</th></tr></thead><tbody><tr v-for="(item, index) in selectedDetail?.items || []" :key="index"><td>{{ item.inboundCode || '—' }}</td><td>{{ item.skuCode || '—' }}</td><td>{{ item.productName || '—' }}</td><td>{{ item.discardPackages ?? '—' }} {{ item.quantityUnit || '单位未记录' }}<br>实际：{{ item.actualDiscardPackages == null ? '未记录' : `${item.actualDiscardPackages} ${item.quantityUnit || '单位未记录'}` }}</td><td>{{ item.cartonMarks?.join('、') || '全部库存（历史记录无箱唛快照）' }}</td></tr></tbody></table></div>
-        <h3>废弃现场照片</h3><div v-if="selectedDetail?.photos?.length" class="warehouse-photo-grid"><div v-for="photo in selectedDetail.photos" :key="photo.fileId" class="warehouse-photo-item"><el-image v-if="discardPhotoUrls[photo.fileId]" :src="discardPhotoUrls[photo.fileId]" :preview-src-list="discardPhotoPreviewUrls" :initial-index="discardPhotoPreviewUrls.indexOf(discardPhotoUrls[photo.fileId])" fit="cover" preview-teleported /><div v-else-if="discardPhotoLoading[photo.fileId]" class="warehouse-photo-placeholder">照片加载中…</div><button v-else class="warehouse-photo-placeholder warehouse-photo-retry" type="button" @click="loadDiscardPhoto(photo.fileId)">{{ discardPhotoErrors[photo.fileId] ? '加载失败，点击重试' : '加载照片' }}</button><small>{{ formatDateTime(photo.submittedAt) }}</small></div></div><div v-else class="warehouse-empty">暂无已提交的废弃现场照片</div>
+        <template v-if="selectedDetail?.photos?.length"><h3>废弃现场照片</h3><div class="warehouse-photo-grid"><div v-for="photo in selectedDetail.photos" :key="photo.fileId" class="warehouse-photo-item"><el-image v-if="discardPhotoUrls[photo.fileId]" :src="discardPhotoUrls[photo.fileId]" :preview-src-list="discardPhotoPreviewUrls" :initial-index="discardPhotoPreviewUrls.indexOf(discardPhotoUrls[photo.fileId])" fit="cover" preview-teleported /><div v-else-if="discardPhotoLoading[photo.fileId]" class="warehouse-photo-placeholder">照片加载中…</div><button v-else class="warehouse-photo-placeholder warehouse-photo-retry" type="button" @click="loadDiscardPhoto(photo.fileId)">{{ discardPhotoErrors[photo.fileId] ? '加载失败，点击重试' : '加载照片' }}</button><small>{{ formatDateTime(photo.submittedAt) }}</small></div></div></template>
      </div>
      <div v-if="props.service === 'transfer' && selectedDetail?.status !== 'DRAFT'" class="warehouse-card warehouse-form-section">
        <div class="warehouse-section-heading warehouse-transfer-receipt-heading"><h3>预报箱唛（{{ selectedDetail?.packageCount || 0 }} 箱）</h3><div class="warehouse-transfer-receipt-actions"><el-button v-if="canIncreaseForecast" type="primary" size="small" @click="openIncreaseForecast"><Plus :size="14" />增加预报箱数</el-button><el-button type="primary" size="small" @click="printTransferCartons(String(selectedDetail?.transferNo || ''))"><Printer :size="14" />打印预报箱唛</el-button><el-button size="small" @click="showForecastCartons = true">查看预报箱唛</el-button></div></div>
        <el-dialog v-model="showForecastCartons" title="预报箱唛明细" width="900px" align-center destroy-on-close append-to-body><el-table :data="selectedDetail?.cartons || []" size="small" border><el-table-column prop="cartonMark" label="仓库唛头" min-width="300" /><el-table-column label="预报SKU" min-width="240"><template #default="{ row }">{{ selectedDetail?.items?.find(item => String(item.id) === String(row.transferItemId))?.skuCode || '—' }}</template></el-table-column><el-table-column label="清点状态" width="130"><template #default="{ row }">{{ row.status === 'COUNTED' ? '已清点' : row.status === 'NOT_RECEIVED' ? '未收到' : '待清点' }}</template></el-table-column></el-table><template #footer><el-button @click="showForecastCartons = false">关闭</el-button></template></el-dialog>
        <el-dialog v-model="increaseForecastOpen" title="增加预报箱数" width="560px" align-center destroy-on-close append-to-body :close-on-click-modal="!increasingForecast" :show-close="!increasingForecast">
-          <el-form label-width="110px"><el-form-item label="新增箱数"><el-input-number v-model="increaseForecastForm.additionalCount" placeholder="" :disabled="increasingForecast" :min="1" :max="Math.max(1, 5000 - Number(forecastSnapshot?.packageCount || 0))" :precision="0" /></el-form-item></el-form><p class="warehouse-form-hint">保留原箱唛，仅补生成新增箱唛；箱内SKU和件数以PDA清点为准，SKU预报总件数保持不变。</p>
+          <el-form label-width="110px"><el-form-item label="新增箱数"><el-input-number v-model="increaseForecastForm.additionalCount" placeholder="" :disabled="increasingForecast" :min="1" :max="Math.max(1, 5000 - Number(forecastSnapshot?.packageCount || 0))" :precision="0" /></el-form-item></el-form>
          <template #footer><el-button :disabled="increasingForecast" @click="increaseForecastOpen = false">取消</el-button><el-button type="primary" :loading="increasingForecast" @click="saveIncreaseForecast">确认增加</el-button></template>
        </el-dialog>
      </div>
@@ -1912,7 +1859,7 @@ function addReturnBoxBinding(source: RelabelInventoryCandidate) {
        <div class="warehouse-section-heading"><h3>预报与实际签收</h3></div>
        <div class="warehouse-table-scroll"><table class="warehouse-edit-table warehouse-transfer-comparison-table"><colgroup><col style="width:500px" /><col style="width:140px" /><col style="width:130px" /><col style="width:100px" /><col style="width:130px" /><col style="width:130px" /></colgroup><thead><tr><th>商品 SKU</th><th>中文品名</th><th>预报数量（件）</th><th>预计箱数</th><th>实际签收件数</th><th>实际签收箱数</th></tr></thead><tbody><tr v-for="(item, index) in selectedDetail?.items || []" :key="String(item.id || index)"><td>{{ item.skuCode || '—' }}</td><td>{{ item.productNameZh || '—' }}</td><td>{{ item.quantity ?? '未记录' }}</td><td>{{ item.packageCount ?? '—' }}</td><td>{{ receivedItemQuantity(item.id) }}</td><td>{{ receivedItemCartons(item.id).length }}</td></tr><tr v-if="!selectedDetail?.items?.length"><td colspan="6"><div class="warehouse-empty">暂无货物明细</div></td></tr></tbody></table></div>
        <details class="warehouse-transfer-pallet-group" open>
-          <summary class="warehouse-section-heading warehouse-transfer-pallet-heading warehouse-transfer-pallet-summary"><h3>PDA 打托实测数据</h3><span class="warehouse-transfer-pallet-count">{{ selectedDetail?.pallets?.length || 0 }} 托</span><span class="warehouse-transfer-pallet-toggle"><span class="when-collapsed">展开托盘</span><span class="when-expanded">收起托盘</span><ChevronDown :size="14" /></span></summary>
+          <summary class="warehouse-section-heading warehouse-transfer-pallet-heading warehouse-transfer-pallet-summary"><h3>托盘实测数据</h3><span class="warehouse-transfer-pallet-count">{{ selectedDetail?.pallets?.length || 0 }} 托</span><span class="warehouse-transfer-pallet-toggle"><span class="when-collapsed">展开托盘</span><span class="when-expanded">收起托盘</span><ChevronDown :size="14" /></span></summary>
          <div v-if="selectedDetail?.pallets?.length" class="warehouse-transfer-pallet-list">
            <article v-for="pallet in selectedDetail.pallets" :key="String(pallet.id || pallet.sequenceNo)" class="warehouse-transfer-pallet-card">
              <header class="warehouse-transfer-pallet-header">
@@ -1925,13 +1872,13 @@ function addReturnBoxBinding(source: RelabelInventoryCandidate) {
              <div class="warehouse-transfer-pallet-meta"><span>库位：{{ pallet.warehouseLocationCode || '—' }}</span><span>完成时间：{{ formatDateTime(pallet.completedAt) }}</span></div>
            </article>
          </div>
-          <div v-else class="warehouse-empty">暂无 PDA 打托测量数据</div>
+          <div v-else class="warehouse-empty">暂无托盘数据</div>
        </details>
-        <div class="warehouse-evidence warehouse-measurement-evidence"><span>测量打托现场照片</span><div v-if="selectedDetail?.measurementPhotos?.length" class="warehouse-photo-grid warehouse-measurement-photo-grid"><div v-for="(photo, index) in selectedDetail.measurementPhotos" :key="photo.fileId" class="warehouse-photo-item warehouse-measurement-photo-item" :title="photo.fileName || `测量照片 ${index + 1}`"><el-image v-if="measurementPhotoUrls[photo.fileId]" :src="measurementPhotoUrls[photo.fileId]" :preview-src-list="measurementPhotoPreviewUrls" :initial-index="measurementPhotoPreviewUrls.indexOf(measurementPhotoUrls[photo.fileId])" :alt="photo.fileName || `测量照片 ${index + 1}`" fit="cover" preview-teleported /><div v-else-if="measurementPhotoLoading[photo.fileId]" class="warehouse-photo-placeholder">照片 {{ index + 1 }} 加载中…</div><button v-else class="warehouse-photo-placeholder warehouse-photo-retry" type="button" @click="loadMeasurementPhoto(photo.fileId)">{{ measurementPhotoErrors[photo.fileId] ? `照片 ${index + 1} 加载失败，点击重试` : `加载照片 ${index + 1}` }}</button></div></div><strong v-else>仓库尚未上传测量打托照片</strong></div>
+        <div v-if="selectedDetail?.measurementPhotos?.length" class="warehouse-evidence warehouse-measurement-evidence"><span>现场照片</span><div v-if="selectedDetail?.measurementPhotos?.length" class="warehouse-photo-grid warehouse-measurement-photo-grid"><div v-for="(photo, index) in selectedDetail.measurementPhotos" :key="photo.fileId" class="warehouse-photo-item warehouse-measurement-photo-item" :title="photo.fileName || `测量照片 ${index + 1}`"><el-image v-if="measurementPhotoUrls[photo.fileId]" :src="measurementPhotoUrls[photo.fileId]" :preview-src-list="measurementPhotoPreviewUrls" :initial-index="measurementPhotoPreviewUrls.indexOf(measurementPhotoUrls[photo.fileId])" :alt="photo.fileName || `测量照片 ${index + 1}`" fit="cover" preview-teleported /><div v-else-if="measurementPhotoLoading[photo.fileId]" class="warehouse-photo-placeholder">照片 {{ index + 1 }} 加载中…</div><button v-else class="warehouse-photo-placeholder warehouse-photo-retry" type="button" @click="loadMeasurementPhoto(photo.fileId)">{{ measurementPhotoErrors[photo.fileId] ? `照片 ${index + 1} 加载失败，点击重试` : `加载照片 ${index + 1}` }}</button></div></div></div>
      </div>
      <div v-if="props.service === 'transfer'" class="warehouse-card warehouse-form-section warehouse-transfer-received-card">
        <div class="warehouse-section-heading warehouse-transfer-receipt-heading"><h3>签收箱号明细（{{ countedTransferCartons().length }} 箱）</h3><div class="warehouse-transfer-receipt-actions"><el-button type="primary" size="small" :disabled="!countedTransferCartons().length" @click="showTransferCartons = true">查看箱号明细</el-button></div></div>
-        <div v-if="!countedTransferCartons().length" class="warehouse-empty">暂无实际签收箱，等待 PDA 清点。</div>
+        <div v-if="!countedTransferCartons().length" class="warehouse-empty">暂无签收箱号</div>
        <el-dialog v-model="showTransferCartons" title="签收箱号明细" width="1120px" align-center destroy-on-close append-to-body>
          <div class="warehouse-cartons-dialog-body">
            <el-collapse>
@@ -1963,7 +1910,7 @@ function addReturnBoxBinding(source: RelabelInventoryCandidate) {
          <div><span>客户确认时间</span><strong>{{ formatDateTime(selectedRelabelDetail?.application.customerConfirmedAt) }}</strong></div>
          <div v-if="selectedRelabelDetail"><RelabelDocumentsPanel inline :relabel-no="selectedRelabelDetail.application.relabelNo" :detail="selectedRelabelDetail" /></div>
        </div>
-        <div class="warehouse-evidence"><span>仓库完工照片</span><div v-if="selectedRelabelDetail?.completionEvidence?.photoFileIds?.length" class="warehouse-photo-grid"><div v-for="(fileId, index) in selectedRelabelDetail.completionEvidence.photoFileIds" :key="fileId" class="warehouse-photo-item"><el-image v-if="completionPhotoUrls[fileId]" :src="completionPhotoUrls[fileId]" :preview-src-list="completionPhotoPreviewUrls" :initial-index="completionPhotoPreviewUrls.indexOf(completionPhotoUrls[fileId])" fit="cover" preview-teleported /><div v-else-if="completionPhotoLoading[fileId]" class="warehouse-photo-placeholder">照片 {{ index + 1 }} 加载中…</div><button v-else class="warehouse-photo-placeholder warehouse-photo-retry" type="button" @click="loadCompletionPhoto(fileId)">{{ completionPhotoErrors[fileId] ? `照片 ${index + 1} 加载失败，点击重试` : `加载照片 ${index + 1}` }}</button></div></div><strong v-else>仓库尚未上传完工照片</strong></div>
+        <div v-if="selectedRelabelDetail?.completionEvidence?.photoFileIds?.length" class="warehouse-evidence"><span>仓库完工照片</span><div v-if="selectedRelabelDetail?.completionEvidence?.photoFileIds?.length" class="warehouse-photo-grid"><div v-for="(fileId, index) in selectedRelabelDetail.completionEvidence.photoFileIds" :key="fileId" class="warehouse-photo-item"><el-image v-if="completionPhotoUrls[fileId]" :src="completionPhotoUrls[fileId]" :preview-src-list="completionPhotoPreviewUrls" :initial-index="completionPhotoPreviewUrls.indexOf(completionPhotoUrls[fileId])" fit="cover" preview-teleported /><div v-else-if="completionPhotoLoading[fileId]" class="warehouse-photo-placeholder">照片 {{ index + 1 }} 加载中…</div><button v-else class="warehouse-photo-placeholder warehouse-photo-retry" type="button" @click="loadCompletionPhoto(fileId)">{{ completionPhotoErrors[fileId] ? `照片 ${index + 1} 加载失败，点击重试` : `加载照片 ${index + 1}` }}</button></div></div></div>
        <p v-if="selectedRelabelDetail?.completionEvidence?.completionRemark" class="warehouse-completion-remark">完工备注：{{ selectedRelabelDetail.completionEvidence.completionRemark }}</p>
      </div>
      <div v-if="props.service === 'transfer' && selectedDetail?.relabelNo" class="warehouse-card warehouse-form-section"><RelabelDocumentsPanel :relabel-no="selectedDetail.relabelNo" /></div>
@@ -1976,7 +1923,7 @@ function addReturnBoxBinding(source: RelabelInventoryCandidate) {
        </tbody></table></div>
      </div>
      <div v-if="props.service === 'labeling'" class="warehouse-card warehouse-form-section">
-        <h3>换标任务明细</h3><RelabelQuantityPanel :relabel-no="detailNumber" />
+        <h3>换标任务明细</h3>
        <div class="warehouse-table-scroll"><table class="warehouse-relabel-detail-table"><thead><tr><th>换标模式</th><th>我方箱唛</th><th>新 FBA 箱唛</th><th>FBA 目的仓</th><th>任务数量／单位</th><th>商品 SKU</th><th>SKU 换标明细</th><th>FBA 货件编号</th><th>贴标要求</th><th>备注</th></tr></thead><tbody>
          <tr v-for="item in selectedRelabelDetail?.items || []" :key="item.id"><td>{{ item.operationType === 'CARTON_AND_SKU' ? '箱唛 + SKU 换标' : ['SKU_LABEL', 'RETURN_BULK_SKU_LABEL'].includes(item.operationType || '') ? 'SKU 换标' : '箱唛换标' }}</td><td><strong>{{ item.cartonMark || '—' }}</strong></td><td><strong>{{ item.fbaCartonMark || '—' }}</strong></td><td>{{ warehouseDisplay(item.destinationFbaWarehouseCode) }}</td><td><span v-if="item.totalPackageCount == null" class="warehouse-missing-value">—</span><template v-else>{{ item.totalPackageCount }} {{ String(item.operationType) === 'RETURN_BULK_SKU_LABEL' ? '件' : '箱任务' }}</template></td><td>{{ relabelSkuCodes(item).join('、') || '—' }}</td><td><template v-if="item.skuItems?.length"><div v-for="skuItem in item.skuItems" :key="`${skuItem.skuCode}-${skuItem.newSkuCode}-${skuItem.quantity}`">{{ skuItem.skuCode }} → {{ skuItem.newSkuCode }} × {{ skuItem.quantity }} 件</div></template><span v-else>{{ item.newSkuCode || '—' }}</span></td><td>{{ item.shipmentNo || '—' }}</td><td>{{ item.labelRequirement || '—' }}</td><td>{{ item.remark || '—' }}</td></tr>
          <tr v-if="!selectedRelabelDetail?.items?.length"><td colspan="10"><div class="warehouse-empty">暂无换标任务明细</div></td></tr>
@@ -57,19 +57,16 @@ test('客户贴标表单不展示客户单号、托盘和内部库存来源列',
  assert.doesNotMatch(view, /已选托盘组成/)
 })

-test('贴标申请保留关联模板下载和上传入口', () => {
+test('贴标申请使用统一明细模板下载和上传入口', () => {
  assert.match(view, /downloadRelabelTemplate/)
-  assert.match(view, /<strong>SKU 关联<\/strong>/)
-  assert.match(view, /<strong>箱号关联<\/strong>/)
-  assert.match(view, /<strong>SKU 混箱<\/strong>/)
+  assert.match(view, /<strong>统一贴标明细<\/strong>/)
  assert.match(view, />下载模板<\/el-button>/)
  assert.match(view, />上传文件<\/el-button>/)
-  assert.match(view, /skuTemplateInput\?\.click\(\)/)
-  assert.match(view, /cartonTemplateInput\?\.click\(\)/)
+  assert.match(view, /unifiedTemplateInput\?\.click\(\)/)
  assert.match(view, /importRelabelTemplate/)
  assert.match(view, /明细行标识/)
-  assert.match(view, /'明细行标识', '旧箱唛', '旧SKU标签', '新SKU标签'/)
-  assert.match(view, /const includeDestination = false/)
+  assert.match(view, /'明细行标识', '贴标类型'/)
+  assert.doesNotMatch(view.slice(view.indexOf('function downloadRelabelTemplate'), view.indexOf('function parseCsvLine')), /FBA目的仓/)
  assert.doesNotMatch(view, /const includeDestination = props\.service !== 'transfer'/)
  assert.match(view, /<strong>绑定明细<\/strong>/)
  assert.match(view, /<th>仓库唛头 \*<\/th>/)
@@ -0,0 +1,87 @@
+import test from 'node:test'
+import assert from 'node:assert/strict'
+import { readFileSync } from 'node:fs'
+import ts from 'typescript'
+
+const source = readFileSync(new URL('./WarehouseServiceView.vue', import.meta.url), 'utf8')
+const csvCell = source.slice(source.indexOf('function csvCell('), source.indexOf('function transferCustomerMarks'))
+const buildItems = source.slice(source.indexOf('function buildSkuRelabelItems('), source.indexOf('function addRelabelCargoRow('))
+const submitStart = source.indexOf('const sourceInboundOrders =', source.indexOf('async function submit('))
+const submitBody = source.slice(submitStart, source.indexOf('      try {', submitStart))
+const code = ts.transpileModule(csvCell + buildItems + source.slice(source.indexOf('function relabelTemplateTypeForMode'), source.indexOf('function selectDiscardInbound')) + '\nasync function submitImported() { const idempotencyKey = "test-key"; ' + submitBody + '\nreturn created; }', { compilerOptions: { target: ts.ScriptTarget.ES2022 } }).outputText
+function harness(service = 'labeling') {
+  const state = { props: { service }, cargoRows: { value: [{ id: 1, sku: 'OLD', name: '货物', included: false, cartonMark: 'BOX-1', customerCartonMarks: 'CUSTOMER-1', shipmentNo: '', remark: '' }] }, labelingMode: { value: 'carton' }, importedRelabelBindings: { value: [] }, skuRelabelRows: { value: [] }, transferRelabelRows: { value: [] }, form: { destination: 'ONT8' }, ElMessage: { error: message => errors.push(message), warning: message => errors.push(message), success: () => {} }, createCargoRow: () => ({}), transferCustomerMarks: row => row.customerCartonMarks.split(',') }
+  const requests = []
+  Object.assign(state, { isReturnRelabelSource: { value: false }, selectedReturnCandidates: { value: [] }, cartonDetailRows: { get value() { return state.cargoRows.value.filter(row => row.included) } }, createRelabel: async request => { requests.push(request); return { application: { relabelNo: 'TEST-RELABEL' } } } })
+  Object.assign(state.cargoRows.value[0], { availableQuantity: 1, sourceInventoryBalanceId: '101', sourceInventoryPositionId: '102', sourceInboundOrderId: '103' })
+  const errors = [], downloads = []
+  const URL = { createObjectURL: blob => { downloads.push(blob); return 'blob:test' }, revokeObjectURL: () => {} }
+  const document = { createElement: () => ({ click() {} }) }
+  const result = new Function(...Object.keys(state), 'URL', 'document', 'let skuRelabelSequence = 0;\n' + code + '\nreturn { downloadRelabelTemplate, importRelabelTemplate, importSelectedBindingsToDetails, buildSkuRelabelItems, submitImported };')(...Object.values(state), URL, document)
+  async function upload(rows) {
+    const csv = [['明细行标识', '贴标类型', '仓库唛头', '旧SKU标签', '新SKU标签', '换标数量（件）', '新FBA箱唛', 'FBA货件编号', '备注'], ...rows].map(row => row.join(',')).join('\r\n')
+    await result.importRelabelTemplate({ target: { files: [new File([csv], '统一模板.csv')], value: 'file' } })
+  }
+  return { ...state, ...result, upload, errors, downloads, requests }
+}
+
+for (const [type, mode, expected] of [['只换箱唛', 'carton', 'carton'], ['只换 SKU 标签', 'sku', 'sku'], ['SKU 和箱唛都换', 'carton_and_sku', 'mixed']]) {
+  test(`${type}：统一模板导入并生成对应类型明细`, async () => {
+    const state = harness()
+    await state.upload([[1, type, 'BOX-1', 'OLD', mode === 'carton' ? '' : 'NEW', 3, mode === 'sku' ? '' : 'FBA-1', mode === 'sku' ? '' : 'SHIP-1', '']])
+    assert.deepEqual(state.errors, [])
+    assert.equal(state.importedRelabelBindings.value[0].templateType, expected)
+    state.importSelectedBindingsToDetails()
+    assert.equal(state.labelingMode.value, mode)
+    if (mode === 'carton') { assert.equal(state.cargoRows.value[0].included, true); assert.equal(state.cargoRows.value[0].quantity, 1) }
+    else {
+      assert.equal(state.skuRelabelRows.value[0].newSku, 'NEW')
+      const [item] = state.buildSkuRelabelItems()
+      assert.equal(item.operationType, mode === 'sku' ? 'SKU_LABEL' : 'CARTON_AND_SKU')
+      assert.equal(item.totalPackageCount, 1)
+      assert.equal(item.skuItems[0].quantity, 3)
+      assert.equal(item.destinationFbaWarehouseCode, mode === 'sku' ? undefined : 'ONT8')
+    }
+    state.form.deliveryMethod = 'TRUCK'
+    await state.submitImported()
+    assert.equal(state.requests.length, 1)
+    assert.equal(state.requests[0].items[0].operationType, mode === 'carton' ? 'CARTON_LABEL' : mode === 'sku' ? 'SKU_LABEL' : 'CARTON_AND_SKU')
+    assert.equal(state.requests[0].deliveryMethod, mode === 'sku' ? undefined : 'TRUCK')
+  })
+}
+
+test('三种类型下载同一列结构，并带出当前换标类型', async () => {
+  const state = harness()
+  const headers = []
+  for (const mode of ['carton', 'sku', 'carton_and_sku']) {
+    state.labelingMode.value = mode
+    state.downloadRelabelTemplate()
+    const csv = await state.downloads.at(-1).text()
+    const lines = csv.split('\r\n')
+    assert.equal(lines.length, 3)
+    headers.push(lines[0])
+    assert.match(lines[1], /只换箱唛|只换 SKU 标签|SKU 和箱唛都换/)
+  }
+  assert.equal(new Set(headers).size, 1)
+})
+
+test('组合换标同箱多 SKU 生成一条箱任务并保留全部 SKU 子项', async () => {
+  const state = harness()
+  await state.upload([[1, 'SKU 和箱唛都换', 'BOX-1', 'OLD', 'NEW', 3, 'FBA-1', 'SHIP-1', ''], [1, 'SKU 和箱唛都换', 'BOX-1', 'OLD2', 'NEW2', 2, 'FBA-1', 'SHIP-1', '']])
+  assert.deepEqual(state.errors, [])
+  state.importSelectedBindingsToDetails()
+  await state.submitImported()
+  assert.equal(state.requests[0].items.length, 1)
+  assert.equal(state.requests[0].items[0].totalPackageCount, 1)
+  assert.deepEqual(state.requests[0].items[0].skuItems.map(item => item.quantity), [3, 2])
+})
+
+test('混合类型、缺字段、无效数量、重复关系和未知库存均不导入', async () => {
+  const valid = [1, 'SKU 和箱唛都换', 'BOX-1', 'OLD', 'NEW', 3, 'FBA-1', 'SHIP-1', '']
+  for (const rows of [[valid, [1, '只换箱唛', 'BOX-2', '', '', 1, 'FBA-2', 'SHIP-2', '']], [[...valid.slice(0, 4), '', ...valid.slice(5)]], [[...valid.slice(0, 5), 0, ...valid.slice(6)]], [valid, valid], [[999, ...valid.slice(1)]], [valid, [1, 'SKU 和箱唛都换', 'BOX-1', 'OTHER', 'NEW2', 1, 'FBA-OTHER', 'SHIP-1', '']]]) {
+    const state = harness()
+    await state.upload(rows)
+    assert.equal(state.errors.length, 1)
+    assert.equal(state.importedRelabelBindings.value.length, 0)
+  }
+})
@@ -69,7 +69,7 @@ test('仓储转运换标整票只允许一个目的仓', () => {
  assert.match(view, /props\.service === 'transfer' \? '客户箱唛号' : '仓库唛头'/)
  assert.match(view, /已导入 \$\{importedRows\.length\} 条仓储转运换标明细/)
  assert.doesNotMatch(transferRelabelSection, /新 FBA 箱唛<\/th><th>FBA 目的仓<\/th>/)
-  assert.match(view, /const includeDestination = false/)
+  assert.doesNotMatch(view.slice(view.indexOf('function downloadRelabelTemplate'), view.indexOf('function parseCsvLine')), /FBA目的仓/)
 })

 test('仓储转运不要求客户填写内部入仓号和我方箱唛，但换标时填写客户箱唛', () => {
@@ -81,9 +81,7 @@ test('仓储转运不要求客户填写内部入仓号和我方箱唛，但换
  assert.match(view, /仓库唛头 \*/)
  assert.match(view, /downloadTransferCartonMarkTemplate/)
  assert.match(view, /importTransferCartonMarks/)
-  assert.match(view, /<strong>SKU 关联<\/strong>/)
-  assert.match(view, /<strong>箱号关联<\/strong>/)
-  assert.match(view, /<strong>SKU 混箱<\/strong>/)
+  assert.match(view, /<strong>统一贴标明细<\/strong>/)
  assert.match(view, />下载模板<\/el-button>/)
  assert.match(view, />上传文件<\/el-button>/)
  assert.match(view, /换标类型/)
@@ -268,7 +266,7 @@ test('PDA 打托完成后客户可从列表或详情确认并查看实测数据'
  assert.match(view, /item\.__status === 'WAIT_CUSTOMER_CONFIRMATION'/)
  assert.match(view, /confirmTransferFromList\(item\['0'\]\)/)
  assert.match(view, /selectedDetail\?\.status === 'WAIT_CUSTOMER_CONFIRMATION'/)
-  assert.match(view, /PDA 打托实测数据/)
+  assert.match(view, /托盘实测数据/)
  for (const label of ['托盘号', '库位', '箱数', 'SKU 汇总', '毛重(kg)', '体积(m³)', '完成时间']) assert.equal(view.includes(label), true)
  assert.match(view, /pallet\.warehouseLocationCode/)
  assert.match(view, /palletCartons\(pallet\)\.length/)
@@ -281,7 +279,7 @@ test('仓储转运详情按订单概览、货物预报、PDA 实测数据排序
  const detailStart = view.indexOf('<header class="warehouse-detail-header">')
  const detailSource = view.slice(detailStart)
  const overviewIndex = detailSource.indexOf('<h3>订单概览</h3>')
-  const measurementIndex = detailSource.indexOf('<h3>PDA 打托实测数据</h3>')
+  const measurementIndex = detailSource.indexOf('<h3>托盘实测数据</h3>')
  const cargoIndex = detailSource.indexOf('<h3>预报与实际签收</h3>')
  assert.ok(overviewIndex >= 0 && overviewIndex < measurementIndex)
  assert.ok(cargoIndex < measurementIndex)
@@ -297,7 +295,7 @@ test('仓储转运详情自动加载 PDA 测量照片并释放 Blob URL', () =>
  assert.match(view, /measurementPhotos\?: TransferMeasurementPhoto\[\]/)
  assert.match(view, /fileId: string \| number/)
  assert.match(view, /if \(props\.service === 'transfer'\) void loadMeasurementPhotos\(\)/)
-  assert.match(view, /测量打托现场照片/)
+  assert.match(view, /v-if="selectedDetail\?\.measurementPhotos\?\.length" class="warehouse-evidence warehouse-measurement-evidence"/)
  assert.match(view, /:preview-src-list="measurementPhotoPreviewUrls"/)
  assert.match(view, /加载失败，点击重试/)
  assert.match(view, /URL\.createObjectURL\(blob\)/)
@@ -386,7 +384,7 @@ test('转运客户详情保留预报并显示实际签收箱内明细和托盘
  const receiptSection = view.slice(view.indexOf('warehouse-transfer-received-card', view.indexOf('<header class="warehouse-detail-header">')), view.indexOf('v-if="props.service === \'transfer\' && selectedDetail?.needRelabel"'))
  assert.doesNotMatch(receiptSection.split('<el-dialog')[0], /<table|<el-table|<el-collapse/)

-  assert.match(view, /暂无实际签收箱，等待 PDA 清点/)
+  assert.match(view, /暂无签收箱号/)
  assert.doesNotMatch(view, /<td>\{\{ \[pallet.lengthCm/)
 })

@@ -395,7 +393,7 @@ test('预报实收同区对照、托盘卡片换行、签收按钮紧邻标题',
  const start = view.indexOf('class="warehouse-card warehouse-form-section warehouse-transfer-cargo-card"', view.indexOf('<header class="warehouse-detail-header">'))
  const section = view.slice(start, view.indexOf('warehouse-transfer-received-card', start))
  assert.ok(section.includes('预报与实际签收'))
-  assert.ok(section.includes('PDA 打托实测数据'))
+  assert.ok(section.includes('托盘实测数据'))
  assert.ok(section.includes('receivedItemQuantity(item.id)'))
  assert.ok(section.includes('receivedItemCartons(item.id).length'))
  assert.ok(section.includes('class="warehouse-transfer-pallet-card"'))
Author	SHA1	Message	Date
liuyihe	b977ccd89d	Merge branch 'release/test' of http://8.163.30.128:10082/html/client-web into release/test	2026-10-29 13:37:30 +08:00
liuyihe	f51e51d50f	优化	2026-10-29 13:37:28 +08:00
ouyangxq	8dd7b16d1d	精简采购下单提示并压缩模块间距	2026-10-29 12:03:31 +08:00
ouyangxq	57be5316d0	优化海外采购新增页布局和预算摘要	2026-10-29 11:39:01 +08:00
liuyihe	338c28c304	优化	2026-10-29 10:53:47 +08:00
ouyangxq	fdf646227e	精简客户采购及头程计费详情展示	2026-10-28 16:56:33 +08:00
liuyihe	e5c4003e3d	优化	2026-10-28 16:33:35 +08:00
liuyihe	510db2bb8c	优化	2026-10-28 14:45:17 +08:00
ouyangxq	c187544a94	修复客户订单列设置持久化并统一最新计费量展示	2026-10-28 11:56:49 +08:00
liuyihe	3ce0f2e234	优化	2026-10-28 11:30:12 +08:00
liuyihe	e98718dcf2	优化	2026-10-28 10:55:19 +08:00
liuyihe	298f1d9fe3	Merge branch 'release/test' of http://8.163.30.128:10082/html/client-web into release/test	2026-10-27 17:39:30 +08:00
liuyihe	dd64f443cf	优化	2026-10-27 17:39:28 +08:00
ouyangxq	44a93d8606	Merge remote-tracking branch 'origin/main' into release/test	2026-10-26 17:44:56 +08:00
liuyihe	b913a931ff	Merge branch 'release/test' of http://8.163.30.128:10082/html/client-web into release/test	2026-10-26 13:43:56 +08:00
liuyihe	fe6d925e7c	优化	2026-10-26 13:43:20 +08:00