优化

AGENTS.md

@@ -3,9 +3,8 @@
 ## 快速读取顺序
 
 1. 由“模块快速路由”选最小模块并读最近 `AGENTS.md`，按 `routes.ts → pages/ → api/types/stores/composables` 下钻，不扫描全部 `src/`。
-2. 视觉、布局/交互承载变更或真实页面验收先读 `../../docs/Admin-Client前端原型还原验收规则.md`；需原型依据再读 `../../docs/悦/货代SAAS平台后台/AGENTS.md` 并定位片段。纯文案、逻辑或单元测试不触发。
-   样式优化另读 `../../docs/Admin高密度界面规范.md` 的“样式维护边界”“新模块接入规则”，保留已确认密度、彩色页签、业务语义及承载。国内仓、客户管理为样板；新增菜单按本轮范围显式接入，货柜入口见 `../../docs/Admin货柜管理样式核对记录.md`。
-   蓝白样式接入见 [样板指南](../../docs/界面参考/蓝白卡片式工作台风格参考.md)。
+2. Admin 样式唯一入口为 [Admin 界面规范](../../docs/Admin高密度界面规范.md#按任务阅读)，按任务只读对应章节；提示小字、加载布局、蓝白风格及密度不再分散查多份规范。样板目录仅在需要视觉参考时查，模块核对记录仅在核对范围、业务例外或验收证据时查。
+   视觉、布局/交互承载变更或真实页面验收再读 [前端验收规则](../../docs/Admin-Client前端原型还原验收规则.md)；需原型依据再读 `../../docs/悦/货代SAAS平台后台/AGENTS.md` 并定位片段。纯文案、逻辑或单元测试不触发验收矩阵。
 3. 标准列表/公共组件读 `src/shared/components/AGENTS.md`；HTTP、Token/刷新读 `src/shared/api/AGENTS.md`；Finance 读 `src/modules/finance/AGENTS.md`；海外仓全流程先读 `../../docs/海外仓业务/README.md`。
 4. 平台/客户层级及权限读 `../../docs/平台客户层级与权限契约.md`；统一 API、Token、会话撤销或可靠事件按需读 `../../docs/统一认证与服务通信契约.md` 对应章节。
 
@@ -99,7 +98,7 @@
 - 接入真实接口时删除对应模拟路径，不允许生产逻辑静默回退假数据。客户专属写操作显式选择客户，长整型 ID 按字符串透传，不从本地存储推断。
 - 订舱代理、拖车承运商和报关代理提交服务端供应商 ID，从公共供应商列表选择 `ACTIVE` 且类别/范围匹配的记录；参数变化同步检查 API、类型、表单、展示、Mock/Fixture、测试和 OpenAPI。
 - 删除、停用、改权限等高风险操作必须有确认、处理中、成功和失败反馈；失败保留用户上下文。日志、提示和示例不得包含真实账号、Token、隐私或生产数据。
-- 页面和交互必须服从对应原型及验收规则；Admin 当前只验收 `1920×1080`、`100%` 缩放。标准列表和共享组件实现继续读 `src/shared/components/AGENTS.md`。
+- 页面外观遵循 Admin 界面规范，业务及操作承载核对当前契约、逐操作确认与原型证据；Admin 当前只验收 `1920×1080`、`100%` 缩放。标准列表和共享组件实现继续读 `src/shared/components/AGENTS.md`。
 
 ## 开发验收身份
 

src/core/navigation/adminNavigation.test.ts

@@ -47,7 +47,7 @@ describe('adminNavigation', () => {
       { title: '货柜管理', children: ['订舱列表', '拖车列表', '货柜列表', '装柜清单', '预装清单'] },
        { title: '海外尾程', children: ['尾程订单', '入库单', '废弃单', '出库单', '换标单', '派送单', '托盘管理', '库位管理', '库存管理', '退货库存管理', '退货箱号管理'] },
       { title: '预约管理', children: ['预约列表'] },
-      { title: '车辆管理', children: ['排车列表', '车辆列表', '司机管理', '自有业务', '外配业务', '出车记录'] },
+      { title: '车辆管理', children: ['排车列表', '车辆列表', '司机管理', '自有业务', '外配任务', '出车记录'] },
       { title: '海外业务', children: ['采购订单', '本土卡车', '本土散板', '散板需求'] },
       { title: '客户服务', children: ['异常订单'] },
       { title: '财务管理', children: ['客户账户', '客户应收应付', '应收款统计表', '客户对账单', '结算单应收', '结算单应付'] },

src/core/navigation/adminNavigation.ts

@@ -135,7 +135,7 @@ export const adminNavigation: AdminNavigationNode[] = [
       { key: 'vehicle-list', title: '车辆列表', icon: Truck, path: '/overseas-master-data/vehicles', permission: 'platform:overseas-master-data:vehicle:list' },
       { key: 'driver-management', title: '司机管理', icon: ContactRound, path: '/overseas-master-data/drivers', permission: 'platform:overseas-master-data:driver:list' },
       { key: 'fleet-owned-business', title: '自有业务', icon: Truck, path: '/overseas-master-data/owned-business', permission: 'platform:fleet:owned-business:list' },
-      { key: 'fleet-outsourced-business', title: '外配业务', icon: Truck, path: '/overseas-master-data/outsourced-business', permission: 'platform:fleet:outsourced-business:list' },
+      { key: 'fleet-outsourced-business', title: '外配任务', icon: Truck, path: '/overseas-master-data/outsourced-business', permission: 'platform:fleet:outsourced-business:list' },
       { key: 'fleet-trips', title: '车次管理', icon: Truck, path: '/overseas-master-data/trips', permission: 'platform:fleet:trip:list', hidden: true },
       { key: 'fleet-operations', title: '出车记录', icon: Truck, path: '/overseas-master-data/trip-operations', permission: 'platform:fleet:operations:list' },
     ],

src/modules/appointment-calendar/AppointmentConfirmationCargo.test.ts

@@ -0,0 +1,98 @@
+import { flushPromises, mount } from '@vue/test-utils'
+import { beforeEach, expect, it, vi } from 'vitest'
+import { ElMessageBox } from 'element-plus'
+import AppointmentConfirmationCargo from './AppointmentConfirmationCargo.vue'
+import { resolvePlanningOrder, resolvePlanningSource, type ResolvedPlanningSource } from './planningApi'
+import { getCargoVerification, saveCargoVerification, type CargoVerificationContext } from './cargoVerificationApi'
+
+const access = vi.hoisted(() => ({ read: true }))
+vi.mock('@/core/access/accessPreview', () => ({ useAccessPreviewStore: () => ({ can: () => access.read }) }))
+vi.mock('element-plus', () => ({ ElMessage: { warning: vi.fn(), success: vi.fn() }, ElMessageBox: { confirm: vi.fn() } }))
+vi.mock('./planningApi', () => ({ resolvePlanningOrder: vi.fn(), resolvePlanningSource: vi.fn() }))
+vi.mock('./cargoVerificationApi', () => ({ getCargoVerification: vi.fn(), saveCargoVerification: vi.fn() }))
+const source: ResolvedPlanningSource['source'] = { sourceKey: 'BOOKING:BK-TEST', customerId: 'customer-1', orderId: '9007199254740993', inboundCode: 'IN-TEST', bookingNo: 'BK-TEST', containerNo: null, originWarehouseId: 'warehouse-1', originWarehouseName: '测试仓', destinationKey: 'FBA:ONT8', destinationWarehouseCode: 'ONT8', packages: 20, sourceVersion: 'BOOKING:1/ORDER:1', canFollowup: true, blockReasons: [] }
+const resolved: ResolvedPlanningSource = { source, coverage: { status: 'PENDING', appointments: [], missingFields: ['FBA_SHIPMENT_REFERENCES'], changeReviewRequired: false } }
+const context: CargoVerificationContext = { source, verification: null, allocatedPackages: 20, unknownAllocationCount: 0, effectivePackages: 20, availablePackages: 0, sourceChanged: false, allowedActions: ['VERIFY_CARGO'], blockReasons: [] }
+const lookup = { orderId: source.orderId!, customerId: source.customerId, destinationKey: source.destinationKey }
+function render(active = true, disabled = false) {
+  return mount(AppointmentConfirmationCargo, { props: { sources: [lookup], active, disabled }, global: { stubs: {
+    ElButton: { props: ['disabled', 'nativeType'], template: '<button :disabled="disabled" :type="nativeType || \'button\'"><slot /></button>' },
+    InlineHelp: { template: '<span />' }, ApiErrorMeta: true,
+    LoadErrorState: { props: ['message'], template: '<div role="alert">{{ message }}<button @click="$emit(\'retry\')">重试核对</button></div>' },
+  } } })
+}
+beforeEach(() => {
+  vi.clearAllMocks(); access.read = true
+  vi.mocked(resolvePlanningOrder).mockResolvedValue(resolved)
+  vi.mocked(resolvePlanningSource).mockResolvedValue(resolved)
+  vi.mocked(getCargoVerification).mockResolvedValue(context)
+  vi.mocked(saveCargoVerification).mockResolvedValue({ version: 1, sourceVersion: source.sourceVersion, destinationKey: source.destinationKey, sourcePackages: 20, packageCount: 20, shipmentReferences: ['FBA-TEST'], remark: null, operatorName: '测试员', verifiedAt: '2026-10-21T03:00:00Z' })
+})
+it('names the missing material and supplements the canonical booking inside the appointment', async () => {
+  const wrapper = render(); await flushPromises()
+  expect(resolvePlanningOrder).toHaveBeenCalledWith(lookup)
+  expect(wrapper.text()).toContain('IN-TEST'); expect(wrapper.text()).toContain('缺少本票 FBA 货件号或追踪号')
+  expect(wrapper.text()).toContain('不能代替货件号'); expect(wrapper.text()).not.toContain(source.orderId)
+  await wrapper.findAll('button').find(button => button.text() === '在此补齐资料')!.trigger('click'); await flushPromises()
+  expect((wrapper.get('input[type=number]').element as HTMLInputElement).value).toBe('20')
+  await wrapper.get('form').trigger('submit'); await flushPromises()
+  expect(saveCargoVerification).not.toHaveBeenCalled()
+  await wrapper.get('textarea[aria-label="本票货件号"]').setValue('FBA-TEST')
+  vi.mocked(resolvePlanningOrder).mockResolvedValue({ ...resolved, coverage: { ...resolved.coverage, missingFields: [] } })
+  await wrapper.get('form').trigger('submit'); await flushPromises()
+  expect(saveCargoVerification).toHaveBeenCalledWith(source, expect.objectContaining({ packageCount: 20, shipmentReferences: ['FBA-TEST'], expectedSourceVersion: source.sourceVersion }))
+  expect(wrapper.text()).toContain('资料齐全，无需重复填写')
+  expect(wrapper.emitted('ready')?.at(-1)).toEqual([true]); wrapper.unmount()
+})
+it('leaves pending arrangements lazy and reads only when formal confirmation is selected', async () => {
+  const wrapper = render(false); await flushPromises()
+  expect(resolvePlanningOrder).not.toHaveBeenCalled()
+  await wrapper.setProps({ active: true }); await flushPromises()
+  expect(resolvePlanningOrder).toHaveBeenCalledTimes(1); wrapper.unmount()
+})
+it('does not ask for known materials to be entered again', async () => {
+  vi.mocked(resolvePlanningOrder).mockResolvedValue({ ...resolved, coverage: { ...resolved.coverage, missingFields: [] } })
+  const wrapper = render(); await flushPromises()
+  expect(wrapper.text()).toContain('资料齐全，无需重复填写')
+  expect(wrapper.findAll('button').some(button => button.text() === '在此补齐资料')).toBe(false)
+  expect(wrapper.emitted('ready')?.at(-1)).toEqual([true]); wrapper.unmount()
+})
+it('retains unsaved inputs when the appointment mode changes and blocks leaving an unknown save outcome', async () => {
+  const wrapper = render(); await flushPromises()
+  await wrapper.findAll('button').find(button => button.text() === '在此补齐资料')!.trigger('click'); await flushPromises()
+  await wrapper.get('textarea[aria-label="本票货件号"]').setValue('FBA-KEEP')
+  await wrapper.setProps({ active: false })
+  expect(wrapper.get('textarea[aria-label="本票货件号"]').isVisible()).toBe(true)
+  vi.mocked(ElMessageBox.confirm).mockRejectedValueOnce(new Error('keep editing'))
+  expect(await wrapper.vm.canLeave()).toBe(false)
+  vi.mocked(saveCargoVerification).mockRejectedValueOnce(new Error('connection lost'))
+  await wrapper.get('form').trigger('submit'); await flushPromises()
+  expect(await wrapper.vm.canLeave()).toBe(false)
+  const payload = vi.mocked(saveCargoVerification).mock.calls[0]![1]
+  await wrapper.get('form').trigger('submit'); await flushPromises()
+  expect(saveCargoVerification).toHaveBeenNthCalledWith(2, source, payload); wrapper.unmount()
+})
+it('reports unknown quantity and unmaterialized cargo without inventing values', async () => {
+  vi.mocked(resolvePlanningOrder).mockResolvedValue({ ...resolved, source: { ...source, orderId: null } })
+  vi.mocked(getCargoVerification).mockResolvedValue({ ...context, effectivePackages: null })
+  const wrapper = render(); await flushPromises()
+  expect(wrapper.text()).toContain('缺少本票箱数'); expect(wrapper.text()).toContain('原来货登记完成实收关联')
+  expect(wrapper.findAll('button').some(button => button.text() === '在此补齐资料')).toBe(false)
+  expect(wrapper.emitted('ready')?.at(-1)).toEqual([false]); wrapper.unmount()
+})
+it('keeps failed reads blocked, supports retry, and denies reads without permission', async () => {
+  vi.mocked(resolvePlanningOrder).mockRejectedValueOnce(new Error('network lost'))
+  const wrapper = render(); await flushPromises()
+  expect(wrapper.find('[role=alert]').exists()).toBe(true)
+  expect(wrapper.emitted('ready')?.at(-1)).toEqual([false])
+  await wrapper.get('[role=alert] button').trigger('click'); await flushPromises()
+  expect(resolvePlanningOrder).toHaveBeenCalledTimes(2); wrapper.unmount()
+  vi.clearAllMocks(); access.read = false
+  const denied = render(); await flushPromises()
+  expect(resolvePlanningOrder).not.toHaveBeenCalled(); expect(denied.text()).toContain('查看权限'); denied.unmount()
+})
+it('keeps the supplement action disabled for read-only appointment views', async () => {
+  const wrapper = render(true, true); await flushPromises()
+  expect(wrapper.findAll('button').find(button => button.text() === '在此补齐资料')!.attributes('disabled')).toBeDefined()
+  expect(saveCargoVerification).not.toHaveBeenCalled(); wrapper.unmount()
+})

src/modules/appointment-calendar/AppointmentConfirmationCargo.vue

@@ -0,0 +1,85 @@
+<script setup lang="ts">
+import { computed, inject, onBeforeUnmount, provide, ref, watch } from 'vue'
+import { useAccessPreviewStore } from '@/core/access/accessPreview'
+import { getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
+import LoadErrorState from '@/shared/components/LoadErrorState.vue'
+import ApiErrorMeta from '@/shared/components/ApiErrorMeta.vue'
+import CargoVerificationForm from './CargoVerificationForm.vue'
+import { getCargoVerification, type CargoVerificationContext } from './cargoVerificationApi'
+import { resolvePlanningOrder, resolvePlanningSource, type PlanningSourceLookup, type ResolvedPlanningSource } from './planningApi'
+import type { LeaveGuard } from './useWorkDraft'
+
+const props = defineProps<{ sources: PlanningSourceLookup[]; active: boolean; disabled?: boolean }>()
+const emit = defineEmits<{ ready: [value: boolean] }>()
+const access = useAccessPreviewStore()
+type Row = { resolved: ResolvedPlanningSource; cargo: CargoVerificationContext }
+const rows = ref<Row[]>([]), loading = ref(false), error = ref<ApiErrorDetails | null>(null)
+const editing = ref<string | null>(null), editor = ref<InstanceType<typeof CargoVerificationForm> | null>(null)
+const editingRow = computed(() => rows.value.find(row => key(row) === editing.value))
+let generation = 0
+const guards = new Set<LeaveGuard>()
+const register = inject<((guard: LeaveGuard) => () => void) | undefined>('appointment-work-leave-guard', undefined)
+provide('appointment-work-leave-guard', (guard: LeaveGuard) => { guards.add(guard); return () => guards.delete(guard) })
+async function canLeave() { for (const guard of guards) if (!await guard()) return false; return true }
+const unregister = register?.(canLeave)
+defineExpose({ canLeave })
+function key(row: Row) { return `${row.resolved.source.customerId}:${row.resolved.source.sourceKey}` }
+function issues(row: Row) {
+  const missing: string[] = []
+  if (!row.resolved.source.orderId) missing.push('尚未来货建单，请先在原来货登记完成实收关联')
+  if (row.cargo.effectivePackages == null || row.cargo.effectivePackages <= 0) missing.push('缺少本票箱数')
+  if (row.resolved.coverage.missingFields.includes('FBA_SHIPMENT_REFERENCES')) missing.push('缺少本票 FBA 货件号或追踪号（至少一种）')
+  if (row.cargo.sourceChanged) missing.push('原货物资料已变化，请重新核对箱数和货件号')
+  return missing
+}
+const ready = computed(() => rows.value.length === props.sources.length && rows.value.length > 0 && !loading.value && !error.value && !editing.value && rows.value.every(row => !issues(row).length))
+watch(ready, value => emit('ready', value), { immediate: true })
+async function load() {
+  const current = ++generation
+  loading.value = true; error.value = null
+  try {
+    if (!access.can('platform:appointment:list') || !access.can('platform:overseas-warehouse:last-mile-order:list')) {
+      error.value = { message: '无法读取本票核实资料，请联系有预约列表和尾程订单查看权限的同事补齐。' }; return
+    }
+    const result: Row[] = []
+    // 只核对本次明确选择的货物，并由服务端解析原 ORDER / BOOKING 身份。
+    for (const lookup of props.sources) {
+      const resolved = 'sourceKey' in lookup ? await resolvePlanningSource(lookup) : await resolvePlanningOrder(lookup)
+      if (current !== generation) return
+      const cargo = await getCargoVerification(resolved.source)
+      if (current !== generation) return
+      result.push({ resolved, cargo })
+    }
+    if (current === generation) rows.value = result
+  } catch (cause) { if (current === generation) error.value = getApiErrorDetails(cause, '货物缺项读取失败，请重试核对') }
+  finally { if (current === generation) loading.value = false }
+}
+async function closeEditor() {
+  if (editor.value && !await editor.value.canLeave()) return
+  editing.value = null
+}
+async function saved() { editing.value = null; await load() }
+watch(() => [props.active, JSON.stringify(props.sources)] as const, ([active]) => { if (active && !editing.value) void load() }, { immediate: true })
+onBeforeUnmount(() => { ++generation; unregister?.() })
+</script>
+<template>
+  <section v-show="active || editing" class="density-dialog-section" data-tone="source" aria-label="正式确认前的货物资料" :aria-busy="loading">
+    <h3 class="density-dialog-section__title">正式确认前：核对本次送仓货物</h3>
+    <el-button :disabled="loading || !!editing || disabled" :loading="loading" @click="load">重新核对资料</el-button>
+    <p>本票总箱数用于校验预约货量；FBA 货件号或追踪号用于识别送的是哪批货。外部约号只代表仓库的预约确认号，不能代替货件号。</p>
+    <LoadErrorState v-if="error" title="货物资料未核对" :message="error.message" :loading="loading" @retry="load"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState>
+    <table class="density-table"><thead><tr><th>操作</th><th>入仓码 / 外接登记号</th><th>本票总箱数</th><th>需要补充的资料</th></tr></thead><tbody>
+      <tr v-for="row in rows" :key="key(row)">
+        <td><el-button v-if="issues(row).length && row.resolved.source.orderId" :disabled="disabled || loading || !!editing || !row.cargo.allowedActions.includes('VERIFY_CARGO')" @click="editing = key(row)">在此补齐资料</el-button><span v-else>—</span></td>
+        <td>{{ row.resolved.source.inboundCode || row.resolved.source.bookingNo || '未提供业务编号' }}</td>
+        <td>{{ row.cargo.effectivePackages ?? '待补充' }}</td>
+        <td>{{ issues(row).join('；') || '资料齐全，无需重复填写' }}</td>
+      </tr>
+    </tbody></table>
+    <div v-if="editingRow">
+      <CargoVerificationForm ref="editor" :source="editingRow.resolved.source" :disabled="disabled" confirmation @saved="saved" />
+      <el-button :disabled="disabled" @click="closeEditor">收起补充资料</el-button>
+    </div>
+    <p v-if="!loading && !error && !ready" role="status">请先在上表补齐并保存资料，再点击“保存预约安排”。暂时拿不到资料，可先选择“先保存安排，等待对方确认”。</p>
+  </section>
+</template>

src/modules/appointment-calendar/AppointmentCreatePanel.vue

@@ -42,13 +42,13 @@ const columns: DataTableColumn[] = [
   { prop: 'originWarehouseName', label: '起运仓', minWidth: 140, slotName: 'origin' },
   { prop: 'destinationWarehouseCode', label: '目的FBA仓', width: 110 },
   { prop: 'packages', label: '箱数', width: 80 },
-  { key: 'eligibility', label: '预约资格', minWidth: 130, slotName: 'eligibility' },
+  { key: 'eligibility', label: '预约资格', minWidth: 260, singleLine: false, slotName: 'eligibility' },
 ]
 function key(row: PlanningCargo) { return JSON.stringify([row.customerId, row.sourceKey]) }
 function reason(row: PlanningCargo) {
   if (row.detained) return '货物暂扣中'
   if (row.mixedDestinations) return '多个目的地，需先核对'
-  if (row.hasActiveAppointment) return '已有有效预约'
+  if (row.hasActiveAppointment) return '已有预约安排，请到入库单编辑原预约'
   const anchor = selectedRows.value[0]
   if (anchor && (anchor.originWarehouseId !== row.originWarehouseId || anchor.destinationWarehouseCode !== row.destinationWarehouseCode)) return '请选择同起运仓、同目的仓'
   if (selectedRows.value.length >= 100 && !selected.value[key(row)]) return '每次最多选择100票'

src/modules/appointment-calendar/CargoVerificationForm.vue

@@ -10,15 +10,16 @@ import ApiErrorMeta from '@/shared/components/ApiErrorMeta.vue'
 import { getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
 import { getCargoVerification, saveCargoVerification, type CargoVerificationContext, type CargoVerificationSource, type SaveCargoVerification } from './cargoVerificationApi'
 import { rejectedCommand, useWorkDraft } from './useWorkDraft'
-const props = defineProps<{ source: CargoVerificationSource }>()
+const props = defineProps<{ source: CargoVerificationSource; confirmation?: boolean; disabled?: boolean }>()
 const emit = defineEmits<{ saved: [] }>()
 const access = useAccessPreviewStore()
 const context = ref<CargoVerificationContext | null>(null), loading = ref(false), saving = ref(false)
 const error = ref<ApiErrorDetails | null>(null), saveError = ref<ApiErrorDetails | null>(null), pending = ref<SaveCargoVerification | null>(null)
 const form = reactive({ packages: '', references: '', remark: '' }), baseline = ref(JSON.stringify(form))
 const dirty = computed(() => JSON.stringify(form) !== baseline.value)
-useWorkDraft(dirty, computed(() => saving.value || !!pending.value))
-const canWrite = computed(() => access.can('platform:overseas-warehouse:inbound-order:fba-appointment') && context.value?.allowedActions.includes('VERIFY_CARGO'))
+const canLeave = useWorkDraft(dirty, computed(() => saving.value || !!pending.value))
+defineExpose({ canLeave })
+const canWrite = computed(() => !props.disabled && access.can('platform:overseas-warehouse:inbound-order:fba-appointment') && context.value?.allowedActions.includes('VERIFY_CARGO'))
 async function load(preserve = false) {
   loading.value = true; error.value = null
   if (!access.can('platform:appointment:list') || !access.can('platform:overseas-warehouse:last-mile-order:list')) { error.value = { message: '当前账号没有该货源的读取权限，请联系预约负责人处理。' }; loading.value = false; return }
@@ -26,7 +27,7 @@ async function load(preserve = false) {
     context.value = await getCargoVerification(props.source)
     if (!preserve) {
       const record = context.value.verification
-      Object.assign(form, { packages: record?.packageCount == null ? '' : String(record.packageCount), references: record?.shipmentReferences.join('\n') || '', remark: record?.remark || '' })
+      Object.assign(form, { packages: context.value.effectivePackages == null ? '' : String(context.value.effectivePackages), references: record?.shipmentReferences.join('\n') || '', remark: record?.remark || '' })
       baseline.value = JSON.stringify(form)
     }
   } catch (cause) { error.value = getApiErrorDetails(cause, '核实资料读取失败') }
@@ -39,6 +40,7 @@ async function save() {
     if (count !== null && (!Number.isSafeInteger(count) || count < 1)) { ElMessage.warning('核实箱数须为正整数，暂未核实可留空'); return }
     if (count !== null && (count < context.value.allocatedPackages || (context.value.source.packages != null && count > context.value.source.packages))) { ElMessage.warning('核实箱数不能低于已分配量，也不能超过已知原箱数'); return }
     const references = [...new Set(form.references.split(/\r?\n/).map(value => value.trim()).filter(Boolean))]
+    if (props.confirmation && (count === null || !references.length)) { ElMessage.warning('请填写本票箱数，以及至少一个 FBA 货件号或追踪号；外部约号不能代替货件号'); return }
     if (references.length > 100 || references.some(value => value.length > 128)) { ElMessage.warning('最多填写100条货件号，每条不超过128字'); return }
     pending.value = { destinationKey: context.value.source.destinationKey, expectedSourceVersion: context.value.source.sourceVersion, expectedVersion: Number(context.value.verification?.version || 0), packageCount: count, shipmentReferences: references, remark: form.remark.trim() || null, idempotencyKey: crypto.randomUUID() }
   }
@@ -56,14 +58,15 @@ onMounted(() => load())
 </script>
 <template>
   <section aria-label="货物核实资料">
-    <h3>核实货物资料<InlineHelp title="核实资料说明"><p>未约成也可保存；只用于预约核实，保留原订单资料。</p></InlineHelp></h3>
+    <h3>{{ confirmation ? '补齐本票送仓资料' : '核实货物资料' }}<InlineHelp title="核实资料说明"><p>未约成也可保存；只用于预约核实，保留原订单资料。</p></InlineHelp></h3>
+    <p v-if="confirmation">请向客户或货物负责人取得本票完整的 FBA 货件号或追踪号，每行一个；不要填写预约外部约号。下方保存只补充货物资料，完成后还需保存预约安排。</p>
     <LoadErrorState v-if="error" title="核实资料读取失败" :message="error.message" :loading="loading" @retry="load(true)"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState>
     <p v-if="loading">正在读取货物资料…</p>
     <template v-if="context">
-      <dl class="cargo-facts"><dt>原票</dt><dd>{{ context.source.inboundCode || context.source.bookingNo || '—' }}</dd><dt>目的仓</dt><dd>{{ context.source.destinationWarehouseCode || '—' }}</dd><dt>原箱数</dt><dd>{{ context.source.packages ?? '待核实' }}</dd><dt>已分配</dt><dd>{{ context.allocatedPackages }} 箱<span v-if="context.unknownAllocationCount">；另有 {{ context.unknownAllocationCount }} 项数量未知</span></dd><dt>可分配</dt><dd>{{ context.availablePackages ?? '待核实' }}</dd></dl>
+      <dl class="cargo-facts"><dt>原票</dt><dd>{{ context.source.inboundCode || context.source.bookingNo || '—' }}</dd><dt>目的仓</dt><dd>{{ context.source.destinationWarehouseCode || '—' }}</dd><dt>原箱数</dt><dd>{{ context.source.packages ?? '待核实' }}</dd><template v-if="!confirmation"><dt>已分配</dt><dd>{{ context.allocatedPackages }} 箱<span v-if="context.unknownAllocationCount">；另有 {{ context.unknownAllocationCount }} 项数量未知</span></dd><dt>可分配</dt><dd>{{ context.availablePackages ?? '待核实' }}</dd></template></dl>
       <p v-if="context.sourceChanged" role="alert">原货源已变化，请核对当前原票和已分配量后重新保存。</p><p v-for="reason in context.blockReasons" :key="reason" role="status">{{ reason }}</p>
       <form class="density-form work-form appointment-native-form" @submit.prevent="save"><fieldset :disabled="!canWrite || loading || !!error || saving || !!pending">
-        <label>核实箱数（可暂不填）<input v-model="form.packages" type="number" min="1" step="1" aria-label="核实箱数" class="workbench-input"></label>
+        <label>{{ confirmation ? '本票核实总箱数（必填）' : '核实箱数（可暂不填）' }}<input v-model="form.packages" type="number" min="1" step="1" aria-label="核实箱数" class="workbench-input"></label>
         <label>本票货件号 / 追踪号（每行一个）<textarea v-model="form.references" rows="4" aria-label="本票货件号" class="workbench-input" /></label>
         <label>核实说明<textarea v-model="form.remark" maxlength="1000" rows="2" class="workbench-input" /></label>
       </fieldset><p v-if="!canWrite">当前仅可查看核实资料；需核实权限及有效货源资格才能保存。</p>

src/modules/appointment-calendar/WorkAppointmentForm.test.ts

@@ -9,7 +9,7 @@ vi.mock('element-plus', () => ({ ElMessage: { warning: vi.fn(), success: vi.fn()
 vi.mock('@/modules/overseas-warehouse', async original => ({ ...await original<typeof import('@/modules/overseas-warehouse')>(), getFbaAppointment: vi.fn(), updateFbaAppointment: vi.fn() }))
 vi.mock('./api', async original => ({ ...await original<typeof import('./api')>(), deleteAppointment: vi.fn() }))
 const detail: FbaAppointmentDto = { id: '1', appointmentNo: 'AP-001', batchKey: 'FBA_APPOINTMENT:1', version: 3, originWarehouseId: 'warehouse-1', fbaWarehouseCode: 'ONT8', selectedCount: 1, items: [], appointmentStatus: 'SUCCESS', confirmationNo: 'EXT-001', appointmentAt: '2026-10-15T23:30:00', appointmentEndAt: '2026-10-16T01:00:00', appointmentStartUtc: '2026-10-16T06:30:00Z', appointmentEndUtc: '2026-10-16T08:00:00Z', timezone: 'America/Los_Angeles' }
-function render(cancel = false) { return mount(WorkAppointmentForm, { props: { appointmentNo: 'AP-001', cancel, canWrite: true }, global: { stubs: { ElButton: { props: ['disabled'], template: '<button :disabled="disabled"><slot /></button>' }, FbaAppointmentFields: { name: 'FbaAppointmentFields', props: ['model', 'disabled'], template: '<div />' }, LoadErrorState: { props: ['message'], template: '<section role="alert">{{ message }}<button @click="$emit(\'retry\')">重试读取</button></section>' }, ApiErrorMeta: true } } }) }
+function render(cancel = false) { return mount(WorkAppointmentForm, { props: { appointmentNo: 'AP-001', cancel, canWrite: true }, global: { stubs: { ElButton: { props: ['disabled'], template: '<button :disabled="disabled"><slot /></button>' }, FbaAppointmentFields: { name: 'FbaAppointmentFields', mounted() { this.$emit('confirmationReady', true) }, props: ['model', 'disabled'], template: '<div />' }, LoadErrorState: { props: ['message'], template: '<section role="alert">{{ message }}<button @click="$emit(\'retry\')">重试读取</button></section>' }, ApiErrorMeta: true } } }) }
 beforeEach(() => { vi.clearAllMocks(); vi.mocked(getFbaAppointment).mockResolvedValue(detail); vi.mocked(updateFbaAppointment).mockResolvedValue(detail) })
 it('initializes confirmed facts after an initial read failure instead of showing an empty editable plan', async () => {
   vi.mocked(getFbaAppointment).mockRejectedValueOnce(new Error('来源暂不可用'))

src/modules/appointment-calendar/WorkAppointmentForm.vue

@@ -13,6 +13,8 @@ import { rejectedCommand, useWorkDraft } from './useWorkDraft'
 const props = defineProps<{ appointmentNo: string; cancel: boolean; canWrite: boolean }>()
 const emit = defineEmits<{ saved: [appointment: FbaAppointmentDto]; batch: [key: string]; receiving: [key: string] }>()
 const access = useAccessPreviewStore(), detail = ref<FbaAppointmentDto | null>(null)
+const confirmationReady = ref(false)
+const appointmentFields = ref<InstanceType<typeof FbaAppointmentFields> | null>(null)
 const form = reactive(createAppointmentForm()), reason = ref(''), baseline = ref(JSON.stringify(appointmentPayload(form)))
 const loading = ref(false), saving = ref(false), error = ref<ApiErrorDetails | null>(null), saveError = ref<ApiErrorDetails | null>(null)
 let initialized = false
@@ -44,6 +46,9 @@ async function save() {
       pending.value = { kind: 'cancel', version: detail.value.version, reason: reason.value.trim() }
     } else {
       const invalid = appointmentFormError(form); if (invalid) { ElMessage.warning(invalid); return }
+      if (form.appointmentStatus === 'SUCCESS' && !confirmationReady.value) { ElMessage.warning('请先在“正式确认前”区域补齐并保存每票货物资料'); return }
+      if (appointmentFields.value?.canLeave && !await appointmentFields.value.canLeave()) return
+      if (saving.value || !writable.value) return
       pending.value = { kind: 'update', payload: { details: appointmentPayload(form), version: detail.value.version, idempotencyKey: crypto.randomUUID() } }
     }
   }
@@ -70,7 +75,7 @@ onMounted(() => load())
       <el-button v-if="detail.batchKey && !saving && !pending" @click="emit('batch', detail.batchKey)">{{ replaced ? '查看替代批次' : '分批 / 合并与货物来源' }}</el-button>
       <el-button v-if="detail.batchKey && !replaced && !saving && !pending" :disabled="loading || !!error" @click="emit('receiving', detail.batchKey)">客户调整 / 共同预约范围</el-button>
       <template v-if="cancel"><p>取消原预约并保留历史；工作需求与后续跟进仍保留。已有运输安排须满足原业务取消条件。</p><label>取消原因<textarea v-model="reason" :disabled="!writable || saving || !!pending" maxlength="1000" class="workbench-input" /></label></template>
-      <FbaAppointmentFields v-else :model="form" :appointment-no="detail.appointmentNo" :timezone="detail.timezone" :disabled="!writable || loading || !!error || saving || !!pending" />
+      <FbaAppointmentFields v-else ref="appointmentFields" :sources="detail.items.map(item => ({ sourceKey: item.sourceKey, customerId: item.customerId, destinationKey: item.destinationKey || `FBA:${item.fbaWarehouseCode}` }))" @confirmation-ready="confirmationReady = $event" :model="form" :appointment-no="detail.appointmentNo" :timezone="detail.timezone" :disabled="!writable || loading || !!error || saving || !!pending" />
       <p v-if="!writable">当前预约仅可查看。</p>
       <LoadErrorState v-if="saveError" title="预约未保存" :message="saveError.message" :show-retry="false"><template #details><ApiErrorMeta :details="saveError" /></template></LoadErrorState>
       <p v-if="!cancel && !rebooking && writable && !changed && !pending">预约内容未修改，无需重复保存。</p>

src/modules/appointment-calendar/WorkCreateAppointmentForm.vue

@@ -13,6 +13,8 @@ import { workReason } from './workPresentation'
 const props = defineProps<{ sources: SourceReference[]; canWrite: boolean }>()
 const emit = defineEmits<{ saved: [appointment: FbaAppointmentDto] }>()
 const access = useAccessPreviewStore(), preview = ref<PlanningBatchPreview | null>(null)
+const confirmationReady = ref(false)
+const appointmentFields = ref<InstanceType<typeof FbaAppointmentFields> | null>(null)
 const form = reactive(createAppointmentForm()), baseline = ref(JSON.stringify(form))
 const loading = ref(false), saving = ref(false), error = ref<ApiErrorDetails | null>(null), saveError = ref<ApiErrorDetails | null>(null)
 const pending = ref<SourceAppointmentPayload | null>(null)
@@ -29,6 +31,9 @@ async function save() {
   if (!writable.value || loading.value || saving.value || error.value || !preview.value) return
   if (!pending.value) {
     const invalid = appointmentFormError(form); if (invalid) { ElMessage.warning(invalid); return }
+    if (form.appointmentStatus === 'SUCCESS' && !confirmationReady.value) { ElMessage.warning('请先在“正式确认前”区域补齐并保存每票货物资料'); return }
+    if (appointmentFields.value?.canLeave && !await appointmentFields.value.canLeave()) return
+    if (saving.value || !writable.value) return
     pending.value = { originWarehouseId: preview.value.group.originWarehouseId, fbaWarehouseCode: preview.value.destinationWarehouseCode, sources: preview.value.sources.map(source => ({ sourceKey: source.sourceKey, customerId: source.customerId, destinationKey: source.destinationKey })), details: appointmentPayload(form), idempotencyKey: crypto.randomUUID() }
   }
   saving.value = true; saveError.value = null
@@ -58,7 +63,7 @@ onMounted(load)
         <p v-for="field in preview.missingFields" :key="field" role="status" class="density-dialog-note">{{ workReason(field) }}</p>
         <p v-if="preview.group.readinessIncomplete" role="status" class="density-dialog-note">货物备妥窗口待核实。</p>
       </section>
-      <FbaAppointmentFields continuous :model="form" :timezone="preview.destinationTimezone" :disabled="!writable || loading || saving || !!pending" />
+      <FbaAppointmentFields continuous ref="appointmentFields" :sources="sources.map(source => ({ ...source, destinationKey: source.destinationKey || undefined }))" @confirmation-ready="confirmationReady = $event" :model="form" :timezone="preview.destinationTimezone" :disabled="!writable || loading || saving || !!pending" />
       <LoadErrorState v-if="saveError" title="预约尚未创建" :message="saveError.message" :show-retry="false"><template #details><ApiErrorMeta :details="saveError" /></template></LoadErrorState>
       <div class="density-actions density-actions--footer"><el-button type="primary" :disabled="!writable || loading" :loading="saving" @click="save">{{ pending ? '重试本次创建' : '保存预约安排' }}</el-button></div>
     </template>

src/modules/appointment-calendar/index.ts

@@ -1,2 +1,4 @@
 export { appointmentReturnTarget, appointmentReturnQuery } from './workNavigation'
 export { default as TripAppointmentPanel } from './TripAppointmentPanel.vue'
+export { default as AppointmentConfirmationCargo } from './AppointmentConfirmationCargo.vue'
+export type { PlanningSourceLookup } from './planningApi'

src/modules/container-loading/pages/ContainersView.test.ts

@@ -479,7 +479,9 @@ describe('ContainersView', () => {
     expect(source).not.toContain('canSmartLoading && row.containerNo')
     expect(source).not.toContain('link type="primary" :aria-label="containerViewLabel')
     expect(source).toContain(':loading="loading" preference-key="container-loading-table"')
-    expect(source).toContain('appearance="integrated" :stripe="false"')
+    expect(source).toContain('appearance="integrated"')
+    expect(source).not.toContain(':stripe="false"')
+    expect(source).not.toContain(':stripe="false"')
   })
 
   it('updates an ACTIVE TRUCKING fleet inline and records actual empty return once', async () => {

src/modules/container-loading/pages/ContainersView.vue

@@ -736,7 +736,7 @@ onMounted(async () => { await Promise.all([loadCustomers(), loadRows()]) })
       <ListPageLayout :ariaLabel="isDomestic ? '送柜报关工作台' : '清关提柜工作台'">
 
 
-        <section id="container-workbench-results" ><div class="workbench-table is-page-surface"><DataTable appearance="integrated" :stripe="false" column-settings-mode="show" :results-visible="!loadError" v-model:page="page" v-model:page-size="pageSize" :data="rows" :columns="columns" :total="total" :loading="loading" preference-key="container-loading-table" empty-text="暂无货柜">
+        <section id="container-workbench-results" ><div class="workbench-table is-page-surface"><DataTable appearance="integrated" column-settings-mode="show" :results-visible="!loadError" v-model:page="page" v-model:page-size="pageSize" :data="rows" :columns="columns" :total="total" :loading="loading" preference-key="container-loading-table" empty-text="暂无货柜">
         <template #toolbar-start>
           <div class="container-scope-tabs density-status-tabs workbench-list-tabs" role="tablist" aria-label="货柜完结状态">
             <button type="button" role="tab" aria-controls="container-workbench-results" :aria-selected="scope === 'ACTIVE'" :tabindex="scope === 'ACTIVE' ? 0 : -1" :class="['container-scope-tab', { 'is-active': scope === 'ACTIVE' }]" @click="scope = 'ACTIVE'">未完结</button>

src/modules/customers/pages/CustomersView.vue

@@ -1065,7 +1065,7 @@ onMounted(() => { void loadCustomers() })
     <ListPageLayout aria-label="客户管理">
 
 
-      <section class="workbench-table is-page-surface" :aria-busy="loading"><DataTable appearance="integrated" :stripe="false" column-settings-mode="show" :results-visible="!loadError" v-model:page="page" v-model:page-size="pageSize" :data="result.records" :columns="customerColumns" preference-key="customers-table" :loading="loading" :total="result.total" aria-label="客户列表" row-key="id" empty-text="暂无符合筛选条件的客户" class="customer-list-table" border>
+      <section class="workbench-table is-page-surface" :aria-busy="loading"><DataTable appearance="integrated" column-settings-mode="show" :results-visible="!loadError" v-model:page="page" v-model:page-size="pageSize" :data="result.records" :columns="customerColumns" preference-key="customers-table" :loading="loading" :total="result.total" aria-label="客户列表" row-key="id" empty-text="暂无符合筛选条件的客户" class="customer-list-table" border>
         <template #toolbar-start><h1>客户列表</h1></template>
         <template #filters><QueryToolbar v-model="filters" ariaLabel="客户筛选" :fields="queryFields" preference-key="customers-query" @search="applyFilters" /></template>
         <template #notices><template v-if="loadError">
@@ -1221,7 +1221,7 @@ onMounted(() => { void loadCustomers() })
 .capital-input { display:grid; grid-template-columns:minmax(0,1fr) 130px; width:100%; gap:var(--admin-space-3, 8px); } .capital-input :deep(.el-input-number) { width:100%; } .capital-input :deep(.el-select) { width:100%; }
 .qualification-heading { display:flex; justify-content:flex-end; margin-bottom:var(--admin-space-5, 12px); } .qualification-hint { margin:var(--admin-space-5, 12px) 0 0; color:var(--workbench-muted); font-size:var(--admin-font-caption, 12px); line-height:1.6; } .qualification-hint span { color:var(--el-color-danger); } .qualification-label > span { color:var(--el-color-danger); }
 .qualification-credit-code small { display:block; margin-top:var(--admin-space-2, 6px); color:var(--workbench-muted); font-size:var(--admin-font-caption, 11px); line-height:1.5; } .field-hint { display:block; margin-top:var(--admin-space-2, 6px); color:var(--workbench-muted); line-height:1.5; }
-.qualification-table { container-type:inline-size; overflow:hidden; margin-top:14px; border:1px solid var(--workbench-border); border-radius:8px; } .qualification-row { display:grid; grid-template-columns:170px minmax(0,1fr) 220px; min-width:0; border-top:1px solid var(--workbench-border); } .qualification-row:first-child { border-top:0; } .qualification-row > * { display:flex; min-width:0; align-items:center; } .qualification-header { min-height:44px; background:var(--workbench-surface-soft); color:var(--workbench-muted); font-size:var(--admin-font-caption, 12px); font-weight:600; }
+.qualification-table { container-type:inline-size; overflow:hidden; margin-top:14px; border:1px solid var(--workbench-border); border-radius:8px; } .qualification-row { display:grid; grid-template-columns:170px minmax(0,1fr) 220px; min-width:0; border-top:1px solid var(--workbench-border); } .qualification-row:first-child { border-top:0; } .qualification-row > * { display:flex; min-width:0; align-items:center; } .qualification-header { min-height:44px; background:var(--cc-list-table-header-bg); color:var(--cc-list-table-header-text); font-size:var(--admin-font-caption, 12px); font-weight:600; }
 .qualification-label { gap:5px; font-weight:600; } .qualification-label svg { margin-left:auto; color:var(--el-color-success); }
 .qualification-optional { padding:2px 5px; border-radius:var(--admin-radius, 4px); background:var(--el-fill-color-light); color:var(--workbench-muted); font-size:var(--admin-font-caption, 10px); font-weight:500; line-height:1.4; }
 .qualification-file { gap:var(--admin-space-5, 12px); } .qualification-file-control { display:flex; min-width:0; flex:1; flex-wrap:wrap; align-items:center; gap:var(--admin-space-3, 8px); } .file-picker { position:relative; display:inline-flex; flex:0 0 auto; align-items:center; gap:7px; overflow:hidden; padding:0 var(--admin-space-5, 12px); border:1px solid var(--workbench-border); border-radius:6px; background:var(--workbench-surface); color:var(--workbench-text); cursor:pointer; } .file-picker:focus-within { outline:2px solid color-mix(in srgb,var(--workbench-primary) 35%,transparent); outline-offset:2px; } .file-picker.is-disabled { cursor:not-allowed; opacity:.6; } .file-picker input { position:absolute; inset:0; width:100%; height:100%; opacity:0; cursor:inherit; } .qualification-file-name { min-width:0; overflow:hidden; color:var(--workbench-muted); font-size:var(--admin-font-caption, 12px); text-overflow:ellipsis; } .qualification-validity :deep(.el-date-editor) { width:100%; min-width:0; } .qualification-error { width:100%; color:var(--el-color-danger); line-height:1.4; }

src/modules/customers/pages/OverseasStorageFeesView.vue

@@ -72,7 +72,7 @@ onMounted(() => { void load() })
   <div class="business-page overseas-fees-page admin-density customer-density">
     <ListPageLayout ariaLabel="海外仓阶梯费用列表">
 
-    <section class="workbench-table is-page-surface"><DataTable appearance="integrated" :stripe="false" column-settings-mode="show" :results-visible="!error" v-model:page="page" v-model:page-size="size" :data="rows" :columns="columns" :loading="loading" :total="total" preference-key="overseas-storage-fees-table" row-key="id" border empty-text="暂无海外仓阶梯费用配置" @update:page="load" @update:page-size="load">
+    <section class="workbench-table is-page-surface"><DataTable appearance="integrated" column-settings-mode="show" :results-visible="!error" v-model:page="page" v-model:page-size="size" :data="rows" :columns="columns" :loading="loading" :total="total" preference-key="overseas-storage-fees-table" row-key="id" border empty-text="暂无海外仓阶梯费用配置" @update:page="load" @update:page-size="load">
         <template #toolbar-start><h1>海外仓阶梯费用</h1></template>
         <template #filters><QueryToolbar v-model="filters" :fields="queryFields" ariaLabel="海外仓阶梯费用筛选" preference-key="overseas-storage-fees-query" @search="search" /></template>
         <template #notices><template v-if="error"><section class="surface-panel error-state" role="alert"><div><strong>{{ error.message }}</strong><ApiErrorMeta :details="error" /></div><el-button type="primary" @click="load">重新加载</el-button></section></template></template>

src/modules/domestic-containers/pages/DomesticContainersView.vue

@@ -75,7 +75,7 @@ watch([page, pageSize], load); onMounted(async () => { await Promise.all([loadWa
 
 <template><AdminPage as="div" class="domestic-containers-page admin-density admin-workbench">
 <LoadErrorState v-if="warehouseError" compact title="国内仓候选加载失败" :message="warehouseError.message" :loading="warehouseLoading" @retry="loadWarehouses"><template #details><ApiErrorMeta :details="warehouseError" /></template></LoadErrorState>
-<ListPageLayout :aria-label="`${activeTab === 'inbound' ? '整柜入库单' : activeTab === 'outbound' ? '整柜出库单' : '整柜库存'}列表`"><section id="domestic-container-results" ><div class="workbench-table is-page-surface"><DataTable appearance="integrated" :stripe="false" column-settings-mode="show" :results-visible="!loadError" v-model:page="page" v-model:page-size="pageSize" :data="rows" :columns="columns" :loading="loading" :total="total" row-key="id" :preference-key="`domestic-containers-${activeTab}-table`" :empty-text="activeTab === 'inbound' ? '暂无整柜入库单' : activeTab === 'outbound' ? '暂无整柜出库单' : '暂无整柜库存'">
+<ListPageLayout :aria-label="`${activeTab === 'inbound' ? '整柜入库单' : activeTab === 'outbound' ? '整柜出库单' : '整柜库存'}列表`"><section id="domestic-container-results" ><div class="workbench-table is-page-surface"><DataTable appearance="integrated" column-settings-mode="show" :results-visible="!loadError" v-model:page="page" v-model:page-size="pageSize" :data="rows" :columns="columns" :loading="loading" :total="total" row-key="id" :preference-key="`domestic-containers-${activeTab}-table`" :empty-text="activeTab === 'inbound' ? '暂无整柜入库单' : activeTab === 'outbound' ? '暂无整柜出库单' : '暂无整柜库存'">
         <template #toolbar-start><div class="status-tabs density-status-tabs workbench-list-tabs" role="tablist" aria-label="整柜业务类型"><button v-for="(tab, index) in businessTabs" :key="tab.value" type="button" role="tab" :aria-selected="activeTab === tab.value" aria-controls="domestic-container-results" :tabindex="activeTab === tab.value ? 0 : -1" :class="['status-tab', { 'is-active': activeTab === tab.value }]" @click="switchTab(tab.value)" @keydown="handleTabKeydown($event, index)">{{ tab.label }}</button></div></template>
         <template #filters><div class="business-query-panel integrated-query-group"><QueryToolbar v-model="filters" class="business-query-toolbar" ariaLabel="整柜业务筛选" :fields="queryFields" :preference-key="`domestic-containers-${activeTab}-query`" @search="search" /></div></template>
         <template #notices><template v-if="loadError"><LoadErrorState title="整柜业务加载失败" :message="loadError.message" :loading="loading" @retry="load"><template #details><ApiErrorMeta :details="loadError" /></template></LoadErrorState></template></template>

src/modules/downloads/pages/DownloadCenterView.vue

@@ -283,7 +283,7 @@ onBeforeUnmount(() => {
 
 
 
-    <section class="workbench-table is-page-surface" :aria-busy="loading"><DataTable appearance="integrated" :stripe="false" column-settings-mode="show" :results-visible="!loadError" v-model:page="page" v-model:page-size="pageSize" :data="result.records" :columns="columns" preference-key="downloads-table" :loading="loading" :total="result.total" row-key="id" empty-text="暂无符合筛选条件的下载任务" aria-label="下载任务列表">
+    <section class="workbench-table is-page-surface" :aria-busy="loading"><DataTable appearance="integrated" column-settings-mode="show" :results-visible="!loadError" v-model:page="page" v-model:page-size="pageSize" :data="result.records" :columns="columns" preference-key="downloads-table" :loading="loading" :total="result.total" row-key="id" empty-text="暂无符合筛选条件的下载任务" aria-label="下载任务列表">
         <template #toolbar-start><h1>下载中心</h1></template>
         <template #filters>
         <QueryToolbar v-model="filters" ariaLabel="下载任务筛选" :fields="queryFields" preference-key="downloads-query" @search="applyFilters" />

src/modules/fba-pricing/carrier-rates/pages/CarrierRatesView.vue

@@ -325,7 +325,7 @@ onMounted(() => {
 
 
 
-      <section aria-live="polite"><div class="workbench-table is-page-surface"><DataTable appearance="integrated" :stripe="false" column-settings-mode="show" :results-visible="!loadError"
+      <section aria-live="polite"><div class="workbench-table is-page-surface"><DataTable appearance="integrated" column-settings-mode="show" :results-visible="!loadError"
         v-model:page="page"
         v-model:page-size="pageSize"
         :data="pagedRows"

src/modules/fee-items/pages/FeeItemsView.test.ts

@@ -129,7 +129,9 @@ describe('FeeItemsView public master data and access', () => {
     expect(actions).not.toMatch(/<(?:el-dropdown|Pencil|Power|Eye|Trash2|Download|CircleX)\b/)
   })
   it('keeps the prototype table treatment and mobile form fallback without inventing a pricing mode', () => {
-    expect(source).toContain('appearance="integrated" :stripe="false"')
+    expect(source).toContain('appearance="integrated"')
+    expect(source).not.toContain(':stripe="false"')
+    expect(source).not.toContain(':stripe="false"')
     expect(source).toContain(':page-sizes="[20, 50, 100]"')
     expect(source).toContain('@media (max-width: 720px)')
     expect(source).toContain('.fee-item-editor-table tr { display: grid; }')

src/modules/fee-items/pages/FeeItemsView.vue

@@ -350,7 +350,7 @@ onMounted(() => {
 
 
 
-      <section class="workbench-table is-page-surface"><DataTable appearance="integrated" :stripe="false" column-settings-mode="show" :results-visible="!loadError"
+      <section class="workbench-table is-page-surface"><DataTable appearance="integrated" column-settings-mode="show" :results-visible="!loadError"
           v-model:page="page"
           v-model:page-size="pageSize"
           :data="rows"

src/modules/finance/pages/FinanceCustomerAccountsView.vue

@@ -446,7 +446,7 @@ onBeforeUnmount(clearVoucherPreview)
     <ListPageLayout v-else-if="!detailOpen" aria-label="客户账户">
 
 
-      <section class="workbench-table is-page-surface"><DataTable appearance="integrated" :stripe="false" column-settings-mode="show" :results-visible="!stateError" v-model:page="page" v-model:page-size="pageSize" :data="rows" :columns="columns" :loading="loading" :total="total" preference-key="finance-customer-accounts-table" aria-label="客户账户列表" row-key="customerId" empty-text="暂无客户账户" @update:page="load()" @update:page-size="page = 1; load()">
+      <section class="workbench-table is-page-surface"><DataTable appearance="integrated" column-settings-mode="show" :results-visible="!stateError" v-model:page="page" v-model:page-size="pageSize" :data="rows" :columns="columns" :loading="loading" :total="total" preference-key="finance-customer-accounts-table" aria-label="客户账户列表" row-key="customerId" empty-text="暂无客户账户" @update:page="load()" @update:page-size="page = 1; load()">
         <template #toolbar-start><h1>客户账户</h1></template>
         <template #filters><QueryToolbar v-model="filters" ariaLabel="客户账户筛选" :fields="queryFields" preference-key="finance-customer-accounts-query" @search="search" /></template>
         <template #notices><template v-if="stateError"><LoadErrorState title="客户账户加载失败" :message="stateError.message" :loading="loading || customersLoading" @retry="customersError ? loadCustomers() : load()"><template #details><ApiErrorMeta :details="stateError" /></template></LoadErrorState></template></template>

src/modules/finance/pages/FinanceCustomerArapView.vue

@@ -403,7 +403,7 @@ watch(() => [route.name, String(route.params.feeSourceId || '')], ([name, feeSou
     <ListPageLayout v-else-if="!detailOpen" aria-label="客户应收应付">
 
 
-      <section class="workbench-table is-page-surface"><DataTable appearance="integrated" :stripe="false" column-settings-mode="show" :results-visible="!customersError && !loadError" v-model:page="page" v-model:page-size="pageSize" :data="rows" :columns="columns" :loading="loading" :total="total" max-height="calc(100vh - 300px)" preference-key="finance-customer-arap-table" aria-label="客户应收应付列表" row-key="id" empty-text="暂无客户应收应付数据" @selection-change="onSelectionChange" @update:page="load()" @update:page-size="page = 1; load()">
+      <section class="workbench-table is-page-surface"><DataTable appearance="integrated" column-settings-mode="show" :results-visible="!customersError && !loadError" v-model:page="page" v-model:page-size="pageSize" :data="rows" :columns="columns" :loading="loading" :total="total" max-height="calc(100vh - 300px)" preference-key="finance-customer-arap-table" aria-label="客户应收应付列表" row-key="id" empty-text="暂无客户应收应付数据" @selection-change="onSelectionChange" @update:page="load()" @update:page-size="page = 1; load()">
         <template #toolbar-start><h1>客户应收应付</h1></template>
         <template #filters><QueryToolbar v-model="filters" ariaLabel="客户应收应付筛选" :fields="queryFields" preference-key="finance-customer-arap-query" @search="search" /></template>
         <template #notices><template v-if="stateError"><LoadErrorState title="客户应收应付加载失败" :message="stateError.message" :loading="customersLoading || loading" @retry="customersError ? loadCustomers() : load()"><template #details><ApiErrorMeta :details="stateError" /></template></LoadErrorState></template></template>

src/modules/finance/pages/FinanceCustomerStatementsView.vue

@@ -680,7 +680,7 @@ watch(detailRouteId, (statementId) => {
     <ListPageLayout v-else aria-label="客户对账单">
 
 
-      <section class="workbench-table is-page-surface"><DataTable appearance="integrated" :stripe="false" column-settings-mode="show" :results-visible="!customerError && !error" v-model:page="page" v-model:page-size="pageSize" :data="paginatedRows" :columns="columns" :loading="loading" :total="filteredRows.length" aria-label="客户对账单列表" row-key="id" empty-text="暂无客户对账单" preference-key="finance-customer-statements" @row-click="openDetail">
+      <section class="workbench-table is-page-surface"><DataTable appearance="integrated" column-settings-mode="show" :results-visible="!customerError && !error" v-model:page="page" v-model:page-size="pageSize" :data="paginatedRows" :columns="columns" :loading="loading" :total="filteredRows.length" aria-label="客户对账单列表" row-key="id" empty-text="暂无客户对账单" preference-key="finance-customer-statements" @row-click="openDetail">
         <template #toolbar-start><h1>客户对账单</h1></template>
         <template #filters><QueryToolbar v-model="filters" ariaLabel="客户对账单筛选" :fields="fields" :loading="loading" preference-key="finance-statements-query" :search-on-clear="false" @search="load" /></template>
         <template #notices><template v-if="customerError || error"><LoadErrorState title="客户对账单加载失败" :message="(customerError || error)?.message || ''" :loading="loading" @retry="customerError ? loadCustomers() : load()"><template #details><ApiErrorMeta :details="(customerError || error)!" /></template></LoadErrorState></template></template>
@@ -733,7 +733,7 @@ watch(detailRouteId, (statementId) => {
         <section v-if="adjustStatement" class="density-dialog-section workbench-evidence" data-tone="summary" aria-label="当前对账单"><h3 class="density-dialog-section__title">当前对账单</h3><table class="density-table statement-dialog-facts"><tbody><tr><th scope="row">对账单号</th><td>{{ adjustStatement.billNo || '—' }}</td><th scope="row">客户</th><td>{{ customerDisplayName(adjustStatement.customerId, adjustStatement.customerName) }}</td></tr></tbody></table></section>
         <section class="density-dialog-section" data-tone="work" aria-label="对账单调整登记"><h3 class="density-dialog-section__title">调整登记</h3><div class="statement-adjust-editor">
           <div class="workbench-evidence"><table class="density-table density-table--editable"><tbody><tr><td><el-form-item label="整体调整原因"><el-input v-model="adjustReason" type="textarea" maxlength="500" show-word-limit placeholder="请输入整体调整原因" /></el-form-item></td></tr></tbody></table></div>
-          <div class="workbench-table"><el-table :data="adjustLines" size="small" border :stripe="false" row-key="statementLineId"><el-table-column label="选择" width="64"><template #default="{ row }"><el-checkbox v-model="row.selected" :aria-label="`选择${row.feeItemName || '费用明细'}`" /></template></el-table-column><el-table-column prop="feeItemName" label="费用项目" min-width="150" show-overflow-tooltip /><el-table-column prop="originalAmount" label="原金额(CNY)" width="130" /><el-table-column label="新金额(CNY)" width="180"><template #default="{ row }"><el-input-number v-model="row.adjustedAmount" :min="0.01" :precision="2" placeholder="请输入新金额" /></template></el-table-column><el-table-column label="明细说明" min-width="220"><template #default="{ row }"><el-input v-model="row.reason" maxlength="500" placeholder="请输入明细说明" /></template></el-table-column></el-table></div>
+          <div class="workbench-table"><el-table :data="adjustLines" size="small" border stripe row-key="statementLineId"><el-table-column label="选择" width="64"><template #default="{ row }"><el-checkbox v-model="row.selected" :aria-label="`选择${row.feeItemName || '费用明细'}`" /></template></el-table-column><el-table-column prop="feeItemName" label="费用项目" min-width="150" show-overflow-tooltip /><el-table-column prop="originalAmount" label="原金额(CNY)" width="130" /><el-table-column label="新金额(CNY)" width="180"><template #default="{ row }"><el-input-number v-model="row.adjustedAmount" :min="0.01" :precision="2" placeholder="请输入新金额" /></template></el-table-column><el-table-column label="明细说明" min-width="220"><template #default="{ row }"><el-input v-model="row.reason" maxlength="500" placeholder="请输入明细说明" /></template></el-table-column></el-table></div>
         </div></section>
       </el-form>
     </AppDialog>

src/modules/finance/pages/FinanceFormalSettlementPage.vue

@@ -606,7 +606,7 @@ onMounted(() => {
     <ListPageLayout v-else :aria-label="title">
 
 
-      <section class="workbench-table is-page-surface"><DataTable :preference-key="`finance-settlement-${kind}-table`" appearance="integrated" :stripe="false" column-settings-mode="show" :results-visible="!customerError && !error" v-model:page="page" v-model:page-size="pageSize" :data="paginatedRows" :columns="columns" :loading="loading" :total="filteredRows.length" :aria-label="`${title}列表`" row-key="id" empty-text="暂无符合条件的结算单">
+      <section class="workbench-table is-page-surface"><DataTable :preference-key="`finance-settlement-${kind}-table`" appearance="integrated" column-settings-mode="show" :results-visible="!customerError && !error" v-model:page="page" v-model:page-size="pageSize" :data="paginatedRows" :columns="columns" :loading="loading" :total="filteredRows.length" :aria-label="`${title}列表`" row-key="id" empty-text="暂无符合条件的结算单">
         <template #toolbar-start><h1>{{ title }}</h1></template>
         <template #filters>
         <QueryToolbar v-model="filters" :ariaLabel="`${title}筛选`" :fields="fields" :preference-key="`finance-settlement-${kind}-query`" :search-on-clear="false" @search="load" />

src/modules/finance/pages/FinancePresentation.test.ts

@@ -132,7 +132,7 @@ describe('finance presentation governance', () => {
   it('keeps bordered statement details and lets the adjustment editor scroll with its dialog', () => {
     expect(statements).toContain(':data="detail.lines" size="small" border stripe')
     expect(statements).toContain(':data="detail.revisions" size="small" border stripe')
-    expect(statements).toContain(':data="adjustLines" size="small" border :stripe="false" row-key="statementLineId"')
+    expect(statements).toContain(':data="adjustLines" size="small" border stripe row-key="statementLineId"')
     expect(statements).not.toContain('max-height="420"')
   })
 

src/modules/finance/pages/FinanceReceivableStatisticsView.vue

@@ -93,7 +93,7 @@ onMounted(() => { void loadCustomers(); void load() })
   <AdminPage class="receivable-statistics-page admin-density admin-workbench" spacing="normal">
     <el-result v-if="!canView" icon="warning" title="无权访问应收款统计表" sub-title="请联系管理员开通应收款统计查看权限" />
     <template v-else>
-      <div class="workbench-table is-page-surface"><DataTable class="statistics-table" appearance="integrated" :stripe="false" column-settings-mode="show" :results-visible="!error" v-model:page="page" v-model:page-size="pageSize" :data="rows" :columns="columns" :loading="loading" :total="result?.totalCustomers ?? 0" :row-key="statisticsRowKey" preference-key="finance-receivable-statistics-table" aria-label="应收款统计列表" empty-text="当前月份暂无应收数据" @update:page="load()" @update:page-size="page = 1; load()">
+      <div class="workbench-table is-page-surface"><DataTable class="statistics-table" appearance="integrated" column-settings-mode="show" :results-visible="!error" v-model:page="page" v-model:page-size="pageSize" :data="rows" :columns="columns" :loading="loading" :total="result?.totalCustomers ?? 0" :row-key="statisticsRowKey" preference-key="finance-receivable-statistics-table" aria-label="应收款统计列表" empty-text="当前月份暂无应收数据" @update:page="load()" @update:page-size="page = 1; load()">
           <template #toolbar-start><h1>应收款统计表</h1></template>
           <template #filters><section class="query-toolbar statistics-query" aria-label="应收款统计筛选">
         <div class="query-field"><span>统计月份</span><el-date-picker v-model="month" type="month" value-format="YYYY-MM" format="YYYY年MM月" :clearable="false" aria-label="统计月份" /></div>

src/modules/iam/pages/InternalUsersView.vue

@@ -389,7 +389,7 @@ onMounted(loadInitialData)
 
 
 
-      <section class="workbench-table is-page-surface" :aria-busy="loading"><DataTable appearance="integrated" :stripe="false" column-settings-mode="show" :results-visible="!loadError" v-model:page="page" v-model:page-size="pageSize" :data="users" :columns="userColumns" preference-key="internal-users-table"
+      <section class="workbench-table is-page-surface" :aria-busy="loading"><DataTable appearance="integrated" column-settings-mode="show" :results-visible="!loadError" v-model:page="page" v-model:page-size="pageSize" :data="users" :columns="userColumns" preference-key="internal-users-table"
         :loading="loading" :total="total" aria-label="内部用户列表" row-key="membershipId" empty-text="没有符合筛选条件的内部用户">
         <template #toolbar-start><h1>用户管理</h1></template>
         <template #filters>

src/modules/iam/pages/PermissionsView.vue

@@ -279,7 +279,7 @@ onMounted(loadPermissions)
 
 
 
-      <section class="workbench-table is-page-surface"><DataTable appearance="integrated" :stripe="false" column-settings-mode="show" :results-visible="!loadError" :key="tableRenderKey" v-model:page="page" v-model:page-size="pageSize" :data="pagedTreeRows" :columns="permissionColumns" preference-key="permissions-table" :loading="loading" :total="treeRows.length" row-key="id" aria-label="平台权限资源列表" :expand-row-keys="expandedRowKeys" :tree-props="{ children: 'children' }" empty-text="没有符合条件的权限资源">
+      <section class="workbench-table is-page-surface"><DataTable appearance="integrated" column-settings-mode="show" :results-visible="!loadError" :key="tableRenderKey" v-model:page="page" v-model:page-size="pageSize" :data="pagedTreeRows" :columns="permissionColumns" preference-key="permissions-table" :loading="loading" :total="treeRows.length" row-key="id" aria-label="平台权限资源列表" :expand-row-keys="expandedRowKeys" :tree-props="{ children: 'children' }" empty-text="没有符合条件的权限资源">
         <template #toolbar-start><h1>菜单权限</h1></template>
         <template #filters><QueryToolbar v-model="filters" ariaLabel="权限筛选" :fields="queryFields" preference-key="permissions-query" @search="applyFilters" /></template>
         <template #notices><template v-if="loadError">

src/modules/iam/pages/RolesView.test.ts

@@ -76,7 +76,9 @@ describe('RolesView', () => {
     expect(rolesSource).toContain("(row as Role).status || '—'")
   })
   it('uses bordered striped tables and semantic role operation buttons', () => {
-    expect(rolesSource).toContain('appearance="integrated" :stripe="false"')
+    expect(rolesSource).toContain('appearance="integrated"')
+    expect(rolesSource).not.toContain(':stripe="false"')
+    expect(rolesSource).not.toContain(':stripe="false"')
     expect(rolesSource).toContain('size="small" data-tone="neutral"')
     expect(rolesSource).toContain('size="small" :data-tone=')
     expect(rolesSource).toContain('size="small" data-tone="danger"')

src/modules/iam/pages/RolesView.vue

@@ -242,7 +242,7 @@ onMounted(loadRoles)
 
 
 
-      <section class="workbench-table is-page-surface"><DataTable appearance="integrated" :stripe="false" column-settings-mode="show" :results-visible="!loadError" v-model:page="page" v-model:page-size="pageSize" :data="pagedRows" :columns="roleColumns" preference-key="roles-table" :loading="loading" :total="filteredRows.length" row-key="id" border aria-label="平台角色列表" empty-text="没有符合条件的角色">
+      <section class="workbench-table is-page-surface"><DataTable appearance="integrated" column-settings-mode="show" :results-visible="!loadError" v-model:page="page" v-model:page-size="pageSize" :data="pagedRows" :columns="roleColumns" preference-key="roles-table" :loading="loading" :total="filteredRows.length" row-key="id" border aria-label="平台角色列表" empty-text="没有符合条件的角色">
         <template #toolbar-start><h1>角色权限</h1></template>
         <template #filters><QueryToolbar v-model="filters" ariaLabel="角色筛选" :fields="queryFields" preference-key="roles-query" @search="applyFilters" /></template>
         <template #notices><template v-if="loadError">

src/modules/inbounds/components/InboundTaskList.vue

@@ -359,7 +359,7 @@ onBeforeUnmount(() => { disposed = true; requestSerial += 1; optionsRequestSeria
 
 
 
-      <section :aria-busy="loading"><div class="workbench-table is-page-surface"><DataTable appearance="integrated" :stripe="false" column-settings-mode="show" :results-visible="!loadError"
+      <section :aria-busy="loading"><div class="workbench-table is-page-surface"><DataTable appearance="integrated" column-settings-mode="show" :results-visible="!loadError"
           v-model:page="page"
           v-model:page-size="pageSize"
           :data="result.records"

src/modules/inbounds/measurement/InboundMeasurementPanel.vue

@@ -928,7 +928,7 @@ defineExpose({ saveDraft, submitForReview, updateWeightEvidence, submissionBlock
 <style scoped>
 .measurement-comparison { width: 100%; border-collapse: collapse; table-layout: fixed; background: var(--admin-surface, #fff); font-size: var(--admin-font-body, 13px); }
 .measurement-comparison th, .measurement-comparison td { padding: var(--admin-space-3, 8px) var(--admin-space-5, 12px); border: 1px solid var(--workbench-border); text-align: left; overflow-wrap: anywhere; font-variant-numeric: tabular-nums; }
-.measurement-comparison thead th { background: #f8fafc; }
+.measurement-comparison thead th { background: var(--cc-list-table-header-bg); color: var(--cc-list-table-header-text); }
 .measurement-comparison thead th:nth-child(2) { background: #f7f9ff; color: #465fc4; }
 .measurement-comparison thead th:nth-child(3) { background: #f4fbf8; color: #18795d; }
 .measurement-comparison__difference { color: var(--el-color-danger-dark-2); font-weight: 600; }
@@ -984,7 +984,7 @@ defineExpose({ saveDraft, submitForReview, updateWeightEvidence, submissionBlock
 .manual-entry-upload { width: 100%; }
 .measurement-items-section { background: var(--admin-surface, #fff); }
 .measurement-table { width: 100%; font-size: var(--admin-font-caption, 12px); }
-.measurement-table :deep(.el-table__header th) { padding: var(--admin-space-3, 8px) 0; background: #f6f8fa; color: #475467; font-size: var(--admin-font-caption, 11px); font-weight: 700; }
+.measurement-table :deep(.el-table__header th) { padding: var(--admin-space-3, 8px) 0; background: var(--cc-list-table-header-bg); color: var(--cc-list-table-header-text); font-size: var(--admin-font-caption, 11px); font-weight: 700; }
 .measurement-table :deep(.el-table__cell) { padding: 7px 0; }
 .measurement-table :deep(.cell) { line-height: 1.35; }
 .measurement-table :deep(.measurement-table__row--error > td.el-table__cell) { background: var(--el-color-danger-light-9); }

src/modules/inbounds/weight/components/WeightOcrPanel.vue

@@ -744,7 +744,7 @@ defineExpose({ reload: loadWorkspace })
 .weight-card__correct { width: 100%; margin: var(--admin-space-5, 12px) 0 0; }
 .weight-table-wrap { overflow-x: auto; border: 1px solid var(--workbench-border); border-radius: 8px; background: #fff; }
 .weight-data-table { width: 100%; min-width: 1180px; border-collapse: separate; border-spacing: 0; table-layout: fixed; font-size: var(--admin-font-caption, 12px); }
-.weight-data-table th { height: 42px; padding: 0 8px; border-bottom: 1px solid var(--workbench-border); background: var(--workbench-surface-soft); color: var(--workbench-muted); font-weight: 700; white-space: nowrap; }
+.weight-data-table th { height: 42px; padding: 0 8px; border-bottom: 1px solid var(--workbench-border); background: var(--cc-list-table-header-bg); color: var(--cc-list-table-header-text); font-weight: 700; white-space: nowrap; }
 .weight-data-table td { height: 76px; padding: 6px 8px; border-top: 1px solid var(--workbench-border); color: var(--workbench-text); text-align: center; vertical-align: middle; white-space: nowrap; }
 .weight-data-table th + th, .weight-data-table td + td { border-left: 1px solid var(--workbench-border); }
 .weight-data-table tbody tr:nth-child(even) td { background: var(--workbench-surface-soft); }

src/modules/loading-lists/components/LoadingListsView.test.ts

@@ -145,7 +145,9 @@ describe('LoadingListsView', () => {
     expect(source).toContain('@media (max-width: 720px)')
     expect(source).toContain('.row-actions { gap: 4px; }')
     expect(source).toContain('row-actions density-actions admin-text-actions')
-    expect(source).toContain('appearance="integrated" :stripe="false"')
+    expect(source).toContain('appearance="integrated"')
+    expect(source).not.toContain(':stripe="false"')
+    expect(source).not.toContain(':stripe="false"')
     expect(detailSource).toMatch(/:columns="itemColumns"\s+stripe/)
   })
 

src/modules/loading-lists/components/LoadingListsView.vue

@@ -191,7 +191,7 @@ onMounted(() => {
 
 
 
-    <section><div class="workbench-table is-page-surface"><DataTable appearance="integrated" :stripe="false" column-settings-mode="show" :results-visible="canList && !error"
+    <section><div class="workbench-table is-page-surface"><DataTable appearance="integrated" column-settings-mode="show" :results-visible="canList && !error"
         v-model:page="page"
         v-model:page-size="pageSize"
         :data="rows"

src/modules/master-data/counterparties/pages/PartnersView.vue

@@ -378,7 +378,7 @@ onMounted(() => {
 
 
 
-      <section class="workbench-table is-page-surface" :aria-busy="loading"><DataTable appearance="integrated" :stripe="false" column-settings-mode="show" :results-visible="!loadError"
+      <section class="workbench-table is-page-surface" :aria-busy="loading"><DataTable appearance="integrated" column-settings-mode="show" :results-visible="!loadError"
         v-model:page="page"
         v-model:page-size="pageSize"
         :data="rows"

src/modules/master-data/express-companies/pages/ExpressCompaniesView.vue

@@ -289,7 +289,7 @@ onMounted(() => {
 
 
 
-    <section class="workbench-table is-page-surface"><DataTable appearance="integrated" :stripe="false" column-settings-mode="show" :results-visible="!loadError"
+    <section class="workbench-table is-page-surface"><DataTable appearance="integrated" column-settings-mode="show" :results-visible="!loadError"
         v-model:page="page"
         v-model:page-size="pageSize"
         :data="rows"

src/modules/notifications/pages/MessageManagementView.vue

@@ -22,7 +22,7 @@ function search(){page.value===1?void load():page.value=1}
 async function action(row:NotificationTask,type:'cancel'|'retry'){try{await ElMessageBox.confirm(type==='cancel'?'确定取消该消息任务吗？':'确定重试该消息任务吗？',`${type==='cancel'?'取消任务':'重试任务'} · ${row.taskNo || '—'}`,{type:'warning',customClass: 'admin-density-confirm admin-workbench'});actionId.value=row.id;if(type==='cancel')await cancelTask(row.id);else await retryTask(row.id);ElMessage.success(type==='cancel'?'任务已取消':'任务已提交重试');await load()}catch(e){if(e!=='cancel'&&e!=='close')ElMessage.error(getApiErrorMessage(e,type==='cancel'?'取消失败':'重试失败'))}finally{actionId.value=''}}
 watch([page,pageSize],load);onMounted(()=>{void load();void loadTemplates()})
 </script>
-<template><AdminPage class="admin-density admin-workbench"><ListPageLayout aria-label="消息管理列表"><section class="workbench-table is-page-surface"><DataTable appearance="integrated" :stripe="false" column-settings-mode="show" :results-visible="!error" v-model:page="page" v-model:page-size="pageSize" :data="result.records" :columns="columns" preference-key="notifications-messages-table" :loading="loading" :total="result.total" row-key="id" empty-text="暂无消息任务">
+<template><AdminPage class="admin-density admin-workbench"><ListPageLayout aria-label="消息管理列表"><section class="workbench-table is-page-surface"><DataTable appearance="integrated" column-settings-mode="show" :results-visible="!error" v-model:page="page" v-model:page-size="pageSize" :data="result.records" :columns="columns" preference-key="notifications-messages-table" :loading="loading" :total="result.total" row-key="id" empty-text="暂无消息任务">
         <template #toolbar-start><h1>消息管理</h1></template>
         <template #filters><QueryToolbar v-model="filters" ariaLabel="消息任务筛选" :fields="queryFields" preference-key="notifications-messages-query" @search="search" /></template>
         <template #notices><template v-if="error"><LoadErrorState title="消息任务加载失败" :message="error.message" :loading="loading" @retry="load"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState></template></template>

src/modules/notifications/pages/MessageTemplatesView.vue

@@ -12,7 +12,7 @@ function search(){page.value===1?void load():page.value=1}function create(){edit
 async function changeStatus(row:NotificationTemplate){const target=row.status==='DRAFT'?'ACTIVE':'DISABLED';try{await ElMessageBox.confirm(target==='ACTIVE'?'激活后模板不可再编辑，确定继续吗？':'禁用后首期不可重新启用，确定继续吗？',`${target==='ACTIVE'?'激活模板':'禁用模板'} · ${row.templateName || row.templateCode || '—'}`,{type:'warning',customClass: 'admin-density-confirm admin-workbench'});actionId.value=row.id;await changeTemplateStatus(row.id,target,row.version);ElMessage.success(target==='ACTIVE'?'模板已激活':'模板已禁用');await load()}catch(e){if(e!=='cancel'&&e!=='close')ElMessage.error(getApiErrorMessage(e,'模板状态变更失败'))}finally{actionId.value=''}}
 watch([page,pageSize],load);onMounted(load)
 </script>
-<template><AdminPage class="admin-density admin-workbench"><ListPageLayout aria-label="消息模板列表"><section class="workbench-table is-page-surface"><DataTable appearance="integrated" :stripe="false" column-settings-mode="show" :results-visible="!error" v-model:page="page" v-model:page-size="pageSize" :data="result.records" :columns="columns" preference-key="notifications-templates-table" :loading="loading" :total="result.total" row-key="id" empty-text="暂无消息模板">
+<template><AdminPage class="admin-density admin-workbench"><ListPageLayout aria-label="消息模板列表"><section class="workbench-table is-page-surface"><DataTable appearance="integrated" column-settings-mode="show" :results-visible="!error" v-model:page="page" v-model:page-size="pageSize" :data="result.records" :columns="columns" preference-key="notifications-templates-table" :loading="loading" :total="result.total" row-key="id" empty-text="暂无消息模板">
         <template #toolbar-start><h1>模板管理</h1></template>
         <template #filters><QueryToolbar v-model="filters" ariaLabel="消息模板筛选" :fields="queryFields" preference-key="notifications-templates-query" @search="search"/></template>
         <template #notices><template v-if="error"><LoadErrorState title="模板加载失败" :message="error.message" :loading="loading" @retry="load"><template #details><ApiErrorMeta :details="error"/></template></LoadErrorState></template></template>

src/modules/notifications/pages/PlatformNotificationsView.vue

@@ -93,7 +93,7 @@ onMounted(() => void load())
     <ListPageLayout aria-label="我的消息列表">
 
 
-      <section class="workbench-table is-page-surface"><DataTable preference-key="notifications-platformnotificationsview" appearance="integrated" :stripe="false" column-settings-mode="show" :results-visible="!error" v-model:page="page" v-model:page-size="pageSize" :data="result.records" :columns="columns" :loading="loading" :total="result.total" row-key="id" empty-text="暂无消息">
+      <section class="workbench-table is-page-surface"><DataTable preference-key="notifications-platformnotificationsview" appearance="integrated" column-settings-mode="show" :results-visible="!error" v-model:page="page" v-model:page-size="pageSize" :data="result.records" :columns="columns" :loading="loading" :total="result.total" row-key="id" empty-text="暂无消息">
         <template #toolbar-start><h1>我的消息</h1></template>
         <template #filters><QueryToolbar v-model="filters" ariaLabel="我的消息筛选" :fields="queryFields" preference-key="notifications-inbox-query" @search="search" /></template>
         <template #notices><template v-if="error"><LoadErrorState title="我的消息加载失败" :message="error.message" :loading="loading" @retry="load"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState></template></template>

src/modules/ocean-bookings/pages/OceanBookingsView.vue

@@ -74,7 +74,7 @@ onActivated(() => void load())
     <ListPageLayout aria-label="订舱列表">
 
 
-      <section><div class="workbench-table is-page-surface"><DataTable appearance="integrated" :stripe="false" column-settings-mode="show" :results-visible="!error" v-model:page="page" v-model:page-size="pageSize" :data="rows" :columns="columns" :loading="loading" :total="total" preference-key="ocean-bookings" aria-label="订舱列表" row-key="id" empty-text="暂无符合筛选条件的订舱">
+      <section><div class="workbench-table is-page-surface"><DataTable appearance="integrated" column-settings-mode="show" :results-visible="!error" v-model:page="page" v-model:page-size="pageSize" :data="rows" :columns="columns" :loading="loading" :total="total" preference-key="ocean-bookings" aria-label="订舱列表" row-key="id" empty-text="暂无符合筛选条件的订舱">
         <template #toolbar-start><h1>订舱列表</h1></template>
         <template #filters><QueryToolbar v-model="query" ariaLabel="订舱筛选" :fields="fields" @search="search" /></template>
         <template #notices><template v-if="error"><LoadErrorState title="订舱列表加载失败" :message="error.message" :loading="loading" @retry="load"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState></template></template>

src/modules/overseas-business/PROTOTYPE_MATRIX.md

@@ -37,6 +37,13 @@
 
 删除和文件预览在三类正式页面中均未定义，不自行补充承载方式；海外采购审核按当前对话确认的承载方式实现。
 
+### 2026-10-21 本土卡车审核详情页头修复
+
+| 页面 | 操作 | 确认依据与布局 | 当前实现 | 修复结论与验收 |
+|---|---|---|---|---|
+| 本土卡车详情 | 从列表点击审核、查看详情 | 用户截图 `codex-clipboard-515ba915-7b67-48de-9914-62cec7371ec5.png` 红框；当前详情密度规范要求返回、编号、状态及操作合并页头 | 标题、状态/刷新、审核/取消拆成三行，标题使用浏览器默认字号 | 接入公共详情页头与连续白底容器：左侧返回、订单号及单一状态徽标，右侧刷新与原业务操作；保留完整编号；待人工 1920×1080、100% 截图确认 |
+| 本土卡车详情 | 审核、取消及后续命令 | 本表已确认的居中操作确认弹框 | `TruckOrderActions` 保留既有表单、权限及提交保护 | 只移动页头入口，弹框承载、尺寸和命令保持现状；按既有行为测试回归 |
+
 ## 本土卡车需求字段调整
 
 依据本轮客户端截图及用户确认，同步平台订单字段；规则唯一见 `docs/海外仓业务/README.md`“美国本土卡独立下单”。
@@ -113,3 +120,13 @@
 | ProcurementNodeActions | 采购详情中的节点命令居中弹框 | 自定义footer绕过AppDialog默认操作区容器；三项操作加入density-actions底部容器，允许换行并保持间距 | 定向回归通过；待人工1920×1080、100%截图确认 |
 
 保持既有命令、草稿、未知结果核对、权限与提交条件；只新增操作区容器。公共AppDialog的直接按钮footer修复由公共样式写者维护，本域未修改公共组件。
+
+## 2026-10-21 本土运输表单布局修复
+
+| 页面 | 操作 | 依据与现有承载 | 当前问题与修复结论 | 验收 |
+|---|---|---|---|---|
+| 本土卡车 | 新增 | 用户截图 `codex-clipboard-1a93aa11-88f2-4e90-8130-030fa91185f5.png`；既有独立路由及上文统一运输表单矩阵 | 移除居中窄表单的宽度限制及重复分区内距，铺满内容区；接入公共密度表单与分区，保留运输双列、货物三列和字段顺序 | 自动检查通过；待人工 1920×1080、100% 截图确认 |
+| 本土卡车 | 编辑 | 既有独立编辑路由，与新增复用运输表单 | 同步宽度、密度与分区；保留回显、状态限制及提交逻辑 | 同上 |
+| 本土散板 | 新增、编辑 | 既有独立路由，与卡车复用运输表单 | 同步布局修复，保留运输双列、货物四列及散板专属字段 | 同上 |
+
+本次仅调整 Admin 运输表单展示，不改采购编辑的宽度或 Client 表单。在 `apps/admin-web` 经 `local-check.ps1` 执行：`pnpm exec vitest run src/modules/overseas-business/pages/OverseasBusinessViews.test.ts src/modules/overseas-business/contract.test.ts src/styles/adminDensity.test.ts`，3 文件 115 项通过；`pnpm typecheck`、`pnpm build` 通过。共享完整 `pnpm test`（任务名 `Admin restored dispatch full regression`，13:55:33–14:05:50）退出码 0，覆盖本次未再变化的运输表单源码；其他在途排车变更由对应任务验证，不据此推定其最新快照通过。视觉仍待人工截图确认。

src/modules/overseas-business/components/TransportDemandForm.vue

@@ -1,7 +1,9 @@
 <script setup lang="ts">
 import '@/styles/adminWorkbench.css'
+import '@/styles/adminDensity.css'
 import { computed, ref } from 'vue'
 import type { FormInstance } from 'element-plus'
+import FormSection from '@/shared/components/FormSection.vue'
 import { transportDemandRules, type TransportDemandForm, type TransportDemandKind } from '../transportDemandForm'
 
 const props = withDefaults(defineProps<{
@@ -22,10 +24,9 @@ defineExpose({
 </script>
 
 <template>
-  <el-form ref="formRef" class="transport-demand-form admin-workbench" :model="model" :rules="rules" label-position="top" :disabled="disabled || submitting">
+  <el-form ref="formRef" class="transport-demand-form admin-density admin-workbench density-form" :model="model" :rules="rules" label-position="top" :disabled="disabled || submitting">
     <slot name="customer" />
-    <section class="transport-demand-section">
-      <h3>运输信息</h3>
+    <FormSection class="density-form-section" title="运输信息">
       <div class="transport-demand-grid">
         <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>
@@ -39,9 +40,8 @@ defineExpose({
         <el-form-item label="起运详细地址"><el-input v-model.trim="model.originAddress" maxlength="500" /></el-form-item>
         <el-form-item label="目的详细地址"><el-input v-model.trim="model.destinationAddress" maxlength="500" /></el-form-item>
       </div>
-    </section>
-    <section class="transport-demand-section">
-      <h3>货物信息</h3>
+    </FormSection>
+    <FormSection class="density-form-section" title="货物信息">
       <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" /></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" /></el-form-item>
@@ -50,9 +50,8 @@ defineExpose({
         <el-form-item label="总体积 (m³)" prop="totalVolumeCbm"><el-input-number v-model="model.totalVolumeCbm" :min="0" :precision="6" controls-position="right" /></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" /></el-form-item>
       </div>
-    </section>
-    <section class="transport-demand-section">
-      <h3>费用与时效</h3>
+    </FormSection>
+    <FormSection class="density-form-section" title="费用与时效">
       <div class="transport-demand-grid">
         <el-form-item label="预算总价" prop="budgetAmount"><div class="transport-demand-budget">
           <el-input-number v-model="model.budgetAmount" :min="0" :precision="2" controls-position="right" />
@@ -63,8 +62,8 @@ defineExpose({
         <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 class="transport-demand-wide" label="备注"><el-input v-model="model.remark" type="textarea" :rows="3" maxlength="1000" show-word-limit /></el-form-item>
       </div>
-    </section>
-    <footer class="transport-demand-actions">
+    </FormSection>
+    <footer class="transport-demand-actions density-actions">
       <el-button :disabled="submitting" @click="emit('cancel')">取消</el-button>
       <el-button v-if="canSubmit" type="primary" :loading="submitting" :disabled="disabled" @click="emit('submit')">{{ editing ? '保存修改' : '提交订单' }}</el-button>
     </footer>
@@ -72,17 +71,12 @@ defineExpose({
 </template>
 
 <style scoped>
-.transport-demand-form { --el-component-size: 36px; width: 100%; max-width: 1180px; margin: 0; background: var(--workbench-surface); }
-.transport-demand-section { padding: 20px 24px 0; border-bottom: 1px solid var(--workbench-border); }
-.transport-demand-section h3 { margin: 0 0 16px; color: var(--workbench-text); font-size: 14px; font-weight: 600; }
-.transport-demand-grid { display: grid; grid-template-columns: repeat(2, minmax(0, 1fr)); gap: 0 24px; }
+.transport-demand-form { width: 100%; min-width: 0; margin: 0; }
+.transport-demand-grid { display: grid; grid-template-columns: repeat(2, minmax(0, 1fr)); gap: 0 var(--admin-space-6); }
 .transport-demand-cargo-three { grid-template-columns: repeat(3, minmax(0, 1fr)); }
 .transport-demand-cargo-four { grid-template-columns: repeat(4, minmax(0, 1fr)); }
 .transport-demand-wide { grid-column: 1 / -1; }
-.transport-demand-form :deep(.el-form-item) { min-width: 0; margin-bottom: 18px; }
-.transport-demand-form :deep(.el-form-item__label) { height: auto; padding-bottom: 6px; font-size: 13px; line-height: 20px; }
-.transport-demand-form :deep(.el-input), .transport-demand-form :deep(.el-input-number), .transport-demand-form :deep(.el-select), .transport-demand-form :deep(.el-date-editor) { width: 100%; }
-.transport-demand-budget { display: grid; width: 100%; grid-template-columns: minmax(0, 1fr) 100px; gap: 10px; }
-.transport-demand-actions { display: flex; justify-content: flex-end; gap: 10px; padding: 18px 24px; }
-.transport-demand-actions :deep(.el-button + .el-button) { margin-left: 0; }
+.transport-demand-form :deep(.el-form-item) { min-width: 0; }
+.transport-demand-budget { display: grid; width: 100%; grid-template-columns: minmax(0, 1fr) 100px; gap: var(--admin-space-3); }
+.transport-demand-actions { justify-content: flex-end; flex-wrap: wrap; padding: var(--admin-space-5) 0; }
 </style>

src/modules/overseas-business/overseasBusinessDensity.css

@@ -1,8 +1,10 @@
 /* Shared business form layout for purchase and local transport editors. */
-.admin-density.overseas-business-editor { width: 100%; max-width: 1120px; }
+.admin-density.overseas-business-editor { width: 100%; }
+.admin-density.overseas-business-editor:not(.overseas-transport-editor) { max-width: 1120px; }
 .overseas-business-editor .overseas-business-form-layout { gap: 0; }
 .overseas-business-editor .form-reference { min-width: 0; color: var(--cc-muted); font-size: var(--admin-font-body); overflow-wrap: anywhere; }
-.overseas-business-editor .form-panel { min-width: 0; padding: var(--admin-space-5); }
+.overseas-business-editor .form-panel { min-width: 0; }
+.overseas-business-editor:not(.overseas-transport-editor) .form-panel { padding: var(--admin-space-5); }
 .overseas-business-editor .form-grid { display: grid; min-width: 0; gap: 0 var(--admin-space-5); }
 .overseas-business-editor .form-grid :is(.el-select, .el-date-editor, .el-input-number) { width: 100%; }
 .overseas-business-editor .form-grid small { display: block; margin-top: var(--admin-space-1); color: var(--cc-muted); font-size: var(--admin-font-caption); }

src/modules/overseas-business/pages/PurchaseOrdersView.vue

@@ -73,7 +73,7 @@ onActivated(() => { if (activatedOnce) void load(); else activatedOnce = true })
   <AdminPage class="admin-density admin-workbench"><ListPageLayout aria-label="海外采购订单列表">
 
 
-    <section><div class="workbench-table is-page-surface"><DataTable appearance="integrated" :stripe="false" column-settings-mode="show" :results-visible="!loadError" v-model:page="page" v-model:page-size="pageSize" :data="rows" :columns="columns" :loading="loading" :total="total" preference-key="overseas-business-purchases" row-key="id" empty-text="暂无符合筛选条件的海外采购订单">
+    <section><div class="workbench-table is-page-surface"><DataTable appearance="integrated" column-settings-mode="show" :results-visible="!loadError" v-model:page="page" v-model:page-size="pageSize" :data="rows" :columns="columns" :loading="loading" :total="total" preference-key="overseas-business-purchases" row-key="id" empty-text="暂无符合筛选条件的海外采购订单">
         <template #toolbar-start><h1>海外采购订单</h1></template>
         <template #filters><QueryToolbar v-model="filters" :fields="fields" ariaLabel="海外采购订单筛选" preference-key="overseas-business-purchases-query" @search="search" /></template>
         <template #notices><template v-if="loadError"><LoadErrorState title="海外采购订单暂时无法加载" :message="loadError.message" :loading="loading" @retry="load"><template #details><ApiErrorMeta :details="loadError" /></template></LoadErrorState></template></template>

src/modules/overseas-business/pages/TransportOrderFormView.vue

@@ -94,7 +94,7 @@ watch([orderId, routeCustomerId, isLooseboard], () => { void load(); void loadCu
 </script>
 
 <template>
-  <AdminPage class="admin-density overseas-business-editor admin-workbench"><OperationErrorToast :details="submitError" /><DetailPageLayout class="overseas-business-form-layout workbench-panel is-flush is-page-surface" :aria-label="`${editing ? '编辑' : '新增'}${domainLabel}订单`">
+  <AdminPage class="admin-density overseas-business-editor overseas-transport-editor admin-workbench"><OperationErrorToast :details="submitError" /><DetailPageLayout class="overseas-business-form-layout workbench-panel is-flush is-page-surface" :aria-label="`${editing ? '编辑' : '新增'}${domainLabel}订单`">
     <template #header><div class="density-detail-header"><div class="density-detail-heading"><el-button link class="density-back" @click="back"><ArrowLeft :size="16" />返回列表</el-button><h1 class="density-detail-title">{{ editing ? '编辑' : '新增' }}{{ domainLabel }}订单</h1><span v-if="editing" class="form-reference">{{ form.orderNo || '—' }}</span></div></div></template>
     <LoadErrorState v-if="loadError" :title="`${domainLabel}订单暂时无法加载`" :message="loadError.message" :loading="loading" @retry="load"><template #details><ApiErrorMeta :details="loadError" /></template></LoadErrorState>
     <FleetArrangementSummary v-else-if="fleetArrangement" :arrangement="fleetArrangement" />
@@ -102,14 +102,10 @@ watch([orderId, routeCustomerId, isLooseboard], () => { void load(); void loadCu
       <el-alert v-if="editing && !editableStatus" type="warning" :closable="false" show-icon title="当前状态不可普通编辑，请返回列表查看" />
       <TransportDemandForm ref="formRef" :model="form" :kind="isLooseboard ? 'looseboard' : 'truck'" :submitting="saving" :disabled="!editableStatus" :editing="editing" @submit="save" @cancel="back">
         <template v-if="!editing" #customer>
-          <FormSection class="transport-customer-section" title="客户信息"><el-form-item label="客户" required><el-select v-model="form.customerId" filterable :loading="customersLoading" :disabled="Boolean(customersError)" placeholder="请选择客户" style="width:100%"><el-option v-for="item in customers" :key="String(item.id)" :label="item.tenantName" :value="String(item.id)" /></el-select><small v-if="customersError" class="field-error">{{ customersError }}</small></el-form-item></FormSection>
+          <FormSection class="transport-customer-section density-form-section" title="客户信息"><el-form-item label="客户" required><el-select v-model="form.customerId" filterable :loading="customersLoading" :disabled="Boolean(customersError)" placeholder="请选择客户"><el-option v-for="item in customers" :key="String(item.id)" :label="item.tenantName" :value="String(item.id)" /></el-select><small v-if="customersError" class="field-error">{{ customersError }}</small></el-form-item></FormSection>
         </template>
       </TransportDemandForm>
       <FormSection v-if="!isLooseboard" class="density-form-section" title="车辆与派车"><el-button @click="routeOpen = true">查看路线</el-button></FormSection>
     </section>
   </DetailPageLayout><TransportRouteDialog v-model="routeOpen" :origin="routeLocation(form.origin, form.originAddress)" :destinations="[routeLocation(form.destination, form.destinationAddress)]" /></AdminPage>
 </template>
-
-<style scoped>
-.transport-customer-section { padding: 20px 24px 0; border-bottom: 1px solid #e7ebf1; }
-</style>

src/modules/overseas-business/pages/TransportOrdersView.vue

@@ -120,7 +120,7 @@ watch([page, pageSize], () => { void load() }); watch([isLooseboard, () => route
   <AdminPage class="admin-density admin-workbench"><ListPageLayout :aria-label="`${domainLabel}订单列表`">
 
 
-    <section><div class="workbench-table is-page-surface"><DataTable appearance="integrated" :stripe="false" column-settings-mode="show" :results-visible="!loadError" v-model:page="page" v-model:page-size="pageSize" :data="rows" :columns="columns" :loading="loading" :total="total" :preference-key="`overseas-business-${domain}`" row-key="id" :empty-text="`暂无符合筛选条件的${domainLabel}订单`">
+    <section><div class="workbench-table is-page-surface"><DataTable appearance="integrated" column-settings-mode="show" :results-visible="!loadError" v-model:page="page" v-model:page-size="pageSize" :data="rows" :columns="columns" :loading="loading" :total="total" :preference-key="`overseas-business-${domain}`" row-key="id" :empty-text="`暂无符合筛选条件的${domainLabel}订单`">
         <template #toolbar-start><el-button v-if="inquiryReturnTarget(route.query)" link @click="router.push(inquiryReturnTarget(route.query)!)">返回原拼车登记</el-button><h1>{{ domainLabel }}</h1></template>
         <template #filters><QueryToolbar v-model="filters" :fields="fields" :ariaLabel="`${domainLabel}订单筛选`" :preference-key="queryPreferenceKey" @search="search" /></template>
         <template #notices><template v-if="loadError"><LoadErrorState :title="`${domainLabel}订单暂时无法加载`" :message="loadError.message" :loading="loading" @retry="load"><template #details><ApiErrorMeta :details="loadError" /></template></LoadErrorState></template></template>

src/modules/overseas-business/pages/TruckOrderDetailView.test.ts

@@ -56,6 +56,20 @@ beforeEach(() => {
 afterEach(() => vi.unstubAllGlobals())
 
 describe('truck review and fulfillment', () => {
+  it('groups the business number, single status and actions in the shared detail header', async () => {
+    const wrapper = mountDetail(); await flushPromises()
+    const header = wrapper.find('.detail-page-layout__header')
+    expect(header.find('.density-detail-title').text()).toBe('本土卡车订单 TR-TEST')
+    expect(header.find('.status-badge').text()).toBe('待审核')
+    expect(wrapper.findAll('.status-badge')).toHaveLength(1)
+    expect(header.find('.truck-order-actions').text()).toContain('审核')
+    expect(header.find('.truck-order-actions').text()).toContain('取消订单')
+    await click(wrapper, '刷新订单')
+    expect(getUsTruckOrder).toHaveBeenCalledTimes(2)
+    await click(wrapper, '返回列表')
+    expect(routing.push).toHaveBeenCalledWith({ name: 'overseas-business-trucks' })
+  })
+
   it('loads customer scoped documents and runs review through receipt, allocation and delivery completion', async () => {
     let current = order()
     vi.mocked(executeUsTruckCommand).mockImplementation(async (_no, _customer, operation) => {
@@ -119,6 +133,7 @@ describe('truck review and fulfillment', () => {
     const wrapper = mountDetail(); await flushPromises(); await click(wrapper, '审核'); await confirm(wrapper); await confirm(wrapper)
     expect(executeUsTruckCommand).toHaveBeenCalledTimes(1)
     expect(wrapper.findComponent(AppDialog).props('confirmLoading')).toBe(true)
+    for (const button of wrapper.find('.detail-page-layout__header').findAll('button')) expect(button.attributes('disabled')).toBeDefined()
     finish(order({ status: 'WAITING_INBOUND', version: 2 })); await flushPromises()
     expect(wrapper.text()).toContain('登记实收')
   })

src/modules/overseas-business/pages/TruckOrderDetailView.vue

@@ -6,6 +6,7 @@ import { useRoute, useRouter } from 'vue-router'
 import { ArrowLeft } from '@lucide/vue'
 import AdminPage from '@/shared/components/AdminPage.vue'
 import DetailPageLayout from '@/shared/components/DetailPageLayout.vue'
+import StatusBadge from '@/shared/components/StatusBadge.vue'
 import DataTable, { type DataTableColumn } from '@/shared/components/DataTable.vue'
 import ApiErrorMeta from '@/shared/components/ApiErrorMeta.vue'
 import LoadErrorState from '@/shared/components/LoadErrorState.vue'
@@ -65,16 +66,25 @@ watch([orderNo, customerId], load, { immediate: true })
 </script>
 
 <template>
-  <AdminPage class="admin-density admin-workbench"><DetailPageLayout aria-label="本土卡车订单详情" class="workbench-panel is-flush is-page-surface">
-    <template #header><div class="truck-detail-header"><el-button :disabled="saving" @click="router.push({ name: 'overseas-business-trucks' })"><ArrowLeft :size="16" />返回列表</el-button><h1>本土卡车订单 {{ detail?.orderNo || orderNo }}</h1></div></template>
+  <AdminPage class="admin-density admin-workbench"><DetailPageLayout aria-label="本土卡车订单详情" class="density-detail-layout workbench-panel is-flush is-page-surface">
+    <template #header>
+      <div class="density-detail-header truck-detail-header">
+        <div class="density-detail-heading">
+          <el-button link class="density-back" :disabled="saving" @click="router.push({ name: 'overseas-business-trucks' })"><ArrowLeft :size="16" />返回列表</el-button>
+          <h1 class="density-detail-title">本土卡车订单 {{ detail?.orderNo || orderNo }}</h1>
+          <StatusBadge v-if="detail" :status="statusLabel(detail.status)" />
+        </div>
+        <div v-if="detail" class="density-actions truck-detail-actions">
+          <el-button :disabled="saving" @click="load">刷新订单</el-button>
+          <TruckOrderActions v-if="!detail.fleetArrangement" :detail="detail" @updated="detail = $event" @busy="saving = $event" />
+        </div>
+      </div>
+    </template>
     <LoadErrorState v-if="error" title="本土卡车订单暂时无法加载" :message="error.message" :loading="loading" @retry="load"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState>
     <el-skeleton v-else-if="loading" :rows="8" animated />
     <template v-else-if="detail">
-      <section class="truck-detail-section"><div class="truck-detail-header"><h2>{{ statusLabel(detail.status) }}</h2><el-button :disabled="saving" @click="load">刷新订单</el-button></div>
-        <FleetArrangementSummary v-if="detail.fleetArrangement" :arrangement="detail.fleetArrangement" />
-        <template v-else><TruckOrderActions :detail="detail" @updated="detail = $event" @busy="saving = $event" /></template>
-      </section>
-      <section class="truck-detail-section"><h2>订单资料</h2><el-descriptions :column="3" border><el-descriptions-item v-for="[label, value] in fields" :key="String(label)" :label="String(label)">{{ value ?? '—' }}</el-descriptions-item></el-descriptions></section>
+      <section v-if="detail.fleetArrangement" class="truck-detail-section"><FleetArrangementSummary :arrangement="detail.fleetArrangement" /></section>
+      <section class="truck-detail-section"><h2>订单资料</h2><el-descriptions class="density-descriptions" :column="3" border><el-descriptions-item v-for="[label, value] in fields" :key="String(label)" :label="String(label)">{{ value ?? '—' }}</el-descriptions-item></el-descriptions></section>
       <section class="truck-detail-section"><h2>托盘记录</h2><div class="workbench-table"><DataTable :data="detail.pallets" :columns="palletColumns" empty-text="暂无托盘记录，独立订单首次实收后生成托盘" /></div></section>
       <section class="truck-detail-section"><h2>审核与操作记录</h2><div class="workbench-table"><DataTable :data="detail.histories" :columns="historyColumns" empty-text="暂无操作记录" /></div></section>
     </template>
@@ -82,7 +92,9 @@ watch([orderNo, customerId], load, { immediate: true })
 </template>
 
 <style scoped>
-.truck-detail-header { display: flex; align-items: center; gap: 12px; flex-wrap: wrap; }
-.truck-detail-header h1, .truck-detail-header h2 { margin: 0; }
-.truck-detail-section { margin-bottom: 16px; }
+.truck-detail-header { flex-wrap: wrap; }
+.truck-detail-header .density-detail-heading { flex: 1; }
+.truck-detail-header .status-badge { flex-shrink: 0; }
+.truck-detail-actions { flex-wrap: wrap; }
+.truck-detail-section { margin-bottom: var(--admin-space-6); }
 </style>

src/modules/overseas-master-data/AGENTS.md

@@ -1,7 +1,7 @@
 # 海外通用资料与车辆管理
 
-- 自有业务：`pages/OwnedBusinessView.vue`、`OwnedBusinessDetailView.vue`及`api/ownedBusiness.ts`沿`fleet-owned-business-v1.yaml`，是原排车装车后的自有车辆运营视图，不按货源分类或另建履约流程；共同规则见`../../../../../docs/海外仓业务/自有业务首版开发契约.md`。详情三个页签，运营登记1080px居中、照片760px居中；金额/油耗单位、附加与排车版本分离，`owned-business:list/edit/upload`独立，统计沿完整计划发车日期筛选。
-- 外配业务：`pages/OutsourcedBusinessView.vue`、`OutsourcedBusinessDetailView.vue`及`api/outsourcedBusiness.ts`沿`fleet-outsourced-business-v1.yaml`；共同规则见`../../../../../docs/海外仓业务/外配业务首版开发契约.md`。读取装车时DISPATCHED归属，包括临时EXTERNAL车辆，不按货源区分。一车一行、三页签详情、整车承运金额除实托数、逐目的仓到达和五个装车照片位；无里程/油耗/油耗照片、成本拆分和新增履约流程。三项`outsourced-business:list/edit/upload`与自有权限独立，缺承运商保留空，vehicleId可空；其余版本、原键、真实来源及完整筛选统计沿共同契约，不能静默把外配写入当成自有权限。
+- 自有业务：`pages/OwnedBusinessView.vue`、`OwnedBusinessDetailView.vue`及`api/ownedBusiness.ts`沿`fleet-owned-business-v1.yaml`，是原排车装车后未实际接入拼车货物的运营视图，与车辆归属无关，不另建履约流程；共同规则见`../../../../../docs/海外仓业务/自有业务首版开发契约.md`。详情三个页签，运营登记1080px居中、照片760px居中；金额/油耗单位、附加与排车版本分离，`owned-business:list/edit/upload`独立，统计沿完整计划发车日期筛选。
+- 外配任务：`pages/OutsourcedBusinessView.vue`、`OutsourcedBusinessDetailView.vue`及`api/outsourcedBusiness.ts`沿`fleet-outsourced-business-v1.yaml`；共同规则见`../../../../../docs/海外仓业务/外配业务首版开发契约.md`。按需求池实际接入本车的拼车货物分类，完整判定见外配契约；车辆归属独立，允许OWNED/DISPATCHED及临时EXTERNAL车辆。一车一行、三页签详情、整车承运金额除实托数、逐目的仓到达和五个装车照片位；无里程/油耗/油耗照片、成本拆分和新增履约流程。三项`outsourced-business:list/edit/upload`与自有权限独立，缺承运商保留空，vehicleId可空；其余版本、原键、真实来源及完整筛选统计沿共同契约，不能静默把外配写入当成自有权限。
 
 - 运输路线地图：`components/TransportRouteDialog.vue`经`index.ts`公开导出，排车装车后、本土散板列表、本土卡车表单共用；来源字段、缺值规则和原型映射唯一见`PROTOTYPE_MATRIX.md`“运输路线地图”。仓库引用经`routeLocations.ts`复用Warehouse列表/详情解析完整地址（warehouse:list）；解析失败不加载地图。仅规划路线，不接GPS、不用固定样例，不在车辆主档顶部重复放入口。
 

src/modules/overseas-master-data/PROTOTYPE_MATRIX.md

@@ -63,6 +63,16 @@
 
 续批验证：81个文件671项定向回归首轮669项通过，出车图表两项旧颜色期望按公共主题更新后，所属1文件5项复验通过；50个修改Vue模板与局部样式编译通过。写前、写后快照核对未发现外部漂移；所有事件/表单绑定、非图表业务脚本保留，图表仅接入配色/字体/tooltip主题。未改API、日期计算、driver、权限、状态与路由。类型检查、全量测试和构建由总控统一执行；截图均待人工确认。
 
+## 自有业务行操作样式核对（2026-10-21）
+
+依据本轮用户截图 `codex-clipboard-eb6aa95b-c8a2-4b85-9294-22f3127cf72c.png` 与 Admin 界面规范“列表”纯文字行操作规则；仅修正列表按钮外观。
+
+| 页面 | 操作 | 已确认承载 | 当前问题与修正 | 验收 |
+|---|---|---|---|---|
+| 自有业务列表 | 查看明细 | 原独立详情路由 | 旧描边粗体按钮接入公共纯文字行操作类，保留路由和业务编号 | 77项定向检查及类型/构建通过；修改后待人工截图确认 |
+| 自有业务列表 | 登记运营信息 | 原1080px居中弹框 | 同上；保留原权限、状态及处理中禁用 | 77项定向检查及类型/构建通过；修改后待人工截图确认 |
+| 自有业务列表 | 上传／查看照片 | 原760px居中弹框 | 同上；保留原读写权限与按钮文案 | 77项定向检查及类型/构建通过；修改后待人工截图确认 |
+
 ## 自有业务实现核对（2026-10-20，主规则已确认）
 
 用户当前要求逐页处理，先看自有业务；HTTP 扩展由既有排车后端对话独立负责。本节记录原型与已确认规则的映射，不授权外配页面改造。自有与外配均为原排车装车后的车辆归属视图，不另建任务或履约流程；自有车增加运营细项，外配管理细度后续确认。视觉沿当前 Admin 高密度规范，业务与操作承载依据用户提供的 `C:/Users/BY-OY/Documents/WXWork/1688854456873012/Cache/File/2026-10/悦/悦/新版.html` 及本轮截图。

src/modules/overseas-master-data/api/outsourcedBusiness.test.ts

@@ -12,6 +12,19 @@ beforeEach(() => vi.clearAllMocks())
 const base = '/platform/v1/last-leg/fleet/outsourced-business'
 const photo: OutsourcedBusinessPhoto = { slot: 'LOADING_SCENE', category: 'LOADING', fileId: '9007199254740993', fileName: 'loading.png', contentType: 'image/png', sizeBytes: '10', uploadedAt: '2026-10-20T10:00:00Z', savedAt: null }
 describe('outsourced business HTTP contract', () => {
+  it.each(['OWNED', 'DISPATCHED'] as const)('accepts server-classified pooled %s vehicles in lists, details and write responses', async ownership => {
+    const detail = outsourcedBusinessFixture(); detail.row.vehicle.ownership = ownership
+    vi.mocked(http.get).mockResolvedValueOnce({ data: { records: [detail.row], page: 1, size: 20, total: 1, summary: { dispatchCount: 1, afterLoadingCount: 1, deliveringCount: 0, deliveredCount: 0 } } }).mockResolvedValue({ data: detail })
+    expect((await listOutsourcedBusiness({})).records[0]!.vehicle).toEqual(detail.row.vehicle)
+    expect((await getOutsourcedBusiness(detail.row.dispatchNo)).row.vehicle.ownership).toBe(ownership)
+    vi.mocked(http.put).mockResolvedValue({ data: detail })
+    expect((await saveOutsourcedBusinessOperations(detail.row.dispatchNo, { recordVersion: detail.row.recordVersion, idempotencyKey: 'pool-ownership', operations: detail.row.operations, reason: null })).row.vehicle.ownership).toBe(ownership)
+  })
+  it.each(['UNKNOWN', null, undefined])('rejects invalid vehicle ownership %s', async ownership => {
+    const detail = outsourcedBusinessFixture()
+    vi.mocked(http.get).mockResolvedValue({ data: { ...detail, row: { ...detail.row, vehicle: { ...detail.row.vehicle, ownership } } } })
+    await expect(getOutsourcedBusiness(detail.row.dispatchNo)).rejects.toThrow('来源或阶段')
+  })
   it('uses one list response for matched statistics and keeps physical count independent of cargo rows', async () => {
     const detail = outsourcedBusinessFixture()
     vi.mocked(http.get).mockResolvedValue({ data: { records: [detail.row], page: '1', size: '20', total: '41', summary: { dispatchCount: '41', afterLoadingCount: '40', deliveringCount: '1', deliveredCount: '0' } } })
@@ -69,10 +82,8 @@ describe('outsourced business HTTP contract', () => {
     expect(value.row.vehicle).toMatchObject({ vehicleId, ownership: 'DISPATCHED', carrierName: null })
     expect(http.get).toHaveBeenCalledTimes(1)
   })
-  it('rejects owned vehicle facts and unsupported fuel or mileage writes before any request', async () => {
+  it('rejects unsupported fuel or mileage writes before any request', async () => {
     const detail = outsourcedBusinessFixture()
-    vi.mocked(http.get).mockResolvedValue({ data: { ...detail, row: { ...detail.row, vehicle: { ...detail.row.vehicle, ownership: 'OWNED' } } } })
-    await expect(getOutsourcedBusiness('DS-OUT-1')).rejects.toThrow('来源或阶段')
     for (const field of ['actualDistanceMiles','fuelConsumptionLitresPer100Km','actualFuelLitres']) {
       const body = { recordVersion:'0', idempotencyKey:'original-key', operations:{ ...detail.row.operations, [field]:'1' }, reason:null }
       await expect(saveOutsourcedBusinessOperations('DS-OUT-1', body)).rejects.toThrow('不支持里程或油耗')

src/modules/overseas-master-data/api/outsourcedBusiness.ts

@@ -18,9 +18,9 @@ function operations(value: OutsourcedBusinessOperations): OutsourcedBusinessOper
   if (value.money && amount == null) throw new Error('承运金额与币种必须同时登记')
   return { money: value.money ? { currency: value.money.currency, amount: amount! } : null, arrivals: value.arrivals }
 }
-function requireSlot(slot: OutsourcedBusinessPhotoSlot) { if (!outsourcedBusinessPhotoRoles.some(role => role.slot === slot)) throw new Error('外配业务不支持该照片分类') }
+function requireSlot(slot: OutsourcedBusinessPhotoSlot) { if (!outsourcedBusinessPhotoRoles.some(role => role.slot === slot)) throw new Error('外配任务不支持该照片分类') }
 function row(value: OutsourcedBusinessRow): OutsourcedBusinessRow {
-  if (!value.dispatchNo || !['AFTER_LOADING','DELIVERING','DELIVERED'].includes(value.stage) || value.vehicle?.ownership !== 'DISPATCHED') throw new Error('外配排车来源或阶段不完整，请重新读取')
+  if (!value.dispatchNo || !['AFTER_LOADING','DELIVERING','DELIVERED'].includes(value.stage) || !['OWNED','DISPATCHED'].includes(value.vehicle?.ownership)) throw new Error('外配排车来源或阶段不完整，请重新读取')
   return { ...value, operations: operations(value.operations), unitPrice: decimal(value.unitPrice,2,18), recordVersion: outsourcedBusinessVersion(value.recordVersion), dispatchRecordVersion: outsourcedBusinessVersion(value.dispatchRecordVersion), actualPalletCount: value.actualPalletCount == null ? null : count(value.actualPalletCount), photoSummary: { loadingCount: count(value.photoSummary.loadingCount) } }
 }
 function detail(value: OutsourcedBusinessDetail): OutsourcedBusinessDetail { if (value.row.dispatchNo !== value.dispatch.dispatchNo) throw new Error('运营资料与原排车单不一致'); return { ...value, row: row(value.row) } }

src/modules/overseas-master-data/api/ownedBusiness.test.ts

@@ -12,6 +12,19 @@ beforeEach(() => vi.clearAllMocks())
 const base = '/platform/v1/last-leg/fleet/owned-business'
 const photo: OwnedBusinessPhoto = { slot: 'FUEL_START', category: 'FUEL', fileId: '9007199254740993', fileName: 'fuel.png', contentType: 'image/png', sizeBytes: '10', uploadedAt: '2026-10-20T10:00:00Z', savedAt: null }
 describe('owned business HTTP contract', () => {
+  it.each(['OWNED', 'DISPATCHED'] as const)('accepts server-classified non-pooled %s vehicles in lists, details and write responses', async ownership => {
+    const detail = ownedBusinessFixture(); detail.row.vehicle.ownership = ownership; detail.row.vehicle.vehicleId = null
+    vi.mocked(http.get).mockResolvedValueOnce({ data: { records: [detail.row], page: 1, size: 20, total: 1, summary: { dispatchCount: 1, afterLoadingCount: 1, deliveringCount: 0, deliveredCount: 0 } } }).mockResolvedValue({ data: detail })
+    expect((await listOwnedBusiness({})).records[0]!.vehicle).toEqual(detail.row.vehicle)
+    expect((await getOwnedBusiness(detail.row.dispatchNo)).row.vehicle.ownership).toBe(ownership)
+    vi.mocked(http.put).mockResolvedValue({ data: detail })
+    expect((await saveOwnedBusinessOperations(detail.row.dispatchNo, { recordVersion: detail.row.recordVersion, idempotencyKey: 'non-pool-ownership', operations: detail.row.operations, reason: null })).row.vehicle.ownership).toBe(ownership)
+  })
+  it.each(['UNKNOWN', null, undefined])('rejects invalid vehicle ownership %s', async ownership => {
+    const detail = ownedBusinessFixture()
+    vi.mocked(http.get).mockResolvedValue({ data: { ...detail, row: { ...detail.row, vehicle: { ...detail.row.vehicle, ownership } } } })
+    await expect(getOwnedBusiness(detail.row.dispatchNo)).rejects.toThrow('来源或阶段')
+  })
   it('uses one list response for matched statistics and keeps physical count independent of cargo rows', async () => {
     const detail = ownedBusinessFixture()
     vi.mocked(http.get).mockResolvedValue({ data: { records: [detail.row], page: '1', size: '20', total: '41', summary: { dispatchCount: '41', afterLoadingCount: '40', deliveringCount: '1', deliveredCount: '0' } } })

src/modules/overseas-master-data/api/ownedBusiness.ts

@@ -16,7 +16,7 @@ function operations(value: OwnedBusinessOperations): OwnedBusinessOperations {
   return { ...value, money: value.money ? { ...value.money, amount: decimal(value.money.amount, 2, 18)! } : null, actualDistanceMiles: decimal(value.actualDistanceMiles,3,12), fuelConsumptionLitresPer100Km: decimal(value.fuelConsumptionLitresPer100Km,3,12) }
 }
 function row(value: OwnedBusinessRow): OwnedBusinessRow {
-  if (!value.dispatchNo || !['AFTER_LOADING','DELIVERING','DELIVERED'].includes(value.stage) || value.vehicle?.ownership !== 'OWNED') throw new Error('自有排车来源或阶段不完整，请重新读取')
+  if (!value.dispatchNo || !['AFTER_LOADING','DELIVERING','DELIVERED'].includes(value.stage) || !['OWNED','DISPATCHED'].includes(value.vehicle?.ownership)) throw new Error('自有排车来源或阶段不完整，请重新读取')
   return { ...value, operations: operations(value.operations), unitPrice: decimal(value.unitPrice,2,18), recordVersion: ownedBusinessVersion(value.recordVersion), dispatchRecordVersion: ownedBusinessVersion(value.dispatchRecordVersion), actualPalletCount: value.actualPalletCount == null ? null : count(value.actualPalletCount), photoSummary: { loadingCount: count(value.photoSummary.loadingCount), fuelCount: count(value.photoSummary.fuelCount) } }
 }
 function detail(value: OwnedBusinessDetail): OwnedBusinessDetail { if (value.row.dispatchNo !== value.dispatch.dispatchNo) throw new Error('运营资料与原排车单不一致'); return { ...value, row: row(value.row) } }

src/modules/overseas-master-data/components/CapacityInquiryTable.vue

@@ -32,7 +32,7 @@ const columns: DataTableColumn[] = [
   { key: 'updatedAt', label: '更新时间', minWidth: 180, slotName: 'time' },
 ]
 </script>
-<template><div class="workbench-table"><DataTable :appearance="integrated ? 'integrated' : 'default'" :stripe="false" :results-visible="!failed" preference-key="fleet-capacity-inquiries" column-settings-mode="show" v-model:page="page" v-model:page-size="size" :columns="columns" :data="rows" :total="total" :loading="loading" row-key="bookingNo" empty-text="当前范围暂无意向">
+<template><div class="workbench-table"><DataTable :appearance="integrated ? 'integrated' : 'default'" :results-visible="!failed" preference-key="fleet-capacity-inquiries" column-settings-mode="show" v-model:page="page" v-model:page-size="size" :columns="columns" :data="rows" :total="total" :loading="loading" row-key="bookingNo" empty-text="当前范围暂无意向">
   <template v-if="$slots['toolbar-start']" #toolbar-start><slot name="toolbar-start" /></template>
   <template v-if="$slots.filters" #filters><slot name="filters" /></template>
   <template v-if="$slots.notices" #notices><slot name="notices" /></template>

src/modules/overseas-master-data/components/OutsourcedBusinessDetailLayout.vue

@@ -11,11 +11,11 @@ const emit = defineEmits<{ back: [] }>()
 
 <template>
   <AdminPage class="admin-density admin-workbench" spacing="compact">
-    <DetailPageLayout aria-label="外配业务详情" class="workbench-panel is-flush is-page-surface">
+    <DetailPageLayout aria-label="外配任务详情" class="workbench-panel is-flush is-page-surface">
       <template #header>
         <div class="outsourced-business-detail-heading">
-          <div><strong>外配业务</strong><span class="outsourced-business-reference">{{ dispatchNo || '—' }}</span><span v-if="statusText">{{ statusText }}</span></div>
-          <div class="density-actions"><slot name="actions" /><el-button class="density-action" @click="emit('back')">返回外配业务</el-button></div>
+          <div><strong>外配任务</strong><span class="outsourced-business-reference">{{ dispatchNo || '—' }}</span><span v-if="statusText">{{ statusText }}</span></div>
+          <div class="density-actions"><slot name="actions" /><el-button class="density-action" @click="emit('back')">返回外配任务</el-button></div>
         </div>
       </template>
       <slot name="state" />

src/modules/overseas-master-data/components/OutsourcedBusinessListLayout.vue

@@ -8,7 +8,7 @@ import ListPageLayout from '@/shared/components/ListPageLayout.vue'
 <template>
   <AdminPage class="admin-density admin-workbench" spacing="compact">
     <slot name="statistics" />
-    <ListPageLayout aria-label="外配业务任务列表">
+    <ListPageLayout aria-label="外配任务任务列表">
       <template v-if="$slots.filters" #toolbar><slot name="filters" /></template>
       <template v-if="$slots.state" #state><slot name="state" /></template>
       <slot />

src/modules/overseas-master-data/components/OutsourcedBusinessOperationsEditor.vue

@@ -20,7 +20,7 @@ const emit = defineEmits<{ saved: [value: OutsourcedBusinessDetail]; busy: [valu
 const auth = useAuthStore(), access = useAccessPreviewStore(), busy = ref(false), pending = ref<OutsourcedBusinessPending | null>(null), error = ref<ApiErrorDetails | null>(null), corrupted = ref(false)
 const form = reactive({ currency: '', amount: '', reason: '', arrivals: {} as Record<string,string> })
 const active = computed(() => open.value || Boolean(pending.value))
-const registration = useUnsavedWorkRegistration({ key: `outsourced-business-operations:${getCurrentInstance()?.uid}`, label: computed(() => '外配业务运营登记'), isOpen: active, model: reactive({ form, pending }), requiredPermission: computed(() => permission.outsourcedBusinessEdit) })
+const registration = useUnsavedWorkRegistration({ key: `outsourced-business-operations:${getCurrentInstance()?.uid}`, label: computed(() => '外配任务运营登记'), isOpen: active, model: reactive({ form, pending }), requiredPermission: computed(() => permission.outsourcedBusinessEdit) })
 let actor = '', number = '', baseline = ''
 const writable = computed(() => !corrupted.value && access.can(permission.outsourcedBusinessEdit) && props.detail?.row.actions.edit.allowed === true)
 const locked = computed(() => busy.value || Boolean(pending.value))

src/modules/overseas-master-data/components/OutsourcedBusinessPhotosEditor.vue

@@ -20,7 +20,7 @@ const emit = defineEmits<{ saved: [value: OutsourcedBusinessDetail]; busy: [valu
 const auth = useAuthStore(), access = useAccessPreviewStore(), busy = ref(false), error = ref<ApiErrorDetails | null>(null), pending = ref<OutsourcedBusinessPending | null>(null), prepared = ref<OutsourcedBusinessPhoto | null>(null), corrupted = ref(false)
 const urls = ref<Partial<Record<OutsourcedBusinessPhotoSlot,string>>>({}), reading = ref<OutsourcedBusinessPhotoSlot | null>(null)
 const uploadable = computed(() => !corrupted.value && access.can(permission.outsourcedBusinessUpload) && props.detail?.row.actions.upload.allowed === true)
-useUnsavedWorkRegistration({ key: `outsourced-business-photos:${getCurrentInstance()?.uid}`, label: computed(() => '外配业务照片作业'), isOpen: computed(() => open.value || Boolean(pending.value) || Boolean(prepared.value)), model: reactive({ pending, prepared }), requiredPermission: computed(() => permission.outsourcedBusinessUpload) })
+useUnsavedWorkRegistration({ key: `outsourced-business-photos:${getCurrentInstance()?.uid}`, label: computed(() => '外配任务照片作业'), isOpen: computed(() => open.value || Boolean(pending.value) || Boolean(prepared.value)), model: reactive({ pending, prepared }), requiredPermission: computed(() => permission.outsourcedBusinessUpload) })
 let actor = '', number = '', generation = 0
 function savedPhoto(slot: OutsourcedBusinessPhotoSlot) { return props.detail?.photos.find(photo => photo.slot === slot && photo.savedAt) }
 function release() { Object.values(urls.value).forEach(url => { if (url) URL.revokeObjectURL(url) }); urls.value = {} }

src/modules/overseas-master-data/outsourcedBusinessTypes.ts

@@ -10,7 +10,7 @@ export interface OutsourcedBusinessDestination { destinationKey: string; warehou
 export interface OutsourcedBusinessRow {
   dispatchNo: string; stage: OutsourcedBusinessStage; plannedDepartureAt: string | null; loadingCompletedAt: string; departedAt: string | null; deliveryCompletedAt: string | null
   origin: { warehouseId: string; warehouseCode: string; warehouseName: string }
-  vehicle: { vehicleId: string | null; plate: string | null; ownership: 'DISPATCHED'; carrierName: string | null }; driver: { name: string | null; phone: string | null }
+  vehicle: { vehicleId: string | null; plate: string | null; ownership: 'OWNED' | 'DISPATCHED'; carrierName: string | null }; driver: { name: string | null; phone: string | null }
   destinations: OutsourcedBusinessDestination[]; actualPalletCount: number | null; operations: OutsourcedBusinessOperations; unitPrice: string | null; recordVersion: string; dispatchRecordVersion: string
   photoSummary: { loadingCount: number }; actions: { edit: OutsourcedBusinessGate; upload: OutsourcedBusinessGate }; sourceIssues: string[]
 }

src/modules/overseas-master-data/ownedBusinessTypes.ts

@@ -10,7 +10,7 @@ export interface OwnedBusinessDestination { destinationKey: string; warehouseCod
 export interface OwnedBusinessRow {
   dispatchNo: string; stage: OwnedBusinessStage; plannedDepartureAt: string; loadingCompletedAt: string; departedAt: string | null; deliveryCompletedAt: string | null
   origin: { warehouseId: string; warehouseCode: string; warehouseName: string }
-  vehicle: { vehicleId: string; plate: string; ownership: 'OWNED' }; driver: { name: string | null; phone: string | null }
+  vehicle: { vehicleId: string | null; plate: string | null; ownership: 'OWNED' | 'DISPATCHED' }; driver: { name: string | null; phone: string | null }
   destinations: OwnedBusinessDestination[]; actualPalletCount: number | null; operations: OwnedBusinessOperations; unitPrice: string | null; recordVersion: string; dispatchRecordVersion: string
   photoSummary: { loadingCount: number; fuelCount: number }; actions: { edit: OwnedBusinessGate; upload: OwnedBusinessGate }; sourceIssues: string[]
 }

src/modules/overseas-master-data/pages/CapacityOfferDetailView.vue

@@ -96,7 +96,7 @@ onBeforeUnmount(() => { followupSequence++; sequence++; inquirySequence++ })
     <dl class="density-fields"><div><dt>车次号</dt><dd><el-button v-if="access.can('platform:fleet:trip:list')" link type="primary" @click="router.push({ name: 'overseas-master-data-trip-detail', params: { tripNo: detail.offer.tripNo } })">{{ detail.offer.tripNo }}</el-button><span v-else>{{ detail.offer.tripNo }}</span></dd></div><div><dt>起运仓</dt><dd>{{ detail.offer.warehouseName }}</dd></div><div><dt>计划发车</dt><dd>{{ offerTime(detail.offer.plannedDepartureAt) }}</dd></div><div><dt>最晚送仓</dt><dd>{{ offerTime(detail.offer.cutoffAt) }}</dd></div><div><dt>调度联系人</dt><dd>{{ detail.offer.contactName || '—' }}</dd></div><div><dt>调度联系方式</dt><dd>{{ detail.offer.contactPhone || '—' }}</dd></div></dl>
     <p v-if="hasCreatePermission && !detail.offer.canCreateInquiry" role="status">无法登记客户货物：{{ detail.offer.blockReason || '当前发布不接受新意向' }}</p>
     <p v-else>{{ detail.offer.blockReason || '按所选卸货站核对每段余位；登记客户货物不占位，调度确认后占位。' }}</p><p v-if="detail.offer.remark">{{ detail.offer.remark }}</p>
-    <h2 class="capacity-section-title">分段运力</h2><div class="workbench-table"><DataTable :data="detail.offer.segments" :columns="columns" :stripe="false" row-key="fromIndex" empty-text="容量待调度核对"><template #planned="{ row }">{{ loadText(row.planned) }}</template><template #reserved="{ row }">{{ loadText(row.reserved) }}</template><template #remaining="{ row }">{{ detail.offer.capacityKnown ? loadText(row.remaining) : '待调度核对' }}</template></DataTable></div>
+    <h2 class="capacity-section-title">分段运力</h2><div class="workbench-table"><DataTable :data="detail.offer.segments" :columns="columns" row-key="fromIndex" empty-text="容量待调度核对"><template #planned="{ row }">{{ loadText(row.planned) }}</template><template #reserved="{ row }">{{ loadText(row.reserved) }}</template><template #remaining="{ row }">{{ detail.offer.capacityKnown ? loadText(row.remaining) : '待调度核对' }}</template></DataTable></div>
     <h2 class="capacity-section-title">{{ access.can('platform:fleet:capacity-offer:manage') ? '本发布全部意向' : '我的登记' }}</h2>
     <LoadErrorState v-if="inquiryError || commands.error.value" title="意向操作未完成" :message="(inquiryError || commands.error.value)?.message" @retry="commands.state.pending ? commands.retry() : loadInquiries()"><template #details><ApiErrorMeta :details="(inquiryError || commands.error.value)!" /></template></LoadErrorState><el-button v-if="commands.state.pending" :loading="commands.busy.value" @click="commands.retry">重试原操作</el-button>
     <CapacityInquiryTable v-model:page="page" v-model:size="size" :rows="detail.inquiries.records" :total="detail.inquiries.total" :loading="inquiryLoading" :failed="!!inquiryError" :busy="commands.busy.value" @action="action" />

src/modules/overseas-master-data/pages/CapacityOffersView.vue

@@ -129,13 +129,13 @@ watch([tab, page, size], load); onMounted(load); onBeforeUnmount(() => { followu
 </script>
 <template><AdminPage class="admin-density admin-workbench"><ListPageLayout aria-label="散板需求">
   <p v-if="selectedDemand && tab === 'offers'">正在匹配 {{ selectedDemand.orderNo }}：{{ selectedDemand.origin }} → {{ selectedDemand.destination }}。请选择合适车次，保存登记后尚不保位。<el-button link @click="selectedDemand = null">取消选择</el-button></p>
-  <div v-if="tab === 'demands'" class="workbench-table is-page-surface"><DataTable appearance="integrated" :stripe="false" preference-key="fleet-looseboard-demands" :results-visible="!error" v-model:page="page" v-model:page-size="size" :data="demands" :columns="demandColumns" :loading="loading" :total="total" row-key="orderNo" empty-text="暂无待匹配散板需求">
+  <div v-if="tab === 'demands'" class="workbench-table is-page-surface"><DataTable appearance="integrated" preference-key="fleet-looseboard-demands" :results-visible="!error" v-model:page="page" v-model:page-size="size" :data="demands" :columns="demandColumns" :loading="loading" :total="total" row-key="orderNo" empty-text="暂无待匹配散板需求">
     <template #toolbar-start><div class="density-status-tabs workbench-list-tabs" role="tablist" aria-label="需求来源"><button v-if="canCreate" role="tab" aria-selected="true" class="is-active" @click="switchTab('demands')">待匹配散板</button><button role="tab" aria-selected="false"  @click="switchTab('offers')">可拼车次</button><button role="tab" aria-selected="false"  @click="switchTab('inquiries')">我的登记</button></div></template>
     <template #filters><QueryToolbar v-model="filters" :fields="fields" ariaLabel="待匹配散板查询" :loading="loading" @search="search" /></template>
     <template #notices><LoadErrorState v-if="error" title="需求读取失败" :message="error.message" @retry="load"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState></template>
     <template #actions="{ row }"><div class="row-actions density-actions admin-text-actions"><el-button class="density-action" v-if="canCreate" @click="matchDemand(row as LooseboardDemand)">匹配车次</el-button></div></template>
   </DataTable></div>
-  <div v-if="tab === 'offers'" class="workbench-table is-page-surface"><DataTable appearance="integrated" :stripe="false" preference-key="fleet-capacity-offers" column-settings-mode="show" :results-visible="!error" v-model:page="page" v-model:page-size="size" :data="offers" :columns="columns" :loading="loading" :total="total" row-key="offerNo" :empty-text="Object.values(applied).some(Boolean) ? '当前筛选条件下暂无运力发布' : '暂无获准查看的运力发布'">
+  <div v-if="tab === 'offers'" class="workbench-table is-page-surface"><DataTable appearance="integrated" preference-key="fleet-capacity-offers" column-settings-mode="show" :results-visible="!error" v-model:page="page" v-model:page-size="size" :data="offers" :columns="columns" :loading="loading" :total="total" row-key="offerNo" :empty-text="Object.values(applied).some(Boolean) ? '当前筛选条件下暂无运力发布' : '暂无获准查看的运力发布'">
     <template #toolbar-start><div class="density-status-tabs workbench-list-tabs" role="tablist" aria-label="需求来源"><button v-if="canCreate" role="tab" aria-selected="false"  @click="switchTab('demands')">待匹配散板</button><button role="tab" aria-selected="true" class="is-active" @click="switchTab('offers')">可拼车次</button><button role="tab" aria-selected="false"  @click="switchTab('inquiries')">我的登记</button></div></template><template #toolbar-end><el-button v-if="manage" @click="switchTab('inquiries'); filters = { scope: 'TODO' }; applied = { scope: 'TODO' }">待我处理</el-button><el-button v-if="manage && access.can('platform:fleet:trip:list')" @click="router.push({ name: 'overseas-master-data-trips' })">选择车次发布余位</el-button></template>
     <template #filters>
       <div class="integrated-query-group">

src/modules/overseas-master-data/pages/DriversView.vue

@@ -113,7 +113,7 @@ onBeforeUnmount(() => { request++ })
 <template>
   <AdminPage class="admin-density admin-workbench">
     <ListPageLayout aria-label="司机管理">
-      <div class="workbench-table is-page-surface"><DataTable appearance="integrated" :stripe="false" column-settings-mode="show" :results-visible="true" preference-key="overseas-drivers-table" v-model:page="page" v-model:page-size="pageSize" :data="rows" :columns="columns" :total="total" :loading="loading" row-key="id" empty-text="暂无符合条件的司机">
+      <div class="workbench-table is-page-surface"><DataTable appearance="integrated" column-settings-mode="show" :results-visible="true" preference-key="overseas-drivers-table" v-model:page="page" v-model:page-size="pageSize" :data="rows" :columns="columns" :total="total" :loading="loading" row-key="id" empty-text="暂无符合条件的司机">
         <template #toolbar-start><h1>司机管理</h1></template>
         <template #filters><QueryToolbar v-model="filters" :fields="fields" ariaLabel="司机查询" preference-key="overseas-drivers-query" :loading="loading" @search="search" /></template>
         <template #notices>

src/modules/overseas-master-data/pages/ExchangeRatesView.vue

@@ -50,7 +50,7 @@ watch([page, pageSize], load); onMounted(load)
 
 
 
-  <section><div class="workbench-table is-page-surface"><DataTable appearance="integrated" :stripe="false" column-settings-mode="show" :results-visible="true" v-model:page="page" v-model:page-size="pageSize" :data="rows" :columns="columns" :total="total" :loading="loading" row-key="month" preference-key="overseas-exchange-rates-table" empty-text="暂无月度汇率">
+  <section><div class="workbench-table is-page-surface"><DataTable appearance="integrated" column-settings-mode="show" :results-visible="true" v-model:page="page" v-model:page-size="pageSize" :data="rows" :columns="columns" :total="total" :loading="loading" row-key="month" preference-key="overseas-exchange-rates-table" empty-text="暂无月度汇率">
         <template #toolbar-start><h1>汇率管理</h1></template>
         <template #filters><QueryToolbar v-model="filters" :fields="fields" ariaLabel="汇率月份筛选" preference-key="overseas-exchange-rates-query" :loading="loading" @search="search" /></template>
         <template #notices><LoadErrorState v-if="error" title="月度汇率加载失败" :message="error.message" @retry="load" /></template>

src/modules/overseas-master-data/pages/OutsourcedBusinessDetailView.vue

@@ -36,7 +36,7 @@ async function load() {
   if (!active) return
   const request = ++generation, no = dispatchNo.value; loading.value = true; error.value = null
   try { if (!no || !access.can(permission.outsourcedBusinessList)) throw new Error('缺少排车业务号或查看权限'); const value = await getOutsourcedBusiness(no); if (active && request === generation) { if (value.row.dispatchNo !== no) throw new Error('当前运营资料与排车业务号不一致'); detail.value = value; if (activeTab.value === 'history') void loadHistory() } }
-  catch (cause) { if (active && request === generation) { detail.value = null; error.value = getApiErrorDetails(cause, '外配业务详情读取失败') } }
+  catch (cause) { if (active && request === generation) { detail.value = null; error.value = getApiErrorDetails(cause, '外配任务详情读取失败') } }
   finally { if (request === generation) loading.value = false }
 }
 async function loadHistory() {
@@ -66,7 +66,7 @@ onBeforeUnmount(() => { active = false; generation++; historyGeneration++; previ
 <template>
   <OutsourcedBusinessDetailLayout v-model:active-tab="activeTab" :dispatch-no="detail?.row.dispatchNo || dispatchNo" :status-text="detail ? outsourcedBusinessStages[detail.row.stage] : ''" :loading="loading" @back="router.push('/overseas-master-data/outsourced-business')">
     <template #actions><el-button v-if="detail && access.can(permission.outsourcedBusinessEdit)" class="density-action" :disabled="busy || !detail.row.actions.edit.allowed" @click="editorOpen = true">登记运营信息</el-button><el-button v-if="detail" class="density-action" :disabled="busy" @click="photosOpen = true">{{ access.can(permission.outsourcedBusinessUpload) && detail.row.actions.upload.allowed ? '上传照片' : '查看照片' }}</el-button></template>
-    <template #state><LoadErrorState v-if="error" title="外配业务详情读取失败" :message="error.message" @retry="load"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState><p v-for="issue in detail?.row.sourceIssues || []" :key="issue">{{ issue }}</p></template>
+    <template #state><LoadErrorState v-if="error" title="外配任务详情读取失败" :message="error.message" @retry="load"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState><p v-for="issue in detail?.row.sourceIssues || []" :key="issue">{{ issue }}</p></template>
     <template #task><dl v-if="detail" class="density-fields outsourced-business-fields"><div v-for="field in taskFields" :key="field[0]"><dt>{{ field[0] }}</dt><dd>{{ field[1] }}</dd></div></dl></template>
     <template #route><template v-if="detail"><section v-for="destination in detail.row.destinations" :key="destination.destinationKey" class="outsourced-business-route"><h3>{{ destination.warehouseCode || destination.warehouseName || destination.address || '目的地资料缺失' }}</h3><p v-if="destination.address">{{ destination.address }}</p><p v-for="appointment in destination.appointments" :key="appointment.appointmentNo">预约号 {{ appointment.appointmentNo }} · 确认号 {{ text(appointment.confirmationNo) }} · 预约到达 {{ time(appointment.scheduledAt) }}</p><p>实际到达 {{ time(destination.actualArrivedAt) }}</p></section><div class="workbench-table"><DataTable :data="detail.cargo" :columns="cargoColumns" row-key="sourceKey" column-settings-mode="hide" empty-text="暂无真实货物明细"><template #destination="{ row }">{{ destinationLabel(row.destinationKey) }}</template></DataTable></div><section class="outsourced-business-route"><h3>原排车关联单据</h3><p>出库单：{{ detail.dispatch.documents.outbounds.map(item => item.outboundNo).join('、') || '—' }}</p><p>派送单：{{ detail.dispatch.documents.deliveries.map(item => item.deliveryNo).join('、') || '—' }}</p><el-button @click="photosOpen = true">查看分类照片</el-button></section></template></template>
     <template #history><LoadErrorState v-if="historyError" title="操作记录读取失败" :message="historyError.message" @retry="loadHistory"><template #details><ApiErrorMeta :details="historyError" /></template></LoadErrorState><LoadErrorState v-if="previewError" title="历史照片读取失败" :message="previewError.message" :show-retry="false"><template #details><ApiErrorMeta :details="previewError" /></template></LoadErrorState><div class="workbench-table"><DataTable v-model:page="historyPage" v-model:page-size="historySize" :data="historyRows" :columns="historyColumns" :total="historyTotal" :loading="historyLoading" row-key="eventKey" empty-text="暂无操作记录"><template #source="{ row }">{{ row.eventSource === 'DISPATCH' ? '原排车' : '运营登记' }}</template><template #action="{ row }">{{ outsourcedBusinessActionLabels[row.action] || '其他操作' }}</template><template #occurredAt="{ row }">{{ time(row.occurredAt) }}</template><template #snapshot="{ row }"><template v-if="row.operations"><p>整车承运金额 {{ row.operations.money ? row.operations.money.currency + ' ' + row.operations.money.amount : '未登记' }}</p><div v-for="arrival in row.operations.arrivals" :key="arrival.destinationKey">{{ destinationLabel(arrival.destinationKey) }} · {{ time(arrival.actualArrivedAt) }}</div></template><span v-else>—</span></template><template #photos="{ row }"><el-button v-for="photo in row.photos" :key="photo.slot" link @click="preview(photo, row.recordVersion)">{{ photoLabel(photo) }}</el-button></template></DataTable></div></template>

src/modules/overseas-master-data/pages/OutsourcedBusinessView.vue

@@ -62,10 +62,10 @@ async function load() {
   const request = ++generation
   loading.value = true; error.value = null
   try {
-    if (!access.can(permission.outsourcedBusinessList)) throw new Error('没有外配业务查看权限')
+    if (!access.can(permission.outsourcedBusinessList)) throw new Error('没有外配任务查看权限')
     const value = await listOutsourcedBusiness({ ...applied, page: page.value, size: size.value })
     if (active && request === generation) result.value = value
-  } catch (cause) { if (active && request === generation) { result.value = null; error.value = getApiErrorDetails(cause, '外配业务读取失败') } }
+  } catch (cause) { if (active && request === generation) { result.value = null; error.value = getApiErrorDetails(cause, '外配任务读取失败') } }
   finally { if (request === generation) loading.value = false }
 }
 function search() {
@@ -102,11 +102,11 @@ onBeforeUnmount(() => { active = false; generation++; openGeneration++ })
 
 <template>
   <OutsourcedBusinessListLayout>
-    <template #statistics><section class="outsourced-business-statistics workbench-panel is-flush" aria-label="完整筛选范围外配业务统计" :aria-busy="loading"><div v-for="item in summary" :key="String(item[0])"><span>{{ item[0] }}</span><strong>{{ item[1] ?? '—' }}</strong></div></section></template>
-    <div class="workbench-table is-page-surface"><DataTable appearance="integrated" :stripe="false" v-model:page="page" v-model:page-size="size" :data="result?.records || []" :columns="columns" :total="result?.total || 0" :loading="loading" row-key="dispatchNo" preference-key="outsourced-business-table" empty-text="当前筛选范围暂无已装车的外配车辆排车单">
-      <template #toolbar-start><h1>外配业务<InlineHelp title="查询范围说明">日期和时间按浏览器本地时区显示；统计覆盖同一完整筛选范围。</InlineHelp></h1></template>
-      <template #filters><QueryToolbar v-model="filters" :fields="fields" ariaLabel="外配业务筛选" preference-key="outsourced-business-query" :loading="loading" @search="search" /></template>
-      <template #notices><LoadErrorState v-if="error" title="外配业务读取未完成" :message="error.message" @retry="load"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState><p v-if="warehouseError">{{ warehouseError.message }} <el-button link @click="loadWarehouses">重试目录</el-button></p><p v-if="!access.can('platform:warehouse:list')">没有公共仓库目录读取权限，仓库筛选暂不可选。</p></template>
+    <template #statistics><section class="outsourced-business-statistics workbench-panel is-flush" aria-label="完整筛选范围外配任务统计" :aria-busy="loading"><div v-for="item in summary" :key="String(item[0])"><span>{{ item[0] }}</span><strong>{{ item[1] ?? '—' }}</strong></div></section></template>
+    <div class="workbench-table is-page-surface"><DataTable appearance="integrated" v-model:page="page" v-model:page-size="size" :data="result?.records || []" :columns="columns" :total="result?.total || 0" :loading="loading" row-key="dispatchNo" preference-key="outsourced-business-table" empty-text="当前筛选范围暂无已装车且实际接入拼车货物的排车单">
+      <template #toolbar-start><h1>外配任务<InlineHelp title="查询范围说明">仅统计实际接入拼车货物的已装车排车，与车辆归属无关；日期和时间按浏览器本地时区显示，统计覆盖同一完整筛选范围。</InlineHelp></h1></template>
+      <template #filters><QueryToolbar v-model="filters" :fields="fields" ariaLabel="外配任务筛选" preference-key="outsourced-business-query" :loading="loading" @search="search" /></template>
+      <template #notices><LoadErrorState v-if="error" title="外配任务读取未完成" :message="error.message" @retry="load"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState><p v-if="warehouseError">{{ warehouseError.message }} <el-button link @click="loadWarehouses">重试目录</el-button></p><p v-if="!access.can('platform:warehouse:list')">没有公共仓库目录读取权限，仓库筛选暂不可选。</p></template>
       <template #actions="{ row }"><RowActions :actions="rowActions(row as OutsourcedBusinessRow)" text-actions @action="act(row as OutsourcedBusinessRow, $event)" /></template>
       <template #carrier="{ row }">{{ text(row.vehicle.carrierName) }}</template>
       <template #driver="{ row }">{{ text(row.driver.name) }}<br>{{ text(row.driver.phone) }}</template>

src/modules/overseas-master-data/pages/OutsourcedBusinessViews.test.ts

@@ -30,10 +30,21 @@ beforeEach(() => {
 })
 
 describe('outsourced business views', () => {
+  it('keeps an owned vehicle with pooled cargo in the outsourced task list', async () => {
+    const detail = outsourcedBusinessFixture()
+    detail.row.vehicle.ownership = 'OWNED'
+    calls.list.mockResolvedValue({ records: [detail.row], page: 1, size: 20, total: 1, summary: { dispatchCount: 1, afterLoadingCount: 1, deliveringCount: 0, deliveredCount: 0 } })
+    const wrapper = mount(OutsourcedBusinessView, { global }); await flushPromises()
+    expect(wrapper.findComponent(Table).props('data')[0].vehicle.ownership).toBe('OWNED')
+    expect(wrapper.findComponent(Table).props('total')).toBe(1)
+    expect(wrapper.text()).toContain('外配任务')
+    expect(wrapper.text()).toContain('登记运营信息')
+    wrapper.unmount()
+  })
   it('uses one list request for all statistics and never hydrates each row', async () => {
     const wrapper = mount(OutsourcedBusinessView,{global}); await flushPromises()
     expect(calls.list).toHaveBeenCalledTimes(1); expect(calls.detail).not.toHaveBeenCalled(); expect(calls.content).not.toHaveBeenCalled()
-    expect(wrapper.find('[aria-label="完整筛选范围外配业务统计"]').text()).toContain('排车数41')
+    expect(wrapper.find('[aria-label="完整筛选范围外配任务统计"]').text()).toContain('排车数41')
     expect(wrapper.text()).not.toContain('今日排车')
     expect(wrapper.findComponent(Table).props('columns')[0].key).toBe('actions')
     expect(wrapper.findComponent(Table).props('total')).toBe(41)
@@ -46,7 +57,7 @@ describe('outsourced business views', () => {
     expect(calls.list).toHaveBeenCalledTimes(1)
     query.vm.$emit('search');await flushPromises()
     expect(calls.list).toHaveBeenLastCalledWith({page:1,size:20,keyword:'FBA-1',stage:'AFTER_LOADING',warehouseId:'1',plannedDepartureFrom:dayjs('2026-10-20').startOf('day').toISOString(),plannedDepartureTo:dayjs('2026-10-21').add(1,'day').startOf('day').toISOString()})
-    expect(wrapper.find('[aria-label="完整筛选范围外配业务统计"]').text()).toContain('装车完成30')
+    expect(wrapper.find('[aria-label="完整筛选范围外配任务统计"]').text()).toContain('装车完成30')
     wrapper.unmount()
   })
   it('opens the operations modal on demand with auxiliary zero version instead of the dispatch version', async () => {

src/modules/overseas-master-data/pages/OverseasQuotesView.vue

@@ -58,7 +58,7 @@ watch([page,pageSize],load);onMounted(()=>{void Promise.all([load(),loadOptions(
 <template><AdminPage class="admin-density admin-workbench"><ListPageLayout aria-label="海外仓报价列表">
 
 
-  <section><div class="workbench-table is-page-surface"><DataTable appearance="integrated" :stripe="false" column-settings-mode="show" :results-visible="true" v-model:page="page" v-model:page-size="pageSize" :data="rows" :columns="columns" :total="total" :loading="loading" preference-key="overseas-quotes-table" row-key="id" empty-text="暂无海外仓报价">
+  <section><div class="workbench-table is-page-surface"><DataTable appearance="integrated" column-settings-mode="show" :results-visible="true" v-model:page="page" v-model:page-size="pageSize" :data="rows" :columns="columns" :total="total" :loading="loading" preference-key="overseas-quotes-table" row-key="id" empty-text="暂无海外仓报价">
         <template #toolbar-start><h1>海外仓报价</h1></template>
         <template #filters><QueryToolbar v-model="filters" :fields="fields" ariaLabel="海外仓报价筛选" preference-key="overseas-quotes-query" :loading="loading" @search="search" /></template>
         <template #notices><LoadErrorState v-if="error" title="海外仓报价加载失败" :message="error.message" @retry="load" /></template>

src/modules/overseas-master-data/pages/OwnedBusinessView.vue

@@ -90,11 +90,11 @@ onBeforeUnmount(() => { active = false; generation++; openGeneration++ })
 <template>
   <OwnedBusinessListLayout>
     <template #statistics><section class="owned-business-statistics workbench-panel is-flush" aria-label="完整筛选范围自有业务统计" :aria-busy="loading"><div v-for="item in summary" :key="String(item[0])"><span>{{ item[0] }}</span><strong>{{ item[1] ?? '—' }}</strong></div></section></template>
-    <div class="workbench-table is-page-surface"><DataTable appearance="integrated" :stripe="false" v-model:page="page" v-model:page-size="size" :data="result?.records || []" :columns="columns" :total="result?.total || 0" :loading="loading" row-key="dispatchNo" preference-key="owned-business-table" empty-text="当前筛选范围暂无已装车的自有车辆排车单">
-      <template #toolbar-start><h1>自有业务<InlineHelp title="查询范围说明">日期和时间按浏览器本地时区显示；统计覆盖同一完整筛选范围。</InlineHelp></h1></template>
+    <div class="workbench-table is-page-surface"><DataTable appearance="integrated" v-model:page="page" v-model:page-size="size" :data="result?.records || []" :columns="columns" :total="result?.total || 0" :loading="loading" row-key="dispatchNo" preference-key="owned-business-table" empty-text="当前筛选范围暂无已装车且未接入拼车货物的排车单">
+      <template #toolbar-start><h1>自有业务<InlineHelp title="查询范围说明">仅统计未实际接入拼车货物的已装车排车，与车辆归属无关；日期和时间按浏览器本地时区显示，统计覆盖同一完整筛选范围。</InlineHelp></h1></template>
       <template #filters><QueryToolbar v-model="filters" :fields="fields" ariaLabel="自有业务筛选" preference-key="owned-business-query" :loading="loading" @search="search" /></template>
       <template #notices><LoadErrorState v-if="error" title="自有业务读取未完成" :message="error.message" @retry="load"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState><p v-if="warehouseError">{{ warehouseError.message }} <el-button link @click="loadWarehouses">重试目录</el-button></p><p v-if="!access.can('platform:warehouse:list')">没有公共仓库目录读取权限，仓库筛选暂不可选。</p></template>
-      <template #actions="{ row }"><div class="density-actions"><el-button class="density-action" link @click="router.push(`/overseas-master-data/owned-business/${encodeURIComponent(row.dispatchNo)}`)">查看明细</el-button><el-button v-if="access.can(permission.ownedBusinessEdit)" class="density-action" link :disabled="opening || mutating || !row.actions.edit.allowed" @click="openAction(row as OwnedBusinessRow, 'operations')">登记运营信息</el-button><el-button class="density-action" link :disabled="opening || mutating" @click="openAction(row as OwnedBusinessRow, 'photos')">{{ access.can(permission.ownedBusinessUpload) && row.actions.upload.allowed ? '上传照片' : '查看照片' }}</el-button></div></template>
+      <template #actions="{ row }"><div class="row-actions density-actions admin-text-actions"><el-button class="density-action" link @click="router.push(`/overseas-master-data/owned-business/${encodeURIComponent(row.dispatchNo)}`)">查看明细</el-button><el-button v-if="access.can(permission.ownedBusinessEdit)" class="density-action" link :disabled="opening || mutating || !row.actions.edit.allowed" @click="openAction(row as OwnedBusinessRow, 'operations')">登记运营信息</el-button><el-button class="density-action" link :disabled="opening || mutating" @click="openAction(row as OwnedBusinessRow, 'photos')">{{ access.can(permission.ownedBusinessUpload) && row.actions.upload.allowed ? '上传照片' : '查看照片' }}</el-button></div></template>
       <template #driver="{ row }">{{ text(row.driver.name) }}<br>{{ text(row.driver.phone) }}</template>
       <template #appointments="{ row }"><div v-for="destination in row.destinations" :key="destination.destinationKey" class="owned-business-destination"><strong>{{ destination.warehouseCode || destination.warehouseName || '—' }}</strong><div v-for="appointment in destination.appointments" :key="appointment.appointmentNo">{{ appointment.appointmentNo }}<small v-if="appointment.confirmationNo">确认号 {{ appointment.confirmationNo }}</small></div><span v-if="!destination.appointments.length">—</span></div></template>
       <template #destinations="{ row }"><div v-for="destination in row.destinations" :key="destination.destinationKey" class="owned-business-destination"><strong>{{ destination.warehouseCode || destination.warehouseName || destination.address || '—' }}</strong><div v-for="appointment in destination.appointments" :key="appointment.appointmentNo">预约 {{ time(appointment.scheduledAt) }}</div><div>实到 {{ time(destination.actualArrivedAt) }}</div></div></template>

src/modules/overseas-master-data/pages/OwnedBusinessViews.test.ts

@@ -30,6 +30,16 @@ beforeEach(() => {
 })
 
 describe('owned business views', () => {
+  it('keeps a non-pool external vehicle returned by the server without filtering or requiring a vehicle id', async () => {
+    const detail = ownedBusinessFixture()
+    detail.row.vehicle = { vehicleId: null, plate: 'EXTERNAL-NO-POOL', ownership: 'DISPATCHED' }
+    calls.list.mockResolvedValue({ records: [detail.row], page: 1, size: 20, total: 1, summary: { dispatchCount: 1, afterLoadingCount: 1, deliveringCount: 0, deliveredCount: 0 } })
+    const wrapper = mount(OwnedBusinessView, { global }); await flushPromises()
+    expect(wrapper.findComponent(Table).props('data')[0].vehicle).toEqual(detail.row.vehicle)
+    expect(wrapper.findComponent(Table).props('total')).toBe(1)
+    expect(wrapper.text()).toContain('登记运营信息')
+    wrapper.unmount()
+  })
   it('uses one list request for all statistics and never hydrates each row', async () => {
     const wrapper = mount(OwnedBusinessView,{global}); await flushPromises()
     expect(calls.list).toHaveBeenCalledTimes(1); expect(calls.detail).not.toHaveBeenCalled(); expect(calls.content).not.toHaveBeenCalled()

src/modules/overseas-master-data/pages/TripOperationsView.vue

@@ -93,7 +93,7 @@ watch([page, size], load); onMounted(load); onBeforeUnmount(() => { sequence++ }
   <template #state>
     <LoadErrorState v-if="error" title="查询或导出失败" :message="error.message" @retry="load"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState>
   </template>
-  <div class="workbench-table is-page-surface"><DataTable appearance="integrated" :stripe="false" column-settings-mode="show" :results-visible="true" preference-key="fleet-operations-table" v-model:page="page" v-model:page-size="size" :data="result?.page.records || []" :columns="columns" :total="result?.page.total || 0" :loading="loading" row-key="tripNo" empty-text="该范围暂无实际出车记录">
+  <div class="workbench-table is-page-surface"><DataTable appearance="integrated" column-settings-mode="show" :results-visible="true" preference-key="fleet-operations-table" v-model:page="page" v-model:page-size="size" :data="result?.page.records || []" :columns="columns" :total="result?.page.total || 0" :loading="loading" row-key="tripNo" empty-text="该范围暂无实际出车记录">
     <template #toolbar-start><h1>出车记录</h1></template>
     <template #filters><QueryToolbar v-model="filters" :fields="fields" ariaLabel="运营记录查询" preference-key="fleet-operations-query" :loading="loading" @search="search" @reset="resetFilters" /></template>
     <template #toolbar-actions><el-button v-if="access.can('platform:fleet:operations:export') && access.can('platform:download:list')" :loading="exporting" @click="download">导出</el-button></template>

src/modules/overseas-master-data/pages/TripsView.vue

@@ -52,7 +52,7 @@ watch([page, size], load); onMounted(load); onBeforeUnmount(() => { sequence++ }
   <AdminPage class="admin-density admin-workbench"><ListPageLayout aria-label="车次管理">
     <el-tabs v-model="workTab" class="density-element-tabs"><el-tab-pane label="车次管理" name="trips" /><el-tab-pane label="待取货" name="pickups" /></el-tabs>
     <PickupDemandPanel v-if="pickupVisited" v-show="workTab === 'pickups'" />
-    <div class="workbench-table is-page-surface"><DataTable v-show="workTab === 'trips'" appearance="integrated" :stripe="false" column-settings-mode="show" :results-visible="true" preference-key="fleet-trips-table" v-model:page="page" v-model:page-size="size" :data="rows" :columns="columns" :total="total" :loading="loading" row-key="tripNo" empty-text="暂无车次，先建立计划再关联排车单">
+    <div class="workbench-table is-page-surface"><DataTable v-show="workTab === 'trips'" appearance="integrated" column-settings-mode="show" :results-visible="true" preference-key="fleet-trips-table" v-model:page="page" v-model:page-size="size" :data="rows" :columns="columns" :total="total" :loading="loading" row-key="tripNo" empty-text="暂无车次，先建立计划再关联排车单">
       <template #toolbar-start><el-button v-if="appointmentReturnTarget(route.query)" link @click="router.push(appointmentReturnTarget(route.query)!)">返回预约工作</el-button><h1>车次管理</h1></template>
       <template #filters><QueryToolbar v-model="filters" :fields="fields" ariaLabel="车次查询" preference-key="fleet-trips-query" :loading="loading" @search="search" @reset="search" /></template>
       <template #notices><LoadErrorState v-if="error" title="车次加载失败" :message="error.message" @retry="load"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState></template>

src/modules/overseas-master-data/pages/VehiclesView.vue

@@ -39,7 +39,7 @@ function openStatus(row:VehicleDetail){statusRow.value=row;statusTarget.value=ro
 async function exportCsv(){exporting.value=true;try{const{page:_,size:__,...q}=params();await submitExport('VEHICLE_LIST', '车辆', q)}catch(e){ElMessage.error(masterDataErrorMessage(e,'车辆导出失败'))}finally{exporting.value=false}}
 watch([page,pageSize],load);onMounted(load)
 </script>
-<template><AdminPage class="admin-density admin-workbench"><ListPageLayout aria-label="车辆列表"><section class="vehicle-panel"><div class="workbench-table is-page-surface"><DataTable appearance="integrated" :stripe="false" column-settings-mode="show" :results-visible="true" v-model:page="page" v-model:page-size="pageSize" :data="rows" :columns="columns" :total="total" :loading="loading" preference-key="overseas-vehicles-table" row-key="id" empty-text="暂无车辆">
+<template><AdminPage class="admin-density admin-workbench"><ListPageLayout aria-label="车辆列表"><section class="vehicle-panel"><div class="workbench-table is-page-surface"><DataTable appearance="integrated" column-settings-mode="show" :results-visible="true" v-model:page="page" v-model:page-size="pageSize" :data="rows" :columns="columns" :total="total" :loading="loading" preference-key="overseas-vehicles-table" row-key="id" empty-text="暂无车辆">
         <template #toolbar-start><div class="status-tabs density-status-tabs workbench-list-tabs" role="tablist" aria-label="车辆归属"><button v-for="tab in tabs" :key="tab[1]" role="tab" :aria-selected="ownership===tab[1]" :class="['status-tab',{'is-active':ownership===tab[1]}]" @click="selectOwnership(tab[1])"><span class="density-tab-icon" aria-hidden="true">{{ tab[1] === 'OWNED' ? '🚚' : '🚛' }}</span>{{tab[0]}}</button></div></template>
         <template #filters><div class="query-panel integrated-query-group"><QueryToolbar v-model="filters" :fields="fields" ariaLabel="车辆筛选" preference-key="overseas-vehicles-query" :loading="loading" @search="search"/></div></template>
         <template #notices><LoadErrorState v-if="error" title="车辆加载失败" :message="error.message" @retry="load"/></template>

src/modules/overseas-master-data/routes.ts

@@ -30,7 +30,7 @@ export const overseasMasterDataRoutes = [
     path: 'overseas-master-data/owned-business',
     name: 'overseas-master-data-owned-business',
     component: () => import('./pages/OwnedBusinessView.vue'),
-    meta: { title: '自有业务', description: '查看自有车辆装车后的排车与运营记录', permission: permission.ownedBusinessList, showPageHeading: false },
+    meta: { title: '自有业务', description: '查看未接入拼车货物的已装车排车与运营记录', permission: permission.ownedBusinessList, showPageHeading: false },
   },
   {
     path: 'overseas-master-data/owned-business/:dispatchNo',
@@ -42,13 +42,13 @@ export const overseasMasterDataRoutes = [
     path: 'overseas-master-data/outsourced-business',
     name: 'overseas-master-data-outsourced-business',
     component: () => import('./pages/OutsourcedBusinessView.vue'),
-    meta: { title: '外配业务', description: '按原排车查询外配车辆装车后的履约与承运信息', permission: permission.outsourcedBusinessList, showPageHeading: false },
+    meta: { title: '外配任务', description: '查看已实际接入拼车货物的装车后履约与承运信息', permission: permission.outsourcedBusinessList, showPageHeading: false },
   },
   {
     path: 'overseas-master-data/outsourced-business/:dispatchNo',
     name: 'overseas-master-data-outsourced-business-detail',
     component: () => import('./pages/OutsourcedBusinessDetailView.vue'),
-    meta: { title: '外配业务详情', description: '查看原排车及外配承运登记', permission: permission.outsourcedBusinessList, showPageHeading: false },
+    meta: { title: '外配任务详情', description: '查看原排车及外配承运登记', permission: permission.outsourcedBusinessList, showPageHeading: false },
   },
   {
     path: 'overseas-master-data/trips',

src/modules/overseas-warehouse/AGENTS.md

@@ -25,7 +25,7 @@
 | 仓储转运审核、通过与驳回 | `pages/LastMileOrdersView.vue`、`components/WarehouseTransferReviewDialog.vue` | `api/warehouseTransfers.ts` 的列表、详情及 `/warehouse-transfers/{transferNo}/review`；审核按钮要求 `permissions.ts` 的 `warehouseTransferApprove` 且行类型为 `WAREHOUSE_TRANSFER`、状态为 `PENDING_REVIEW`。请求携带该行客户范围和转运单号，审核结论为 `APPROVE/REJECT`，驳回原因必填；这是尾程订单内的审核弹框，不是独立审核路由或排车转派送入口 |
 | 尾程订单控制与柜级入仓计划转换 | `pages/LastMileOrdersView.vue`、`pages/LastMileOrderDetailView.vue` | 柜子工作台按 `sourceContainerBookingId` 消费 `/orders/container-summaries`；服务端分页返回全部稳定来源柜，计划已经齐全的柜仍保留用于接柜仓查询和修改，并按冻结 `plannedArrivalAt` 升序、空值最后排序。详情返回全柜订单且不受列表分页截断；单票手工计划保存后，由服务端在整柜最后一票计划齐全时自动生成并绑定全柜托盘码，一票柜立即生成；`resourcePendingPlanCount` 只表示自动生成异常的重试入口，不是正常人工步骤。柜级确认弹框先调用 `/inbound-plans/container-preview`，按服务端 FBA/一件代发/私人地址分组展示头程已有、海外仓补充和最终托数以及 `readiness/blockers`；散货最终托数不得少于头程已有托盘码，差额连续补码且不阻断流程；一件代发必须严格按不可变头程封托托盘数整体入库，单票表单托数锁定且服务端再次失败关闭校验。前端不计算托数、不逐票建计划、不预占托盘，再把同一 `snapshotVersion/snapshotHash` 原样提交 `/inbound-plans/convert-container`，快照冲突后重新获取预览。服务端只为剩余订单逐票生成独立计划，并为异常遗留的人工计划补齐真实托盘，整批原子且重放不得产生第二批资源。单票完整入库计划、暂扣/解除和八行人工节点均从 `api/lastMileOrders.ts` 提交订单版本与幂等键；预计到仓时间只读展示来源柜冻结值，不进入人工计划请求，服务端按整柜校验并写入同一日期；入仓码只读展示并提交订单冻结值，不允许人工改写。新增暂扣只在 `INBOUND_COMPLETED` 开放，解除暂扣保持可用；暂扣不阻断入库计划，只限制后续排车和出库。人工节点一经保存不得回退柜级节点。转仓候选只取 `../iam/api/platformIam.ts` 的平台公共 `ACTIVE + FBA` 仓主档；Backend `lastleg-service/` |
 | 入仓单、入仓计划、FBA 预约 | `pages/InboundOrdersView.vue`、`pages/InboundOrderDetailView.vue` | 列表/预约 `api/inboundOrders.ts`，计划列表/详情 `api/inboundPlans.ts`；Backend `lastleg-service/inboundplan/` |
-| 排车查询、整车草稿、审核及派送安排 | `pages/DispatchesView.vue`、`pages/DispatchDetailView.vue`、`components/SmartDispatchDialog.vue`、`components/DispatchWorkflowDialog.vue` | `api/dispatches.ts`、`dispatchContracts.ts`、`dispatchCommandRecovery.ts`；Backend `lastleg-service/dispatch/`、`delivery/`。一单一趟、同仓多客户多目的地，空单或先选货均可；候选使用来源版本，草稿走服务器token及公共版本，全部容器原子转换。当前规则见`../../../../../docs/海外仓业务/排车列表统一作业改造契约.md`，不恢复旧单客户预排协议 |
+| 排车查询、整车草稿、审核及派送安排 | `pages/DispatchesView.vue`、`pages/DispatchDetailView.vue`、`components/SmartDispatchDialog.vue`、`components/SmartDispatchExistingCargo.vue`、`components/DispatchWorkflowDialog.vue` | `api/dispatches.ts`、`dispatchContracts.ts`、`dispatchCommandRecovery.ts`；Backend `lastleg-service/dispatch/`、`delivery/`。一单一趟、同仓多客户多目的地，空单或先选货均可；候选使用来源版本，草稿走服务器token及公共版本，全部容器原子转换。当前规则见`../../../../../docs/海外仓业务/排车列表统一作业改造契约.md`，不恢复旧单客户预排协议 |
 | 海外出库与派送 | `pages/OutboundsView.vue`、`pages/OutboundDetailView.vue`、`pages/DeliveryOrdersView.vue`、`pages/DeliveryOrderDetailView.vue` | `api/outbounds.ts`、`api/deliveryOrders.ts`；出库详情使用 `deliveries` 展示按目的 FBA 仓拆出的全部派送单，派送列表和详情必须显示目的 FBA 仓。人工状态入口不提供完成派送；签收资料保存成功后提示自动完成并刷新列表。出库列表按类型筛选并展示中文类型，状态须覆盖 `WAIT_PICK/待拣货`、`PICKING/拣货中`、`PICKED/已拣货`、`WAIT_OUTBOUND/待出库`、`OUTBOUNDED/已出库` 和 `CANCELLED/已取消`；仅未开始的 `WAIT_PICK/WAIT_OUTBOUND` 允许取消。一件代发新建弹窗直接跨客户加载服务端可用候选，不单独展示客户筛选，海外仓必选并优先默认洛杉矶仓；订单条件可按订单号、入库单号、客户、托盘号、SKU 或品名查询/重置，以托盘+SKU 行分页多选。提交时从所选行解析唯一客户，并校验所选行属于当前唯一海外仓，不要求先选客户。退货出库客户下拉同时展示客户名称与联系电话并支持手机号检索，客户和仓库选项独立容错加载；选择客户后须立即按当前默认/已选海外仓加载库存。SKU 与箱号查询均使用输入态/已查询态分离，只允许点击查询按钮后生效；支持英文逗号批量条件，查询时清除空格并按任一条件命中，左右列表分别提供每页 5/10/20/50 条选择。SKU 列表只展示 `availableQuantity > 0` 的未占用可用数量，合箱后已扣减为零的 SKU 不再作为可选库存显示，实际作业以可用箱唛选择和箱内 SKU 明细扣减为准。取消、派送列表/详情及退回入口对应 Backend `lastleg-service/delivery/`、`dropship/` |
 | 异常退回与客户回访 | `pages/ExceptionOrdersView.vue`、`pages/CustomerVisitsView.vue` | `api/exceptionOrders.ts`、`api/customerVisits.ts`；异常关系解析、异常建档、派送退回、完成/状态和回访附件对应 Backend `lastleg-service/exceptionorder/`、`customervisit/` |
 | 库存余额、库位与流水 | `pages/InventoryView.vue`、`pages/InventoryDetailView.vue`、`pages/InventoryTransactionsView.vue` | `api/inventory.ts`；业务库存归 `lastleg-service/inventory/`，实物资源归 `warehouse-overseas-service/` |
@@ -34,21 +34,23 @@
 
 ## 履约硬边界
 
-- 排车详情固定四个彩色图标页签：车辆信息、排车信息、单据信息、关联订单明细。五阶段及审核分区、逐动作Gate由服务端返回；取消独立于阶段。装车完成须真实PDA拣货核平，装车与实际发车分别确认；Admin和PDA共用正式版本化命令。已有单写入提交recordVersion（0合法）、原幂等键和完整载荷；未知结果保留原请求核对，成功后另读当前事实。
+- 排车详情固定四个彩色图标页签：车辆信息、排车信息、单据信息、关联订单明细。四个作业阶段及审核分区、逐动作Gate由服务端返回；取消独立于阶段。装车完成须真实PDA拣货核平，装车完成自动生成派送单并直接进入派送中，无独立安排派送或发车确认；Admin和PDA共用正式版本化命令。已有单写入提交recordVersion（0合法）、原幂等键和完整载荷；未知结果保留原请求核对，成功后另读当前事实。
 - 智能排车来源支持 `RELABEL`（待出库换标单），按服务端候选的`selection.relabelNo/sourceVersion`提交，不用展示订单号或原入仓号替代换标身份；沿用真实库存、托盘与箱唛，不生成新入库单。客户和仓库归属由服务端核验，不在前端拼接客户子排车。
 
 - 托盘管理单张打印：`pages/PalletsView.vue` 每行“打印”经 `api/pallets.ts` 的 `getPalletLabelPdf` 下载当前托盘一页 PDF；使用该行仓库 ID 与托盘 ID，权限复用托盘列表。Backend `warehouse-overseas-service` 的 `PalletLabelPrintService` 读取公共托盘；有 FBA 仓码的托盘与国内统一使用 Print `FBA_PALLET_A4_LANDSCAPE_V1`（297×210 mm，FBA 仓码、完整托盘号 Code 128、托盘号文字），其他托盘使用 `INBOUND_MARK_V1`。不在前端生成标签、改码或维护第二套模板。
 
-- API 为 `api/dispatches.ts`、`api/outbounds.ts`、`api/deliveryOrders.ts`；Backend `lastleg-service/dispatch/`、`delivery/`、`dropship/`。一件代发独立出库，从服务端库存位置选择并携带幂等键；换标只有平台卡车进入排车，普通自提、亚马逊自提、客户自提及快递由客户确认直接创建出库任务。整车派送安排在装车完成后、实际发车前进行；每客户一张出库单，每客户每目的地一张派送单，公开完整数组，不能回退为单个outboundNo或按客户拆排车头。
+- API 为 `api/dispatches.ts`、`api/outbounds.ts`、`api/deliveryOrders.ts`；Backend `lastleg-service/dispatch/`、`delivery/`、`dropship/`。一件代发独立出库，从服务端库存位置选择并携带幂等键；换标只有平台卡车进入排车，普通自提、亚马逊自提、客户自提及快递由客户确认直接创建出库任务。整车派送在装车完成事务内自动生成；每客户一张出库单，每客户每目的地一张派送单，公开完整数组，不能回退为单个outboundNo或按客户拆排车头。
 - API 为 `api/exceptionOrders.ts`、`api/customerVisits.ts`；Backend `lastleg-service/exceptionorder/`、`customervisit/`。异常处理只消费服务端 `allowedActions/version`；完成时至少上传一份异常证据。派送退回先从服务端原出库拣货事实选择入仓单和可退箱数，不允许自由填写 SKU/数量；退回海外仓时必须选择服务端校验的目标托盘和库位，库存恢复、异常完成与派送 `RETURNED` 由服务端原子推进。回访附件和派送完成/状态均走海外真实 API
 
 ## 验证
 
+- 排车调度／理货审核分区仅显示审核、详情；审核弹框的车辆图片、司机照片和驾驶证照片通过既有本车附件接口上传，随 `ReviewCommand.attachments` 保存，不调用资源编辑命令。已有资源与审核附件只读预览，详情合并展示；当前审核权限与服务端 Gate 控制上传及提交，列表查看权限控制读取。
+
 - 一件代发出库候选选择：`pages/OutboundsView.vue` 按 `inventoryPositionId + skuCode` 保留跨页选择，只提供本页全选；查询/重置回到第一页，切换海外仓清空选择。提交仍校验同客户、同海外仓，数量取所选行的 `availablePackages`（箱数），不能按 SKU 件数替代；候选同时展示当前可出箱数对应的毛重、材积重和体积，创建出库单时服务端按本次出库箱数占实际入库箱数的比例冻结三项测量快照。候选交互回归见 `pages/OutboundsView.selection.test.ts`；状态展示与取消门禁见 `pages/OutboundsView.test.ts`、`pages/OutboundDetailView.test.ts`。
 - 转运审核定向测试：从应用根运行 `pnpm test src/modules/overseas-warehouse/api/warehouseTransfers.test.ts src/modules/overseas-warehouse/pages/prototypeContract.test.ts`，分别核对客户作用域/API 与审核入口权限、状态。
-- 派送安排弹框通过`getDispatchArrangement`读取整车分组、实际货物、外接报价及原费用依据，`DispatchArrangeFields.vue`按真实客户目的地组提交；不逐行查费用，不按金额推断覆盖，不把原费用再次记入新费用行。移货必须使用`GET items`返回的真实dispatchItemId及逐项remove Gate；路线仅重排`GET route`返回的既有全部目的地，包含外接点，不能新增或猜测目的地。附件沿`DispatchEvidenceFiles.vue`的本车鉴权上传/读取，上传与主单引用保存分开。
+- 装车完成通过`completeDispatchLoading`一次提交，结果仅接受`DELIVERING`；原请求恢复不重建单据。未知费用保持未确认，由既有后台费用管理维护，不按金额推断覆盖或重复记费。已有排车加货和移货仅从`SmartDispatchDialog.vue`内的`SmartDispatchExistingCargo.vue`进入；移货必须使用`GET items`返回的真实dispatchItemId及逐项remove Gate；路线仅重排`GET route`返回的既有全部目的地，包含外接点，不能新增或猜测目的地。附件沿`DispatchEvidenceFiles.vue`的本车鉴权上传/读取，上传与主单引用保存分开。
 - 出库取消提示先解除车次关联，取消后仍须在排车列表释放原排车占用；不提示库存已自动回滚。派送详情费用读取reviewStatus/sourceStatus/voidStatus，同一详情响应展示待财务确认、待财务处理、确认作废，不逐行查询，也不把取消成功视为费用作废。货柜费用面板直接消费同一费用来源接口，待确认时同样禁止调整和重复作废，沿用原页面/弹框承载。
-- 排车列表编辑、托盘移除、BOL PDF 和转派送从 `pages/DispatchesView.vue` → `api/dispatches.ts` 进入；智能预排的候选、草稿柜与托盘锁从 `components/SmartDispatchDialog.vue` 进入。回归为 `pages/DispatchesView.test.ts`、`pages/prototypeContract.test.ts`，不要把列表操作与预排草稿当作同一入口。
+- 排车列表车辆信息编辑、BOL PDF 和装车完成从 `pages/DispatchesView.vue` → `api/dispatches.ts` 进入；列表和详情不另设添加／移除货物入口。货物计划统一由 `components/SmartDispatchDialog.vue` 承载：新建使用候选、草稿及托盘锁，已有排车经 `components/SmartDispatchExistingCargo.vue` 读取实际明细并按版本增减；两类服务端命令不得混用。原加货／移货未知请求也在智能排车恢复。回归为对应组件测试、`pages/DispatchesView.test.ts`、`pages/DispatchDetailView.test.ts` 及 `pages/prototypeContract.test.ts`。
 - 从应用根按目标页面选择相邻测试：`pnpm test src/modules/overseas-warehouse/<目标测试路径>`；API 或类型变化同时运行 `pnpm typecheck`。应用完整门禁继续遵循上层指引。
 - 索引变更从后端根运行 `./scripts/agents-index-contract.ps1`。离线检查不代替真实 HTTP 和人工截图验收。
 

src/modules/overseas-warehouse/PROTOTYPE_MATRIX.md

@@ -1,5 +1,130 @@
 # 海外仓原型核对矩阵
 
+## 2026-10-21 智能排车查询与三栏统一对齐
+
+用户确认保留蓝白配色，按最初第二张原型恢复区块与控件位置；最新截图 `codex-clipboard-40f3fcdc-8093-4fd1-8b0e-bd1abb147b3e.png` 确认已有排车查询散落、三栏错位，上轮不构成视觉验收通过。
+
+| 页面／操作 | 依据与问题 | 修复目标 | 验收 |
+|---|---|---|---|
+| 新建排车／查询与设置 | 原型 `modal-dispatch-schedule` 查询在三栏之前，现状设置占据顶部 | 起运仓进入首个查询面板；建单方式、草稿恢复按需展开；保留区域按钮与现行真实字段 | 定向179项通过；待人工截图确认 |
+| 两模式／选订单、托盘与装车 | 截图中中栏固定偏移、已有货物栏替换整个布局 | 三栏共享标题行和内容行，右栏插槽只更换标题与内容，不再自行定位；长标题换行一起撑高标题行 | 定向179项通过；待人工截图确认 |
+| 已有排车／查询、加货与移除 | 两行裸露查询，货物查询被重复单号推偏 | 同一个查询面板、统一标签和输入宽度；单号及仓库移入右栏标题；保留即时保存与移除确认 | 定向179项通过；待人工截图确认 |
+| 新建排车／搜索标签与分页 | 最新截图 `codex-clipboard-06b92e79-d28a-4eec-8d63-f0f856d1f380.png` 三栏已对齐，但起运仓换行、分页提示多余；用户要求仅做样式定向检查 | 按最新确认删除起运仓可见标签并默认首个可用仓；删除分页提示及对应说明入口；分页与订单表左边缘对齐 | 后续合并定向161项通过；待截图确认 |
+
+本轮追加：用户要求打开时默认第一个起运仓并删除标签；无已有选择、草稿或订单指定仓时采用目录首项并读取候选，空目录保持空值。已有排车按新截图 `codex-clipboard-43654ee8-6c76-4141-bca5-4d108d45b828.png` 合并为可搜索单号的选择器，分页进入下拉底部、货物查询同排，删除重复标签和介绍文字。沿用当前查询API、明确选择后读取清单，不自动选择已有排车。6个文件161项定向回归通过（18.32秒），覆盖默认仓自动加载、空目录、草稿仓保留、下拉搜索分页及原有加货/移除；本轮不跑全量测试。应用类型检查与差异检查通过，真实样式待截图确认。
+
+自动检查：7个文件179项定向回归通过；`pnpm build`（含应用类型检查）通过。标题共享网格行，三栏内容共同起始，不再使用中栏固定顶部偏移；已有排车自定义内容仍留在同一网格列内。本轮修改的4个测试文件及其组件依赖定向类型检查通过；新增查询断言修正后已有排车23项再次通过。额外全仓`typecheck:all`触及统一入口2GB堆上限，未提高资源限制；扩大到未改动的规划测试时存在既有`VueWrapper`类型报错，未据此宣称全仓测试代码类型检查通过。全量`pnpm test`通过：470文件、4336项（14:34启动，591.74秒）。验证期间三个生产组件哈希未变；测试断言查询方法的最后修正已另跑23项通过。差异空白检查通过。只调整本模块模板和布局，保留蓝白配色及现行排车契约；未部署，视觉验收待1920×1080、100%人工截图确认。
+
+## 2026-10-21 智能排车截图复核与样式纠偏
+
+依据用户截图 `codex-clipboard-03c13f2c-5e0d-46da-9f0c-10f2be9fcdad.png`：上轮仅通过自动检查，真实截图确认仍未还原，不能据上轮结论标记视觉完成。对照原型 `overlays.html:1247-1300` 的完整样式以及10月18日组件末尾覆盖规则，本轮纠正标题留白、固定空白高度和托盘明细缺表头。
+
+| 操作 | 截图问题 | 本轮目标 | 验收 |
+|---|---|---|---|
+| 打开／空态／切换区域 | 92vh外框、74px标题区和固定520px表区叠加，空数据也出现滚动；区域仍为下划线 | 外框随内容增长且保留全屏；三栏标题按控件高度对齐；订单区只限制最大高度；区域恢复独立按钮 | 排车定向108项通过；人工截图待确认 |
+| 选择订单／托盘明细 | 标题浮在边框外，缺少托盘号和箱数表头 | 恢复完整明细表格及表内空态，保留整托说明、按钮加货与拖放；中栏卡片与订单表顶部对齐 | 排车定向108项通过；人工截图待确认 |
+| 装车分组 | 右栏过窄，标题、两个说明图标、容量与按钮挤在一行 | 按原型44／22／34三栏比例，容量与添加操作独立成组，只保留一处说明入口；当前蓝白主题和业务契约继续保留 | 排车定向108项通过；人工截图待确认 |
+
+本轮定向7文件178项：排车6文件108项全部通过；共享样式70项中68项通过，2项失败为预约消费者的`<FbaAppointmentFields continuous`属性顺序断言，未改动这些预约实现。`pnpm build`在预约模块`WorkCreateAppointmentForm.vue:63`被`SourceReference.destinationKey`的`null`与`PlanningSourceLookup`不兼容阻断；不据此宣称构建通过，也不扩大范围修复其他在途业务。本轮全量`pnpm test`完成：468文件中465通过、3失败；4324项中4305通过、19失败，另3个未处理错误。失败集中于预约属性顺序断言、预约组件Mock缺少`AppointmentConfirmationCargo`／`canLeave`及其卸载连带错误，未修改对应在途预约代码。排车组件输入在检查期间未变，差异空白检查通过。未部署，视觉仍待1920×1080、100%人工截图确认。
+
+## 2026-10-21 装车完成直接进入派送中
+
+依据用户本轮明确确认“PDA装完货后车就开走”，覆盖早期截图中的装车后等待阶段；沿用原装车完成居中弹框及实载字段，不新增操作入口。
+
+| 页面／操作 | 当前调整 | 验收 |
+|---|---|---|
+| 排车列表／阶段与动作 | 显示装车前、装车中、派送中、派送完成；移除人工安排派送、确认发车，路线在派送中可读 | 定向回归通过；1920×1080人工截图待确认 |
+| 排车详情／装车完成 | 继续使用原装车完成弹框；真实拣货与实载条件保留，单次成功直接进入派送中 | 交互、原请求恢复与阶段校验通过；人工截图待确认 |
+| 装车完成／异常恢复 | 仅接受最终DELIVERING结果；读详情失败只刷新，不重复创建单据 | 定向回归及类型检查通过 |
+
+## 2026-10-21 智能排车恢复10月18日布局
+
+依据：本轮用户明确确认恢复10月18日版本；Admin Git `a5a19769` 的 `SmartDispatchDialog.vue:496` 起模板与 `.dispatch-workbench` 三栏样式，结合原型 `modal-dispatch-schedule`。只恢复页面布局，当前接口、整托资格、草稿与幂等恢复、15／30托位及已有排车调整继续保留，不回退旧协议。
+
+| 页面／操作 | 10月18日布局 | 本轮恢复范围 | 验收 |
+|---|---|---|---|
+| 智能排车／新建与查询 | 顶部紧凑查询、区域按钮，之后直接三栏 | 必要起运仓、建单方式、草稿合并一条工具栏；删除两块步骤表单；查询独立一行；区域恢复active选中态 | 定向177项通过；1920×1080人工截图待确认 |
+| 选订单／拖托盘／分车 | 左订单、中托盘、右装车，三栏标题对齐；托盘可拖入各车 | 恢复1.5／0.85／1三栏比例及订单、托盘工作区高度；计划托位移到右侧添加车辆旁；保留当前真实字段、分页和完整组提示，不补造旧字段 | 定向177项通过；1920×1080人工截图待确认 |
+| 空单／调整已有／生成 | 旧版不包含全部当前能力 | 保留现行入口与权限、独立时间备注、原请求恢复和提交门禁；共用三栏的已有排车同步验证 | 定向177项通过 |
+
+本条覆盖此前“三栏交互”中的顶部步骤区和布局结论；不表示旧版所有字段、旧协议或紫色主题一并恢复。
+
+自动验证：通过统一 `local-check.ps1` 在 `apps/admin-web` 执行7文件定向回归177项全部通过；最终 `pnpm build`（含应用类型检查）通过；`pnpm test` 全量469文件／4332项全部通过（13:55启动，614.49秒）。差异空白检查通过。本轮只改两处组件模板／局部样式、对应布局和样式合同及本段记录；保留其他对话改动，未部署。真实页面1920×1080、100%截图待人工确认。
+
+## 2026-10-21 排车列表操作列收紧
+
+依据本轮用户两张截图，第二张为当前操作展示参考；仓库拆分原型 `04-overseas-delivery.html:1101` 的 `page-outbound-vehicle` 仍为旧版列表，不据此覆盖现行五阶段和审核链。
+
+| 页面／操作 | 原型／截图布局 | 当前调整 | 验收 |
+|---|---|---|---|
+| 排车列表／维护车辆、详情 | 主要动作在前、详情在后 | 直接展示当前主要动作及详情，操作列左固定220px；提交审核、取消、卸货顺序及BOL沿已有更多菜单可达 | 定向49项、类型检查及构建通过；1920×1080人工截图待确认 |
+| 排车列表／调度、理货审核 | 对应分区显示“审核、详情” | 优先当前分区审核，按钮简称“审核”，可访问名称保留完整环节；原居中弹框、权限与服务端动作资格不变 | 定向49项、类型检查及构建通过；1920×1080人工截图待确认 |
+
+本轮Admin完整回归4328/4329通过，唯一失败为布局合同仍要求旧260px操作列；已同步为220px及两个直接动作，随后页面、原型合同和布局合同49项全部通过。修正后未重复完整回归；未部署，最终页面待人工截图确认。
+
+## 2026-10-21 审核驳回统一返回客服处理
+
+依据用户本轮确认及会话原型截图1（装车前三分区）、截图2/3（居中审核弹框及必填驳回意见）。保留现有列表、详情和居中弹框承载；首分区仍称“车辆信息”，即客服最初处理位置。
+
+| 页面／操作 | 目标 | 验收 |
+|---|---|---|
+| 排车列表／审核分区 | 客服处理、调度待审、理货待审按服务端流转；任一驳回回车辆信息，显示环节与原因 | 定向回归通过；1920×1080人工截图待确认 |
+| 详情／维护车辆信息 | 展示当前退回原因，客服修改期间保留；重新提交后开启完整新审核轮次 | 两级退回原因与重提清除回归通过；人工截图待确认 |
+| 调度／理货审核弹框 | 驳回必填原因，成功提示退回客服；理货员双端审核共用服务端资格 | 必填校验、原命令恢复及成功提示回归通过；人工截图待确认 |
+
+
+## 2026-10-21 货物调整统一在智能排车
+
+依据用户排车列表截图及本轮确认：去掉车辆信息中的添加货物入口，安排后的货物只在智能排车修改，保留理货员现场真实拣货。
+
+| 操作 | 本轮目标 | 验收 |
+|---|---|---|
+| 排车列表、详情 | 删除独立添加／移除货物动作及旧弹框，列表统一通过“智能排车”进入；原货物变更未知请求也进入智能排车恢复 | 定向检查通过；1920×1080待人工截图 |
+| 智能排车 | 同一弹框区分新建与调整已有排车；已有单读取真实排车及货物清单、来源候选，使用当前版本及既有资格增减货物，不转回草稿、不重建排车；跨页补齐同托各来源的预约分配，资料缺失或组成变化阻断提交 | 交互、权限、版本冲突及原请求恢复通过；类型检查、构建通过 |
+| 现场作业 | PDA真实拣货及装车规则保持；已扫码不得改计划，理货通过未扫码仍须显式退回重审才能修改 | 服务端原门禁不变 |
+
+本次完整Admin回归4319/4320通过，唯一失败为旧样式断言仍要求已删除的货物弹框保留`LineClampText`；已改为核对智能排车内的统一货物面板，并定向复核`adminDensity.test.ts`全部69项通过。类型检查、构建及1229项AGENTS索引检查通过；完整回归与修正后的定向结果分别记录，未再次运行完整回归。未部署、未执行真实HTTP；真实页面待人工截图确认。
+
+## 2026-10-21 新建排车先安排货物
+
+依据本轮用户确认：先排车和货物，车辆、司机留到建单后由调度或客服在后台补充；不涉及客户自助填写。此项覆盖下方新建弹框内提前填写车辆与司机的说明。
+
+| 操作 | 本轮目标 | 验收 |
+|---|---|---|
+| 智能排车／选货建单、空单 | 保留三栏选货、多车分组、计划托位与每组时间／备注；移除新建环节的车辆、司机和证照表单，创建时两项均为空，后续从车辆信息维护进入 | 定向97项、类型检查和构建通过；1920×1080真实页面待人工截图确认 |
+
+当前完整验证结果以上方“货物调整统一在智能排车”为准。
+
+
+## 2026-10-21 智能排车三栏交互（当前确认）
+
+依据：用户最新截图 `codex-clipboard-136583c3-e776-440b-980b-eed26a228c13.png`、原型 `prototype-src/overlays.html:25-91` 的 `modal-dispatch-schedule` 及 `app.js:6170-6240`。用户明确“本次仍用15／30，只还原三栏交互”。本条覆盖下方先前两栏最小方案，容量和后端业务接口保持当前合同。
+
+| 操作 | 原型承载／布局 | 当前目标／边界 | 验收 |
+|---|---|---|---|
+| 入库单智能排车／排车列表新增排车 | 共用同一智能排车弹窗 | 两处均使用 `SmartDispatchDialog.vue` 及内部三栏组件；入库单入口传入已选入库单范围，排车列表入口不预选。选货、分车、容量与生成逻辑共用 | 入口合同通过 |
+| 选择订单／查看托盘 | 大居中弹窗；左订单、中选中订单托盘、右多辆车装载区 | 默认不选订单，点击后中间才出现对应托盘。复用候选服务端分页，明确本页订单／本页货物关联托盘，同一订单可能跨页；关联托数含必须同车的完整组，不以本页汇总冒充全单统计 | 定向回归通过；待人工截图 |
+| 加货／分车 | 中间托盘拖入右侧指定车辆；各车同时可见 | 拖放沿用现有完整选择组LOCK及幂等恢复；支持按钮作为键盘替代，拖到非当前车以目标ID提交，同实托关联货物整组加入；不把外部拖放文本当可信货物 | 定向回归通过 |
+| 添加车辆／删除车辆／移除货物 | 右侧添加及逐车移除 | 计划容量15／30；各车保持独立时间／备注，跨页保留；已配货不能直接车间拖移，先使用原移除接口再重新选择，避免拆成不原子的隐式两次写 | 定向回归通过 |
+| 查询／生成排车 | 顶部查询与仓库页签，底部统一生成 | 仅保留真实订单／入仓码、目的仓、来源阶段及仓库筛选；不把预约批次号冒充预约号，不补造渠道／订单类型／配送状态。每辆有货的车生成一单 | 定向回归通过 |
+
+样式使用当前公共密度和浅蓝表头，按最新截图还原三栏比例和右侧装载区；保留起运仓、草稿恢复、空单及时间／备注。车辆司机按上方最新确认在建单后维护。详情／审核／文件预览承载不受本次调整。真实页面仍需1920×1080、100%人工截图确认；不以自动DOM测试认定视觉已验收。
+
+本轮自动检查：三栏与先货后车组合定向5文件81项通过（2026-10-21 11:57启动），`pnpm build`（含应用类型检查）通过。当前最终源码：`SmartDispatchDialog.vue` SHA256 `D5399FA4B5909A21E4C089F9F8267607DB31C87ED1412855C1E9E6E272EC639C`；`SmartDispatchCargoBoard.vue` SHA256 `3A9195B76D40D5C0F618978E0DDFA90FFBB15C8FF2E28EE29D5760C81DF66958`。复用11:56启动的完整回归结果：4294/4295通过，唯一旧车辆表单样式断言已修正，对应共享布局测试69项复核通过；完整与修正后定向分别记证。未发布，不代表真实页面已验收。
+
+## 2026-10-21 智能排车最小交互优化（已被上方三栏确认覆盖）
+
+依据：用户截图 `codex-clipboard-5f71bb39-dc08-4048-a5c7-31f4c0893bc2.png`，原型 `prototype-src/overlays.html:25-91` 的 `modal-dispatch-schedule`，以及用户随后确认的最小方案：保留两栏，移除“开始安排第一辆车”，默认空车、直接加货、多辆车常驻，不改后端。本条覆盖下方旧“先开始选货”的安排；完整三栏、拖拽、车间移货暂不实施。
+
+| 页面／操作 | 原型承载与布局 | 原实现问题 | 本次调整／验收 |
+|---|---|---|---|
+| 智能排车／选货与分车 | 原型多辆车同时展示；最新确认保留当前两栏居中弹框 | 须先建草稿才能选货；仅改名称仍无法看清步骤 | 默认显示空车辆框；首次点击“加入这辆车”时内部顺序创建草稿、创建车辆区、锁货，准备期间禁用交互，任一步失败即停止。已有分配跨页保留；待自动检查及1920×1080人工截图 |
+| 智能排车／新增车辆与生成排车单 | 右侧各车货物分别展示，统一提交 | “开始安排第一辆车／再安排一辆车”易被理解为串行离开前车 | “添加车辆”保留前车并选中新车，按服务端ID差集识别新车，按车独立车辆／司机／时间。空区不生成单，有货各车一次原子转换。容量仍使用现有服务端15／30托位，截图26为参考示例，不自行扩展容量合同 |
+
+既有空单、详情、审核、文件预览与删除业务不改承载。来源资格、同实托完整组、跨客户归属、版本与未知请求恢复继续沿现行服务端合同；不复制原型示例数据、前端估算重量或未经证实的预约／状态筛选。
+
+自动验证：原组件及原型合同52项、新增真实组件交互12项通过；覆盖首加货、两车配置独立、切回加货、乱序新车回执、准备链冻结、明确拒绝、已执行但响应丢失的原键恢复、跨页恢复和同托整组一次写。只读源码审查通过；`pnpm build`（含应用类型检查）通过，Admin完整回归467个文件／4268项通过。本轮未修改后端、未执行环境HTTP、未发布；真实页面1920×1080、100%截图待人工确认。
+
 ## 尾程订单汇总文字隐藏（2026-10-20）
 
 按用户截图`codex-clipboard-168f9aa5-5478-4085-a9b4-d59e7b08ca1f.png`及明确要求，移除查询区下方“仓储转运·全筛选”和“当前筛选中的退货”两段长汇总，不再挂载仅提供转运汇总的组件。订单明细、退货行维度、筛选、分页和错误反馈保持；不删交易数据或改变统计口径。原列表顶部矩阵中的“数量汇总”不再指这两段常驻文字。本页行为回归75项通过，差异检查通过；待人工截图确认。
@@ -259,3 +384,24 @@
 本批未修改SmartDispatchDialog及其候选分页、入库计划、换标与退货出库业务逻辑。源码复查这些入口的既有承载与表单/表格布局，未凭推测批量改宽度或删除必要横向滚动。
 
 公共缺口复核：此前AppDialog后代选择器可能连带命中二级弹框；当前公共写者已将header/body/footer改为直接子级选择器，代码层已收口，本域未修改公共样式；真实嵌套预览仍待人工截图确认。
+
+
+### 2026-10-21 FBA 正式确认缺项补充
+
+| 页面 | 操作 | 依据与承载 | 本次变更 | 验收 |
+|---|---|---|---|---|
+| 入库单 | 新增 / 编辑 FBA 预约 | 用户本轮截图 Image 1：既有居中弹框；保持原尺寸与底部保存按钮 | 正式确认前按入仓码展示实际缺项；弹框内补齐箱数和货件资料，分别反馈资料保存与预约确认 | 定向回归通过；待人工 1920×1080、100% 截图确认 |
+| 入库单 | 查看预约 | 同一弹框只读 | 展示缺项及用途，禁用资料补充 | 定向回归通过；待人工截图确认 |
+| 预约列表 | 新增 / 编辑 FBA 预约 | 用户截图 Image 2 与现有 WorkCreateAppointmentForm / WorkAppointmentForm 居中弹框 | 共用逐票资料补充；已有安排明确指向原预约编辑，保留原占用规则 | 定向回归通过；待人工截图确认 |
+
+自动验证：本轮 Admin 全量初跑 469 文件、4333 项，4315 项通过；2 个关联文件的 18 项失败在修复后，由包含这两文件的 45 文件、426 项定向回归全部通过。最终补充文案与表单另行复测 11 项通过；最终 `pnpm build`（含应用类型检查）通过。未触发部署、未写测试环境数据；真实页面仍待人工截图确认。
+
+### 2026-10-21 排车审核入口与附件
+
+| 页面 | 操作 | 依据与承载 | 本次变更 | 验收 |
+|---|---|---|---|---|
+| 排车列表：调度审核、理货员审核 | 行操作 | 用户本轮确认只保留审核、详情；沿现有列表 | 去掉维护车辆信息及更多菜单，仅显示本环节审核与详情 | 本轮定向回归通过；待人工截图确认 |
+| 排车审核弹框 | 通过／驳回、上传附件 | 用户附件 codex-clipboard-249614d2-efac-4494-af47-090980981900.png；沿既有弹框 | 车辆图片、司机照片、驾驶证照片三类，原证据只读，本次附件随审核结果保存；未知结果重试原请求 | 本轮定向回归通过；待人工 1920×1080、100% 截图确认 |
+| 排车详情：车辆信息 | 查看审核附件 | 复用既有附件预览 | 汇总原资源与两级审核已保存证据，去重并只读预览 | 本轮定向回归通过；待人工截图确认 |
+
+本轮自动验证：Admin 5 个定向文件 96 项通过，`pnpm typecheck` 通过；Lastleg/File 8 个定向类 63 项通过，API 路由合同 5 项通过，AGENTS 索引 1232 项通过。未部署，未进行真实页面操作；上线本次变更须包含 Admin、lastleg-service 和 file（新增司机照片文件分类）。

src/modules/overseas-warehouse/api/dispatches.test.ts

@@ -2,7 +2,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { http } from '@/shared/api/http'
 import * as api from './dispatches'
 import { candidate, command, detail, loadingPreview, page } from '../dispatchTestFixtures'
-import type { ArrangeDelivery, CreateDispatch, DispatchBatchAllocation, DraftSelection, LoadingComplete, ReasonCommand, ReviewCommand, UpdateDispatch, Version, VersionCommand } from '../dispatchContracts'
+import type { CreateDispatch, DispatchBatchAllocation, DraftSelection, LoadingComplete, ReasonCommand, ReviewCommand, UpdateDispatch, Version, VersionCommand } from '../dispatchContracts'
 vi.mock('@/shared/api/http', () => ({ http: { get: vi.fn(), post: vi.fn(), put: vi.fn(), delete: vi.fn() }, unwrapApiResponse: (value: { data: unknown }) => value.data }))
 const body = { recordVersion: 0, idempotencyKey: 'original-key', reason: '核对原因' }
 const draft = () => ({ draftToken: 'server-token', recordVersion: 0, status: 'ACTIVE', warehouseId: '321', containers: [], sources: [candidate()], expiresAt: '' })
@@ -74,7 +74,7 @@ describe('native whole-vehicle dispatch API', () => {
     const request: CreateDispatch = { idempotencyKey: 'create', warehouseId: '321', vehicle: null, driver: null, plannedDepartureAt: null, estimatedArrivalAt: null, remark: null, cargo: [], batchAllocations: [] }
     await api.createDispatch(request); expect(http.post).toHaveBeenCalledWith('/platform/v1/last-leg/dispatches', request)
   })
-  it.each(['cancel', 'remove', 'review', 'loading-review', 'return', 'loading', 'depart', 'arrange', 'add', 'submit', 'draft-container', 'draft-select', 'draft-release', 'draft-convert', 'draft-snapshot'])('rejects missing/null/negative versions before %s requests and accepts zero', async action => {
+  it.each(['cancel', 'remove', 'review', 'loading-review', 'return', 'loading', 'add', 'submit', 'draft-container', 'draft-select', 'draft-release', 'draft-convert', 'draft-snapshot'])('rejects missing/null/negative versions before %s requests and accepts zero', async action => {
     const invoke = (value: unknown) => {
       const request = { ...body, recordVersion: value as Version }
       switch (action) {
@@ -84,8 +84,6 @@ describe('native whole-vehicle dispatch API', () => {
         case 'loading-review': return api.reviewDispatchLoading('PC/1', request as unknown as ReviewCommand)
         case 'return': return api.returnDispatchToReview('PC/1', request)
         case 'loading': return api.completeDispatchLoading('PC/1', request as unknown as LoadingComplete)
-        case 'depart': return api.departDispatch('PC/1', { ...request, remark: null })
-        case 'arrange': return api.transferDispatchToDelivery('PC/1', request as unknown as ArrangeDelivery)
         case 'add': return api.addDispatchCargo('PC/1', { ...request, cargo: [], batchAllocations: [] })
         case 'submit': return api.submitDispatchReview('PC/1', { ...request, remark: null })
         case 'draft-container': return api.createDispatchDraftContainer({ ...request, draftToken: 'draft', capacity: 30 })
@@ -107,14 +105,6 @@ describe('native whole-vehicle dispatch API', () => {
     await api.cancelDispatch('PC/1', body); await api.removeDispatchItem('PC/1', 'item/1', body)
     expect(vi.mocked(http.post).mock.calls.map(call => call[0])).toEqual(['/platform/v1/last-leg/dispatches/PC%2F1/cancel', '/platform/v1/last-leg/dispatches/PC%2F1/items/item%2F1/remove']); expect(http.delete).not.toHaveBeenCalled()
   })
-  it('preserves complete grouped arrangement evidence and returns an immutable command envelope', async () => {
-    const outbound = (customerId: string) => ({ customerId, customerName: `客户${customerId}`, outboundNo: `OUT-${customerId}`, status: 'WAIT_OUTBOUND', packageCount: 2, palletCount: 1 })
-    const delivery = (customerId: string) => ({ ...outbound(customerId), groupKey: customerId, deliveryNo: `DEL-${customerId}`, destination: candidate().destination })
-    const data = { ...command('ARRANGE_DELIVERY'), result: { dispatchNo: 'PC/1', recordVersion: '9007199254740993', arrangementKey: 'arrange', cargoHash: 'cargo', arrangedAt: '2026-10-19T10:00:00Z', outbounds: [outbound('A'), outbound('B')], deliveries: [delivery('A'), delivery('B')] } }
-    vi.mocked(http.post).mockResolvedValueOnce({ data })
-    const request: ArrangeDelivery = { ...body, recordVersion: '9007199254740993', cargoHash: 'cargo', loadingCompletionHash: 'loaded', groups: [] }
-    expect(await api.transferDispatchToDelivery('PC/1', request)).toEqual(data); expect(http.post).toHaveBeenCalledWith('/platform/v1/last-leg/dispatches/PC%2F1/transfer-delivery', request)
-  })
   it('keeps draft version, server token and source evidence and converts explicit groups atomically', async () => {
     const source = candidate().selection
     await api.lockDispatchDraftPallet({ ...body, draftToken: 'server-token', draftContainerId: '190000000000000011', source })

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

@@ -1,7 +1,7 @@
 import { http, unwrapApiResponse, type ApiEnvelope } from '@/shared/api/http'
 import type { DispatchEvidenceKind, DispatchRoute, DispatchRouteCommand } from '../dispatchContracts'
-import { requireVersion, requireBatchVersions, type AddCargo, type ArrangeDelivery, type CandidateQuery, type ConvertDraft, type CreateDispatch, type DispatchQuery, type DraftContainer, type DraftSelection, type LoadingComplete, type ReasonCommand, type ReviewCommand, type UpdateDispatch, type VersionCommand, type DispatchBatchAllocation } from '../dispatchContracts'
-import { normalizeArrangementPreview, normalizeCandidateList, normalizeConvertedDraft, normalizeDispatchCommand, normalizeDispatchDetail, normalizeDispatchDraft, normalizeDispatchItems, normalizeDispatchPage, normalizeEvidenceFile, normalizeLoadingPreview, type ArrangementPreviewWire, type CandidateListWire, type CommandResultWire, type ConvertedDraftWire, type DispatchDetailWire, type DispatchDraftWire, type DispatchEvidenceFileWire, type DispatchItemsWire, type DispatchPageWire, type LoadingPreviewWire } from '../dispatchWire'
+import { requireVersion, requireBatchVersions, type AddCargo, type CandidateQuery, type ConvertDraft, type CreateDispatch, type DispatchQuery, type DraftContainer, type DraftSelection, type LoadingComplete, type ReasonCommand, type ReviewCommand, type UpdateDispatch, type VersionCommand, type DispatchBatchAllocation } from '../dispatchContracts'
+import { normalizeCandidateList, normalizeConvertedDraft, normalizeDispatchCommand, normalizeDispatchDetail, normalizeDispatchDraft, normalizeDispatchItems, normalizeDispatchPage, normalizeEvidenceFile, normalizeLoadingPreview, type CandidateListWire, type CommandResultWire, type ConvertedDraftWire, type DispatchDetailWire, type DispatchDraftWire, type DispatchEvidenceFileWire, type DispatchItemsWire, type DispatchPageWire, type LoadingPreviewWire } from '../dispatchWire'
 export type { DispatchBatchReference, DispatchBatchAllocation } from '../dispatchContracts'
 
 const base = '/platform/v1/last-leg/dispatches'
@@ -38,9 +38,6 @@ export const reviewDispatch = (no: string, body: ReviewCommand) => postCommand(`
 export const reviewDispatchLoading = (no: string, body: ReviewCommand) => postCommand(`${path(no)}/loading-review`, versioned(body))
 export const returnDispatchToReview = (no: string, body: ReasonCommand) => postCommand(`${path(no)}/return-to-review`, versioned(body))
 export const completeDispatchLoading = (no: string, body: LoadingComplete) => postCommand(`${path(no)}/loading-complete`, versioned(body))
-export const departDispatch = (no: string, body: VersionCommand & { remark: string | null }) => postCommand(`${path(no)}/depart`, versioned(body))
-export const getDispatchArrangement = (no: string) => get<ArrangementPreviewWire>(`${path(no)}/delivery-arrangement`).then(normalizeArrangementPreview)
-export const transferDispatchToDelivery = (no: string, body: ArrangeDelivery) => postCommand(`${path(no)}/transfer-delivery`, versioned(body))
 export const getDispatchBolPdf = (no: string) => http.get<Blob, Blob>(`${path(no)}/prints/bol`, { responseType: 'blob' })
 
 export async function listDispatchCandidates(query: CandidateQuery) {

src/modules/overseas-warehouse/components/DispatchArrangeFields.test.ts

@@ -1,35 +0,0 @@
-import ElementPlus from 'element-plus'
-import { mount } from '@vue/test-utils'
-import { expect, it } from 'vitest'
-import DispatchArrangeFields from './DispatchArrangeFields.vue'
-import type { ArrangeGroup, CargoLine, PreviewGroup } from '../dispatchContracts'
-import { destination } from '../dispatchTestFixtures'
-const cargo = (sourceKey: string, customerId = 'C1'): CargoLine => ({ sourceKey, customerId, inboundCode: `IN-${sourceKey}`, sourceOrigin: null }) as CargoLine
-function values() {
-  const preview: PreviewGroup = { groupKey: 'group-1', customerId: 'C1', customerName: '客户甲', destination: destination(), groupCargoHash: 'group-cargo', cargo: [cargo('A'), cargo('B')], externalFreightHash: 'external-hash', externalQuotes: [], feeCoverageCargoHash: 'coverage-hash', feeSources: [{ financeFeeId: 'fee-1', customerId: 'C1', currency: 'USD', amount: 100, sourceVersion: 2, sourceHash: 'fee-hash', status: 'ACTIVE', services: ['DELIVERY_FEE', 'LOADING_FEE'], sourceKeys: ['A'] }], requiredServices: ['DELIVERY_FEE'], blockReasons: [] }
-  const group: ArrangeGroup = { groupKey: 'group-1', groupCargoHash: 'group-cargo', plannedDeliveryAt: '', deliveryMethod: '', waybillNo: null, carrierName: null, pickupMethod: '', loadingType: 'PALLET', vehicleType: null, vehicleSize: null, appointmentAccount: null, sellerName: null, remark: null, externalFreightHash: 'external-hash', feeCoverageCargoHash: 'coverage-hash', feeCoverage: [], fees: ['DELIVERY_FEE', 'LOADING_FEE', 'APPOINTMENT_FEE'].map(feeType => ({ feeType, feeName: feeType, direction: 'RECEIVABLE', currency: 'USD', amount: null })) }
-  return { preview, group }
-}
-it('requires explicit per-service coverage and preserves uncovered cargo instead of treating a partial fee as full coverage', async () => {
-  const { preview, group } = values()
-  const wrapper = mount(DispatchArrangeFields, { props: { modelValue: [group], preview: [preview], disabled: false }, global: { plugins: [ElementPlus] } })
-  const covered = (wrapper.vm as unknown as { covered(index: number, preview: PreviewGroup, service: string): boolean }).covered
-  expect(covered(0, preview, 'DELIVERY_FEE')).toBe(false)
-  await wrapper.get('input[type="checkbox"]').setValue(true)
-  expect(group.feeCoverage).toEqual([{ financeFeeId: 'fee-1', sourceVersion: 2, sourceHash: 'fee-hash', services: ['DELIVERY_FEE'] }])
-  expect(covered(0, preview, 'DELIVERY_FEE')).toBe(false)
-  preview.feeSources[0]!.sourceKeys.push('B'); expect(covered(0, preview, 'DELIVERY_FEE')).toBe(true)
-  expect(covered(0, preview, 'LOADING_FEE')).toBe(false)
-  preview.feeSources[0]!.customerId = 'C2'; expect(covered(0, preview, 'DELIVERY_FEE')).toBe(false); wrapper.unmount()
-})
-it('matches external quotes to the original customer and inbound source and shows only applicable additional fees', async () => {
-  const { preview, group } = values(); preview.cargo = [cargo('A')]
-  preview.externalQuotes = [{ customerId: 'C2', groupKey: 'group-1', bookingNo: 'BOOK-1', inboundCode: 'IN-A', currency: 'USD', amount: 100, sourceHash: 'external-source' }]
-  const wrapper = mount(DispatchArrangeFields, { props: { modelValue: [group], preview: [preview], disabled: false }, global: { plugins: [ElementPlus] } })
-  const state = wrapper.vm as unknown as { covered(index: number, preview: PreviewGroup, service: string): boolean }
-  expect(state.covered(0, preview, 'DELIVERY_FEE')).toBe(false)
-  expect(wrapper.findAll('.el-input-number')).toHaveLength(1)
-  preview.externalQuotes[0]!.customerId = 'C1'; expect(state.covered(0, preview, 'DELIVERY_FEE')).toBe(true)
-  group.loadingType = 'FLOOR'; group.appointmentAccount = 'BUY_APPOINTMENT'; await wrapper.setProps({ modelValue: [{ ...group }] })
-  expect(wrapper.findAll('.el-input-number')).toHaveLength(2); expect(wrapper.text()).toContain('卖家姓名'); wrapper.unmount()
-})

src/modules/overseas-warehouse/components/DispatchArrangeFields.vue

@@ -1,57 +0,0 @@
-<script setup lang="ts">
-import type { ArrangeGroup, PreviewGroup } from '../dispatchContracts'
-const groups = defineModel<ArrangeGroup[]>({ required: true })
-defineProps<{ preview: PreviewGroup[]; disabled: boolean }>()
-const serviceLabels: Record<string, string> = { DELIVERY_FEE: '派送费', LOADING_FEE: '装车费', APPOINTMENT_FEE: '买约费' }
-function setCoverage(index: number, fee: PreviewGroup['feeSources'][number], service: string, checked: unknown) {
-  const group = groups.value[index]; if (!group) return
-  let selection = group.feeCoverage.find(row => row.financeFeeId === fee.financeFeeId)
-  if (!selection && checked === true) { selection = { financeFeeId: fee.financeFeeId, sourceVersion: fee.sourceVersion, sourceHash: fee.sourceHash, services: [] }; group.feeCoverage.push(selection) }
-  if (!selection) return
-  selection.services = checked === true ? [...new Set([...selection.services, service])] : selection.services.filter(value => value !== service)
-  group.feeCoverage = group.feeCoverage.filter(row => row.services.length)
-}
-function covered(index: number, preview: PreviewGroup, service: string) {
-  if (!preview.cargo.length) return false
-  const selections = groups.value[index]?.feeCoverage || []
-  return preview.cargo.every(cargo => service === 'DELIVERY_FEE' && preview.externalQuotes.some(quote => quote.customerId === cargo.customerId && quote.inboundCode === cargo.inboundCode)
-    || preview.feeSources.some(fee => fee.customerId === cargo.customerId && fee.sourceKeys.includes(cargo.sourceKey) && selections.some(selection => selection.financeFeeId === fee.financeFeeId && selection.services.includes(service))))
-}
-function required(index: number, preview: PreviewGroup, service: string) {
-  const group = groups.value[index]
-  return preview.requiredServices.includes(service)
-    || service === 'LOADING_FEE' && ['FLOOR', 'MIXED'].includes(group?.loadingType || '')
-    || service === 'APPOINTMENT_FEE' && group?.appointmentAccount === 'BUY_APPOINTMENT'
-}
-defineExpose({ covered })
-</script>
-<template>
-  <section v-for="(previewGroup, index) in preview" :key="previewGroup.groupKey" class="arrange-group density-dialog-sections">
-    <template v-if="groups[index]">
-      <section class="density-dialog-section" data-tone="source" :aria-label="'派送分组依据 ' + (index + 1)"><h3 class="density-dialog-section__title">{{ previewGroup.customerName || '—' }} · {{ previewGroup.destination.warehouseCode || previewGroup.destination.warehouseName || previewGroup.destination.address || '—' }}</h3>
-        <el-alert v-for="reason in previewGroup.blockReasons" :key="reason" :title="reason" type="warning" :closable="false" show-icon />
-        <el-table :data="previewGroup.cargo" border><el-table-column prop="orderNo" label="来源订单" min-width="150" show-overflow-tooltip /><el-table-column prop="inboundCode" label="入仓码" min-width="150" show-overflow-tooltip /><el-table-column prop="palletNo" label="实物托盘码" min-width="150" show-overflow-tooltip /><el-table-column prop="cartonMark" label="来源箱唛" min-width="150" show-overflow-tooltip /><el-table-column prop="packages" label="本次箱数" width="100" /></el-table>
-        <template v-if="previewGroup.externalQuotes.length"><h4 class="density-dialog-section__title">外接约定运费</h4><table class="density-table"><thead><tr><th>外接预订号</th><th>入仓码</th><th>币种</th><th>金额</th></tr></thead><tbody><tr v-for="quote in previewGroup.externalQuotes" :key="quote.bookingNo"><td>{{ quote.bookingNo }}</td><td>{{ quote.inboundCode }}</td><td>{{ quote.currency }}</td><td>{{ quote.amount }}</td></tr></tbody></table></template>
-        <h4 class="density-dialog-section__title">原费用覆盖</h4><p v-if="!previewGroup.feeSources.length" class="density-dialog-note">暂无可引用原费用。</p>
-        <table v-else class="density-table"><thead><tr><th>覆盖服务</th><th>币种</th><th>金额</th><th>状态</th></tr></thead><tbody><tr v-for="fee in previewGroup.feeSources" :key="fee.financeFeeId"><td><el-checkbox v-for="service in fee.services" :key="service" :disabled="disabled" :model-value="groups[index]!.feeCoverage.some(row => row.financeFeeId === fee.financeFeeId && row.services.includes(service))" @update:model-value="setCoverage(index, fee, service, $event)">已包含{{ serviceLabels[service] || '服务费用' }}</el-checkbox></td><td>{{ fee.currency }}</td><td>{{ fee.amount }}</td><td>{{ fee.status }}</td></tr></tbody></table>
-      </section>
-      <section class="density-dialog-section" data-tone="work" :aria-label="'派送分组登记 ' + (index + 1)"><h3 class="density-dialog-section__title">派送信息</h3>
-        <table class="density-table density-table--editable arrange-editor-table"><tbody>
-          <tr><td><el-form-item label="预计派送时间" required><el-date-picker v-model="groups[index]!.plannedDeliveryAt" :disabled="disabled" type="datetime" value-format="YYYY-MM-DDTHH:mm:ssZ" placeholder="请选择派送时间" /></el-form-item></td><td><el-form-item label="派送方式" required><el-select v-model="groups[index]!.deliveryMethod" :disabled="disabled" placeholder="请选择"><el-option label="卡派打托" value="TRUCK_PALLET" /><el-option label="卡派地板" value="TRUCK_FLOOR" /><el-option label="FBA自提" value="FBA_PICKUP" /><el-option label="客户自提" value="CUSTOMER_PICKUP" /><el-option label="快递" value="EXPRESS" /><el-option label="外配" value="OUTSOURCED" /><el-option label="专车直送" value="DEDICATED_TRUCK" /><el-option label="零担派送" value="LTL" /></el-select></el-form-item></td></tr>
-          <tr><td><el-form-item label="提货方式" required><el-select v-model="groups[index]!.pickupMethod" :disabled="disabled" placeholder="请选择"><el-option label="一提一卸" value="ONE_PICKUP_ONE_DROP" /><el-option label="一提多卸" value="ONE_PICKUP_MULTI_DROP" /><el-option label="多提一卸" value="MULTI_PICKUP_ONE_DROP" /><el-option label="多提多卸" value="MULTI_PICKUP_MULTI_DROP" /><el-option label="仓库自提" value="WAREHOUSE_PICKUP" /></el-select></el-form-item></td><td><el-form-item label="装车类型" required><el-select v-model="groups[index]!.loadingType" :disabled="disabled" placeholder="请选择"><el-option label="托盘" value="PALLET" /><el-option label="地板" value="FLOOR" /><el-option label="混装" value="MIXED" /></el-select></el-form-item></td></tr>
-          <tr><td><el-form-item label="承运商"><el-input v-model="groups[index]!.carrierName" :disabled="disabled" /></el-form-item></td><td><el-form-item label="运单号"><el-input v-model="groups[index]!.waybillNo" :disabled="disabled" /></el-form-item></td></tr>
-          <tr><td><el-form-item label="车型"><el-input v-model="groups[index]!.vehicleType" :disabled="disabled" /></el-form-item></td><td><el-form-item label="车辆尺寸"><el-input v-model="groups[index]!.vehicleSize" :disabled="disabled" /></el-form-item></td></tr>
-          <tr><td><el-form-item label="预约账号"><el-select v-model="groups[index]!.appointmentAccount" :disabled="disabled" clearable placeholder="请选择"><el-option label="自有账号" value="SELF" /><el-option label="买约" value="BUY_APPOINTMENT" /></el-select></el-form-item></td><td><el-form-item v-if="groups[index]!.appointmentAccount === 'BUY_APPOINTMENT'" label="卖家姓名" required><el-input v-model="groups[index]!.sellerName" :disabled="disabled" /></el-form-item></td></tr>
-          <tr><td colspan="2"><el-form-item label="备注"><el-input v-model="groups[index]!.remark" :disabled="disabled" /></el-form-item></td></tr>
-        </tbody></table>
-        <h4 class="density-dialog-section__title">本组新增费用</h4><table class="density-table density-table--editable"><tbody><tr v-for="fee in groups[index]!.fees.filter(item => required(index, previewGroup, item.feeType))" :key="fee.feeType"><td><el-form-item v-if="!covered(index, previewGroup, fee.feeType)" :label="(serviceLabels[fee.feeType] || fee.feeName) + '（未覆盖部分）'" required><div class="arrange-fee-controls"><el-input-number v-model="fee.amount" :disabled="disabled" :min="0.01" :precision="2" controls-position="right" /><el-select v-model="fee.currency" :disabled="disabled" placeholder="币种"><el-option label="USD" value="USD" /><el-option label="CNY" value="CNY" /></el-select></div></el-form-item><p v-else class="density-dialog-note">本组{{ serviceLabels[fee.feeType] || fee.feeName }}已全部覆盖，不重复登记。</p></td></tr></tbody></table>
-      </section>
-    </template>
-  </section>
-</template>
-<style scoped>
-.arrange-editor-table { table-layout: fixed; }
-.arrange-editor-table td:not([colspan]) { width: 50%; }
-.arrange-fee-controls { display: grid; width: 100%; grid-template-columns: minmax(0, 1fr) 120px; gap: var(--admin-space-3); }
-.arrange-group h4 { margin-top: var(--admin-space-4); }
-</style>

src/modules/overseas-warehouse/components/DispatchEvidenceFiles.test.ts

@@ -12,6 +12,15 @@ const options = { props: { modelValue: ['301'], dispatchNo: 'PC/1', kind: 'VEHIC
 const button = (wrapper: ReturnType<typeof mount>, label: string) => wrapper.findAll('button').find(value => value.text() === label)!
 async function selectFile(wrapper: ReturnType<typeof mount>, file: File) { const input = wrapper.get('input[type="file"]'); Object.defineProperty(input.element, 'files', { configurable: true, value: [file] }); await input.trigger('change'); await flushPromises() }
 beforeEach(() => { vi.resetAllMocks(); vi.mocked(api.getDispatchEvidence).mockResolvedValue(metadata()); vi.mocked(api.uploadDispatchEvidence).mockResolvedValue(metadata('302')); vi.mocked(api.getDispatchEvidenceContent).mockResolvedValue(new Blob(['png'], { type: 'image/png' })); URL.createObjectURL = vi.fn().mockReturnValue('blob:authenticated'); URL.revokeObjectURL = vi.fn() })
+it('keeps previously provided references read-only and only submits newly uploaded audit files', async () => {
+  const wrapper = mount(DispatchEvidenceFiles, { ...options, props: { ...options.props, modelValue: [], referenceIds: ['301'], kind: 'DRIVER_PHOTO', label: '司机照片' } }); await flushPromises()
+  expect(wrapper.findAll('tbody button').map(item => item.text())).toEqual(['预览'])
+  await selectFile(wrapper, new File(['pdf'], 'photo.pdf', { type: 'application/pdf' })); expect(api.uploadDispatchEvidence).not.toHaveBeenCalled()
+  await selectFile(wrapper, new File(['png'], 'photo.png', { type: 'image/png' }))
+  expect(api.uploadDispatchEvidence).toHaveBeenCalledWith('PC/1', 'DRIVER_PHOTO', expect.any(File))
+  expect(wrapper.emitted('update:modelValue')?.at(-1)).toEqual([['302']])
+  wrapper.unmount()
+})
 it('previews and replaces real string-size metadata through the JSON parser and API boundary', async () => {
   const actual = await vi.importActual<typeof import('../api/dispatches')>('../api/dispatches')
   const envelope = (fileId: string) => parseApiJsonResponse(JSON.stringify({ code: '200', data: { ...metadata(fileId), sizeBytes: '3' } }))

src/modules/overseas-warehouse/components/DispatchEvidenceFiles.vue

@@ -10,13 +10,16 @@ import ApiErrorMeta from '@/shared/components/ApiErrorMeta.vue'
 import { ApiResponseError, getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
 import { getDispatchEvidence, getDispatchEvidenceContent, uploadDispatchEvidence } from '../api/dispatches'
 import { DispatchInputError, type DispatchEvidenceFile, type DispatchEvidenceKind } from '../dispatchContracts'
-const props = defineProps<{ dispatchNo: string; kind: DispatchEvidenceKind; disabled?: boolean; readonly?: boolean }>()
+const props = defineProps<{ dispatchNo: string; kind: DispatchEvidenceKind; disabled?: boolean; readonly?: boolean; label?: string; saveHint?: string; referenceIds?: string[] }>()
 const ids = defineModel<string[]>({ required: true })
+const allIds = computed(() => [...new Set([...(props.referenceIds || []), ...ids.value])])
 const emit = defineEmits<{ busy: [value: boolean] }>()
 const metadata = ref<Record<string, DispatchEvidenceFile>>({}), error = ref<ApiErrorDetails | null>(null), uploading = ref(false), input = ref<HTMLInputElement | null>(null)
 const imageOpen = ref(false), imageUrl = ref(''), imageName = ref(''), previewLoading = ref(false)
-const label = computed(() => props.kind === 'VEHICLE' ? '本趟车辆证据' : '本趟司机证照')
+const label = computed(() => props.label || (props.kind === 'VEHICLE' ? '本趟车辆证据' : props.kind === 'DRIVER_PHOTO' ? '司机照片' : '本趟司机证照'))
 const types = ['application/pdf', 'image/jpeg', 'image/png'], maximum = 10 * 1024 * 1024, urls = new Set<string>()
+const uploadTypes = computed(() => props.kind === 'DRIVER_PHOTO' ? types.slice(1) : types)
+const uploadFormats = computed(() => props.kind === 'DRIVER_PHOTO' ? 'JPG、PNG' : 'PDF、JPG、PNG')
 let generation = 0, previewGeneration = 0, replacing: string | null = null, pendingPopup: Window | null = null
 function valid(value: DispatchEvidenceFile, expected?: string) {
   if (!value || !/^[1-9]\d*$/.test(String(value.fileId)) || typeof value.fileId === 'number' && !Number.isSafeInteger(value.fileId) || expected && String(value.fileId) !== expected || !value.fileName?.trim() || !types.includes(value.contentType) || !Number.isSafeInteger(value.sizeBytes) || value.sizeBytes <= 0 || value.sizeBytes > maximum) throw new DispatchInputError('附件元数据未确认本车有效文件，请重新读取')
@@ -25,7 +28,7 @@ function valid(value: DispatchEvidenceFile, expected?: string) {
 function fail(cause: unknown, fallback: string) { error.value = getApiErrorDetails(cause, cause instanceof DispatchInputError ? cause.message : fallback) }
 function closePreview() { previewGeneration++; pendingPopup?.close(); pendingPopup = null; imageOpen.value = false; previewLoading.value = false; if (imageUrl.value) { URL.revokeObjectURL(imageUrl.value); urls.delete(imageUrl.value); imageUrl.value = '' } }
 async function load() {
-  const current = ++generation, no = props.dispatchNo, kind = props.kind, values = [...ids.value]
+  const current = ++generation, no = props.dispatchNo, kind = props.kind, values = [...allIds.value]
   closePreview(); metadata.value = {}; error.value = null
   if (!no) return
   const results = await Promise.allSettled(values.map(async id => valid(await getDispatchEvidence(no, kind, id), id)))
@@ -37,7 +40,7 @@ async function upload(event: Event) {
   const element = event.target as HTMLInputElement, file = element.files?.[0]; element.value = ''
   if (!file || props.readonly || props.disabled || uploading.value) return
   error.value = null
-  if (!types.includes(file.type) || file.size <= 0 || file.size > maximum) { fail(new DispatchInputError('请选择10MiB以内的PDF、JPG或PNG文件'), '附件不符合要求'); return }
+  if (!uploadTypes.value.includes(file.type) || file.size <= 0 || file.size > maximum) { fail(new DispatchInputError(`请选择10MiB以内的${uploadFormats.value}文件`), '附件不符合要求'); return }
   const current = generation, no = props.dispatchNo, kind = props.kind, replaceId = replacing
   uploading.value = true; emit('busy', true)
   try {
@@ -71,15 +74,15 @@ async function preview(id: string) {
   } catch (cause) { if (current === previewGeneration) { closePreview(); fail(cause, '本车附件预览失败，原引用已保留') } }
   finally { if (current === previewGeneration) previewLoading.value = false }
 }
-watch(() => JSON.stringify([props.dispatchNo, props.kind, ids.value]), load, { immediate: true })
+watch(() => JSON.stringify([props.dispatchNo, props.kind, allIds.value]), load, { immediate: true })
 onBeforeUnmount(() => { generation++; closePreview(); for (const url of urls) URL.revokeObjectURL(url); urls.clear(); emit('busy', false) })
 </script>
 <template>
-  <section class="dispatch-evidence density-dialog-section" data-tone="source" :class="{ 'dispatch-evidence--readonly': readonly }" :aria-label="label"><h4 class="density-dialog-section__title">{{ label }}<InlineHelp title="附件上传说明"><p>PDF、JPG、PNG，单文件最大10MiB；上传后保存车辆信息才完成本车引用。</p></InlineHelp></h4>
+  <section class="dispatch-evidence density-dialog-section" data-tone="source" :class="{ 'dispatch-evidence--readonly': readonly }" :aria-label="label"><h4 class="density-dialog-section__title">{{ label }}<InlineHelp title="附件上传说明"><p>{{ uploadFormats }}，单文件最大10MiB；{{ saveHint || '上传后保存车辆信息才完成本车引用。' }}</p></InlineHelp></h4>
     <LoadErrorState v-if="error" title="本趟附件操作未完成" :message="error.message" compact retry-text="重新读取资料" @retry="load"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState>
-    <table v-if="ids.length" class="density-table dispatch-evidence-table"><thead><tr><th class="dispatch-evidence__actions">操作</th><th>附件名称</th></tr></thead><tbody><tr v-for="id in ids" :key="id"><td class="dispatch-evidence__actions"><div class="density-actions"><el-button link :disabled="!metadata[id] || previewLoading" @click="preview(id)">预览</el-button><template v-if="!readonly"><el-button link :disabled="disabled || uploading" @click="choose(id)">替换</el-button><el-button link :disabled="disabled || uploading" @click="remove(id)">移除引用</el-button></template></div></td><td><LineClampText :content="metadata[id]?.fileName || '附件资料待核实'" /></td></tr></tbody></table>
+    <table v-if="allIds.length" class="density-table dispatch-evidence-table"><thead><tr><th class="dispatch-evidence__actions">操作</th><th>附件名称</th></tr></thead><tbody><tr v-for="id in allIds" :key="id"><td class="dispatch-evidence__actions"><div class="density-actions"><el-button link :disabled="!metadata[id] || previewLoading" @click="preview(id)">预览</el-button><template v-if="!readonly && ids.includes(id)"><el-button link :disabled="disabled || uploading" @click="choose(id)">替换</el-button><el-button link :disabled="disabled || uploading" @click="remove(id)">移除引用</el-button></template></div></td><td><LineClampText :content="metadata[id]?.fileName || '附件资料待核实'" /></td></tr></tbody></table>
     <p v-else class="density-dialog-note">暂无本趟附件。</p>
-    <template v-if="!readonly"><input ref="input" class="evidence-input" type="file" accept="application/pdf,image/jpeg,image/png" :aria-label="'上传' + label" :disabled="disabled || uploading || !dispatchNo" @change="upload"><el-button :disabled="disabled || uploading || !dispatchNo" :loading="uploading" @click="choose()">上传{{ label }}</el-button></template>
+    <template v-if="!readonly"><input ref="input" class="evidence-input" type="file" :accept="uploadTypes.join(',')" :aria-label="'上传' + label" :disabled="disabled || uploading || !dispatchNo" @change="upload"><el-button :disabled="disabled || uploading || !dispatchNo" :loading="uploading" @click="choose()">上传{{ label }}</el-button></template>
     <AppDialog append-to-body class="admin-density-dialog admin-workbench is-dialog" :model-value="imageOpen" :title="imageName || '附件预览'" width="min(900px, calc(100vw - 28px))" fullscreenable :loading="previewLoading" :show-confirm="false" cancel-text="关闭" @update:model-value="closePreview">
       <div class="density-dialog-sections"><section class="density-dialog-section" data-tone="source" aria-label="本车附件预览信息"><h3 class="density-dialog-section__title">附件信息</h3><table class="density-table"><tbody><tr><th scope="row">排车单号</th><td>{{ dispatchNo || '—' }}</td></tr><tr><th scope="row">附件名称</th><td>{{ imageName || '—' }}</td></tr></tbody></table></section><p v-if="previewLoading" class="density-dialog-note" role="status">正在读取本车附件…</p><img v-if="imageUrl" class="evidence-image" :src="imageUrl" :alt="imageName"></div>
     </AppDialog>

src/modules/overseas-warehouse/components/DispatchWorkflowDialog.layout.test.ts

@@ -2,37 +2,27 @@ import ElementPlus from 'element-plus'
 import { DOMWrapper, enableAutoUnmount, flushPromises, mount, type VueWrapper } from '@vue/test-utils'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import DispatchWorkflowDialog from './DispatchWorkflowDialog.vue'
-import DispatchArrangeFields from './DispatchArrangeFields.vue'
 import DispatchEvidenceFiles from './DispatchEvidenceFiles.vue'
 import DispatchResourceFields from './DispatchResourceFields.vue'
 import AppDialog from '@/shared/components/AppDialog.vue'
 import LoadErrorState from '@/shared/components/LoadErrorState.vue'
 import { ApiResponseError } from '@/shared/api/http'
 import * as api from '../api/dispatches'
-import { command, detail, destination, loadingPreview, page, resources, sharedPalletCandidates } from '../dispatchTestFixtures'
-import type { ArrangementPreview, CargoLine, DispatchAction, DispatchActions, DispatchCargoItem, DispatchEvidenceFile, PreviewGroup, UpdateDispatch } from '../dispatchContracts'
+import { command, detail, loadingPreview, resources } from '../dispatchTestFixtures'
+import type { DispatchAction, DispatchActions, DispatchEvidenceFile, UpdateDispatch } from '../dispatchContracts'
 
 const identity = vi.hoisted(() => ({ id: '' }))
 const can = vi.hoisted(() => vi.fn((_code: string) => true))
 vi.mock('@/core/auth/auth', () => ({ useAuthStore: () => ({ user: identity }) }))
 vi.mock('@/core/access/accessPreview', () => ({ useAccessPreviewStore: () => ({ can }) }))
 vi.mock('@/modules/overseas-master-data', () => ({ listVehicles: vi.fn(), listDrivers: vi.fn(), overseasMasterDataPermissions: { vehicleList: 'vehicle:list', driverList: 'driver:list' } }))
-vi.mock('../api/dispatches', () => ({ getDispatch: vi.fn(), getDispatchItems: vi.fn(), getDispatchRoute: vi.fn(), reorderDispatchRoute: vi.fn(), removeDispatchItem: vi.fn(), getDispatchLoading: vi.fn(), getDispatchArrangement: vi.fn(), getDispatchCommand: vi.fn(), listDispatches: vi.fn(), listDispatchCandidates: vi.fn(), completeDispatchLoading: vi.fn(), departDispatch: vi.fn(), reviewDispatch: vi.fn(), reviewDispatchLoading: vi.fn(), returnDispatchToReview: vi.fn(), cancelDispatch: vi.fn(), updateDispatch: vi.fn(), addDispatchCargo: vi.fn(), submitDispatchReview: vi.fn(), transferDispatchToDelivery: vi.fn(), getDispatchEvidence: vi.fn(), getDispatchEvidenceContent: vi.fn(), uploadDispatchEvidence: vi.fn() }))
+vi.mock('../api/dispatches', () => ({ getDispatch: vi.fn(), getDispatchItems: vi.fn(), getDispatchRoute: vi.fn(), reorderDispatchRoute: vi.fn(), removeDispatchItem: vi.fn(), getDispatchLoading: vi.fn(), getDispatchCommand: vi.fn(), listDispatches: vi.fn(), listDispatchCandidates: vi.fn(), completeDispatchLoading: vi.fn(), reviewDispatch: vi.fn(), reviewDispatchLoading: vi.fn(), returnDispatchToReview: vi.fn(), cancelDispatch: vi.fn(), updateDispatch: vi.fn(), addDispatchCargo: vi.fn(), submitDispatchReview: vi.fn(), getDispatchEvidence: vi.fn(), getDispatchEvidenceContent: vi.fn(), uploadDispatchEvidence: vi.fn() }))
 
 enableAutoUnmount(afterEach)
 afterEach(() => vi.unstubAllGlobals())
 const gate = { allowed: true, blockCode: null, blockReason: null }
 const actions: DispatchActions = { EDIT: gate, ADD_CARGO: gate, REMOVE_CARGO: gate, CANCEL: gate, SUBMIT_REVIEW: gate, DISPATCH_REVIEW: gate, LOADING_REVIEW: gate, RETURN_TO_REVIEW: gate, LOADING_COMPLETE: gate, ARRANGE_DELIVERY: gate, DEPART: gate }
 const evidence = (fileId = '301'): DispatchEvidenceFile => ({ fileId, fileName: fileId === '301' ? '旧附件.png' : '新附件.png', contentType: 'image/png', sizeBytes: 3 })
-function item(id: string, picked = 0): DispatchCargoItem { return { dispatchItemId: id, customerId: 'C1', customerName: '客户甲', sourceKey: 'source-1', sourceVersion: 'source-v1', sourceType: 'INBOUND_PLAN', planPalletId: '11', returnReceiptId: null, relabelNo: null, warehousePalletId: '21', palletNo: 'PALLET-1', orderNo: 'ORDER-1', inboundCode: 'IN-1', destination: destination(), scheduledPackages: 2, pickedPackages: picked, remove: picked ? { allowed: false, blockCode: 'PICKED', blockReason: '已经扫码，不可移除' } : gate } }
-function cargo(key: string, customerId: string): CargoLine { return { dispatchItemId: 'item-' + key, customerId, customerName: '客户' + customerId, orderId: null, orderNo: 'ORDER-' + key, sourceKey: key, sourceStage: 'RECEIVED', sourceRegion: null, sourceInboundId: null, inboundCode: 'IN-' + key, planPalletId: null, warehousePalletId: 'pallet-' + key, palletNo: 'PALLET-' + key, pickId: null, attributionId: null, inventoryPositionId: null, receiptId: null, returnReceiptId: null, returnCartonId: null, cartonMark: 'BOX-' + key, relabelNo: null, destination: destination(), packages: 2, productQuantity: 4, grossWeightKg: 10, volumeCbm: 1, batchAllocations: [], sourceOrigin: null } }
-function arrangement(): ArrangementPreview {
-  const group = (key: string, customerId: string): PreviewGroup => ({ groupKey: key, customerId, customerName: '客户' + customerId, destination: destination(), groupCargoHash: 'cargo-' + key, cargo: [cargo(key, customerId)], externalFreightHash: 'external-' + key, externalQuotes: [], feeCoverageCargoHash: 'coverage-' + key, feeSources: [], requiredServices: ['DELIVERY_FEE'], blockReasons: [] })
-  const first = group('A', 'C1'), second = group('B', 'C2')
-  first.feeSources = [{ financeFeeId: 'original-fee', customerId: 'C1', currency: 'USD', amount: 100, sourceVersion: 0, sourceHash: 'original-fee-hash', status: 'ACTIVE', services: ['DELIVERY_FEE'], sourceKeys: ['A'] }]
-  second.externalQuotes = [{ customerId: 'C2', groupKey: 'B', bookingNo: 'BOOK-2', inboundCode: 'IN-B', currency: 'USD', amount: 200, sourceHash: 'quote-hash' }]
-  return { dispatchNo: 'PC/1', recordVersion: 0, status: 'ACTIVE', stage: 'AFTER_LOADING', cargoHash: 'whole-cargo', loadingCompletionHash: 'loaded', arrange: gate, groups: [first, second], arrangement: null }
-}
 beforeEach(() => {
   vi.resetAllMocks(); sessionStorage.clear(); identity.id = crypto.randomUUID(); can.mockReturnValue(true)
   vi.stubGlobal('ResizeObserver', class { observe() {} unobserve() {} disconnect() {} })
@@ -45,17 +35,10 @@ beforeEach(() => {
   vi.mocked(api.cancelDispatch).mockImplementation(async (_, body) => command('CANCEL', body.idempotencyKey))
   vi.mocked(api.returnDispatchToReview).mockImplementation(async (_, body) => command('RETURN_TO_REVIEW', body.idempotencyKey))
   vi.mocked(api.submitDispatchReview).mockImplementation(async (_, body) => command('SUBMIT_REVIEW', body.idempotencyKey))
-  vi.mocked(api.departDispatch).mockImplementation(async (_, body) => command('DEPART', body.idempotencyKey))
-  vi.mocked(api.addDispatchCargo).mockImplementation(async (_, body) => command('ADD_CARGO', body.idempotencyKey))
-  vi.mocked(api.removeDispatchItem).mockImplementation(async (_, __, body) => command('REMOVE_CARGO', body.idempotencyKey))
   vi.mocked(api.reorderDispatchRoute).mockImplementation(async (_, body) => command('EDIT', body.idempotencyKey))
   vi.mocked(api.completeDispatchLoading).mockImplementation(async (_, body) => command('LOADING_COMPLETE', body.idempotencyKey))
   vi.mocked(api.getDispatchLoading).mockResolvedValue(loadingPreview())
   vi.mocked(api.getDispatchRoute).mockResolvedValue({ dispatchNo: 'PC/1', recordVersion: 0, edit: gate, stops: [{ index: 0, name: '起运仓', address: '起点地址', destinationKey: null }, { index: 1, name: '目的仓甲', address: '甲地址', destinationKey: 'A' }, { index: 2, name: '外接卸货点', address: '乙地址', destinationKey: 'B' }] })
-  vi.mocked(api.getDispatchItems).mockResolvedValue({ dispatchNo: 'PC/1', recordVersion: '9007199254740993', status: 'ACTIVE', stage: 'BEFORE_LOADING', items: [item('9223372036854775001'), item('picked', 1)] })
-  vi.mocked(api.listDispatches).mockResolvedValue(page())
-  vi.mocked(api.listDispatchCandidates).mockResolvedValue({ total: 1, page: 1, size: 20, pages: 1, candidates: [sharedPalletCandidates()[0]!], complete: true, snapshotAt: '' })
-  vi.mocked(api.getDispatchArrangement).mockResolvedValue(arrangement())
   vi.mocked(api.getDispatchEvidence).mockImplementation(async (_, __, id) => evidence(id))
   vi.mocked(api.getDispatchEvidenceContent).mockResolvedValue(new Blob(['png'], { type: 'image/png' }))
   vi.mocked(api.uploadDispatchEvidence).mockResolvedValue(evidence('302'))
@@ -109,12 +92,42 @@ describe('dispatch workflow native layout', () => {
     dialog.vm.$emit('confirm'); await flushPromises(); expect(review).not.toHaveBeenCalled()
     await dialog.get('textarea').setValue(' 证据不完整 '); dialog.vm.$emit('confirm'); await flushPromises()
     expect(review).toHaveBeenCalledExactlyOnceWith('PC/1', { recordVersion: 0, idempotencyKey: expect.any(String), decision: 'REJECTED', reason: '证据不完整' })
-    expect(dialog.findAll('input[type="file"]')).toHaveLength(0)
+    expect(dialog.findAll('input[type="file"]')).toHaveLength(3)
   })
-  it.each(['CANCEL', 'RETURN_TO_REVIEW', 'SUBMIT_REVIEW', 'DEPART'] as const)('preserves the %s confirmation branch and its exact reason or remark', async action => {
+  it.each(['DISPATCH_REVIEW', 'LOADING_REVIEW'] as const)('uploads three audit attachments with only %s permission and retries the same rejected review', async action => {
+    can.mockImplementation(code => code === (action === 'DISPATCH_REVIEW' ? 'platform:fleet:trip:dispatch-review' : 'platform:fleet:trip:loading-review'))
+    const review = action === 'DISPATCH_REVIEW' ? api.reviewDispatch : api.reviewDispatchLoading
+    vi.mocked(review).mockRejectedValueOnce(new Error('unknown review')).mockImplementationOnce(async (_, body) => command(action, body.idempotencyKey))
+    const { wrapper, dialog } = await render(action, undefined, true)
+    const fields = dialog.findAllComponents(DispatchEvidenceFiles)
+    expect(fields.map(item => item.props('label'))).toEqual(['车辆图片', '司机照片', '驾驶证照片'])
+    expect(fields[0]!.props('referenceIds')).toEqual(['301'])
+    expect(fields[0]!.findAll('button').some(button => button.text() === '替换')).toBe(false)
+    for (const [index, files] of fields.entries()) {
+      let resolve!: (value: DispatchEvidenceFile) => void
+      vi.mocked(api.uploadDispatchEvidence).mockReturnValueOnce(new Promise(done => { resolve = done }))
+      const input = files.get('input[type="file"]'), file = new File(['png'], 'audit.png', { type: 'image/png' })
+      Object.defineProperty(input.element, 'files', { configurable: true, value: [file] })
+      await input.trigger('change'); await flushPromises()
+      expect(dialog.props('confirmLoading')).toBe(true)
+      dialog.vm.$emit('confirm'); await flushPromises(); expect(review).not.toHaveBeenCalled()
+      resolve(evidence(String(401 + index))); await flushPromises()
+    }
+    expect(vi.mocked(api.uploadDispatchEvidence).mock.calls.map(call => call[1])).toEqual(['VEHICLE', 'DRIVER_PHOTO', 'DRIVER'])
+    field(dialog, '审核结果').getComponent({ name: 'ElRadioGroup' }).vm.$emit('update:modelValue', 'REJECTED'); await flushPromises()
+    await dialog.get('textarea').setValue('需重新核对车牌')
+    dialog.vm.$emit('confirm'); await flushPromises()
+    const original = structuredClone(vi.mocked(review).mock.calls[0]![1])
+    expect(original).toMatchObject({ decision: 'REJECTED', reason: '需重新核对车牌', attachments: { vehicleFileIds: ['401'], driverPhotoFileIds: ['402'], licenseFileIds: ['403'] } })
+    await wrapper.setProps({ modelValue: false }); await wrapper.setProps({ modelValue: true }); await flushPromises()
+    dialog.vm.$emit('confirm'); await flushPromises()
+    expect(vi.mocked(review).mock.calls[1]![1]).toEqual(original)
+    expect(api.updateDispatch).not.toHaveBeenCalled()
+  })
+  it.each(['CANCEL', 'RETURN_TO_REVIEW', 'SUBMIT_REVIEW'] as const)('preserves the %s confirmation branch and its exact reason or remark', async action => {
     const { dialog } = await render(action)
     const needsReason = action === 'CANCEL' || action === 'RETURN_TO_REVIEW'
-    const send = action === 'CANCEL' ? api.cancelDispatch : action === 'RETURN_TO_REVIEW' ? api.returnDispatchToReview : action === 'DEPART' ? api.departDispatch : api.submitDispatchReview
+    const send = action === 'CANCEL' ? api.cancelDispatch : action === 'RETURN_TO_REVIEW' ? api.returnDispatchToReview : api.submitDispatchReview
     if (needsReason) { dialog.vm.$emit('confirm'); await flushPromises(); expect(send).not.toHaveBeenCalled() }
     await dialog.get('textarea').setValue(needsReason ? ' 现场原因 ' : '本次交接')
     dialog.vm.$emit('confirm'); await flushPromises()
@@ -130,25 +143,16 @@ describe('dispatch workflow native layout', () => {
     dialog.vm.$emit('confirm'); await flushPromises()
     expect(api.reorderDispatchRoute).toHaveBeenCalledExactlyOnceWith('PC/1', { recordVersion: 0, idempotencyKey: expect.any(String), destinationKeys: ['B', 'A'], reason: '顺序调整' })
   })
-  it('removes the real item identity while keeping scanned cargo unavailable', async () => {
-    const { dialog } = await render('REMOVE_CARGO')
-    const radios = dialog.get('[aria-label="本车可移除货物"]').findAllComponents({ name: 'ElRadio' })
-    expect(radios[1]!.props('disabled')).toBe(true)
-    radios[0]!.vm.$emit('update:modelValue', '9223372036854775001'); await dialog.get('textarea').setValue(' 计划变更 ')
-    expect(dialog.text()).not.toContain('9223372036854775001')
+  it.each(['ADD_CARGO', 'REMOVE_CARGO'] as const)('replaces the old %s editor with the smart dispatch entry notice', async action => {
+    const { dialog } = await render(action)
+    expect(dialog.text()).toContain('货物安排统一在智能排车中修改')
+    expect(dialog.props('confirmDisabled')).toBe(true)
+    expect(dialog.findComponent({ name: 'ElForm' }).exists()).toBe(false)
     dialog.vm.$emit('confirm'); await flushPromises()
-    expect(api.removeDispatchItem).toHaveBeenCalledExactlyOnceWith('PC/1', '9223372036854775001', { recordVersion: '9007199254740993', idempotencyKey: expect.any(String), reason: '计划变更' })
-  })
-  it('adds the complete filtered shared-pallet group and keeps every source visible when expanded', async () => {
-    const [first, second] = sharedPalletCandidates()
-    const { dialog } = await render('ADD_CARGO')
-    const source = dialog.get('details')
-    await source.get('summary').trigger('click'); await flushPromises()
-    expect(source.findAll('li')).toHaveLength(2)
-    await dialog.get('input[type="checkbox"]').setValue(true); await flushPromises()
-    dialog.vm.$emit('confirm'); await flushPromises()
-    expect(api.addDispatchCargo).toHaveBeenCalledExactlyOnceWith('PC/1', { recordVersion: 0, idempotencyKey: expect.any(String), cargo: [first!.selection, second!.selection], batchAllocations: [] })
-    expect(dialog.findComponent({ name: 'ElTable' }).props('maxHeight')).toBeUndefined()
+    expect(api.addDispatchCargo).not.toHaveBeenCalled()
+    expect(api.removeDispatchItem).not.toHaveBeenCalled()
+    expect(api.getDispatchItems).not.toHaveBeenCalled()
+    expect(api.listDispatchCandidates).not.toHaveBeenCalled()
   })
   it('keeps references separate from real loading measurements and submits the exact manifest', async () => {
     const { dialog } = await render('LOADING_COMPLETE')
@@ -161,27 +165,6 @@ describe('dispatch workflow native layout', () => {
     dialog.vm.$emit('confirm'); await flushPromises()
     expect(api.completeDispatchLoading).toHaveBeenCalledExactlyOnceWith('PC/1', { recordVersion: 0, idempotencyKey: expect.any(String), manifestHash: 'manifest', measurements: [{ warehousePalletId: '21', palletSpaces: 1, weightKg: 120, volumeCbm: 1.2, deliveryIndex: 1 }], remark: '真实备注' })
   })
-  it('keeps grouped delivery fields, explicit old-fee coverage and only actual uncovered charges', async () => {
-    const { dialog } = await render('ARRANGE_DELIVERY')
-    const sections = dialog.findAll('[data-tone="work"]').filter(section => section.attributes('aria-label')?.startsWith('派送分组登记'))
-    expect(sections).toHaveLength(2)
-    const groups = dialog.getComponent(DispatchArrangeFields).props('modelValue')
-    await dialog.get('[aria-label="派送分组依据 1"] input[type="checkbox"]').setValue(true); await flushPromises()
-    for (let index = 0; index < 2; index++) {
-      const section = sections[index]!
-      for (const [label, value] of [['派送方式', 'TRUCK_PALLET'], ['提货方式', 'ONE_PICKUP_ONE_DROP'], ['装车类型', index ? 'PALLET' : 'FLOOR']] as const) field(section, label).getComponent({ name: 'ElSelect' }).vm.$emit('update:modelValue', value)
-      field(section, '预计派送时间').getComponent({ name: 'ElDatePicker' }).vm.$emit('update:modelValue', '2026-11-02T10:00:00Z')
-    }
-    field(sections[0]!, '预约账号').getComponent({ name: 'ElSelect' }).vm.$emit('update:modelValue', 'BUY_APPOINTMENT'); await flushPromises()
-    dialog.vm.$emit('confirm'); await flushPromises(); expect(api.transferDispatchToDelivery).not.toHaveBeenCalled()
-    await field(sections[0]!, '卖家姓名').get('input').setValue('卖家甲')
-    field(sections[0]!, '装车费（未覆盖部分）').getComponent({ name: 'ElInputNumber' }).vm.$emit('update:modelValue', 25)
-    field(sections[0]!, '装车费（未覆盖部分）').getComponent({ name: 'ElSelect' }).vm.$emit('update:modelValue', 'CNY')
-    field(sections[0]!, '买约费（未覆盖部分）').getComponent({ name: 'ElInputNumber' }).vm.$emit('update:modelValue', 40); await flushPromises()
-    expect(groups[0]!.feeCoverage).toEqual([{ financeFeeId: 'original-fee', sourceVersion: 0, sourceHash: 'original-fee-hash', services: ['DELIVERY_FEE'] }])
-    dialog.vm.$emit('confirm'); await flushPromises()
-    expect(api.transferDispatchToDelivery).toHaveBeenCalledExactlyOnceWith('PC/1', expect.objectContaining({ recordVersion: 0, cargoHash: 'whole-cargo', loadingCompletionHash: 'loaded', groups: [expect.objectContaining({ groupKey: 'A', sellerName: '卖家甲', feeCoverage: groups[0]!.feeCoverage, fees: [expect.objectContaining({ feeType: 'LOADING_FEE', amount: 25, currency: 'CNY' }), expect.objectContaining({ feeType: 'APPOINTMENT_FEE', amount: 40, currency: 'USD' })] }), expect.objectContaining({ groupKey: 'B', fees: [] })] }))
-  })
   it('previews owned images fullscreen and locks the parent while a real file reference upload is pending', async () => {
     let resolve!: (value: DispatchEvidenceFile) => void
     vi.mocked(api.uploadDispatchEvidence).mockReturnValue(new Promise(done => { resolve = done }))

src/modules/overseas-warehouse/components/DispatchWorkflowDialog.test.ts

@@ -1,70 +1,18 @@
 import ElementPlus, { ElMessage } from 'element-plus'
-import { ApiResponseError, http } from '@/shared/api/http'
-import { parseApiJsonResponse } from '@chongchong/shared'
+import { ApiResponseError } from '@/shared/api/http'
 import { flushPromises, mount } from '@vue/test-utils'
 import { beforeEach, expect, it, vi } from 'vitest'
 import DispatchWorkflowDialog from './DispatchWorkflowDialog.vue'
 import * as api from '../api/dispatches'
-import { candidate, command, detail, destination, loadingPreview, page, sharedPalletCandidates } from '../dispatchTestFixtures'
-import type { ArrangeGroup, CargoLine, CommandResult, DispatchAction, DispatchDetail, PreviewGroup } from '../dispatchContracts'
+import { command, detail, loadingPreview } from '../dispatchTestFixtures'
+import type { CommandResult, DispatchAction, DispatchDetail } from '../dispatchContracts'
 import { useDispatchCommandRecovery } from '../dispatchCommandRecovery'
 const identity = vi.hoisted(() => ({ id: '' }))
 vi.mock('@/core/auth/auth', () => ({ useAuthStore: () => ({ user: identity }) }))
 vi.mock('@/core/access/accessPreview', () => ({ useAccessPreviewStore: () => ({ can: () => true }) }))
 vi.mock('./DispatchResourceFields.vue', () => ({ default: { template: '<div />' } }))
-vi.mock('../api/dispatches', () => ({ getDispatch: vi.fn(), getDispatchItems: vi.fn(), getDispatchRoute: vi.fn(), reorderDispatchRoute: vi.fn(), removeDispatchItem: vi.fn(), getDispatchLoading: vi.fn(), getDispatchArrangement: vi.fn(), getDispatchCommand: vi.fn(), listDispatches: vi.fn(), listDispatchCandidates: vi.fn(), completeDispatchLoading: vi.fn(), departDispatch: vi.fn(), reviewDispatch: vi.fn(), reviewDispatchLoading: vi.fn(), returnDispatchToReview: vi.fn(), cancelDispatch: vi.fn(), updateDispatch: vi.fn(), addDispatchCargo: vi.fn(), submitDispatchReview: vi.fn(), transferDispatchToDelivery: vi.fn() }))
+vi.mock('../api/dispatches', () => ({ getDispatch: vi.fn(), getDispatchItems: vi.fn(), getDispatchRoute: vi.fn(), reorderDispatchRoute: vi.fn(), removeDispatchItem: vi.fn(), getDispatchLoading: vi.fn(), getDispatchCommand: vi.fn(), listDispatches: vi.fn(), listDispatchCandidates: vi.fn(), completeDispatchLoading: vi.fn(), reviewDispatch: vi.fn(), reviewDispatchLoading: vi.fn(), returnDispatchToReview: vi.fn(), cancelDispatch: vi.fn(), updateDispatch: vi.fn(), addDispatchCargo: vi.fn(), submitDispatchReview: vi.fn() }))
 interface State { submit(): Promise<void>; retryError(): Promise<void>; measurements: Array<{ weightKg: number | null; volumeCbm: number | null; deliveryIndex: number | null; palletSpaces: number | null }>; form: { reason: string; decision: string; remark: string }; detail: DispatchDetail }
-it('adds all hidden shared-pallet sources once and rejects a changed group composition before another command', async () => {
-  const [first, second] = sharedPalletCandidates()
-  vi.mocked(api.listDispatches).mockResolvedValue(page()); vi.mocked(api.listDispatchCandidates).mockResolvedValue({ total: 1, page: 1, size: 20, pages: 1, candidates: [first!], complete: true, snapshotAt: '' })
-  const { wrapper, state } = await open('ADD_CARGO')
-  const selection = wrapper.vm as unknown as { selectCargo(row: NonNullable<typeof first>, checked: boolean): void }
-  selection.selectCargo(first!, true)
-  first!.selectionGroup = { ...first!.selectionGroup, groupVersion: 'composition-2' }
-  await state.submit(); expect(api.addDispatchCargo).not.toHaveBeenCalled(); expect(wrapper.text()).toContain('组成已变化')
-  first!.selectionGroup.complete = false; selection.selectCargo(first!, false)
-  await state.submit(); expect(api.addDispatchCargo).not.toHaveBeenCalled(); expect(wrapper.text()).toContain('请选择来源完整')
-  first!.selectionGroup.complete = true
-  await (wrapper.vm as unknown as { searchCargo(): Promise<void> }).searchCargo()
-  selection.selectCargo(first!, true)
-  vi.mocked(api.addDispatchCargo).mockImplementation(async (_, request) => command('ADD_CARGO', request.idempotencyKey)); vi.mocked(api.getDispatch).mockResolvedValue(detail({ recordVersion: 1 }))
-  await state.submit(); expect(api.addDispatchCargo).toHaveBeenCalledExactlyOnceWith('PC/1', expect.objectContaining({ cargo: [first!.selection, second!.selection] }))
-  wrapper.unmount()
-})
-it.each([0, '0', '9007199254740993'])('adds cargo with original batch version %s while keeping the parent dispatch version independent', async recordVersion => {
-  const value = candidate({ appointmentBatches: [{ batchKey: 'FBA_APPOINTMENT:1', batchNo: 'AP-1', customerId: 'C1', recordVersion, sources: [{ sourceKey: 'ORDER:1', destinationKey: 'FBA:ONT8', packageCount: 2 }] }] })
-  vi.mocked(api.listDispatches).mockResolvedValue(page()); vi.mocked(api.listDispatchCandidates).mockResolvedValue({ total: 1, page: 1, size: 20, pages: 1, candidates: [value], complete: true, snapshotAt: '' })
-  const { wrapper, state } = await open('ADD_CARGO')
-  try {
-    (wrapper.vm as unknown as { selectCargo(row: typeof value, checked: boolean): void }).selectCargo(value, true)
-    vi.mocked(api.addDispatchCargo).mockImplementation(async (_, request) => command('ADD_CARGO', request.idempotencyKey)); vi.mocked(api.getDispatch).mockResolvedValue(detail({ recordVersion: 1 }))
-    await state.submit()
-    expect(api.addDispatchCargo).toHaveBeenCalledWith('PC/1', expect.objectContaining({ recordVersion: 0, batchAllocations: [{ planPalletId: '11', batchKey: 'FBA_APPOINTMENT:1', customerId: 'C1', sourceKey: 'ORDER:1', destinationKey: 'FBA:ONT8', packageCount: 2, recordVersion }] }))
-  } finally { wrapper.unmount() }
-})
-it('blocks cargo addition when the authoritative batch version is absent', async () => {
-  const value = candidate({ appointmentBatches: [{ batchKey: 'FBA_APPOINTMENT:1', batchNo: 'AP-1', customerId: 'C1', recordVersion: undefined as unknown as number, sources: [] }] })
-  vi.mocked(api.listDispatches).mockResolvedValue(page()); vi.mocked(api.listDispatchCandidates).mockResolvedValue({ total: 1, page: 1, size: 20, pages: 1, candidates: [value], complete: true, snapshotAt: '' })
-  const { wrapper, state } = await open('ADD_CARGO')
-  try {
-    (wrapper.vm as unknown as { selectCargo(row: typeof value, checked: boolean): void }).selectCargo(value, true); await state.submit()
-    expect(api.addDispatchCargo).not.toHaveBeenCalled(); expect(wrapper.text()).toContain('预约批次版本缺失或无效，请重新读取候选')
-  } finally { wrapper.unmount() }
-})
-it('removes an unpicked authoritative item after real JSON and API normalization of pickedPackages string zero', async () => {
-  const actual = await vi.importActual<typeof import('../api/dispatches')>('../api/dispatches')
-  const source = candidate()
-  const data = { dispatchNo: 'PC/1', recordVersion: '0', status: 'ACTIVE', stage: 'BEFORE_LOADING', items: [{ ...source.selection, dispatchItemId: '9007199254740993', sourceKey: source.sourceKey, sourceVersion: source.sourceVersion, customerId: 'C1', customerName: '客户甲', palletNo: 'PALLET-1', orderNo: 'LM-1', inboundCode: 'IN-1', destination: source.destination, scheduledPackages: '2', pickedPackages: '0', remove: { allowed: true, blockCode: null, blockReason: null } }] }
-  const get = vi.spyOn(http, 'get').mockResolvedValue(parseApiJsonResponse(JSON.stringify({ code: '200', data })))
-  vi.mocked(api.getDispatchItems).mockImplementation(actual.getDispatchItems)
-  const { wrapper, state } = await open('REMOVE_CARGO')
-  try {
-    (wrapper.vm as unknown as { itemId: string }).itemId = '9007199254740993'; state.form.reason = '本车计划调整'
-    vi.mocked(api.removeDispatchItem).mockImplementation(async (_, __, request) => command('REMOVE_CARGO', request.idempotencyKey)); vi.mocked(api.getDispatch).mockResolvedValue(detail({ recordVersion: 1 }))
-    await state.submit()
-    expect(api.removeDispatchItem).toHaveBeenCalledWith('PC/1', '9007199254740993', expect.objectContaining({ recordVersion: '0', reason: '本车计划调整' })); expect(wrapper.emitted('saved')).toHaveLength(1)
-  } finally { wrapper.unmount(); get.mockRestore() }
-})
 async function open(action: DispatchAction, allowed = true) {
   vi.mocked(api.getDispatch).mockResolvedValue(detail({ actions: { [action]: { allowed, blockCode: null, blockReason: allowed ? null : '前置审核未通过' } } }))
   const wrapper = mount(DispatchWorkflowDialog, { props: { modelValue: true, dispatchNo: 'PC/1', action }, global: { plugins: [ElementPlus] } }); await flushPromises()
@@ -79,10 +27,10 @@ it('keeps order allocation references out of actual measurements and submits nat
   await state.submit(); expect(api.completeDispatchLoading).not.toHaveBeenCalled(); expect(wrapper.text()).toContain('真实托位')
   state.measurements[0]!.weightKg = 92; state.measurements[0]!.volumeCbm = 1.5
   vi.mocked(api.completeDispatchLoading).mockImplementation(async (_, body) => command('LOADING_COMPLETE', body.idempotencyKey))
-  vi.mocked(api.getDispatch).mockResolvedValue(detail({ stage: 'AFTER_LOADING', recordVersion: 1 }))
+  vi.mocked(api.getDispatch).mockResolvedValue(detail({ stage: 'DELIVERING', recordVersion: 1 }))
   await state.submit()
   expect(api.completeDispatchLoading).toHaveBeenCalledWith('PC/1', expect.objectContaining({ recordVersion: 0, manifestHash: 'manifest', measurements: [{ warehousePalletId: '21', palletSpaces: 1, weightKg: 92, volumeCbm: 1.5, deliveryIndex: 1 }] }))
-  expect(api.departDispatch).not.toHaveBeenCalled(); expect(wrapper.emitted('saved')).toHaveLength(1); wrapper.unmount()
+  expect(api.completeDispatchLoading).toHaveBeenCalledTimes(1); expect(wrapper.emitted('saved')).toHaveLength(1); wrapper.unmount()
 })
 it('accepts actual evidence and a matching confirmed manifest while refusing an unknown unloading index', async () => {
   const value = loadingPreview(); value.pallets[0]!.weightKg = 92; value.pallets[0]!.volumeCbm = 1.5; value.pallets[0]!.deliveryIndex = null
@@ -92,52 +40,37 @@ it('accepts actual evidence and a matching confirmed manifest while refusing an
   const { wrapper, state } = await open('LOADING_COMPLETE'); expect(state.measurements[0]).toMatchObject({ weightKg: 92, volumeCbm: 1.5, deliveryIndex: null })
   await state.submit(); expect(api.completeDispatchLoading).not.toHaveBeenCalled(); wrapper.unmount()
 })
-it('requires a rejection reason and retains the full original command after an unknown review result', async () => {
-  const { wrapper, state } = await open('DISPATCH_REVIEW'); state.form.decision = 'REJECTED'
-  await state.submit(); expect(api.reviewDispatch).not.toHaveBeenCalled()
-  state.form.reason = '预约未核实'; vi.mocked(api.reviewDispatch).mockRejectedValue(new Error('unknown result'))
-  await state.submit(); state.form.reason = 'later changed'
-  vi.mocked(api.getDispatchCommand).mockImplementation(async (_, key) => command('DISPATCH_REVIEW', key))
+it.each(['DISPATCH_REVIEW', 'LOADING_REVIEW'] as const)('requires a rejection reason and retains the original %s decision after an unknown result', async action => {
+  const success = vi.spyOn(ElMessage, 'success')
+  const reviewApi = action === 'DISPATCH_REVIEW' ? api.reviewDispatch : api.reviewDispatchLoading
+  const { wrapper, state } = await open(action); state.form.decision = 'REJECTED'
+  await state.submit(); expect(reviewApi).not.toHaveBeenCalled()
+  state.form.reason = '预约未核实'; vi.mocked(reviewApi).mockRejectedValue(new Error('unknown result'))
+  await state.submit(); state.form.reason = 'later changed'; state.form.decision = 'APPROVED'
+  vi.mocked(api.getDispatchCommand).mockImplementation(async (_, key) => command(action, key))
   vi.mocked(api.getDispatch).mockResolvedValue(detail({ recordVersion: 1 }))
-  await state.submit(); expect(api.reviewDispatch).toHaveBeenCalledTimes(1)
-  expect(vi.mocked(api.reviewDispatch).mock.calls[0]![1]).toMatchObject({ recordVersion: 0, decision: 'REJECTED', reason: '预约未核实' })
+  await state.submit(); expect(reviewApi).toHaveBeenCalledTimes(1)
+  expect(vi.mocked(reviewApi).mock.calls[0]![1]).toMatchObject({ recordVersion: 0, decision: 'REJECTED', reason: '预约未核实' })
+  expect(success).toHaveBeenCalledWith('已退回客服处理（车辆信息），修改后需重新提交调度审核')
   expect(wrapper.emitted('saved')).toHaveLength(1); wrapper.unmount()
 })
-it('blocks an action without a literal service allowance', async () => {
-  const { wrapper, state } = await open('DEPART', false); await state.submit(); expect(api.departDispatch).not.toHaveBeenCalled(); expect(wrapper.text()).toContain('前置审核未通过'); wrapper.unmount()
+it('shows the preserved rejection while customer service edits vehicle information', async () => {
+  const { wrapper, state } = await open('EDIT')
+  state.detail.reviews.loadingReview = { ...state.detail.reviews.loadingReview, status: 'REJECTED', reason: '车牌照片不清晰' }
+  await flushPromises()
+  expect(wrapper.getComponent({ name: 'ElDialogContent' }).text()).toContain('理货员审核退回：车牌照片不清晰')
+  wrapper.unmount()
 })
-it('submits every customer destination group in one arrangement and does not waive another customer fee', async () => {
-  const previews: PreviewGroup[] = ['A', 'B'].map(customerId => ({ groupKey: `group-${customerId}`, customerId, customerName: `客户${customerId}`, destination: destination(), groupCargoHash: `cargo-${customerId}`, cargo: [{ customerId, sourceKey: `source-${customerId}`, inboundCode: `IN-${customerId}`, orderNo: `LM-${customerId}`, packages: 2, sourceOrigin: null } as CargoLine], externalFreightHash: `external-${customerId}`, externalQuotes: customerId === 'A' ? [{ customerId: 'A', groupKey: 'group-A', bookingNo: 'BOOK-A', inboundCode: 'IN-A', currency: 'USD', amount: 100, sourceHash: 'quote-A' }] : [], feeCoverageCargoHash: `coverage-${customerId}`, feeSources: [], requiredServices: ['DELIVERY_FEE'], blockReasons: [] }))
-  vi.mocked(api.getDispatchArrangement).mockResolvedValue({ dispatchNo: 'PC/1', recordVersion: 0, status: 'ACTIVE', stage: 'AFTER_LOADING', cargoHash: 'whole-cargo', loadingCompletionHash: 'load-hash', arrange: { allowed: true, blockCode: null, blockReason: null }, groups: previews, arrangement: null })
-  const { wrapper, state } = await open('ARRANGE_DELIVERY')
-  const groups = (wrapper.vm as unknown as { groups: ArrangeGroup[] }).groups
-  groups.forEach(group => Object.assign(group, { plannedDeliveryAt: '2026-10-20T00:00:00Z', deliveryMethod: 'TRUCK_PALLET', pickupMethod: 'ONE_PICKUP_MULTI_DROP', loadingType: 'PALLET' }))
-  await state.submit(); expect(api.transferDispatchToDelivery).not.toHaveBeenCalled()
-  groups[1]!.fees.find(fee => fee.feeType === 'DELIVERY_FEE')!.amount = 77
-  vi.mocked(api.transferDispatchToDelivery).mockImplementation(async (_, body): Promise<CommandResult> => ({ ...command('ARRANGE_DELIVERY', body.idempotencyKey), action: 'ARRANGE_DELIVERY', result: { dispatchNo: 'PC/1', recordVersion: 1, arrangementKey: 'arrangement', cargoHash: 'whole-cargo', arrangedAt: '2026-10-19T00:00:00Z', outbounds: [], deliveries: [] } }))
-  vi.mocked(api.getDispatch).mockResolvedValue(detail({ recordVersion: 1, stage: 'AFTER_LOADING' })); await state.submit()
-  const sent = vi.mocked(api.transferDispatchToDelivery).mock.calls[0]![1]
-  expect(sent).toMatchObject({ recordVersion: 0, cargoHash: 'whole-cargo', loadingCompletionHash: 'load-hash' })
-  expect(sent.groups).toHaveLength(2); expect(sent.groups[0]!.fees).toEqual([]); expect(sent.groups[1]!.fees).toEqual([expect.objectContaining({ feeType: 'DELIVERY_FEE', amount: 77 })])
-  expect(api.getDispatchArrangement).toHaveBeenCalledTimes(1); expect(wrapper.emitted('saved')).toHaveLength(1); wrapper.unmount()
+it('blocks an action without a literal service allowance', async () => {
+  const { wrapper, state } = await open('SUBMIT_REVIEW', false); await state.submit(); expect(api.submitDispatchReview).not.toHaveBeenCalled(); expect(wrapper.text()).toContain('前置审核未通过'); wrapper.unmount()
 })
 it('does not reuse another dispatch detail when the target changes while its dialog remains open', async () => {
-  const { wrapper, state } = await open('DEPART')
+  const { wrapper, state } = await open('SUBMIT_REVIEW')
   let resolve!: (value: DispatchDetail) => void
   vi.mocked(api.getDispatch).mockImplementationOnce(() => new Promise(done => { resolve = done }))
-  await wrapper.setProps({ dispatchNo: 'PC/2' }); await state.submit(); expect(api.departDispatch).not.toHaveBeenCalled()
-  resolve(detail({ dispatchNo: 'PC/2', actions: { DEPART: { allowed: false, blockCode: 'NOT_READY', blockReason: '另一车尚未就绪' } } })); await flushPromises()
-  await state.submit(); expect(api.departDispatch).not.toHaveBeenCalled(); expect(wrapper.text()).toContain('另一车尚未就绪'); wrapper.unmount()
-})
-it('removes only the authoritative unpicked item using its item ID as path identity and retains that original target on recovery', async () => {
-  const source = candidate()
-  vi.mocked(api.getDispatchItems).mockResolvedValue({ dispatchNo: 'PC/1', recordVersion: 0, status: 'ACTIVE', stage: 'BEFORE_LOADING', items: [{ ...source.selection, dispatchItemId: '9007199254740993', sourceKey: source.sourceKey, sourceVersion: source.sourceVersion, customerId: 'C1', customerName: '客户甲', palletNo: 'PALLET-1', orderNo: 'LM-1', inboundCode: 'IN-1', destination: source.destination, scheduledPackages: 2, pickedPackages: 0, remove: { allowed: true, blockCode: null, blockReason: null } }] })
-  const { wrapper, state } = await open('REMOVE_CARGO'); const target = wrapper.vm as unknown as { itemId: string }; target.itemId = '9007199254740993'
-  await state.submit(); expect(api.removeDispatchItem).not.toHaveBeenCalled()
-  state.form.reason = '本车计划调整'; vi.mocked(api.removeDispatchItem).mockRejectedValueOnce(new Error('unknown')); await state.submit()
-  target.itemId = 'another-item'; state.form.reason = 'later changed'
-  vi.mocked(api.getDispatchCommand).mockImplementation(async (_, key) => command('REMOVE_CARGO', key)); vi.mocked(api.getDispatch).mockResolvedValue(detail({ recordVersion: 1 }))
-  await state.submit(); expect(api.removeDispatchItem).toHaveBeenCalledExactlyOnceWith('PC/1', '9007199254740993', expect.objectContaining({ recordVersion: 0, reason: '本车计划调整' })); expect(wrapper.emitted('saved')).toHaveLength(1); wrapper.unmount()
+  await wrapper.setProps({ dispatchNo: 'PC/2' }); await state.submit(); expect(api.submitDispatchReview).not.toHaveBeenCalled()
+  resolve(detail({ dispatchNo: 'PC/2', actions: { SUBMIT_REVIEW: { allowed: false, blockCode: 'NOT_READY', blockReason: '另一车尚未就绪' } } })); await flushPromises()
+  await state.submit(); expect(api.submitDispatchReview).not.toHaveBeenCalled(); expect(wrapper.text()).toContain('另一车尚未就绪'); wrapper.unmount()
 })
 it('preserves external destinations and retries route EDIT through its original route endpoint instead of a resource update', async () => {
   const toast = vi.spyOn(ElMessage, 'success')
@@ -150,10 +83,7 @@ it('preserves external destinations and retries route EDIT through its original
   const first = vi.mocked(api.reorderDispatchRoute).mock.calls[0]![1]
   expect(first).toMatchObject({ recordVersion: 0, destinationKeys: ['PRIVATE:actual', 'CODE:ONT8'], reason: '按本车现场顺序卸货' }); expect(api.reorderDispatchRoute).toHaveBeenNthCalledWith(2, 'PC/1', first); expect(api.updateDispatch).not.toHaveBeenCalled(); expect(toast).toHaveBeenLastCalledWith('卸货顺序调整已确认，请重新核对两级审核'); toast.mockRestore(); wrapper.unmount()
 })
-it('refuses already picked item removal and a route that drops an authoritative destination', async () => {
-  const source = candidate()
-  vi.mocked(api.getDispatchItems).mockResolvedValue({ dispatchNo: 'PC/1', recordVersion: 0, status: 'ACTIVE', stage: 'BEFORE_LOADING', items: [{ ...source.selection, dispatchItemId: 'item-picked', sourceKey: source.sourceKey, sourceVersion: source.sourceVersion, customerId: 'C1', customerName: '客户甲', palletNo: 'PALLET-1', orderNo: 'LM-1', inboundCode: 'IN-1', destination: source.destination, scheduledPackages: 2, pickedPackages: 1, remove: { allowed: false, blockCode: 'PICKED', blockReason: '本来源已经真实扫码' } }] })
-  const removed = await open('REMOVE_CARGO'); (removed.wrapper.vm as unknown as { itemId: string }).itemId = 'item-picked'; removed.state.form.reason = '调整'; await removed.state.submit(); expect(api.removeDispatchItem).not.toHaveBeenCalled(); expect(removed.wrapper.text()).toContain('已经真实扫码'); removed.wrapper.unmount()
+it('refuses a route that drops an authoritative destination', async () => {
   vi.mocked(api.getDispatchRoute).mockResolvedValue({ dispatchNo: 'PC/1', recordVersion: 0, edit: { allowed: true, blockCode: null, blockReason: null }, stops: [{ index: 0, name: '起运仓', address: null, destinationKey: null }, { index: 1, name: 'ONT8', address: null, destinationKey: 'CODE:ONT8' }, { index: 2, name: '外接点', address: null, destinationKey: 'EXTERNAL:destination' }] })
   const route = await open('EDIT'); await route.wrapper.setProps({ operation: 'ROUTE' }); await flushPromises(); (route.wrapper.vm as unknown as { stops: unknown[] }).stops.pop(); route.state.form.reason = '调整'; await route.state.submit(); expect(api.reorderDispatchRoute).not.toHaveBeenCalled(); expect(route.wrapper.text()).toContain('完整保留'); route.wrapper.unmount()
 })
@@ -236,29 +166,34 @@ it('describes a proven success with a failed GET as completed and retries only i
   wrapper.unmount()
 })
 
-it('preserves selected complete groups across pages and submits hidden sources with their original versions', async () => {
-  const [first, hidden] = sharedPalletCandidates(), second = candidate({ sourceKey: 'next-page' })
-  vi.mocked(api.listDispatches).mockResolvedValue(page())
-  vi.mocked(api.listDispatchCandidates).mockImplementation(async query => ({ candidates: query.page === 2 ? [second] : [first!], page: query.page!, size: query.size!, total: 21, pages: 2, complete: false, snapshotAt: '' }))
-  const { wrapper, state } = await open('ADD_CARGO')
+it.each(['ADD_CARGO', 'REMOVE_CARGO'] as const)('blocks a fresh %s command and directs cargo changes to smart dispatch', async action => {
+  const { wrapper, state } = await open(action)
   try {
-    const selection = wrapper.vm as unknown as { selectCargo(row: typeof second, checked: boolean): void; changeCandidatePage(value: number): void; candidatePageNumber: number; candidateKeyword: string; searchCargo(): Promise<void> }
-    selection.selectCargo(first!, true); selection.changeCandidatePage(2); await flushPromises(); selection.selectCargo(second, true); await flushPromises()
-    expect(wrapper.text()).toContain('已选择 2 个完整来源组')
-    selection.candidateKeyword = 'next'; await selection.searchCargo()
-    expect(api.listDispatchCandidates).toHaveBeenLastCalledWith(expect.objectContaining({ page: 1, orderNo: 'next' }))
-    expect(api.listDispatches).toHaveBeenCalledTimes(1)
-    vi.mocked(api.addDispatchCargo).mockImplementation(async (_, request) => command('ADD_CARGO', request.idempotencyKey)); vi.mocked(api.getDispatch).mockResolvedValue(detail({ recordVersion: 1 }))
+    expect(wrapper.text()).toContain('货物安排统一在智能排车中修改')
     await state.submit()
-    expect(api.addDispatchCargo).toHaveBeenCalledWith('PC/1', expect.objectContaining({ cargo: [first!.selection, hidden!.selection, second.selection] }))
-  } finally { wrapper.unmount() }
-})
-it('shows authoritative warehouse lookup failures when retrying a cargo search', async () => {
-  vi.mocked(api.listDispatches).mockRejectedValue(new Error('warehouse lookup unavailable'))
-  const { wrapper } = await open('ADD_CARGO')
-  try {
-    await (wrapper.vm as unknown as { searchCargo(): Promise<void> }).searchCargo()
-    expect(wrapper.text()).toContain('货物候选读取失败')
+    expect(api.addDispatchCargo).not.toHaveBeenCalled()
+    expect(api.removeDispatchItem).not.toHaveBeenCalled()
+    expect(api.getDispatchItems).not.toHaveBeenCalled()
     expect(api.listDispatchCandidates).not.toHaveBeenCalled()
+    expect(useDispatchCommandRecovery(() => identity.id).pending.value).toBeNull()
+    expect(wrapper.emitted('saved')).toBeUndefined()
+  } finally { wrapper.unmount() }
+})
+it.each(['ADD_CARGO', 'REMOVE_CARGO'] as const)('preserves the exact pending %s command for recovery in smart dispatch', async action => {
+  const recovery = useDispatchCommandRecovery(() => identity.id)
+  recovery.begin('PC/ORIGINAL', action, { recordVersion: '9007199254740993', idempotencyKey: 'original-key', reason: 'original reason', cargo: [{ sourceVersion: 'original-source' }] }, action === 'REMOVE_CARGO' ? { itemId: 'original-item' } : {})
+  recovery.pending.value!.attempted = true
+  const original = JSON.parse(JSON.stringify(recovery.pending.value))
+  const { wrapper, state } = await open('EDIT')
+  try {
+    expect(wrapper.text()).toContain('请从智能排车恢复原请求')
+    await state.submit(); await state.retryError()
+    expect(recovery.pending.value).toEqual(original)
+    expect(api.addDispatchCargo).not.toHaveBeenCalled()
+    expect(api.removeDispatchItem).not.toHaveBeenCalled()
+    expect(api.updateDispatch).not.toHaveBeenCalled()
+    expect(api.getDispatchCommand).not.toHaveBeenCalled()
+    expect(wrapper.emitted('saved')).toBeUndefined()
+    expect(wrapper.emitted('rejected')).toBeUndefined()
   } finally { wrapper.unmount() }
 })

src/modules/overseas-warehouse/components/DispatchWorkflowDialog.vue

@@ -7,18 +7,15 @@ import { useAuthStore } from '@/core/auth/auth'
 import { useAccessPreviewStore } from '@/core/access/accessPreview'
 import { getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
 import AppDialog from '@/shared/components/AppDialog.vue'
-import LineClampText from '@/shared/components/LineClampText.vue'
 import ApiErrorMeta from '@/shared/components/ApiErrorMeta.vue'
 import LoadErrorState from '@/shared/components/LoadErrorState.vue'
 import * as api from '../api/dispatches'
-import { useDispatchCandidates } from '../useDispatchCandidates'
-import type { AddCargo, ArrangeDelivery, ArrangeGroup, ArrangementPreview, Candidate, CommandResult, DispatchAction, DispatchDetail, Driver, LoadingComplete, LoadingPreview, ReasonCommand, ReviewCommand, UpdateDispatch, Vehicle, VersionCommand } from '../dispatchContracts'
-import type { DispatchItems, DispatchRoute, DispatchRouteCommand, DispatchRouteStop } from '../dispatchContracts'
-import { DispatchInputError, requireVersion, requireBatchVersions, requireSelectionGroup, expandSelectionGroups, selectionGroupBlockReason } from '../dispatchContracts'
-import { canDispatchAction, dispatchActionLabels } from '../dispatchPresentation'
+import type { CommandResult, DispatchAction, DispatchDetail, Driver, LoadingComplete, LoadingPreview, ReasonCommand, ReviewCommand, UpdateDispatch, Vehicle, VersionCommand } from '../dispatchContracts'
+import type { DispatchRoute, DispatchRouteCommand, DispatchRouteStop } from '../dispatchContracts'
+import { DispatchInputError, requireVersion } from '../dispatchContracts'
+import { canDispatchAction, dispatchActionLabels, dispatchRejectionReason, dispatchReviewAttachmentFields, dispatchReviewEvidence, emptyReviewAttachments } from '../dispatchPresentation'
 import { isDefiniteDispatchRejection, useDispatchCommandRecovery, type PendingDispatchCommand } from '../dispatchCommandRecovery'
 import DispatchResourceFields from './DispatchResourceFields.vue'
-import DispatchArrangeFields from './DispatchArrangeFields.vue'
 import DispatchEvidenceFiles from './DispatchEvidenceFiles.vue'
 
 const open = defineModel<boolean>({ default: false })
@@ -30,42 +27,41 @@ const { pending, busy } = recovery
 const currentAction = computed(() => pending.value?.action || props.action)
 const currentNo = computed(() => pending.value?.dispatchNo || props.dispatchNo)
 const currentOperation = computed(() => pending.value ? pending.value.operation : props.operation)
-const items = ref<DispatchItems | null>(null), itemId = ref(''), route = ref<DispatchRoute | null>(null), stops = ref<DispatchRouteStop[]>([])
+const route = ref<DispatchRoute | null>(null), stops = ref<DispatchRouteStop[]>([])
 const detail = ref<DispatchDetail | null>(null), working = ref(false), error = ref<ApiErrorDetails | null>(null)
 const factsStale = ref(false)
-const preview = ref<LoadingPreview | null>(null), arrangement = ref<ArrangementPreview | null>(null), groups = ref<ArrangeGroup[]>([])
-const arrangeFields = ref<InstanceType<typeof DispatchArrangeFields> | null>(null)
-const candidatePage = useDispatchCandidates(error)
-const { candidates, page: candidatePageNumber, size: candidatePageSize, total: candidateTotal } = candidatePage
-const loading = computed(() => working.value || candidatePage.loading.value)
-const selected = ref<Array<{ sourceKey: string; groupKey: string; groupVersion: string; row: Candidate }>>([]), candidateKeyword = ref('')
-const candidateWarehouseId = ref('')
-let candidateFilterKey = ''
+const preview = ref<LoadingPreview | null>(null)
+const loading = computed(() => working.value)
 const measurements = ref<Array<{ warehousePalletId: string; palletNo: string; palletSpaces: number | null; weightKg: number | null; volumeCbm: number | null; deliveryIndex: number | null }>>([])
 const blankVehicle = (): Vehicle => ({ mode: 'MASTER', vehicleId: null, plate: null, carrierName: null, capacity: { palletSpaces: null, maxLoadKg: null, maxVolumeCbm: null }, evidenceFileIds: [] })
 const blankDriver = (): Driver => ({ mode: 'MASTER', driverId: null, name: null, phone: null, evidence: { licenseNo: null, licenseExpiresOn: null, fileIds: [], expectedTaskEndAt: null } })
 const vehicle = ref<Vehicle>(blankVehicle()), driver = ref<Driver>(blankDriver())
+const reviewAttachments = ref(emptyReviewAttachments())
+const reviewEvidence = computed(() => dispatchReviewEvidence(detail.value))
 const form = reactive({ plannedDepartureAt: '', estimatedArrivalAt: '', remark: '', decision: 'APPROVED' as 'APPROVED' | 'REJECTED', reason: '' })
 let generation = 0
 let editorRequestKey = ''
-const allowed = computed(() => !factsStale.value && !pending.value && canDispatchAction(detail.value?.actions, currentAction.value, access.can) && (currentOperation.value !== 'ROUTE' || route.value?.edit.allowed === true))
-const width = computed(() => ['EDIT', 'LOADING_COMPLETE', 'ARRANGE_DELIVERY', 'ADD_CARGO', 'REMOVE_CARGO'].includes(currentAction.value) ? '1120px' : ['DISPATCH_REVIEW', 'LOADING_REVIEW'].includes(currentAction.value) ? '760px' : '560px')
+const cargoAction = computed(() => ['ADD_CARGO', 'REMOVE_CARGO'].includes(currentAction.value))
+const cargoEntryMessage = '货物安排统一在智能排车中修改；如有未确认操作，请从智能排车恢复原请求。'
+const allowed = computed(() => !cargoAction.value && !factsStale.value && !pending.value && canDispatchAction(detail.value?.actions, currentAction.value, access.can) && (currentOperation.value !== 'ROUTE' || route.value?.edit.allowed === true))
+const width = computed(() => ['EDIT', 'LOADING_COMPLETE'].includes(currentAction.value) ? '1120px' : ['DISPATCH_REVIEW', 'LOADING_REVIEW'].includes(currentAction.value) ? '760px' : '560px')
 const frozen = computed(() => busy.value || Boolean(pending.value))
-const evidenceBusy = reactive({ VEHICLE: false, DRIVER: false })
-const uploadingEvidence = computed(() => evidenceBusy.VEHICLE || evidenceBusy.DRIVER)
+const evidenceBusy = reactive({ VEHICLE: false, DRIVER_PHOTO: false, DRIVER: false })
+const uploadingEvidence = computed(() => Object.values(evidenceBusy).some(Boolean))
 
 async function load() {
   const sequence = ++generation, no = currentNo.value, action = currentAction.value
   if (editorRequestKey && pending.value?.body.idempotencyKey === editorRequestKey && detail.value?.dispatchNo === no) { working.value = false; return }
-  working.value = true; factsStale.value = false; error.value = null; detail.value = null; preview.value = null; arrangement.value = null; selected.value = []
-  items.value = null; itemId.value = ''; route.value = null; stops.value = []
-  candidatePage.reset(); candidateWarehouseId.value = ''
+  working.value = true; factsStale.value = false; error.value = null; detail.value = null; preview.value = null
+  route.value = null; stops.value = []
   try {
+    if (cargoAction.value) return
     if (action === 'CREATE') throw new DispatchInputError('请从排车列表的原请求入口恢复新建排车')
     const value = await api.getDispatch(no)
     if (sequence !== generation) return
     if (value.dispatchNo !== no) throw new DispatchInputError('排车业务号不一致，请重新打开')
     detail.value = value
+    reviewAttachments.value = emptyReviewAttachments()
     const oldVehicle = value.vehicleInfo.vehicle
     vehicle.value = oldVehicle ? { mode: oldVehicle.mode, vehicleId: oldVehicle.vehicleId, plate: oldVehicle.plate, carrierName: oldVehicle.carrierName, capacity: oldVehicle.capacity ? { ...oldVehicle.capacity } : null, evidenceFileIds: [...oldVehicle.evidenceFileIds] } : blankVehicle()
     driver.value = value.vehicleInfo.driver ? structuredClone(value.vehicleInfo.driver) : blankDriver()
@@ -77,12 +73,6 @@ async function load() {
       if (data.dispatchNo !== no || !data.stops.length || data.stops[0]?.index !== 0) throw new DispatchInputError('本车真实起点及路线未完整返回')
       route.value = data; stops.value = data.stops.slice(1).map(stop => ({ ...stop }))
     }
-    if (action === 'REMOVE_CARGO') {
-      const data = await api.getDispatchItems(no)
-      if (sequence !== generation) return
-      if (data.dispatchNo !== no) throw new DispatchInputError('移货清单与原排车单不一致')
-      items.value = data
-    }
     if (action === 'LOADING_COMPLETE') {
       const data = await api.getDispatchLoading(no)
       if (sequence !== generation) return
@@ -95,55 +85,10 @@ async function load() {
           weightKg: confirmed?.weightKg ?? (actual('weightKg') ? row.weightKg : null), volumeCbm: confirmed?.volumeCbm ?? (actual('volumeCbm') ? row.volumeCbm : null) }
       })
     }
-    if (action === 'ARRANGE_DELIVERY') {
-      const data = await api.getDispatchArrangement(no)
-      if (sequence !== generation) return
-      if (data.dispatchNo !== no) throw new DispatchInputError('派送预览与排车单不一致')
-      arrangement.value = data
-      groups.value = data.groups.map(group => ({ groupKey: group.groupKey, groupCargoHash: group.groupCargoHash, plannedDeliveryAt: '', deliveryMethod: '', waybillNo: null, carrierName: null, pickupMethod: '', loadingType: '', vehicleType: null, vehicleSize: null, appointmentAccount: null, sellerName: null, remark: null, externalFreightHash: group.externalFreightHash, feeCoverageCargoHash: group.feeCoverageCargoHash, feeCoverage: [], fees: ['DELIVERY_FEE', 'LOADING_FEE', 'APPOINTMENT_FEE'].map(feeType => ({ feeType, feeName: ({ DELIVERY_FEE: '派送费', LOADING_FEE: '装车费', APPOINTMENT_FEE: '买约费' })[feeType] || '服务费用', direction: 'RECEIVABLE', currency: 'USD', amount: null })) }))
-    }
-    if (action === 'ADD_CARGO') await loadCandidates(sequence)
+
   } catch (cause) { if (sequence === generation) error.value = getApiErrorDetails(cause, cause instanceof DispatchInputError ? cause.message : '排车操作资料读取失败') }
   finally { if (sequence === generation) working.value = false }
 }
-async function loadCandidates(sequence = generation) {
-  if (!candidateWarehouseId.value) {
-    // Detail has no warehouse field: resolve the authoritative list row by this business number.
-    const no = currentNo.value
-    const result = await api.listDispatches({ page: 1, size: 1, dispatchNo: no, status: 'ACTIVE' })
-    if (sequence !== generation) return
-    const row = result.records.find(item => item.dispatchNo === no)
-    if (!row?.warehouseId) throw new DispatchInputError('当前排车起运仓未返回，请刷新核对')
-    candidateWarehouseId.value = row.warehouseId
-  }
-  if (sequence !== generation) return
-  const filterKey = JSON.stringify([candidateWarehouseId.value, candidateKeyword.value])
-  if (filterKey !== candidateFilterKey) { candidatePageNumber.value = 1; candidateFilterKey = filterKey }
-  await candidatePage.load({ warehouseId: candidateWarehouseId.value, orderNo: candidateKeyword.value || undefined, page: candidatePageNumber.value, size: candidatePageSize.value, warehouseTab: 'ALL' })
-}
-async function searchCargo() {
-  if (frozen.value) return
-  const sequence = generation
-  candidatePageNumber.value = 1
-  try { await loadCandidates(sequence) }
-  catch (cause) { if (sequence === generation) error.value = getApiErrorDetails(cause, cause instanceof DispatchInputError ? cause.message : '货物候选读取失败') }
-}
-function changeCandidatePage(value: number) { candidatePageNumber.value = value; void loadCandidates() }
-function changeCandidateSize(value: number) { candidatePageSize.value = value; void searchCargo() }
-
-function requirePlanPallet(row: Candidate): string {
-  if (!row.selection.planPalletId) throw new DispatchInputError('批次分配缺少真实计划来源，请核对')
-  return row.selection.planPalletId
-}
-function isCargoSelected(row: Candidate): boolean { return selected.value.some(value => value.groupKey === row.selectionGroup?.groupKey) }
-function selectCargo(row: Candidate, checked: unknown) {
-  try {
-    if (checked !== true) { selected.value = selected.value.filter(value => value.groupKey !== row.selectionGroup?.groupKey && value.sourceKey !== row.sourceKey); return }
-    const group = requireSelectionGroup(row)
-    selected.value = selected.value.filter(value => value.groupKey !== group.groupKey && value.sourceKey !== row.sourceKey)
-    if (checked === true) selected.value.push({ sourceKey: row.sourceKey, groupKey: group.groupKey, groupVersion: group.groupVersion, row })
-  } catch (cause) { error.value = getApiErrorDetails(cause, cause instanceof Error ? cause.message : '完整选货组无效') }
-}
 function payload(): object {
   if (!detail.value || !allowed.value) throw new DispatchInputError(detail.value?.actions[currentAction.value]?.blockReason || '当前操作未获得服务端允许，请刷新核对')
   const common = { recordVersion: requireVersion(detail.value.recordVersion), idempotencyKey: crypto.randomUUID() }
@@ -153,26 +98,10 @@ function payload(): object {
     return { recordVersion: requireVersion(data.recordVersion), idempotencyKey: common.idempotencyKey, destinationKeys: keys as string[], reason: form.reason.trim() } satisfies DispatchRouteCommand
   }
   switch (currentAction.value) {
-    case 'REMOVE_CARGO': {
-      const row = items.value?.items.find(value => value.dispatchItemId === itemId.value)
-      if (!row || row.remove.allowed !== true || row.pickedPackages !== 0 || !form.reason.trim()) throw new DispatchInputError(row?.remove.blockReason || '请选择允许移除的未扫码货物并填写原因')
-      return { recordVersion: requireVersion(items.value!.recordVersion), idempotencyKey: common.idempotencyKey, reason: form.reason.trim() } satisfies ReasonCommand
-    }
     case 'EDIT': return { ...common, vehicle: vehicle.value, driver: driver.value, plannedDepartureAt: form.plannedDepartureAt || null, estimatedArrivalAt: form.estimatedArrivalAt || null, remark: form.remark || null } satisfies UpdateDispatch
-    case 'ADD_CARGO': {
-      const chosen = selected.value.map(value => {
-        const row = value.row
-        if (!row || row.selectionGroup?.groupKey !== value.groupKey || row.selectionGroup.groupVersion !== value.groupVersion) throw new DispatchInputError('选货组组成已变化，请重新读取并选择货物')
-        return row
-      })
-      candidatePage.assertCurrent(chosen)
-      requireBatchVersions(chosen.flatMap(row => row.appointmentBatches))
-      if (!chosen.length || chosen.some(row => row.warehouseId !== candidateWarehouseId.value || row.blockReasons.length || !row.sourceVersion || row.sourceVersion !== row.selection.sourceVersion || row.appointmentBatches.some(batch => batch.customerId !== row.customerId))) throw new DispatchInputError('请选择来源完整、预约客户一致且可排的货物')
-      return { ...common, cargo: expandSelectionGroups(chosen), batchAllocations: chosen.flatMap(row => row.appointmentBatches.flatMap(batch => batch.sources.map(source => ({ planPalletId: requirePlanPallet(row), batchKey: batch.batchKey, customerId: batch.customerId, ...source, recordVersion: batch.recordVersion })))) } satisfies AddCargo
-    }
     case 'DISPATCH_REVIEW': case 'LOADING_REVIEW':
       if (form.decision === 'REJECTED' && !form.reason.trim()) throw new DispatchInputError('驳回时必须填写原因')
-      return { ...common, decision: form.decision, reason: form.reason.trim() || null } satisfies ReviewCommand
+      return { ...common, decision: form.decision, reason: form.reason.trim() || null, ...(Object.values(reviewAttachments.value).some(ids => ids.length) ? { attachments: reviewAttachments.value } : {}) } satisfies ReviewCommand
     case 'CANCEL': case 'RETURN_TO_REVIEW':
       if (!form.reason.trim()) throw new DispatchInputError('请填写操作原因')
       return { ...common, reason: form.reason.trim() } satisfies ReasonCommand
@@ -181,19 +110,6 @@ function payload(): object {
       if (!measurements.value.length || measurements.value.some(row => row.weightKg == null || row.volumeCbm == null || row.palletSpaces == null || row.deliveryIndex == null || row.weightKg <= 0 || row.volumeCbm <= 0 || row.palletSpaces <= 0 || !Number.isInteger(row.palletSpaces) || !Number.isInteger(row.deliveryIndex) || row.deliveryIndex < 0)) throw new DispatchInputError('请核对每托真实托位、重量、体积和卸货站；不能以参考值代替实测')
       return { recordVersion: requireVersion(preview.value.recordVersion), idempotencyKey: common.idempotencyKey, manifestHash: preview.value.manifestHash, measurements: measurements.value.map(row => ({ warehousePalletId: row.warehousePalletId, palletSpaces: row.palletSpaces!, weightKg: row.weightKg!, volumeCbm: row.volumeCbm!, deliveryIndex: row.deliveryIndex! })), remark: form.remark || null } satisfies LoadingComplete
     }
-    case 'ARRANGE_DELIVERY': {
-      const data = arrangement.value
-      if (!data || data.arrange.allowed !== true || !data.groups.length || data.groups.some(row => row.blockReasons.length)) throw new DispatchInputError(data?.arrange.blockReason || '本车派送资料未就绪')
-      const prepared = groups.value.map((group, index) => {
-        if (!group.plannedDeliveryAt || !group.deliveryMethod || !group.pickupMethod || !group.loadingType) throw new DispatchInputError('请完整填写每个客户及目的仓的派送信息')
-        if (group.appointmentAccount === 'BUY_APPOINTMENT' && !group.sellerName?.trim()) throw new DispatchInputError('买约时卖家姓名必填')
-        const required = [...new Set([...(data.groups[index]?.requiredServices || []), ...(['FLOOR', 'MIXED'].includes(group.loadingType) ? ['LOADING_FEE'] : []), ...(group.appointmentAccount === 'BUY_APPOINTMENT' ? ['APPOINTMENT_FEE'] : [])])]
-        const fees = group.fees.filter(fee => required.includes(fee.feeType) && !arrangeFields.value?.covered(index, data.groups[index]!, fee.feeType))
-        if (fees.some(fee => fee.amount == null || !Number.isFinite(fee.amount) || fee.amount <= 0)) throw new DispatchInputError('请填写本组未覆盖服务的正数新增费用')
-        return { ...group, fees }
-      })
-      return { recordVersion: requireVersion(data.recordVersion), idempotencyKey: common.idempotencyKey, cargoHash: data.cargoHash, loadingCompletionHash: data.loadingCompletionHash, groups: prepared } satisfies ArrangeDelivery
-    }
     default: return { ...common, remark: form.remark || null }
   }
 }
@@ -201,17 +117,13 @@ async function send(command: PendingDispatchCommand): Promise<CommandResult> {
   const no = command.dispatchNo, body = command.body
   if (command.operation === 'ROUTE') return api.reorderDispatchRoute(no, body as unknown as DispatchRouteCommand)
   switch (command.action) {
-    case 'REMOVE_CARGO': if (!command.itemId) throw new DispatchInputError('原移货请求缺少真实明细，请保留现场核对'); return api.removeDispatchItem(no, command.itemId, body as unknown as ReasonCommand)
     case 'EDIT': return api.updateDispatch(no, body as unknown as UpdateDispatch)
-    case 'ADD_CARGO': return api.addDispatchCargo(no, body as unknown as AddCargo)
     case 'DISPATCH_REVIEW': return api.reviewDispatch(no, body as unknown as ReviewCommand)
     case 'LOADING_REVIEW': return api.reviewDispatchLoading(no, body as unknown as ReviewCommand)
     case 'RETURN_TO_REVIEW': return api.returnDispatchToReview(no, body as unknown as ReasonCommand)
     case 'CANCEL': return api.cancelDispatch(no, body as unknown as ReasonCommand)
     case 'LOADING_COMPLETE': return api.completeDispatchLoading(no, body as unknown as LoadingComplete)
-    case 'ARRANGE_DELIVERY': return api.transferDispatchToDelivery(no, body as unknown as ArrangeDelivery)
     case 'SUBMIT_REVIEW': return api.submitDispatchReview(no, body as unknown as VersionCommand & { remark: string | null })
-    case 'DEPART': return api.departDispatch(no, body as unknown as VersionCommand & { remark: string | null })
     default: throw new DispatchInputError('此操作不属于当前后台作业入口')
   }
 }
@@ -219,15 +131,17 @@ async function submit() {
   if (busy.value || loading.value || uploadingEvidence.value) return
   error.value = null
   try {
+    if (cargoAction.value) throw new DispatchInputError(cargoEntryMessage)
     if (pending.value?.action === 'CREATE') throw new DispatchInputError('请从排车列表的原请求入口恢复新建排车')
     if (!pending.value) {
-      recovery.begin(props.dispatchNo, props.action, payload(), { operation: currentOperation.value, ...(props.action === 'REMOVE_CARGO' ? { itemId: itemId.value } : {}) })
+      recovery.begin(props.dispatchNo, props.action, payload(), { operation: currentOperation.value })
       editorRequestKey = String(recovery.pending.value?.body.idempotencyKey || '')
     }
     const routeCommand = pending.value?.operation === 'ROUTE'
+    const reviewReturned = ['DISPATCH_REVIEW', 'LOADING_REVIEW'].includes(pending.value?.action || '') && pending.value?.body.decision === 'REJECTED'
     const result = await recovery.execute(send, api.getDispatch, api.getDispatchCommand)
     if (!result) return
-    ElMessage.success(routeCommand ? '卸货顺序调整已确认，请重新核对两级审核' : result.alreadyArranged ? '已引用本车原派送安排，未重复生成单据和费用' : result.replayed ? '原操作结果已核对' : `${dispatchActionLabels[result.action]}已确认`)
+    ElMessage.success(reviewReturned ? '已退回客服处理（车辆信息），修改后需重新提交调度审核' : result.action === 'LOADING_COMPLETE' ? '装车完成，已进入派送中' : routeCommand ? '卸货顺序调整已确认，请重新核对两级审核' : result.alreadyArranged ? '已引用本车原派送安排，未重复生成单据和费用' : result.replayed ? '原操作结果已核对' : `${dispatchActionLabels[result.action]}已确认`)
     emit('saved'); open.value = false
   } catch (cause) {
     error.value = getApiErrorDetails(cause, cause instanceof DispatchInputError ? cause.message : pending.value?.result ? '操作已完成，页面资料待刷新' : pending.value ? '操作结果尚未确认，请保留原请求核对' : '本次操作未通过，请核对后再提交')
@@ -262,23 +176,22 @@ async function refreshFacts() {
 }
 async function retryError() { if (pending.value) await submit(); else if (detail.value) await refreshFacts(); else await load() }
 function moveStop(index: number, offset: number) { const target = index + offset; if (frozen.value || target < 0 || target >= stops.value.length) return; [stops.value[index], stops.value[target]] = [stops.value[target]!, stops.value[index]!] }
-watch([open, () => props.dispatchNo, () => props.action, () => props.operation], ([value]) => { if (value) void load(); else { generation++; candidatePage.reset() } }, { immediate: true })
+watch([open, () => props.dispatchNo, () => props.action, () => props.operation], ([value]) => { if (value) void load(); else { generation++ } }, { immediate: true })
 </script>
 <template>
-  <AppDialog v-model="open" class="admin-density-dialog admin-density admin-workbench is-dialog" :title="(currentOperation === 'ROUTE' ? '调整卸货顺序' : dispatchActionLabels[currentAction]) + ' · ' + (currentNo || '—')" :width="width" :fullscreenable="width !== '560px'" :loading="loading" :confirm-loading="busy || uploadingEvidence" :confirm-disabled="loading || uploadingEvidence || !pending && !allowed" :confirm-text="pending?.result ? '刷新页面资料' : pending ? '核对并重试原请求' : '确认提交'" @confirm="submit">
+  <AppDialog v-model="open" class="admin-density-dialog admin-density admin-workbench is-dialog" :title="(currentOperation === 'ROUTE' ? '调整卸货顺序' : dispatchActionLabels[currentAction]) + ' · ' + (currentNo || '—')" :width="width" :fullscreenable="width !== '560px'" :loading="loading" :confirm-loading="busy || uploadingEvidence" :confirm-disabled="cargoAction || loading || uploadingEvidence || !pending && !allowed" :confirm-text="cargoAction ? '请从智能排车修改' : pending?.result ? '刷新页面资料' : pending ? '核对并重试原请求' : '确认提交'" @confirm="submit">
     <div class="density-dialog-sections">
-      <el-alert v-if="pending" role="status" :title="pending.result ? '操作已完成，页面资料待刷新；刷新不会再次提交。' : '原操作结果尚待核对，当前使用原版本和原请求内容。'" :type="pending.result ? 'info' : 'warning'" :closable="false" show-icon />
-      <LoadErrorState v-if="error" :title="pending?.result ? '操作已完成，页面资料待刷新' : '排车操作未完成'" :message="error.message" :loading="loading || busy || uploadingEvidence" :retry-text="pending?.result ? '刷新页面资料' : pending ? '核对原请求' : '刷新当前资料'" @retry="retryError"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState>
+      <el-alert v-if="cargoAction" :title="cargoEntryMessage" type="warning" :closable="false" show-icon />
+      <el-alert v-if="dispatchRejectionReason(detail?.reviews)" title="已退回客服处理，请核对原因后重新提交调度审核。" :description="dispatchRejectionReason(detail?.reviews)" type="warning" :closable="false" show-icon />
+      <el-alert v-if="pending && !cargoAction" role="status" :title="pending.result ? '操作已完成，页面资料待刷新；刷新不会再次提交。' : '原操作结果尚待核对，当前使用原版本和原请求内容。'" :type="pending.result ? 'info' : 'warning'" :closable="false" show-icon />
+      <LoadErrorState v-if="error && !cargoAction" :title="pending?.result ? '操作已完成，页面资料待刷新' : '排车操作未完成'" :message="error.message" :loading="loading || busy || uploadingEvidence" :retry-text="pending?.result ? '刷新页面资料' : pending ? '核对原请求' : '刷新当前资料'" @retry="retryError"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState>
       <el-alert v-if="detail && !allowed && !pending" :title="detail?.actions[currentAction]?.blockReason || '当前操作未获得允许，请核对权限与作业状态'" type="warning" :closable="false" show-icon />
-      <el-form v-if="detail" class="density-form density-dialog-sections" label-position="left" label-width="130px" :disabled="frozen || loading || uploadingEvidence || !allowed">
+      <el-form v-if="detail && !cargoAction" class="density-form density-dialog-sections" label-position="left" label-width="130px" :disabled="frozen || loading || uploadingEvidence || !allowed">
         <section v-if="currentOperation === 'ROUTE' && route" class="density-dialog-section" data-tone="source" aria-label="本车卸货顺序"><h3 class="density-dialog-section__title">卸货顺序</h3>
           <table class="density-table"><tbody><tr><th scope="row">起运仓</th><td>{{ route.stops[0]?.name || '—' }}</td><th scope="row">地址</th><td>{{ route.stops[0]?.address || '—' }}</td></tr></tbody></table>
           <el-alert :title="route.edit.blockReason || '仅调整本车既有卸货点，外接卸货点一并保留。调整后须重新审核。'" type="info" :closable="false" show-icon />
           <table class="density-table"><thead><tr><th>操作</th><th>顺序</th><th>卸货点</th><th>地址</th></tr></thead><tbody><tr v-for="(stop, index) in stops" :key="stop.destinationKey || stop.index"><td class="workflow-order-actions"><el-button :disabled="frozen || loading || uploadingEvidence || !allowed || index === 0" @click="moveStop(index, -1)">上移</el-button><el-button :disabled="frozen || loading || uploadingEvidence || !allowed || index === stops.length - 1" @click="moveStop(index, 1)">下移</el-button></td><td>{{ index + 1 }}</td><td>{{ stop.name }}</td><td>{{ stop.address || '—' }}</td></tr></tbody></table>
         </section>
-        <section v-else-if="currentAction === 'REMOVE_CARGO' && items" class="density-dialog-section" data-tone="source" aria-label="本车可移除货物"><h3 class="density-dialog-section__title">本车货物</h3>
-          <el-table :data="items.items" border><el-table-column label="操作" width="140" fixed="left"><template #default="{ row }"><el-radio v-model="itemId" :value="row.dispatchItemId" :disabled="frozen || loading || uploadingEvidence || !allowed || row.remove.allowed !== true || row.pickedPackages > 0">移除此项</el-radio></template></el-table-column><el-table-column prop="customerName" label="客户" min-width="140" show-overflow-tooltip /><el-table-column prop="orderNo" label="来源订单" min-width="150" show-overflow-tooltip /><el-table-column prop="inboundCode" label="入仓码" min-width="150" show-overflow-tooltip /><el-table-column prop="palletNo" label="托盘码" min-width="150" show-overflow-tooltip /><el-table-column prop="scheduledPackages" label="本次箱数" width="100" /><el-table-column prop="pickedPackages" label="真实已拣" width="100" /><el-table-column label="移货资格" min-width="180" show-overflow-tooltip><template #default="{ row }">{{ row.remove.blockReason || '可移除' }}</template></el-table-column></el-table>
-        </section>
         <template v-else-if="currentAction === 'EDIT'">
           <section class="density-dialog-section" data-tone="work" aria-label="本车资源登记"><h3 class="density-dialog-section__title">车辆与司机</h3><DispatchResourceFields continuous v-model:vehicle="vehicle" v-model:driver="driver" :disabled="frozen || loading || uploadingEvidence || !allowed" /></section>
           <section class="density-dialog-section" data-tone="work" aria-label="本车时间登记"><h3 class="density-dialog-section__title">排车时间</h3><table class="density-table density-table--editable workflow-editor-table"><tbody><tr><td><el-form-item label="计划发车时间"><el-date-picker v-model="form.plannedDepartureAt" :disabled="frozen || loading || uploadingEvidence || !allowed" type="datetime" value-format="YYYY-MM-DDTHH:mm:ssZ" placeholder="请选择计划发车时间" /></el-form-item></td><td><el-form-item label="预计到达时间"><el-date-picker v-model="form.estimatedArrivalAt" :disabled="frozen || loading || uploadingEvidence || !allowed" type="datetime" value-format="YYYY-MM-DDTHH:mm:ssZ" placeholder="请选择预计到达时间" /></el-form-item></td></tr></tbody></table></section>
@@ -286,31 +199,26 @@ watch([open, () => props.dispatchNo, () => props.action, () => props.operation],
         <template v-else-if="currentAction === 'DISPATCH_REVIEW' || currentAction === 'LOADING_REVIEW'">
           <section class="density-dialog-section" data-tone="source" aria-label="本车审核依据"><h3 class="density-dialog-section__title">审核依据</h3><table class="density-table"><tbody><tr><th scope="row">车牌</th><td>{{ detail.vehicleInfo.vehicle?.plate || '—' }}</td><th scope="row">司机</th><td>{{ detail.vehicleInfo.driver?.name || '—' }}</td></tr><tr><th scope="row">托盘数</th><td>{{ detail.counts.palletCount }} 托</td><th scope="row">箱数</th><td>{{ detail.counts.packageCount }} 箱</td></tr></tbody></table>
             <table v-if="detail.dispatchInfo.fbaAppointments.length" class="density-table"><thead><tr><th>目的仓</th><th>预约单号</th><th>预约状态</th></tr></thead><tbody><tr v-for="appointment in detail.dispatchInfo.fbaAppointments" :key="appointment.batchKey"><td>{{ appointment.destinationWarehouseCode }}</td><td>{{ appointment.appointmentNo || '—' }}</td><td>{{ appointment.status }}</td></tr></tbody></table>
-            <el-alert title="请核对本车资源与本趟证据；审核通过不代替后续现场扫码。" type="info" :closable="false" show-icon />
+            <el-alert title="请核对本车资源与本趟证据；审核通过不代替后续现场扫码。驳回必须填写原因，并统一退回客服处理（车辆信息）。" type="info" :closable="false" show-icon />
           </section>
           <section class="density-dialog-section" data-tone="work" aria-label="审核结果登记"><h3 class="density-dialog-section__title">审核结果</h3><table class="density-table density-table--editable"><tbody><tr><td><el-form-item label="审核结果"><el-radio-group v-model="form.decision" :disabled="frozen || loading || uploadingEvidence || !allowed"><el-radio value="APPROVED">审核通过</el-radio><el-radio value="REJECTED">驳回</el-radio></el-radio-group></el-form-item></td></tr></tbody></table></section>
         </template>
-        <section v-else-if="currentAction === 'ADD_CARGO'" class="density-dialog-section" data-tone="source" aria-label="本车添加货物"><h3 class="density-dialog-section__title">选择完整货物组</h3>
-          <div class="workflow-cargo-query"><el-input v-model="candidateKeyword" :disabled="frozen || loading || uploadingEvidence || !allowed" placeholder="订单号／入仓码" /><el-button :disabled="frozen || loading || uploadingEvidence || !allowed" @click="searchCargo">查询</el-button></div>
-          <el-table :data="candidates" border><el-table-column label="选择" width="70" fixed="left"><template #default="{ row }"><el-checkbox :model-value="isCargoSelected(row as Candidate)" @change="selectCargo(row as Candidate, $event)" :disabled="frozen || loading || uploadingEvidence || !allowed || (!isCargoSelected(row as Candidate) && Boolean(selectionGroupBlockReason(row as Candidate)))" :aria-label="'选择货物 ' + (row.palletNo || row.orderNo || '待核实')" /></template></el-table-column><el-table-column prop="customerName" label="客户" min-width="140" show-overflow-tooltip /><el-table-column prop="orderNo" label="订单号" min-width="150" show-overflow-tooltip /><el-table-column label="托盘与完整来源组" min-width="240"><template #default="{ row }"><LineClampText :content="row.palletNo || '—'" /><details class="workflow-source-group"><summary>查看完整来源</summary><ul><li v-for="source in row.selectionGroup.sources" :key="source.sourceKey">{{ source.sourceBusinessNo || '—' }} · {{ source.customerName }} · {{ source.packages }}箱</li></ul></details><span>{{ selectionGroupBlockReason(row as Candidate) }}</span></template></el-table-column><el-table-column prop="availablePackages" label="可排箱数" width="100" /><el-table-column label="目的仓" min-width="150" show-overflow-tooltip><template #default="{ row }">{{ row.destination.warehouseCode || row.destination.address || '—' }}</template></el-table-column></el-table>
-          <el-pagination aria-label="加货候选分页" :current-page="candidatePageNumber" :page-size="candidatePageSize" :page-sizes="[10, 20, 50]" :total="candidateTotal" :disabled="frozen || loading || !allowed" layout="total, sizes, prev, pager, next" @update:current-page="changeCandidatePage" @update:page-size="changeCandidateSize" />
-          <p class="density-dialog-note">已选择 {{ selected.length }} 个完整来源组（含其他页）</p>
-        </section>
         <template v-else-if="currentAction === 'LOADING_COMPLETE' && preview">
           <el-alert :title="preview.loadingComplete.blockReason || 'PDA真实拣货已核平，请核对每托实际装载。'" type="info" :closable="false" show-icon />
           <section class="density-dialog-section" data-tone="work" aria-label="真实实载登记"><h3 class="density-dialog-section__title">逐托实载</h3><el-table class="density-table--editable" :data="measurements" border><el-table-column prop="palletNo" label="实物托盘码" min-width="170" show-overflow-tooltip /><el-table-column label="实际托位" min-width="140"><template #default="{ row }"><el-input-number v-model="row.palletSpaces" :disabled="frozen || loading || uploadingEvidence || !allowed" :min="1" placeholder="请确认" controls-position="right" /></template></el-table-column><el-table-column label="实测重量(kg)" min-width="170"><template #default="{ row }"><el-input-number v-model="row.weightKg" :disabled="frozen || loading || uploadingEvidence || !allowed" :min="0.001" placeholder="请核对真实实测" controls-position="right" /></template></el-table-column><el-table-column label="实测体积(m³)" min-width="170"><template #default="{ row }"><el-input-number v-model="row.volumeCbm" :disabled="frozen || loading || uploadingEvidence || !allowed" :min="0.001" placeholder="请核对真实实测" controls-position="right" /></template></el-table-column><el-table-column label="已匹配卸货顺序" min-width="170"><template #default="{ row }">{{ row.deliveryIndex ?? '尚未匹配，请调度核对' }}</template></el-table-column></el-table></section>
           <section class="density-dialog-section" data-tone="source" aria-label="实载与参考依据"><h3 class="density-dialog-section__title">测量依据</h3><table class="density-table"><thead><tr><th>托盘码</th><th>依据</th><th>来源业务号</th><th>值</th></tr></thead><tbody><template v-for="pallet in preview.pallets" :key="pallet.warehousePalletId"><tr v-for="evidence in pallet.evidence" :key="evidence.field + evidence.sourceType"><td>{{ pallet.palletNo }}</td><td>{{ evidence.actual ? '实测依据' : '仅供参考' }}</td><td>{{ evidence.sourceBusinessNo || '—' }}</td><td>{{ evidence.value ?? '—' }}</td></tr></template></tbody></table></section>
         </template>
-        <DispatchArrangeFields v-else-if="currentAction === 'ARRANGE_DELIVERY' && arrangement" ref="arrangeFields" v-model="groups" :preview="arrangement.groups" :disabled="frozen || loading || uploadingEvidence || !allowed" />
-        <el-alert v-else-if="currentAction === 'DEPART'" title="确认本车实际发车。装车完成及全部客户派送安排由服务端再次核验。" type="warning" :closable="false" show-icon />
         <el-alert v-else-if="currentAction === 'RETURN_TO_REVIEW'" title="仅零真实扫码允许退回装车前，保留原排车号，修改后两级审核重新提交。" type="warning" :closable="false" show-icon />
         <el-alert v-else-if="currentAction === 'CANCEL'" title="确认取消本排车单；服务端将核对真实作业和来源占用，不自动回库。" type="warning" :closable="false" show-icon />
-        <template v-if="currentOperation !== 'ROUTE' && ['EDIT', 'DISPATCH_REVIEW', 'LOADING_REVIEW'].includes(currentAction)">
-          <DispatchEvidenceFiles v-model="vehicle.evidenceFileIds" :dispatch-no="currentNo" kind="VEHICLE" :readonly="currentAction !== 'EDIT'" :disabled="frozen || loading || uploadingEvidence || !allowed" @busy="evidenceBusy.VEHICLE = $event" />
-          <DispatchEvidenceFiles v-if="driver.evidence" v-model="driver.evidence.fileIds" :dispatch-no="currentNo" kind="DRIVER" :readonly="currentAction !== 'EDIT'" :disabled="frozen || loading || uploadingEvidence || !allowed" @busy="evidenceBusy.DRIVER = $event" />
+        <template v-if="currentOperation !== 'ROUTE' && currentAction === 'EDIT'">
+          <DispatchEvidenceFiles v-model="vehicle.evidenceFileIds" :dispatch-no="currentNo" kind="VEHICLE" :disabled="frozen || loading || uploadingEvidence || !allowed" @busy="evidenceBusy.VEHICLE = $event" />
+          <DispatchEvidenceFiles v-if="driver.evidence" v-model="driver.evidence.fileIds" :dispatch-no="currentNo" kind="DRIVER" :disabled="frozen || loading || uploadingEvidence || !allowed" @busy="evidenceBusy.DRIVER = $event" />
         </template>
-        <section v-if="currentOperation === 'ROUTE' || ['REMOVE_CARGO', 'CANCEL', 'RETURN_TO_REVIEW', 'DISPATCH_REVIEW', 'LOADING_REVIEW'].includes(currentAction)" class="density-dialog-section" data-tone="work" aria-label="操作原因与意见"><h3 class="density-dialog-section__title">操作说明</h3><table class="density-table density-table--editable"><tbody><tr><td><el-form-item :label="currentOperation === 'ROUTE' || form.decision === 'REJECTED' || ['REMOVE_CARGO', 'CANCEL', 'RETURN_TO_REVIEW'].includes(currentAction) ? '原因（必填）' : '审核意见（选填）'"><el-input v-model="form.reason" :disabled="frozen || loading || uploadingEvidence || !allowed" type="textarea" :rows="3" /></el-form-item></td></tr></tbody></table></section>
-        <section v-else-if="currentAction !== 'ARRANGE_DELIVERY' && currentAction !== 'ADD_CARGO'" class="density-dialog-section" data-tone="work" aria-label="本次操作备注"><h3 class="density-dialog-section__title">本次备注</h3><table class="density-table density-table--editable"><tbody><tr><td><el-form-item label="备注"><el-input v-model="form.remark" aria-label="本次操作备注" :disabled="frozen || loading || uploadingEvidence || !allowed" type="textarea" :rows="3" /></el-form-item></td></tr></tbody></table></section>
+        <template v-else-if="['DISPATCH_REVIEW', 'LOADING_REVIEW'].includes(currentAction)">
+          <DispatchEvidenceFiles v-for="field in dispatchReviewAttachmentFields" :key="field.key" v-model="reviewAttachments[field.key]" :reference-ids="reviewEvidence[field.key]" :dispatch-no="currentNo" :kind="field.kind" :label="field.label" save-hint="上传后提交审核，附件与本次审核结果一起保存。" :disabled="frozen || loading || uploadingEvidence || !allowed" @busy="evidenceBusy[field.kind] = $event" />
+        </template>
+        <section v-if="currentOperation === 'ROUTE' || ['CANCEL', 'RETURN_TO_REVIEW', 'DISPATCH_REVIEW', 'LOADING_REVIEW'].includes(currentAction)" class="density-dialog-section" data-tone="work" aria-label="操作原因与意见"><h3 class="density-dialog-section__title">操作说明</h3><table class="density-table density-table--editable"><tbody><tr><td><el-form-item :label="currentOperation === 'ROUTE' || form.decision === 'REJECTED' || ['CANCEL', 'RETURN_TO_REVIEW'].includes(currentAction) ? '原因（必填）' : '审核意见（选填）'"><el-input v-model="form.reason" :disabled="frozen || loading || uploadingEvidence || !allowed" type="textarea" :rows="3" /></el-form-item></td></tr></tbody></table></section>
+        <section v-else class="density-dialog-section" data-tone="work" aria-label="本次操作备注"><h3 class="density-dialog-section__title">本次备注</h3><table class="density-table density-table--editable"><tbody><tr><td><el-form-item label="备注"><el-input v-model="form.remark" aria-label="本次操作备注" :disabled="frozen || loading || uploadingEvidence || !allowed" type="textarea" :rows="3" /></el-form-item></td></tr></tbody></table></section>
       </el-form>
     </div>
   </AppDialog>
@@ -319,8 +227,4 @@ watch([open, () => props.dispatchNo, () => props.action, () => props.operation],
 .workflow-editor-table { table-layout: fixed; }
 .workflow-editor-table td { width: 50%; }
 .workflow-order-actions { width: 160px; white-space: nowrap; }
-.workflow-cargo-query { display: flex; gap: var(--admin-space-3); margin-bottom: var(--admin-space-4); }
-.workflow-cargo-query > .el-input { max-width: 320px; }
-.workflow-source-group > summary { cursor: pointer; }
-.workflow-source-group ul { margin: var(--admin-space-2) 0 0; padding-left: 18px; }
 </style>

src/modules/overseas-warehouse/components/ExceptionProcessingPanel.vue

@@ -238,5 +238,5 @@ watch(() => [props.customerId, props.exceptionNo, props.active], () => { ++seque
 .exception-return-batch + .exception-return-batch { margin-top: 12px; }
 .exception-redispatch-table { width: 100%; border-collapse: collapse; font-size: 12px; }
 .exception-redispatch-table th, .exception-redispatch-table td { padding: 6px 8px; border: 1px solid var(--el-border-color-lighter); text-align: left; }
-.exception-redispatch-table th { background: var(--el-fill-color-light); }
+.exception-redispatch-table th { background: var(--cc-list-table-header-bg); color: var(--cc-list-table-header-text); }
 </style>

src/modules/overseas-warehouse/components/FbaAppointmentFields.vue

@@ -1,9 +1,16 @@
 <script setup lang="ts">
 import InlineHelp from '@/shared/components/InlineHelp.vue'
+import { AppointmentConfirmationCargo, type PlanningSourceLookup } from '@/modules/appointment-calendar'
+import { ref } from 'vue'
 import type { AppointmentForm } from '../appointmentForm'
-defineProps<{ model: AppointmentForm; appointmentNo?: string; timezone?: string | null; disabled?: boolean; continuous?: boolean }>()
+defineProps<{ model: AppointmentForm; appointmentNo?: string; timezone?: string | null; disabled?: boolean; continuous?: boolean; sources?: PlanningSourceLookup[] }>()
+const emit = defineEmits<{ confirmationReady: [ready: boolean] }>()
+const cargo = ref<InstanceType<typeof AppointmentConfirmationCargo> | null>(null)
+defineExpose({ canLeave: () => cargo.value?.canLeave() ?? Promise.resolve(true) })
 </script>
 <template>
+  <p v-if="model.appointmentStatus === 'SUCCESS' && timezone && /^(UTC|GMT|Etc\/(GMT|UTC)|[+-])/.test(timezone)" role="alert">目的仓当前只有固定时差，尚未设置地区时区。请到“仓库管理”编辑本次目的 FBA 仓，按实际地址设置地区时区（如 America/New_York），再重新打开预约；固定时差无法判断夏令时。</p>
+  <AppointmentConfirmationCargo v-if="sources?.length" ref="cargo" :sources="sources" :active="model.appointmentStatus === 'SUCCESS'" :disabled="disabled" @ready="emit('confirmationReady', $event)" />
   <div v-if="continuous" class="density-dialog-sections">
     <section class="density-dialog-section" data-tone="source" aria-label="预约来源信息"><h3 class="density-dialog-section__title">预约信息</h3><table class="density-table"><tbody><tr><th scope="row">系统单号</th><td>{{ appointmentNo || '保存后生成' }}</td><th scope="row">目的仓时区</th><td>{{ timezone || '待核实' }}</td></tr></tbody></table></section>
     <section class="density-dialog-section" data-tone="work" aria-label="预约安排登记"><h3 class="density-dialog-section__title">预约安排</h3>

src/modules/overseas-warehouse/components/SmartDispatchCargoBoard.test.ts

@@ -0,0 +1,191 @@
+import ElementPlus from 'element-plus'
+import { defineComponent, h } from 'vue'
+import { enableAutoUnmount, mount, type VueWrapper } from '@vue/test-utils'
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import SmartDispatchCargoBoard from './SmartDispatchCargoBoard.vue'
+import { candidate, sharedPalletCandidates } from '../dispatchTestFixtures'
+import type { Candidate, DispatchDraft } from '../dispatchContracts'
+
+enableAutoUnmount(afterEach)
+const clone = <T>(value: T): T => JSON.parse(JSON.stringify(value)) as T
+function draft(): DispatchDraft {
+  return { draftToken: 'server-token', recordVersion: 2, warehouseId: '321', status: 'ACTIVE', expiresAt: '2026-12-01T00:00:00Z', sources: [], containers: [
+    { draftContainerId: 'car-1', sequenceNo: 1, capacity: 30, sourceKeys: [] },
+    { draftContainerId: 'car-2', sequenceNo: 2, capacity: 15, sourceKeys: [] },
+  ] }
+}
+function render(candidates: Candidate[] = [candidate()], extra: Record<string, unknown> = {}) {
+  return mount(SmartDispatchCargoBoard, { props: { candidates, draft: draft(), activeContainerId: 'car-1', capacity: 30, disabled: false, warehouseSelected: true, page: 1, size: 20, total: candidates.length, ...extra }, global: { plugins: [ElementPlus] } })
+}
+async function select(wrapper: VueWrapper, index = 0) { await wrapper.get('[aria-label="待排订单"]').findAll('tbody tr')[index]!.get('button').trigger('click') }
+function pallet(wrapper: VueWrapper) { return wrapper.get('[aria-label="托盘明细"] tr[draggable]') }
+function transfer() { return { setData: vi.fn(), getData: vi.fn(() => '{"sourceKey":"forged","containerId":"car-2"}'), effectAllowed: '', dropEffect: '' } }
+
+describe('smart dispatch three-column cargo board', () => {
+  it('shows only the chosen order pallets and a default empty car without emitting writes', async () => {
+    const first = candidate(), second = candidate({ sourceKey: 'source-2', orderNo: 'ORDER-2', palletNo: 'PALLET-2' })
+    const wrapper = render([first, second], { draft: null, activeContainerId: '' })
+    expect(wrapper.get('[aria-label="托盘明细"]').text()).toContain('请选择左侧订单')
+    expect(wrapper.get('[aria-label="托盘明细"]').findAll('thead th').map(cell => cell.text())).toEqual(['托盘号', '箱数'])
+    expect(wrapper.findAll('[aria-label="车辆装载"] article')).toHaveLength(1)
+    expect(wrapper.get('[aria-label="第 1 辆车"]').text()).toContain('30 托位')
+    await select(wrapper, 1)
+    expect(pallet(wrapper).text()).toContain('PALLET-2')
+    expect(wrapper.get('[aria-label="托盘明细"]').text()).not.toContain('PALLET-1')
+    expect(wrapper.emitted('add')).toBeUndefined()
+    await pallet(wrapper).get('button').trigger('click')
+    expect(wrapper.emitted('add')).toEqual([[second, '']])
+  })
+
+  it('drops a current pallet into a non-active car using the drop target identity', async () => {
+    const source = candidate(), wrapper = render([source]), dataTransfer = transfer()
+    await select(wrapper)
+    await pallet(wrapper).trigger('dragstart', { dataTransfer })
+    await wrapper.get('[aria-label="第 2 辆车"]').trigger('dragover', { dataTransfer })
+    await wrapper.get('[aria-label="第 2 辆车"]').trigger('drop', { dataTransfer })
+    expect(wrapper.emitted('add')).toEqual([[source, 'car-2']])
+    expect(dataTransfer.getData).not.toHaveBeenCalled()
+    await wrapper.get('[aria-label="第 1 辆车"]').trigger('drop', { dataTransfer })
+    expect(wrapper.emitted('add')).toHaveLength(1)
+  })
+
+  it('rejects external or forged drag payloads that were never selected inside this component', async () => {
+    const wrapper = render(), dataTransfer = transfer()
+    await select(wrapper)
+    await wrapper.get('[aria-label="第 2 辆车"]').trigger('dragover', { dataTransfer })
+    await wrapper.get('[aria-label="第 2 辆车"]').trigger('drop', { dataTransfer })
+    expect(wrapper.emitted('add')).toBeUndefined()
+    expect(dataTransfer.getData).not.toHaveBeenCalled()
+  })
+
+  it.each(['refresh', 'page', 'size', 'disabled', 'draft'] as const)('rejects a previously started drag after %s changes', async change => {
+    const source = candidate(), wrapper = render([source]), dataTransfer = transfer()
+    await select(wrapper); await pallet(wrapper).trigger('dragstart', { dataTransfer })
+    if (change === 'refresh') await wrapper.setProps({ candidates: [clone(source)] })
+    if (change === 'page') await wrapper.setProps({ page: 2 })
+    if (change === 'size') await wrapper.setProps({ size: 10 })
+    if (change === 'disabled') await wrapper.setProps({ disabled: true })
+    if (change === 'draft') await wrapper.setProps({ draft: { ...draft(), recordVersion: 3 } })
+    await wrapper.get('[aria-label="第 2 辆车"]').trigger('drop', { dataTransfer })
+    expect(wrapper.emitted('add')).toBeUndefined()
+  })
+
+  it('freezes add, removal, selection and pagination while a command is pending', async () => {
+    const source = candidate(), state = draft()
+    state.sources = [source]; state.containers[0]!.sourceKeys = [source.sourceKey]
+    const wrapper = render([source], { draft: state, total: 21 })
+    await select(wrapper); await wrapper.setProps({ disabled: true })
+    expect(wrapper.findAll('button').filter(button => ['添加车辆', '移除货物', '删除车辆', '查看托盘'].includes(button.text())).every(button => button.attributes('disabled') !== undefined)).toBe(true)
+    expect(wrapper.findAll('input[type="radio"]').every(input => input.attributes('disabled') !== undefined)).toBe(true)
+    await pallet(wrapper).trigger('dragstart', { dataTransfer: transfer() })
+    await wrapper.get('[aria-label="第 2 辆车"]').trigger('drop')
+    await wrapper.get('[aria-label="候选货物分页"] button.btn-next').trigger('click')
+    expect(wrapper.emitted('add')).toBeUndefined()
+    expect(wrapper.emitted('changePage')).toBeUndefined()
+  })
+
+  it('keeps a shared pallet as one full source group even when only one member is on the current page', async () => {
+    const sources = sharedPalletCandidates(), wrapper = render([sources[0]!])
+    await select(wrapper)
+    expect(wrapper.findAll('[aria-label="托盘明细"] tr[draggable]')).toHaveLength(1)
+    const group = pallet(wrapper)
+    expect(group.text()).toContain('整托关联货物一起加入')
+    expect(group.findAll('details li')).toHaveLength(2)
+    expect(group.text()).toContain('客户A'); expect(group.text()).toContain('客户B')
+    expect(group.text()).toContain('8 箱')
+    await group.get('button').trigger('click')
+    expect(wrapper.emitted('add')).toEqual([[sources[0], 'car-1']])
+    expect((wrapper.emitted('add')![0]![0] as Candidate).selectionGroup.sources).toHaveLength(2)
+  })
+
+  it('shows a shared loaded pallet only once and blocks another member from being added to another car', async () => {
+    const sources = sharedPalletCandidates(), state = draft()
+    state.sources = sources; state.containers[0]!.sourceKeys = sources.map(row => row.sourceKey)
+    const wrapper = render(sources, { draft: state, activeContainerId: 'car-2' })
+    expect(wrapper.get('[aria-label="第 1 辆车"]').text()).toContain('托数 1/30')
+    expect(wrapper.get('[aria-label="第 1 辆车"]').findAll('.cargo-board-loaded-pallet')).toHaveLength(1)
+    for (const index of [0, 1]) {
+      await select(wrapper, index)
+      expect(pallet(wrapper).attributes('draggable')).toBe('false')
+      expect(pallet(wrapper).get('button').text()).toBe('已加入第 1 辆车')
+      expect(pallet(wrapper).get('button').attributes('disabled')).toBeDefined()
+    }
+    expect(wrapper.emitted('add')).toBeUndefined()
+  })
+
+  it('blocks incomplete server-owned groups and does not convert missing measurements to zero', async () => {
+    const source = candidate({ suggestedWeightKg: null, suggestedVolumeCbm: null })
+    source.selectionGroup.complete = false
+    source.selectionGroup.blockReasons = ['同托货物未全部返回']
+    const wrapper = render([source])
+    await select(wrapper)
+    expect(pallet(wrapper).attributes('draggable')).toBe('false')
+    expect(pallet(wrapper).get('button').attributes('disabled')).toBeDefined()
+    expect(pallet(wrapper).text()).toContain('同托货物未全部返回')
+    expect(wrapper.text()).not.toMatch(/0(?:\.0)?\s*(?:kg|m³)/)
+    expect(wrapper.emitted('add')).toBeUndefined()
+  })
+
+  it('keeps allocated cars visible across candidate pages and reports page events without pretending to have full orders', async () => {
+    const source = candidate(), state = draft()
+    state.sources = [source]; state.containers[0]!.sourceKeys = [source.sourceKey]
+    const wrapper = render([source], { draft: state, total: 21 })
+    await select(wrapper)
+    await wrapper.get('[aria-label="候选货物分页"] button.btn-next').trigger('click')
+    expect(wrapper.emitted('changePage')).toEqual([[2]])
+    expect(wrapper.get('[aria-label="托盘明细"]').text()).toContain('请选择左侧订单')
+    await wrapper.setProps({ page: 2, candidates: [candidate({ orderNo: 'NEXT-PAGE', palletNo: 'NEXT-PALLET' })] })
+    expect(wrapper.get('[aria-label="待排订单"]').text()).not.toContain('货物分页，同一订单可能分布在多页')
+    expect(wrapper.get('[aria-label="第 1 辆车"]').text()).toContain('PALLET-1')
+    expect(wrapper.findAll('[aria-label="车辆装载"] article')).toHaveLength(2)
+  })
+
+  it('restores the chosen order after a same-page loading refresh but discards its old drag reference', async () => {
+    const source = candidate(), wrapper = render([source]), dataTransfer = transfer()
+    await select(wrapper); await pallet(wrapper).trigger('dragstart', { dataTransfer })
+    await wrapper.setProps({ candidates: [] })
+    await wrapper.setProps({ candidates: [clone(source)] })
+    expect(pallet(wrapper).text()).toContain('PALLET-1')
+    await wrapper.get('[aria-label="第 2 辆车"]').trigger('drop', { dataTransfer })
+    expect(wrapper.emitted('add')).toBeUndefined()
+  })
+
+  it('counts distinct planned groups separately when their display pallet labels are the same', async () => {
+    const first = candidate({ selection: { ...candidate().selection, warehousePalletId: null } })
+    const second = candidate({ sourceKey: 'source-2', selection: { ...first.selection, planPalletId: '12' } })
+    const wrapper = render([first, second])
+    const order = wrapper.get('[aria-label="待排订单"] tbody tr')
+    expect(order.findAll('td')[3]!.text()).toBe('2')
+    await select(wrapper)
+    expect(wrapper.findAll('[aria-label="托盘明细"] tr[draggable]')).toHaveLength(2)
+  })
+
+  it('uses independent vehicle radio groups when two entrypoint dialogs are mounted', () => {
+    const props = { candidates: [candidate()], draft: draft(), activeContainerId: 'car-1', capacity: 30, disabled: false, warehouseSelected: true, page: 1, size: 20, total: 1 }
+    const host = mount(defineComponent({ setup: () => () => h('div', [h(SmartDispatchCargoBoard, props), h(SmartDispatchCargoBoard, props)]) }), { global: { plugins: [ElementPlus] } })
+    const [first, second] = host.findAllComponents(SmartDispatchCargoBoard)
+    expect(first!.get('input[type="radio"]').attributes('name')).not.toBe(second!.get('input[type="radio"]').attributes('name'))
+  })
+
+  it('accepts an existing dispatch slot as the exact drop target without draft containers', async () => {
+    const source = candidate()
+    const wrapper = mount(SmartDispatchCargoBoard, {
+      props: { candidates: [source], draft: null, activeContainerId: 'PC/1', capacity: 0, disabled: false, warehouseSelected: true, page: 1, size: 20, total: 1 },
+      slots: { vehicles: ({ dragOver, drop }: { dragOver: (event: DragEvent, id: string) => void; drop: (event: DragEvent, id: string) => void }) => h('section', { 'aria-label': '真实本车清单', onDragover: (event: DragEvent) => dragOver(event, 'PC/1'), onDrop: (event: DragEvent) => drop(event, 'PC/1') }, 'PALLET-EXISTING') },
+      global: { plugins: [ElementPlus] },
+    })
+    expect(wrapper.find('[aria-label="车辆装载"]').exists()).toBe(true)
+    expect(wrapper.get('[aria-label="车辆装载"]').text()).not.toContain('添加车辆')
+    expect(wrapper.text()).toContain('PALLET-EXISTING')
+    await select(wrapper)
+    const dataTransfer = transfer()
+    await pallet(wrapper).trigger('dragstart', { dataTransfer })
+    await wrapper.get('[aria-label="真实本车清单"]').trigger('dragover', { dataTransfer })
+    await wrapper.get('[aria-label="真实本车清单"]').trigger('drop', { dataTransfer })
+    expect(wrapper.emitted('add')).toEqual([[source, 'PC/1']])
+    await pallet(wrapper).trigger('dragstart', { dataTransfer })
+    await wrapper.setProps({ activeContainerId: 'PC/2' })
+    await wrapper.get('[aria-label="真实本车清单"]').trigger('drop', { dataTransfer })
+    expect(wrapper.emitted('add')).toHaveLength(1)
+  })
+})

src/modules/overseas-warehouse/components/SmartDispatchCargoBoard.vue

@@ -0,0 +1,280 @@
+<script setup lang="ts">
+import { computed, ref, shallowRef, useId, useSlots, watch } from 'vue'
+import InlineHelp from '@/shared/components/InlineHelp.vue'
+import type { Candidate, DispatchDraft, DraftContainer } from '../dispatchContracts'
+import { selectionGroupBlockReason } from '../dispatchContracts'
+
+const props = defineProps<{
+  candidates: Candidate[]
+  draft: DispatchDraft | null
+  activeContainerId: string
+  capacity: number
+  disabled: boolean
+  warehouseSelected: boolean
+  page: number
+  size: number
+  total: number
+}>()
+const emit = defineEmits<{
+  add: [source: Candidate, containerId: string]
+  selectContainer: [id: string]
+  removeCargo: [source: Candidate, containerId: string]
+  removeContainer: [id: string]
+  addVehicle: []
+  changePage: [page: number]
+  changeSize: [size: number]
+}>()
+
+const selectedOrderKey = ref('')
+const slots = useSlots()
+const vehicleRadioName = `smart-dispatch-active-vehicle-${useId()}`
+const draggedSource = shallowRef<Candidate | null>(null)
+const dropTarget = ref<string | null>(null)
+
+function orderKey(source: Candidate) {
+  return JSON.stringify([source.customerId, source.selection.sourceType, source.orderNo || source.inboundCode || source.planNo || source.selection.relabelNo || source.sourceKey])
+}
+function businessNo(source: Candidate) {
+  return source.orderNo || source.inboundCode || source.planNo || source.selection.relabelNo || '—'
+}
+function sourceLabel(source: Candidate) {
+  return source.selection.sourceType === 'RELABEL' ? '换标' : source.selection.sourceType === 'RETURN_RECEIPT' ? '退回实收' : source.selection.warehousePalletId ? '已收货托盘' : '在途计划'
+}
+function destinationLabel(source: Candidate) {
+  return source.destination.warehouseCode || source.destination.warehouseName || source.destination.address || '—'
+}
+function uniqueGroups(sources: Candidate[]) {
+  const seen = new Set<string>()
+  return sources.filter(source => {
+    const key = source.selectionGroup?.groupKey || source.sourceKey
+    if (seen.has(key)) return false
+    seen.add(key)
+    return true
+  })
+}
+const orders = computed(() => {
+  const grouped = new Map<string, Candidate[]>()
+  for (const source of props.candidates) {
+    const key = orderKey(source)
+    const existing = grouped.get(key)
+    if (existing) existing.push(source)
+    else grouped.set(key, [source])
+  }
+  return [...grouped].map(([key, sources]) => ({ key, source: sources[0]!, sources }))
+})
+const selectedOrder = computed(() => orders.value.find(order => order.key === selectedOrderKey.value))
+const palletGroups = computed(() => uniqueGroups(selectedOrder.value?.sources || []))
+const vehicles = computed<DraftContainer[]>(() => props.draft?.containers.length ? props.draft.containers : [{ draftContainerId: '', sequenceNo: 1, capacity: props.capacity, sourceKeys: [] }])
+function assignedVehicle(source: Candidate) {
+  const keys = new Set([source.sourceKey, ...(source.selectionGroup?.sources.map(row => row.sourceKey) || [])])
+  return props.draft?.containers.find(vehicle => vehicle.sourceKeys.some(key => keys.has(key)))
+}
+function canAdd(source: Candidate) {
+  return !props.disabled && props.warehouseSelected && props.candidates.includes(source) && !assignedVehicle(source) && !selectionGroupBlockReason(source)
+}
+function validTarget(id: string) {
+  if (slots.vehicles) return props.warehouseSelected && Boolean(id) && id === props.activeContainerId
+  return vehicles.value.some(vehicle => vehicle.draftContainerId === id)
+}
+function add(source: Candidate, id: string) {
+  if (!canAdd(source) || !validTarget(id)) return
+  emit('add', source, id)
+}
+function clearDrag() { draggedSource.value = null; dropTarget.value = null }
+function dragStart(event: DragEvent, source: Candidate) {
+  clearDrag()
+  if (!canAdd(source)) { event.preventDefault(); return }
+  draggedSource.value = source
+  if (event.dataTransfer) {
+    // Transfer only a harmless marker. The live component reference is the authority.
+    event.dataTransfer.setData('text/plain', 'dispatch-pallet')
+    event.dataTransfer.effectAllowed = 'copy'
+  }
+}
+function dragOver(event: DragEvent, id: string) {
+  if (!draggedSource.value || !canAdd(draggedSource.value) || !validTarget(id)) return
+  event.preventDefault()
+  dropTarget.value = id
+  if (event.dataTransfer) event.dataTransfer.dropEffect = 'copy'
+}
+function drop(event: DragEvent, id: string) {
+  event.preventDefault()
+  const source = draggedSource.value
+  clearDrag()
+  if (source) add(source, id)
+}
+function chooseOrder(key: string) {
+  if (props.disabled) return
+  clearDrag()
+  selectedOrderKey.value = key
+}
+function changePage(page: number) {
+  if (props.disabled) return
+  selectedOrderKey.value = ''
+  clearDrag()
+  emit('changePage', page)
+}
+function changeSize(size: number) {
+  if (props.disabled) return
+  selectedOrderKey.value = ''
+  clearDrag()
+  emit('changeSize', size)
+}
+function vehicleSources(vehicle: DraftContainer) {
+  const keys = new Set(vehicle.sourceKeys)
+  return uniqueGroups((props.draft?.sources || []).filter(source => keys.has(source.sourceKey)))
+}
+function physicalPalletCount(sources: Candidate[]): number | null {
+  const keys = new Set<string>()
+  for (const source of sources) {
+    if (!source.selectionGroup?.pallets.length) return null
+    for (const pallet of source.selectionGroup.pallets) {
+      if (!pallet.warehousePalletId && (!source.selectionGroup.groupKey || !pallet.palletNo)) return null
+      const key = pallet.warehousePalletId
+        ? JSON.stringify(['physical', pallet.warehousePalletId])
+        : JSON.stringify(['planned', source.selectionGroup.groupKey, pallet.palletNo])
+      keys.add(key)
+    }
+  }
+  return keys.size
+}
+function vehiclePalletCount(vehicle: DraftContainer) {
+  if (vehicle.sourceKeys.some(key => !props.draft?.sources.some(source => source.sourceKey === key))) return null
+  return physicalPalletCount(vehicleSources(vehicle))
+}
+function groupPackages(source: Candidate) {
+  const packages = source.selectionGroup?.pallets.map(pallet => pallet.packageCount)
+  return packages?.length && packages.every(value => Number.isSafeInteger(value) && value >= 0) ? packages.reduce((sum, value) => sum + value, 0) : null
+}
+function palletLabel(source: Candidate) {
+  return source.selectionGroup?.pallets.map(pallet => pallet.palletNo || '托盘号未提供').join('、') || source.palletNo || '—'
+}
+watch(() => [props.page, props.size], () => { selectedOrderKey.value = ''; clearDrag() }, { flush: 'sync' })
+watch(() => props.candidates, () => {
+  clearDrag()
+  // A same-page reload temporarily empties candidates. Keep the selected key;
+  // selectedOrder naturally becomes undefined if the refreshed page no longer has it.
+}, { deep: true, flush: 'sync' })
+watch(() => [props.disabled, props.warehouseSelected, props.draft, props.activeContainerId], clearDrag, { deep: true, flush: 'sync' })
+</script>
+
+<template>
+  <div class="dispatch-cargo-board" aria-label="智能排车三栏选货">
+    <section class="cargo-board-panel cargo-board-orders" aria-label="待排订单">
+      <header class="cargo-board-heading"><h3>待排订单</h3><span class="cargo-board-muted">本页 {{ orders.length }} 单</span></header>
+      <div class="cargo-board-order-content">
+      <div class="cargo-board-table-wrap">
+        <table class="density-table cargo-board-table">
+          <thead><tr><th class="cargo-board-operation">操作</th><th>订单号 / 来源</th><th>客户</th><th>关联托数</th><th>目的仓</th></tr></thead>
+          <tbody>
+            <tr v-for="order in orders" :key="order.key" :class="{ 'is-selected': selectedOrderKey === order.key }" @click="chooseOrder(order.key)">
+              <td><el-button link :disabled="disabled" :aria-pressed="selectedOrderKey === order.key" @click.stop="chooseOrder(order.key)">查看托盘</el-button></td>
+              <td><span class="cargo-board-business-no">{{ businessNo(order.source) }}</span><small class="cargo-board-muted">{{ sourceLabel(order.source) }}{{ !order.source.orderNo ? ' · 未关联订单' : '' }}</small></td>
+              <td>{{ order.source.customerName || '—' }}</td>
+              <td>{{ physicalPalletCount(order.sources) ?? '—' }}</td>
+              <td>{{ [...new Set(order.sources.map(destinationLabel))].join('、') }}</td>
+            </tr>
+            <tr v-if="!orders.length"><td colspan="5" class="cargo-board-empty">{{ warehouseSelected ? '暂无可排货物' : '请先选择起运仓' }}</td></tr>
+          </tbody>
+        </table>
+      </div>
+      <footer class="cargo-board-pagination"><el-pagination aria-label="候选货物分页" :current-page="page" :page-size="size" :page-sizes="[10, 20, 50]" :total="total" :disabled="disabled" layout="total, sizes, prev, pager, next" @update:current-page="changePage" @update:page-size="changeSize" /></footer>
+      </div>
+    </section>
+
+    <section class="cargo-board-panel cargo-board-pallets" aria-label="托盘明细" aria-live="polite">
+      <header class="cargo-board-heading"><h3>托盘明细</h3><span class="cargo-board-order-caption">订单号：{{ selectedOrder ? businessNo(selectedOrder.source) : '未选择订单' }}<small v-if="selectedOrder && !selectedOrder.source.orderNo" class="cargo-board-muted">未关联订单</small></span></header>
+      <div class="cargo-board-pallet-list">
+        <table class="density-table cargo-board-pallet-table">
+          <thead><tr><th>托盘号</th><th class="cargo-board-pallet-count">箱数</th></tr></thead>
+          <tbody>
+            <tr v-if="!selectedOrder"><td colspan="2" class="cargo-board-empty">请选择左侧订单查看托盘明细</td></tr>
+            <tr v-for="source in palletGroups" :key="source.selectionGroup.groupKey" class="cargo-board-pallet" :class="{ 'is-assigned': assignedVehicle(source), 'is-draggable': canAdd(source) }" :draggable="canAdd(source)" :aria-label="`托盘 ${palletLabel(source)}`" @dragstart="dragStart($event, source)" @dragend="clearDrag">
+              <td>
+                <strong>{{ palletLabel(source) }}</strong>
+                <div class="cargo-board-muted">{{ destinationLabel(source) }}</div>
+                <details v-if="source.selectionGroup.sources.length > 1" class="cargo-board-group-details"><summary>整托关联货物一起加入</summary><ul><li v-for="item in source.selectionGroup.sources" :key="item.sourceKey">{{ item.sourceBusinessNo || '业务号未提供' }} · {{ item.customerName || '—' }} · {{ item.packages }} 箱</li></ul></details>
+                <p v-if="selectionGroupBlockReason(source)" class="cargo-board-block">{{ selectionGroupBlockReason(source) }}</p>
+                <el-button link :disabled="!canAdd(source) || !validTarget(activeContainerId)" @click="add(source, activeContainerId)">{{ assignedVehicle(source) ? `已加入第 ${assignedVehicle(source)!.sequenceNo} 辆车` : '加入这辆车' }}</el-button>
+              </td>
+              <td class="cargo-board-pallet-count">{{ groupPackages(source) ?? '—' }} 箱</td>
+            </tr>
+            <tr v-if="selectedOrder && !palletGroups.length"><td colspan="2" class="cargo-board-empty">该订单本页暂无托盘</td></tr>
+          </tbody>
+        </table>
+      </div>
+    </section>
+
+    <section class="cargo-board-panel cargo-board-vehicles" aria-label="车辆装载">
+      <header class="cargo-board-heading"><slot name="vehicle-heading"><template v-if="!slots.vehicles"><h3>装车托盘</h3><InlineHelp title="车辆装载说明"><p>将中间托盘拖入任意车辆，或选中车辆后点击“加入这辆车”。已装货物需先移除才能加入其他车辆。计划托位仅用于新车辆预排，不代表真实载重或容积；体积、重量以装车核对为准。</p></InlineHelp><div class="cargo-board-vehicle-tools"><slot name="vehicle-controls" /><el-button type="primary" :disabled="disabled || !warehouseSelected" @click="emit('addVehicle')">添加车辆</el-button></div></template></slot></header>
+      <div class="cargo-board-vehicle-content">
+      <slot name="vehicles" :drag-over="dragOver" :drop="drop" :drop-target="dropTarget">
+      <div class="cargo-board-vehicle-list">
+        <article v-for="vehicle in vehicles" :key="vehicle.draftContainerId" class="cargo-board-vehicle" :class="{ 'is-current': vehicle.draftContainerId === activeContainerId, 'is-drop-target': dropTarget === vehicle.draftContainerId }" :aria-label="`第 ${vehicle.sequenceNo} 辆车`" @dragover="dragOver($event, vehicle.draftContainerId)" @dragleave.self="dropTarget = null" @drop="drop($event, vehicle.draftContainerId)">
+          <header class="cargo-board-vehicle-heading"><label><input type="radio" :name="vehicleRadioName" :checked="activeContainerId === vehicle.draftContainerId" :disabled="disabled" :aria-label="`选择第 ${vehicle.sequenceNo} 辆车`" @change="emit('selectContainer', vehicle.draftContainerId)" /> 第 {{ vehicle.sequenceNo }} 辆车 · {{ vehicle.capacity }} 托位</label><span>托数 {{ vehiclePalletCount(vehicle) ?? '—' }}/{{ vehicle.capacity }}</span></header>
+          <div class="cargo-board-vehicle-body">
+            <p v-if="!vehicle.sourceKeys.length" class="cargo-board-empty">拖入托盘</p>
+            <div v-for="source in vehicleSources(vehicle)" :key="source.selectionGroup.groupKey" class="cargo-board-loaded-pallet">
+              <div><strong>{{ palletLabel(source) }}</strong><small class="cargo-board-muted">{{ businessNo(source) }} · {{ groupPackages(source) ?? '—' }} 箱</small><details v-if="source.selectionGroup.sources.length > 1" class="cargo-board-group-details"><summary>整托关联货物</summary><ul><li v-for="item in source.selectionGroup.sources" :key="item.sourceKey">{{ item.sourceBusinessNo || '业务号未提供' }} · {{ item.customerName || '—' }} · {{ item.packages }} 箱</li></ul></details></div>
+              <el-button link :disabled="disabled" @click="emit('removeCargo', source, vehicle.draftContainerId)">移除货物</el-button>
+            </div>
+            <p v-if="vehiclePalletCount(vehicle) === null" class="cargo-board-block">已选货物资料不完整，请重新读取草稿。</p>
+          </div>
+          <footer v-if="vehicle.draftContainerId" class="cargo-board-vehicle-footer"><el-button link type="danger" :disabled="disabled" @click="emit('removeContainer', vehicle.draftContainerId)">删除车辆</el-button></footer>
+        </article>
+      </div>
+      </slot>
+      </div>
+    </section>
+  </div>
+</template>
+
+<style scoped>
+.dispatch-cargo-board { display: grid; grid-template-columns: minmax(0, 44fr) minmax(0, 22fr) minmax(0, 34fr); grid-template-rows: auto auto; align-items: stretch; gap: var(--admin-space-5) var(--admin-space-6); }
+.cargo-board-panel { display: grid; grid-row: 1 / span 2; grid-template-rows: subgrid; align-items: start; min-width: 0; background: var(--admin-surface); }
+.cargo-board-orders { grid-column: 1; }
+.cargo-board-pallets { grid-column: 2; }
+.cargo-board-vehicles { grid-column: 3; }
+.cargo-board-order-content, .cargo-board-vehicle-content { min-width: 0; }
+.cargo-board-heading { align-self: stretch; display: flex; align-items: center; gap: var(--admin-space-3); min-height: var(--admin-control-height); box-sizing: border-box; margin: 0; flex-wrap: wrap; }
+.cargo-board-heading h3 { margin: 0; font-size: var(--admin-font-section); }
+.cargo-board-vehicle-tools { display: flex; align-items: center; gap: var(--admin-space-3); margin-left: auto; flex-wrap: wrap; }
+.cargo-board-vehicle-tools > .el-button { margin-left: 0; }
+.cargo-board-muted { color: var(--cc-muted); font-size: var(--admin-font-caption); }
+.cargo-board-table-wrap { overflow: auto; max-height: min(390px, 40vh); border: 1px solid var(--admin-table-border); border-radius: var(--admin-dialog-section-radius); }
+.cargo-board-table { width: 100%; table-layout: fixed; }
+.cargo-board-table td { overflow-wrap: anywhere; }
+.cargo-board-table th:nth-child(1) { width: 82px; }
+.cargo-board-table th:nth-child(2) { width: 32%; }
+.cargo-board-table th:nth-child(4) { width: 72px; }
+.cargo-board-table small, .cargo-board-loaded-pallet small { display: block; }
+.cargo-board-table tbody tr { cursor: pointer; }
+.cargo-board-table tr.is-selected td { background: var(--admin-action-primary-hover); }
+.cargo-board-business-no { font-weight: 600; }
+.cargo-board-pagination { display: flex; align-items: center; padding-top: var(--admin-space-5); overflow-x: auto; }
+.cargo-board-order-caption { margin-left: auto; max-width: 65%; overflow-wrap: anywhere; color: var(--cc-muted); font-size: var(--admin-font-caption); }
+.cargo-board-order-caption small { display: block; }
+.cargo-board-empty { padding: var(--admin-space-7); color: var(--cc-muted); text-align: center; margin: 0; }
+.cargo-board-pallet-list { max-height: min(500px, 48vh); overflow-y: auto; border: 1px solid var(--admin-table-border); border-radius: var(--admin-dialog-section-radius); }
+.cargo-board-pallet-table { width: 100%; table-layout: fixed; }
+.cargo-board-pallet-table .cargo-board-pallet-count { width: 72px; text-align: right; white-space: nowrap; }
+.cargo-board-pallet-table td { vertical-align: top; overflow-wrap: anywhere; }
+.cargo-board-pallet-table .cargo-board-empty { text-align: center; padding: var(--admin-space-5); }
+.cargo-board-pallet.is-draggable { cursor: grab; }
+.cargo-board-pallet.is-assigned td { background: var(--admin-label-bg); }
+.cargo-board-group-details { margin-top: var(--admin-space-2); font-size: var(--admin-font-caption); overflow-wrap: anywhere; }
+.cargo-board-group-details summary { cursor: pointer; }
+.cargo-board-group-details ul { margin: var(--admin-space-2) 0; padding-left: var(--admin-space-6); }
+.cargo-board-block { color: var(--admin-action-danger); font-size: var(--admin-font-caption); margin: var(--admin-space-2) 0; }
+.cargo-board-vehicle-list { display: flex; flex-direction: column; gap: var(--admin-space-5); max-height: 58vh; overflow-y: auto; }
+.cargo-board-vehicle { border: 2px dashed var(--admin-table-border); border-radius: var(--admin-dialog-section-radius); background: var(--admin-surface); }
+.cargo-board-vehicle.is-current { border-color: var(--admin-action-primary-border); }
+.cargo-board-vehicle.is-drop-target { border-color: var(--cc-primary); background: var(--admin-action-primary-hover); }
+.cargo-board-vehicle-heading { display: flex; justify-content: space-between; align-items: center; gap: var(--admin-space-3); flex-wrap: wrap; padding: var(--admin-space-5); background: var(--admin-dialog-source-bg); }
+.cargo-board-vehicle-heading label { display: flex; align-items: center; gap: var(--admin-space-2); cursor: pointer; }
+.cargo-board-vehicle-body { min-height: 90px; padding: var(--admin-space-3); }
+.cargo-board-loaded-pallet { display: flex; align-items: flex-start; justify-content: space-between; gap: var(--admin-space-3); padding: var(--admin-space-3); border-bottom: 1px solid var(--admin-table-border); overflow-wrap: anywhere; }
+.cargo-board-loaded-pallet > div { min-width: 0; }
+.cargo-board-loaded-pallet > .el-button { flex: none; }
+.cargo-board-vehicle-footer { display: flex; justify-content: flex-end; padding: 0 var(--admin-space-5) var(--admin-space-3); }
+</style>

src/modules/overseas-warehouse/components/SmartDispatchDialog.layout.test.ts

@@ -4,14 +4,13 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import SmartDispatchDialog from './SmartDispatchDialog.vue'
 import DispatchResourceFields from './DispatchResourceFields.vue'
 import AppDialog from '@/shared/components/AppDialog.vue'
-import LineClampText from '@/shared/components/LineClampText.vue'
 import LoadErrorState from '@/shared/components/LoadErrorState.vue'
 import { ApiResponseError } from '@/shared/api/http'
 import { listAllPlatformWarehouses, type PlatformWarehouseResource } from '@/modules/warehouses'
 import { listDrivers, listVehicles, type DriverDetail, type VehicleDetail } from '@/modules/overseas-master-data'
 import * as api from '../api/dispatches'
 import { candidate, command, detail, sharedPalletCandidates } from '../dispatchTestFixtures'
-import type { ConvertDraft, DispatchDraft, Vehicle } from '../dispatchContracts'
+import type { ConvertDraft, DispatchDraft } from '../dispatchContracts'
 
 const identity = vi.hoisted(() => ({ id: '' }))
 const can = vi.hoisted(() => vi.fn((_code: string) => true))
@@ -47,23 +46,68 @@ beforeEach(() => {
 async function render() { const wrapper = mount(SmartDispatchDialog, { attachTo: document.body, props: { modelValue: true, orders: [] }, global: { plugins: [ElementPlus] } }); await flushPromises(); return { wrapper, dialog: wrapper.findComponent(AppDialog) } }
 function view(dialog: VueWrapper) { return dialog.getComponent({ name: 'ElDialogContent' }) }
 function field(dialog: VueWrapper, label: string) { return dialog.findAllComponents({ name: 'ElFormItem' }).find(item => item.props('label') === label)! }
-async function selectWarehouse(dialog: VueWrapper) { const select = field(dialog, '起运仓').getComponent({ name: 'ElSelect' }); select.vm.$emit('update:modelValue', '321'); select.vm.$emit('change', '321'); await flushPromises() }
+async function selectWarehouse(dialog: VueWrapper) { const select = dialog.findAllComponents({ name: 'ElSelect' }).find(select => select.props('placeholder') === '请选择起运仓')!; select.vm.$emit('update:modelValue', '321'); select.vm.$emit('change', '321'); await flushPromises() }
 async function emptyMode(dialog: VueWrapper) { field(dialog, '建单方式').getComponent({ name: 'ElRadioGroup' }).vm.$emit('update:modelValue', 'empty'); await flushPromises() }
-async function restore(dialog: VueWrapper) { dialog.findAllComponents({ name: 'ElSelect' }).find(select => select.props('placeholder') === '继续已有草稿')!.vm.$emit('change', 'server-token'); await flushPromises() }
-async function externalResources(dialog: VueWrapper, plate: string, name: string) {
-  for (const label of ['车辆来源', '司机来源']) { const select = field(dialog, label).getComponent({ name: 'ElSelect' }); select.vm.$emit('update:modelValue', 'EXTERNAL'); select.vm.$emit('change', 'EXTERNAL'); await flushPromises() }
-  await field(dialog, '车牌号').get('input').setValue(plate)
-  expect(dialog.getComponent(DispatchResourceFields).props('vehicle').plate, 'plate immediately after typing').toBe(plate)
-  await field(dialog, '拖车公司名称').get('input').setValue('本趟承运公司')
-  for (const [label, value] of [['实际托位容量', 17], ['最大载重(kg)', 15000], ['最大容积(m³)', 62]] as const) field(dialog, label).getComponent({ name: 'ElInputNumber' }).vm.$emit('update:modelValue', value)
-  await field(dialog, '司机姓名').get('input').setValue(name); await field(dialog, '联系电话').get('input').setValue('555-0102'); await field(dialog, '驾驶证号').get('input').setValue('EXTERNAL-LICENSE')
-  field(dialog, '驾驶证到期日').getComponent({ name: 'ElDatePicker' }).vm.$emit('update:modelValue', '2030-01-01')
-  field(dialog, '预计任务结束').getComponent({ name: 'ElDatePicker' }).vm.$emit('update:modelValue', '2026-11-03T18:00:00Z'); await flushPromises()
-  expect(dialog.getComponent(DispatchResourceFields).props('vehicle').plate, 'plate after completing driver fields').toBe(plate)
-}
-
+async function restore(dialog: VueWrapper) { dialog.findAllComponents({ name: 'ElSelect' }).find(select => select.props('placeholder') === '继续待完成排车')!.vm.$emit('change', 'server-token'); await flushPromises() }
+async function selectFirstOrder(dialog: VueWrapper) { await view(dialog).get('[aria-label="待排订单"] tbody tr button').trigger('click'); await flushPromises() }
 describe('new dispatch native layout', () => {
-  it('starts cargo with one explicit action, creates the first group and enables submission only after cargo is assigned', async () => {
+  it('selects the first warehouse and loads its cargo immediately without creating a draft', async () => {
+    vi.mocked(listAllPlatformWarehouses).mockResolvedValue([warehouse, { ...warehouse, id: '654', warehouseName: '纽约仓' }])
+    const { dialog } = await render()
+    const picker = dialog.findAllComponents({ name: 'ElSelect' }).find(select => select.props('placeholder') === '请选择起运仓')!
+    expect(picker.props('modelValue')).toBe('321')
+    expect(api.listDispatchCandidates).toHaveBeenCalledWith(expect.objectContaining({ warehouseId: '321', page: 1 }))
+    expect(api.createDispatchDraft).not.toHaveBeenCalled()
+  })
+  it('keeps the warehouse empty and skips cargo loading when no warehouse is available', async () => {
+    vi.mocked(listAllPlatformWarehouses).mockResolvedValue([])
+    const { dialog } = await render()
+    expect(api.listDispatchCandidates).not.toHaveBeenCalled()
+    expect(view(dialog).text()).toContain('请先选择起运仓')
+  })
+  it('retains the restored draft warehouse instead of selecting the first warehouse on reopen', async () => {
+    vi.mocked(listAllPlatformWarehouses).mockResolvedValue([warehouse, { ...warehouse, id: '654', warehouseName: '纽约仓' }])
+    vi.mocked(api.listDispatchDrafts).mockResolvedValue([{ ...draft(), warehouseId: '654', sources: [], containers: [] }])
+    vi.mocked(api.listDispatchCandidates).mockResolvedValue({ total: 0, page: 1, size: 20, pages: 0, candidates: [], complete: true, snapshotAt: '' })
+    const { wrapper, dialog } = await render()
+    await restore(dialog)
+    await wrapper.setProps({ modelValue: false }); await wrapper.setProps({ modelValue: true }); await flushPromises()
+    expect(api.listDispatchCandidates).toHaveBeenLastCalledWith(expect.objectContaining({ warehouseId: '654' }))
+  })
+
+  it('keeps the restored workbench controls together and shows the selected warehouse tab', async () => {
+    const { dialog } = await render()
+    const content = view(dialog)
+    const searchPanel = content.get('[aria-label="候选货物查询"]')
+    expect(searchPanel.find('.el-form-item__label').exists()).toBe(false)
+    expect(searchPanel.find('[aria-label="起运仓"]').exists()).toBe(true)
+    expect(searchPanel.find('input[placeholder="订单号／入仓码"]').exists()).toBe(true)
+    const settingsToggle = searchPanel.findAll('button').find(button => button.text() === '排车设置')!
+    expect(content.get('[aria-label="排车设置"]').isVisible()).toBe(false)
+    await settingsToggle.trigger('click')
+    expect(settingsToggle.attributes('aria-expanded')).toBe('true')
+    expect(content.get('[aria-label="排车设置"]').isVisible()).toBe(true)
+    expect(content.get('[aria-label="排车设置"]').text()).toContain('建单方式')
+    expect(content.get('[aria-label="排车设置"]').find('[aria-label="车辆选货安排"]').exists()).toBe(true)
+    expect(content.text()).not.toContain('1. 排车设置')
+    expect(content.text()).not.toContain('2. 为车辆选货')
+    const vehicles = content.get('[aria-label="车辆装载"]')
+    expect(vehicles.text()).toContain('托位')
+    expect(vehicles.get('.cargo-board-vehicle-tools').text()).toContain('添加车辆')
+    expect(vehicles.text()).toContain('添加车辆')
+    const tabs = content.get('[aria-label="候选仓库展示"]').findAll('button')
+    expect(tabs[0]!.classes()).toContain('active')
+    await selectWarehouse(dialog)
+    await tabs[1]!.trigger('click'); await flushPromises()
+    expect(tabs[1]!.attributes('aria-selected')).toBe('true')
+    expect(tabs[1]!.classes()).toContain('active')
+    expect(tabs[0]!.classes()).not.toContain('active')
+    const capacity = dialog.findAllComponents({ name: 'ElSelect' }).find(select => select.props('placeholder') === '计划托位')!
+    capacity.vm.$emit('update:modelValue', 15); await flushPromises()
+    expect(content.get('[aria-label="第 1 辆车"]').text()).toContain('15 托位')
+  })
+
+  it('adds cargo directly, preparing the first vehicle internally and enabling submission after assignment', async () => {
     const empty: DispatchDraft = { ...draft(), containers: [], sources: [] }
     const grouped: DispatchDraft = { ...empty, recordVersion: 1, containers: [{ draftContainerId: 'first-group', sequenceNo: 1, capacity: 30, sourceKeys: [] }] }
     const planned = candidate({ selection: { ...candidate().selection, warehousePalletId: null } })
@@ -72,43 +116,45 @@ describe('new dispatch native layout', () => {
     vi.mocked(api.listDispatchCandidates).mockResolvedValue({ total: 1, page: 1, size: 20, pages: 1, candidates: [planned], complete: true, snapshotAt: '' })
     vi.mocked(api.lockDispatchDraftPallet).mockResolvedValue({ ...grouped, recordVersion: 2, sources: [planned], containers: [{ ...grouped.containers[0]!, sourceKeys: [planned.sourceKey] }] })
     const { dialog } = await render()
-    const start = () => view(dialog).findAll('button').find(button => button.text() === '开始选货')!
-    expect(start().attributes('disabled')).toBeDefined()
+    expect(view(dialog).text()).not.toContain('开始安排第一辆车')
+    expect(view(dialog).find('[aria-label="第 1 辆车"]').exists()).toBe(true)
     expect(api.createDispatchDraft).not.toHaveBeenCalled()
     await selectWarehouse(dialog)
     expect(view(dialog).text()).toContain('在途计划')
     const candidateCalls = vi.mocked(api.listDispatchCandidates).mock.calls.length
-    await start().trigger('click'); await flushPromises()
+    expect(dialog.props('confirmDisabled')).toBe(true)
+    await selectFirstOrder(dialog)
+    await view(dialog).findAll('button').find(button => button.text() === '加入这辆车')!.trigger('click'); await flushPromises()
     expect(api.createDispatchDraft).toHaveBeenCalledExactlyOnceWith({ warehouseId: '321', idempotencyKey: expect.any(String) })
     expect(api.createDispatchDraftContainer).toHaveBeenCalledExactlyOnceWith({ draftToken: 'server-token', recordVersion: 0, capacity: 30, idempotencyKey: expect.any(String) })
-    expect(api.listDispatchCandidates).toHaveBeenCalledTimes(candidateCalls)
-    expect(dialog.findComponent(DispatchResourceFields).exists()).toBe(true)
-    expect(dialog.props('confirmDisabled')).toBe(true)
-    await view(dialog).findAll('button').find(button => button.text() === '加入本组')!.trigger('click'); await flushPromises()
+    expect(api.listDispatchCandidates).toHaveBeenCalledTimes(candidateCalls + 1)
+    expect(dialog.findComponent(DispatchResourceFields).exists()).toBe(false)
     expect(api.lockDispatchDraftPallet).toHaveBeenCalledExactlyOnceWith(expect.objectContaining({ draftContainerId: 'first-group', source: planned.selection, recordVersion: 1 }))
     expect(dialog.props('confirmDisabled')).toBe(false)
-    expect(view(dialog).text()).toContain('1 组有货')
-    expect(view(dialog).findAll('button').find(button => button.text() === '已加入第1组')!.attributes('disabled')).toBeDefined()
+    expect(view(dialog).get('[aria-label="第 1 辆车"]').text()).toContain('托数 1/30')
+    expect(view(dialog).findAll('button').find(button => button.text() === '已加入第 1 辆车')!.attributes('disabled')).toBeDefined()
   })
   it('retains the exact first-group command after an unknown result without creating a second draft', async () => {
     const empty: DispatchDraft = { ...draft(), containers: [], sources: [] }
     vi.mocked(api.createDispatchDraft).mockResolvedValue(empty)
     vi.mocked(api.createDispatchDraftContainer).mockRejectedValueOnce(new Error('network unknown')).mockResolvedValueOnce({ ...empty, recordVersion: 1, containers: [{ draftContainerId: 'first-group', sequenceNo: 1, capacity: 30, sourceKeys: [] }] })
     const { dialog } = await render(); await selectWarehouse(dialog)
-    await view(dialog).findAll('button').find(button => button.text() === '开始选货')!.trigger('click'); await flushPromises()
+    await selectFirstOrder(dialog)
+    await view(dialog).findAll('button').find(button => button.text() === '加入这辆车')!.trigger('click'); await flushPromises()
     const original = vi.mocked(api.createDispatchDraftContainer).mock.calls[0]![0]
     expect(dialog.props('confirmDisabled')).toBe(false)
     dialog.vm.$emit('confirm'); await flushPromises()
     expect(api.createDispatchDraft).toHaveBeenCalledTimes(1)
     expect(api.createDispatchDraftContainer).toHaveBeenNthCalledWith(2, original)
-    expect(dialog.findComponent(DispatchResourceFields).exists()).toBe(true)
+    expect(api.lockDispatchDraftPallet).not.toHaveBeenCalled()
+    expect(dialog.findComponent(DispatchResourceFields).exists()).toBe(false)
     expect(api.convertDispatchDraft).not.toHaveBeenCalled()
   })
   it('requires an active cargo group before accepting per-group settings while keeping setup controls available', async () => {
     const { dialog } = await render()
     expect(view(dialog).find('[aria-label="排车设置"] table').exists()).toBe(false)
     expect(view(dialog).find('[aria-label="排车设置"] .density-dialog-note').exists()).toBe(false)
-    expect(view(dialog).classes()).toContain('admin-density-workspace')
+    expect(view(dialog).classes()).not.toContain('admin-density-workspace')
     expect(dialog.getComponent({ name: 'ElDialog' }).props()).toMatchObject({ appendToBody: true, lockScroll: true })
     expect(view(dialog).text()).not.toContain('点击“开始选货”建立第一组')
     expect(view(dialog).text()).not.toContain('选择起运仓后点击')
@@ -116,59 +162,45 @@ describe('new dispatch native layout', () => {
     expect(dialog.props('confirmDisabled')).toBe(true)
     expect(field(dialog, '建单方式').getComponent({ name: 'ElRadioGroup' }).props('disabled')).toBe(false)
     await restore(dialog)
-    expect(dialog.getComponent(DispatchResourceFields).props('disabled')).toBe(false)
+    expect(dialog.findComponent(DispatchResourceFields).exists()).toBe(false)
     expect(field(dialog, '备注').get('input').attributes('disabled')).toBeUndefined()
   })
-  it('preserves every external field and actual capacity through fullscreen in a real empty creation', async () => {
-    const { wrapper, dialog } = await render(); await emptyMode(dialog); await selectWarehouse(dialog)
-    await externalResources(dialog, 'CA-EXTERNAL', '临时司机')
-    const state = wrapper.vm as unknown as { vehicle: Vehicle }
-    expect(state.vehicle.plate, 'parent vehicle after external inputs').toBe('CA-EXTERNAL')
+  it('creates an unassigned empty dispatch while preserving optional dates and remark through fullscreen', async () => {
+    const { dialog } = await render(); await emptyMode(dialog); await selectWarehouse(dialog)
+    expect(dialog.findComponent(DispatchResourceFields).exists()).toBe(false)
     field(dialog, '计划发车时间').getComponent({ name: 'ElDatePicker' }).vm.$emit('update:modelValue', '2026-11-02T10:00:00Z')
     field(dialog, '预计到达时间').getComponent({ name: 'ElDatePicker' }).vm.$emit('update:modelValue', '2026-11-02T18:00:00Z')
     await field(dialog, '备注').get('input').setValue('本趟备注')
-    expect(state.vehicle.plate, 'parent vehicle after dates and remark').toBe('CA-EXTERNAL')
     await view(dialog).get('button[aria-label="展开全屏"]').trigger('click'); await flushPromises()
-    expect(state.vehicle.plate, 'parent vehicle after fullscreen').toBe('CA-EXTERNAL')
-    expect(dialog.getComponent(DispatchResourceFields).props('continuous')).toBe(true)
     expect(dialog.findComponent({ name: 'ElDialog' }).props('fullscreen')).toBe(true)
     expect(view(dialog).text()).toContain('空单暂不能核平、装车或发车')
-    expect(view(dialog).find('[aria-label="排车候选货物"]').exists()).toBe(false)
+    expect(view(dialog).find('[aria-label="智能排车三栏选货"]').exists()).toBe(false)
     await view(dialog).findAll('button').find(button => button.text() === '保存空排车单')!.trigger('click'); await flushPromises()
-    expect(api.createDispatch).toHaveBeenCalledExactlyOnceWith({ idempotencyKey: expect.any(String), warehouseId: '321', cargo: [], batchAllocations: [], plannedDepartureAt: '2026-11-02T10:00:00Z', estimatedArrivalAt: '2026-11-02T18:00:00Z', remark: '本趟备注', vehicle: { mode: 'EXTERNAL', vehicleId: null, plate: 'CA-EXTERNAL', carrierName: '本趟承运公司', capacity: { palletSpaces: 17, maxLoadKg: 15000, maxVolumeCbm: 62 }, evidenceFileIds: [] }, driver: { mode: 'EXTERNAL', driverId: null, name: '临时司机', phone: '555-0102', evidence: { licenseNo: 'EXTERNAL-LICENSE', licenseExpiresOn: '2030-01-01', fileIds: [], expectedTaskEndAt: '2026-11-03T18:00:00Z' } } })
+    expect(api.createDispatch).toHaveBeenCalledExactlyOnceWith({ idempotencyKey: expect.any(String), warehouseId: '321', cargo: [], batchAllocations: [], plannedDepartureAt: '2026-11-02T10:00:00Z', estimatedArrivalAt: '2026-11-02T18:00:00Z', remark: '本趟备注', vehicle: null, driver: null })
   })
-  it('queries real master directories and keeps business labels and task-end evidence in the command', async () => {
+  it('creates with only the warehouse and never requests vehicle or driver directories', async () => {
     const { dialog } = await render(); await emptyMode(dialog); await selectWarehouse(dialog)
-    field(dialog, '预计任务结束').getComponent({ name: 'ElDatePicker' }).vm.$emit('update:modelValue', '2026-11-03T18:00:00Z'); await flushPromises()
-    const vehicleSelect = field(dialog, '车辆').getComponent({ name: 'ElSelect' })
-    vehicleSelect.vm.$emit('focus'); await flushPromises()
-    vehicleSelect.vm.$emit('update:modelValue', vehicleRecord.id); vehicleSelect.vm.$emit('change', vehicleRecord.id); await flushPromises()
-    const driverSelect = field(dialog, '司机').getComponent({ name: 'ElSelect' })
-    driverSelect.vm.$emit('focus'); await flushPromises()
-    driverSelect.vm.$emit('update:modelValue', driverRecord.id); driverSelect.vm.$emit('change', driverRecord.id); await flushPromises()
-    expect(listVehicles).toHaveBeenCalledWith({ page: 1, size: 100, keyword: '', region: 'OVERSEAS', status: 'IN_SERVICE' })
-    expect(listDrivers).toHaveBeenCalledWith({ page: 1, size: 100, keyword: '', region: 'OVERSEAS', active: true, reviewStatus: 'APPROVED', expectedEnd: '2026-11-03T18:00:00Z' })
-    expect(view(dialog).text()).not.toContain(vehicleRecord.id)
+    expect(dialog.findComponent(DispatchResourceFields).exists()).toBe(false)
     dialog.vm.$emit('confirm'); await flushPromises()
-    expect(api.createDispatch).toHaveBeenCalledWith(expect.objectContaining({ vehicle: { mode: 'MASTER', vehicleId: vehicleRecord.id, plate: 'CA-MASTER', carrierName: null, capacity: null, evidenceFileIds: [] }, driver: { mode: 'MASTER', driverId: driverRecord.id, name: '档案司机', phone: '555-0101', evidence: { licenseNo: null, licenseExpiresOn: null, fileIds: [], expectedTaskEndAt: '2026-11-03T18:00:00Z' } } }))
+    expect(api.createDispatch).toHaveBeenCalledWith(expect.objectContaining({ vehicle: null, driver: null, plannedDepartureAt: null, estimatedArrivalAt: null, remark: null }))
+    expect(listVehicles).not.toHaveBeenCalled()
+    expect(listDrivers).not.toHaveBeenCalled()
   })
   it('keeps each group configuration independent and verifies proven conversions without creating them twice', async () => {
     vi.mocked(api.getDispatch).mockRejectedValueOnce(new Error('details not ready')).mockImplementation(async no => detail({ dispatchNo: no, recordVersion: 1 }))
     const { wrapper, dialog } = await render(); await restore(dialog)
-    await externalResources(dialog, 'CA-A', '司机甲'); await field(dialog, '备注').get('input').setValue('第一组')
-    const radios = view(dialog).get('[aria-label="排车装车组"]').findAllComponents({ name: 'ElRadio' })
-    radios[1]!.vm.$emit('update:modelValue', 'container-2'); await flushPromises()
-    await externalResources(dialog, 'CA-B', '司机乙'); await field(dialog, '备注').get('input').setValue('第二组')
-    radios[0]!.vm.$emit('update:modelValue', 'container-1'); await flushPromises()
-    expect((field(dialog, '车牌号').get('input').element as HTMLInputElement).value).toBe('CA-A')
+    await field(dialog, '备注').get('input').setValue('第一组')
+    const radios = view(dialog).get('[aria-label="车辆装载"]').findAll('input[type="radio"]')
+    await radios[1]!.setValue(true); await flushPromises()
+    await field(dialog, '备注').get('input').setValue('第二组')
+    await radios[0]!.setValue(true); await flushPromises()
     expect((field(dialog, '备注').get('input').element as HTMLInputElement).value).toBe('第一组')
     await view(dialog).get('button[aria-label="展开全屏"]').trigger('click'); await flushPromises()
     dialog.vm.$emit('confirm'); await flushPromises()
     expect(api.convertDispatchDraft).toHaveBeenCalledTimes(1)
     const request = vi.mocked(api.convertDispatchDraft).mock.calls[0]![0]
     expect(request.recordVersion).toBe(0)
-    expect(request.groups.map(group => [group.dispatch.vehicle?.plate, group.dispatch.driver?.name, group.dispatch.remark])).toEqual([['CA-A', '司机甲', '第一组'], ['CA-B', '司机乙', '第二组']])
-    expect(request.groups.map(group => group.dispatch.vehicle?.capacity?.palletSpaces)).toEqual([17, 17])
+    expect(request.groups.map(group => [group.dispatch.vehicle, group.dispatch.driver, group.dispatch.remark])).toEqual([[null, null, '第一组'], [null, null, '第二组']])
     expect(wrapper.emitted('created')).toBeUndefined()
     expect(view(dialog).text()).toContain('草稿操作结果未确认，原请求已保留')
     dialog.findComponent(LoadErrorState).vm.$emit('retry'); await flushPromises()
@@ -178,33 +210,30 @@ describe('new dispatch native layout', () => {
   it('locks the real frame and all resource edits while pending and reuses the original conversion after failure', async () => {
     let reject!: (reason: unknown) => void
     vi.mocked(api.convertDispatchDraft).mockReturnValueOnce(new Promise((_, no) => { reject = no })).mockImplementationOnce(async body => ({ draftToken: body.draftToken, replayed: true, vehicles: body.groups.map((group, index) => ({ draftContainerId: group.draftContainerId, dispatch: command('CREATE', group.dispatch.idempotencyKey, `PC/${index + 1}`) })) }))
-    const { wrapper, dialog } = await render(); await restore(dialog); await externalResources(dialog, 'CA-A', '司机甲')
+    const { wrapper, dialog } = await render(); await restore(dialog)
     dialog.vm.$emit('confirm'); dialog.vm.$emit('confirm'); await flushPromises()
     expect(api.convertDispatchDraft).toHaveBeenCalledTimes(1)
     const original = JSON.parse(JSON.stringify(vi.mocked(api.convertDispatchDraft).mock.calls[0]![0])) as ConvertDraft
     expect(dialog.findComponent({ name: 'ElDialog' }).props()).toMatchObject({ showClose: false, closeOnPressEscape: false })
-    expect(field(dialog, '车牌号').get('input').attributes('disabled')).toBeDefined()
+    expect(field(dialog, '备注').get('input').attributes('disabled')).toBeDefined()
     reject(new ApiResponseError('转换结果尚未确认', 'A0503', 503, null, 'new-dispatch-request')); await flushPromises()
     expect(view(dialog).text()).toContain('new-dispatch-request')
-    expect(dialog.getComponent(DispatchResourceFields).props('disabled')).toBe(true)
+    expect(dialog.findComponent(DispatchResourceFields).exists()).toBe(false)
     await wrapper.setProps({ modelValue: false }); await wrapper.setProps({ modelValue: true }); await flushPromises()
     dialog.vm.$emit('confirm'); await flushPromises()
     expect(vi.mocked(api.convertDispatchDraft).mock.calls[1]![0]).toEqual(original)
   })
-  it('keeps all candidate rows and complete source details in the body with shared ellipsis components', async () => {
+  it('keeps all current-page orders and reveals complete pallet source details only after selecting an order', async () => {
     const rows = Array.from({ length: 20 }, (_, index) => candidate({ sourceKey: `SOURCE-${index}`, palletNo: `PALLET-${index}`, orderNo: `ORDER-${index}`, customerName: '很长的客户名称'.repeat(8) }))
     rows[0] = sharedPalletCandidates()[0]!
     vi.mocked(api.listDispatchCandidates).mockResolvedValue({ total: 20, page: 1, size: 20, pages: 1, candidates: rows, complete: true, snapshotAt: '' })
     const { dialog } = await render(); await selectWarehouse(dialog)
-    const table = view(dialog).get('[aria-label="排车候选货物"]')
-    expect(table.findAll('.el-table__body-wrapper .el-table__row')).toHaveLength(20)
-    expect(table.text()).toContain('PALLET-19')
-    expect(dialog.findComponent({ name: 'ElTable' }).props('height')).toBeUndefined()
-    expect(dialog.findComponent({ name: 'ElTable' }).props('maxHeight')).toBeUndefined()
-    expect(dialog.findAllComponents(LineClampText).length).toBeGreaterThanOrEqual(40)
-    const sourceGroup = table.findAll('details')[0]!
-    await sourceGroup.get('summary').trigger('click'); await flushPromises()
-    expect(sourceGroup.element.hasAttribute('open')).toBe(true)
+    const table = view(dialog).get('[aria-label="待排订单"]')
+    expect(table.findAll('tbody tr')).toHaveLength(20)
+    expect(table.text()).toContain('ORDER-19')
+    expect(view(dialog).get('[aria-label="托盘明细"]').text()).toContain('请选择左侧订单')
+    await selectFirstOrder(dialog)
+    const sourceGroup = view(dialog).get('[aria-label="托盘明细"] details')
     expect(sourceGroup.findAll('li')).toHaveLength(2)
     expect(sourceGroup.text()).toContain('客户A')
     expect(sourceGroup.text()).toContain('客户B')
@@ -234,7 +263,8 @@ describe('new dispatch native layout', () => {
   it('requires the explicit recheck action after a definite rejection without automatically resubmitting', async () => {
     vi.mocked(api.createDispatchDraft).mockRejectedValue(new ApiResponseError('草稿条件已变化', 'A0409', 409, null, 'draft-rejected-request'))
     const { dialog } = await render(); await selectWarehouse(dialog)
-    await view(dialog).findAll('button').find(button => button.text() === '开始选货')!.trigger('click'); await flushPromises()
+    await selectFirstOrder(dialog)
+    await view(dialog).findAll('button').find(button => button.text() === '加入这辆车')!.trigger('click'); await flushPromises()
     expect(view(dialog).text()).toContain('draft-rejected-request')
     expect(dialog.findComponent(DispatchResourceFields).exists()).toBe(false)
     await view(dialog).findAll('button').find(button => button.text() === '按明确驳回结果重新核对')!.trigger('click'); await flushPromises()

src/modules/overseas-warehouse/components/SmartDispatchDialog.planning.test.ts

@@ -0,0 +1,247 @@
+import ElementPlus from 'element-plus'
+import { enableAutoUnmount, flushPromises, mount, type VueWrapper } from '@vue/test-utils'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import AppDialog from '@/shared/components/AppDialog.vue'
+import { ApiResponseError } from '@/shared/api/http'
+import { listAllPlatformWarehouses, type PlatformWarehouseResource } from '@/modules/warehouses'
+import SmartDispatchDialog from './SmartDispatchDialog.vue'
+import DispatchResourceFields from './DispatchResourceFields.vue'
+import * as api from '../api/dispatches'
+import { candidate, command, detail, sharedPalletCandidates } from '../dispatchTestFixtures'
+import type { Candidate, DispatchDraft } from '../dispatchContracts'
+
+const identity = vi.hoisted(() => ({ id: '' }))
+const push = vi.hoisted(() => vi.fn())
+vi.mock('@/core/auth/auth', () => ({ useAuthStore: () => ({ user: identity }) }))
+vi.mock('@/core/access/accessPreview', () => ({ useAccessPreviewStore: () => ({ can: () => true }) }))
+vi.mock('vue-router', () => ({ useRouter: () => ({ push }) }))
+vi.mock('@/modules/warehouses', () => ({ listAllPlatformWarehouses: vi.fn() }))
+vi.mock('@/modules/overseas-master-data', () => ({ listVehicles: vi.fn(), listDrivers: vi.fn(), overseasMasterDataPermissions: { vehicleList: 'vehicle:list', driverList: 'driver:list' } }))
+vi.mock('../api/dispatches', () => ({ listDispatchDrafts: vi.fn(), listDispatchCandidates: vi.fn(), createDispatchDraft: vi.fn(), createDispatchDraftContainer: vi.fn(), lockDispatchDraftPallet: vi.fn(), unlockDispatchDraftPallet: vi.fn(), deleteDispatchDraftContainer: vi.fn(), releaseDispatchDraft: vi.fn(), convertDispatchDraft: vi.fn(), createDispatch: vi.fn(), getDispatch: vi.fn(), getDispatchCommand: vi.fn() }))
+
+enableAutoUnmount(afterEach)
+afterEach(() => vi.unstubAllGlobals())
+const clone = <T>(value: T): T => JSON.parse(JSON.stringify(value)) as T
+const warehouse: PlatformWarehouseResource = { id: '321', tenantId: '0', warehouseCode: 'LAX', internalCode: null, warehouseName: '洛杉矶仓', warehouseType: 'OVERSEAS', countryCode: 'US', timezone: 'America/Los_Angeles', contactName: null, contactPhone: null, contactEmail: null, status: 'ACTIVE', remark: null }
+type Step = 'CREATE' | 'CONTAINER' | 'LOCK'
+let catalog: Candidate[], server: DispatchDraft | null, lostReply: Step | null, reverseContainers: boolean
+let receipts: Map<string, DispatchDraft>, calls: Step[]
+function source(index: number): Candidate {
+  return candidate({ sourceKey: `source-${index}`, customerId: `C${index}`, customerName: `客户${index}`, orderNo: `ORDER-${index}`, inboundCode: `IN-${index}`, palletNo: `PALLET-${index}`,
+    selection: { sourceType: 'INBOUND_PLAN', planPalletId: String(10 + index), returnReceiptId: null, relabelNo: null, warehousePalletId: String(20 + index), sourceVersion: `source-version-${index}` }, sourceVersion: `source-version-${index}` })
+}
+function emptyDraft(): DispatchDraft { return { draftToken: 'server-token', recordVersion: 0, warehouseId: '321', status: 'ACTIVE', expiresAt: '2026-12-01T00:00:00Z', containers: [], sources: [] } }
+function response(step: Step, key: string, mutate: () => void): DispatchDraft {
+  calls.push(step)
+  const identityKey = `${step}:${key}`
+  if (!receipts.has(identityKey)) { mutate(); receipts.set(identityKey, clone(server!)) }
+  if (lostReply === step) { lostReply = null; throw new Error(`${step} committed but response was lost`) }
+  return clone(receipts.get(identityKey)!)
+}
+beforeEach(() => {
+  vi.resetAllMocks(); sessionStorage.clear(); identity.id = crypto.randomUUID()
+  vi.stubGlobal('ResizeObserver', class { observe() {} unobserve() {} disconnect() {} })
+  catalog = [source(1), source(2), source(3)]; server = null; lostReply = null; reverseContainers = false; receipts = new Map(); calls = []
+  vi.mocked(listAllPlatformWarehouses).mockResolvedValue([warehouse])
+  vi.mocked(api.listDispatchDrafts).mockImplementation(async () => server ? [clone(server)] : [])
+  vi.mocked(api.listDispatchCandidates).mockImplementation(async query => {
+    const page = query.page ?? 1, size = query.size ?? 20
+    return { candidates: clone(catalog.slice((page - 1) * size, page * size)), total: catalog.length, page, size, pages: Math.ceil(catalog.length / size), complete: true, snapshotAt: '2026-10-21T00:00:00Z' }
+  })
+  vi.mocked(api.createDispatchDraft).mockImplementation(async body => response('CREATE', body.idempotencyKey, () => { server = emptyDraft() }))
+  vi.mocked(api.createDispatchDraftContainer).mockImplementation(async body => response('CONTAINER', body.idempotencyKey, () => {
+    expect(body.draftToken).toBe(server!.draftToken); expect(body.recordVersion).toBe(server!.recordVersion)
+    const next = Math.max(0, ...server!.containers.map(row => row.sequenceNo)) + 1
+    server!.containers.push({ draftContainerId: `container-${next}`, sequenceNo: next, capacity: body.capacity, sourceKeys: [] })
+    server!.recordVersion = Number(server!.recordVersion) + 1
+    if (reverseContainers) server!.containers.reverse()
+  }))
+  vi.mocked(api.lockDispatchDraftPallet).mockImplementation(async body => response('LOCK', body.idempotencyKey, () => {
+    expect(body.draftToken).toBe(server!.draftToken); expect(body.recordVersion).toBe(server!.recordVersion)
+    const selected = catalog.find(row => JSON.stringify(row.selection) === JSON.stringify(body.source))!
+    expect(selected, 'LOCK must use a currently returned exact source selection').toBeDefined()
+    const target = server!.containers.find(row => row.draftContainerId === body.draftContainerId)!
+    expect(target, 'LOCK must retain its explicit container identity').toBeDefined()
+    for (const member of selected.selectionGroup.sources) {
+      if (!target.sourceKeys.includes(member.sourceKey)) target.sourceKeys.push(member.sourceKey)
+      if (!server!.sources.some(row => row.sourceKey === member.sourceKey)) {
+        server!.sources.push(clone(catalog.find(row => row.sourceKey === member.sourceKey) || { ...selected, sourceKey: member.sourceKey, customerId: member.customerId, customerName: member.customerName, selection: member.selection, sourceVersion: member.selection.sourceVersion }))
+      }
+    }
+    server!.recordVersion = Number(server!.recordVersion) + 1
+  }))
+  vi.mocked(api.convertDispatchDraft).mockImplementation(async body => ({ draftToken: body.draftToken, replayed: false, vehicles: body.groups.map((group, index) => ({ draftContainerId: group.draftContainerId, dispatch: command('CREATE', group.dispatch.idempotencyKey, `PC-${index + 1}`) })) }))
+  vi.mocked(api.getDispatch).mockImplementation(async no => detail({ dispatchNo: no, recordVersion: 1 }))
+})
+async function render() {
+  const wrapper = mount(SmartDispatchDialog, { attachTo: document.body, props: { modelValue: true, orders: [] }, global: { plugins: [ElementPlus] } })
+  await flushPromises()
+  return wrapper.getComponent(AppDialog)
+}
+function view(dialog: VueWrapper) { return dialog.getComponent({ name: 'ElDialogContent' }) }
+function field(dialog: VueWrapper, label: string) { return dialog.findAllComponents({ name: 'ElFormItem' }).find(row => row.props('label') === label)! }
+function button(dialog: VueWrapper, label: string) { return view(dialog).findAll('button').find(row => row.text() === label)! }
+function car(dialog: VueWrapper, index: number) { return view(dialog).get(`article[aria-label="第 ${index} 辆车"]`) }
+function cargoRow(dialog: VueWrapper, palletNo: string) { return view(dialog).get(`[aria-label="托盘 ${palletNo}"]`) }
+async function selectOrder(dialog: VueWrapper, palletNo: string) {
+  const source = catalog.find(row => row.palletNo === palletNo)!
+  const row = view(dialog).get('[aria-label="待排订单"]').findAll('tbody tr').find(row => row.text().includes(source.orderNo!))!
+  await row.get('button').trigger('click'); await flushPromises()
+}
+async function warehouseSelected(dialog: VueWrapper) {
+  const picker = dialog.findAllComponents({ name: 'ElSelect' }).find(select => select.props('placeholder') === '请选择起运仓')!
+  picker.vm.$emit('update:modelValue', '321'); picker.vm.$emit('change', '321'); await flushPromises()
+}
+async function join(dialog: VueWrapper, palletNo: string) { await selectOrder(dialog, palletNo); await cargoRow(dialog, palletNo).findAll('button').find(row => row.text() === '加入这辆车')!.trigger('click'); await flushPromises() }
+async function chooseCar(dialog: VueWrapper, index: number) { await car(dialog, index).get('input[type="radio"]').setValue(true); await flushPromises() }
+describe('three-column cargo planning through visible controls', () => {
+  it('opens and selects a warehouse as reads only with one empty 30-space placeholder and no start prerequisite', async () => {
+    const dialog = await render()
+    expect(car(dialog, 1).text()).toContain('30 托位')
+    expect(view(dialog).findAll('article[aria-label^="第 "]')).toHaveLength(1)
+    expect(view(dialog).text()).not.toContain('开始安排第一辆车')
+    expect(dialog.findComponent(DispatchResourceFields).exists()).toBe(false)
+    expect(calls).toEqual([])
+    await warehouseSelected(dialog)
+    expect(view(dialog).get('[aria-label="待排订单"]').text()).toContain('ORDER-1')
+    expect(view(dialog).get('[aria-label="托盘明细"]').text()).toContain('请选择左侧订单')
+    expect(calls).toEqual([])
+    expect(api.createDispatch).not.toHaveBeenCalled()
+    expect(dialog.props('confirmDisabled')).toBe(true)
+  })
+  it('first adds cargo through CREATE then CONTAINER then exactly one LOCK', async () => {
+    const dialog = await render(); await warehouseSelected(dialog); await join(dialog, 'PALLET-1')
+    expect(calls).toEqual(['CREATE', 'CONTAINER', 'LOCK'])
+    expect(api.createDispatchDraftContainer).toHaveBeenCalledExactlyOnceWith({ draftToken: 'server-token', recordVersion: 0, idempotencyKey: expect.any(String), capacity: 30 })
+    expect(api.lockDispatchDraftPallet).toHaveBeenCalledExactlyOnceWith({ draftToken: 'server-token', recordVersion: 1, idempotencyKey: expect.any(String), draftContainerId: 'container-1', source: catalog[0]!.selection })
+    expect(car(dialog, 1).text()).toContain('PALLET-1')
+    expect(dialog.findComponent(DispatchResourceFields).exists()).toBe(false)
+    expect(dialog.props('confirmDisabled')).toBe(false)
+  })
+  it('adding a vehicle before any cargo materializes the first and second empty cars without locking stock', async () => {
+    const dialog = await render(); await warehouseSelected(dialog)
+    await button(dialog, '添加车辆').trigger('click'); await flushPromises()
+    expect(calls).toEqual(['CREATE', 'CONTAINER', 'CONTAINER'])
+    expect(view(dialog).findAll('article[aria-label^="第 "]')).toHaveLength(2)
+    expect(car(dialog, 2).get('input[type="radio"]').element).toHaveProperty('checked', true)
+    expect(api.lockDispatchDraftPallet).not.toHaveBeenCalled()
+    expect(dialog.props('confirmDisabled')).toBe(true)
+  })
+  it('retains the first car cargo, isolates per-car fields and adds later cargo to the car selected again', async () => {
+    const dialog = await render(); await warehouseSelected(dialog); await join(dialog, 'PALLET-1')
+    await field(dialog, '备注').get('input').setValue('第一车独立备注')
+    await button(dialog, '添加车辆').trigger('click'); await flushPromises()
+    expect(car(dialog, 1).text()).toContain('PALLET-1')
+    expect(car(dialog, 2).get('input[type="radio"]').element).toHaveProperty('checked', true)
+    expect(dialog.findComponent(DispatchResourceFields).exists()).toBe(false)
+    await field(dialog, '备注').get('input').setValue('第二车独立备注'); await join(dialog, 'PALLET-2')
+    expect(vi.mocked(api.lockDispatchDraftPallet).mock.calls[1]![0].draftContainerId).toBe('container-2')
+    await chooseCar(dialog, 1)
+    expect(dialog.findComponent(DispatchResourceFields).exists()).toBe(false)
+    expect((field(dialog, '备注').get('input').element as HTMLInputElement).value).toBe('第一车独立备注')
+    await join(dialog, 'PALLET-3')
+    expect(vi.mocked(api.lockDispatchDraftPallet).mock.calls[2]![0].draftContainerId).toBe('container-1')
+    expect(car(dialog, 1).text()).toContain('PALLET-3'); expect(car(dialog, 2).text()).toContain('PALLET-2')
+    await chooseCar(dialog, 2)
+    expect(dialog.findComponent(DispatchResourceFields).exists()).toBe(false)
+    expect((field(dialog, '备注').get('input').element as HTMLInputElement).value).toBe('第二车独立备注')
+  })
+  it('selects the newly added ID even when its response lists the new container first and old container last', async () => {
+    const dialog = await render(); await warehouseSelected(dialog); await join(dialog, 'PALLET-1')
+    reverseContainers = true
+    await button(dialog, '添加车辆').trigger('click'); await flushPromises()
+    expect(server!.containers.map(row => row.draftContainerId)).toEqual(['container-2', 'container-1'])
+    expect(car(dialog, 2).get('input[type="radio"]').element).toHaveProperty('checked', true)
+    await join(dialog, 'PALLET-2')
+    expect(vi.mocked(api.lockDispatchDraftPallet).mock.calls.at(-1)![0].draftContainerId).toBe('container-2')
+    expect(car(dialog, 1).text()).toContain('PALLET-1'); expect(car(dialog, 1).text()).not.toContain('PALLET-2')
+  })
+  it('locks a dragged pallet to a non-active car and keeps the other car allocation unchanged', async () => {
+    const dialog = await render(); await warehouseSelected(dialog); await join(dialog, 'PALLET-1')
+    await button(dialog, '添加车辆').trigger('click'); await flushPromises()
+    expect(car(dialog, 2).get('input[type="radio"]').element).toHaveProperty('checked', true)
+    await selectOrder(dialog, 'PALLET-2')
+    const dataTransfer = { setData: vi.fn(), effectAllowed: '', dropEffect: '' }
+    await cargoRow(dialog, 'PALLET-2').trigger('dragstart', { dataTransfer })
+    await car(dialog, 1).trigger('dragover', { dataTransfer })
+    await car(dialog, 1).trigger('drop', { dataTransfer }); await flushPromises()
+    expect(api.lockDispatchDraftPallet).toHaveBeenCalledTimes(2)
+    expect(vi.mocked(api.lockDispatchDraftPallet).mock.calls.at(-1)![0]).toMatchObject({ draftContainerId: 'container-1', source: catalog[1]!.selection })
+    expect(server!.containers[0]!.sourceKeys).toEqual(['source-1', 'source-2'])
+    expect(server!.containers[1]!.sourceKeys).toEqual([])
+  })
+  it.each(['CREATE', 'CONTAINER'] as const)('does not continue to LOCK after a definite %s rejection', async step => {
+    const rejected = new ApiResponseError(`${step}条件不允许`, 'A0409', 409, undefined, `request-${step}`)
+    if (step === 'CREATE') vi.mocked(api.createDispatchDraft).mockRejectedValueOnce(rejected)
+    else vi.mocked(api.createDispatchDraftContainer).mockRejectedValueOnce(rejected)
+    const dialog = await render(); await warehouseSelected(dialog); await join(dialog, 'PALLET-1')
+    expect(api.lockDispatchDraftPallet).not.toHaveBeenCalled()
+    expect(api.createDispatchDraft).toHaveBeenCalledTimes(1)
+    expect(api.createDispatchDraftContainer).toHaveBeenCalledTimes(step === 'CREATE' ? 0 : 1)
+    expect(view(dialog).text()).toContain(`request-${step}`)
+    expect(view(dialog).text()).toContain('按明确驳回结果重新核对')
+  })
+  it.each(['CREATE', 'CONTAINER'] as const)('stops after an unknown %s and retries its exact command without auto-locking or recreating', async step => {
+    lostReply = step
+    const dialog = await render(); await warehouseSelected(dialog); await join(dialog, 'PALLET-1')
+    expect(api.lockDispatchDraftPallet).not.toHaveBeenCalled()
+    const before = step === 'CREATE' ? clone(vi.mocked(api.createDispatchDraft).mock.calls[0]![0]) : clone(vi.mocked(api.createDispatchDraftContainer).mock.calls[0]![0])
+    await button(dialog, '重试原请求').trigger('click'); await flushPromises()
+    if (step === 'CREATE') {
+      expect(api.createDispatchDraft).toHaveBeenNthCalledWith(2, before)
+      expect(api.createDispatchDraftContainer).not.toHaveBeenCalled()
+    } else {
+      expect(api.createDispatchDraftContainer).toHaveBeenNthCalledWith(2, before)
+      expect(api.createDispatchDraft).toHaveBeenCalledTimes(1)
+    }
+    expect(api.lockDispatchDraftPallet).not.toHaveBeenCalled()
+    await join(dialog, 'PALLET-1')
+    expect(api.createDispatchDraft).toHaveBeenCalledTimes(step === 'CREATE' ? 2 : 1)
+    expect(api.createDispatchDraftContainer).toHaveBeenCalledTimes(step === 'CONTAINER' ? 2 : 1)
+    expect(api.lockDispatchDraftPallet).toHaveBeenCalledTimes(1)
+  })
+  it('keeps the preparation chain frozen while CREATE is in flight', async () => {
+    let resolve!: (value: DispatchDraft) => void
+    vi.mocked(api.createDispatchDraft).mockImplementationOnce(() => new Promise(done => { resolve = done }))
+    const dialog = await render(); await warehouseSelected(dialog)
+    await selectOrder(dialog, 'PALLET-1')
+    await cargoRow(dialog, 'PALLET-1').findAll('button').find(row => row.text() === '加入这辆车')!.trigger('click')
+    expect(button(dialog, '添加车辆').attributes('disabled')).toBeDefined()
+    expect(cargoRow(dialog, 'PALLET-1').findAll('button').find(row => row.text() === '加入这辆车')!.attributes('disabled')).toBeDefined()
+    expect(view(dialog).get('[aria-label="待排订单"]').findAll('tbody tr button').every(row => row.attributes('disabled') !== undefined)).toBe(true)
+    expect(api.createDispatchDraft).toHaveBeenCalledTimes(1)
+    expect(api.createDispatchDraftContainer).not.toHaveBeenCalled(); expect(api.lockDispatchDraftPallet).not.toHaveBeenCalled()
+    server = emptyDraft(); resolve(clone(server)); await flushPromises()
+    expect(api.createDispatchDraftContainer).toHaveBeenCalledTimes(1); expect(api.lockDispatchDraftPallet).toHaveBeenCalledTimes(1)
+  })
+  it('restores both existing cars without an extra placeholder and retains their allocations across real paging', async () => {
+    catalog = Array.from({ length: 21 }, (_, index) => source(index + 1))
+    server = { ...emptyDraft(), recordVersion: 4, sources: clone(catalog.slice(0, 2)), containers: [1, 2].map(index => ({ draftContainerId: `container-${index}`, sequenceNo: index, capacity: index === 1 ? 30 : 15, sourceKeys: [`source-${index}`] })) }
+    const dialog = await render()
+    dialog.findAllComponents({ name: 'ElSelect' }).find(row => row.props('placeholder') === '继续待完成排车')!.vm.$emit('change', 'server-token'); await flushPromises()
+    expect(view(dialog).findAll('article[aria-label^="第 "]')).toHaveLength(2)
+    expect(car(dialog, 1).text()).toContain('PALLET-1'); expect(car(dialog, 2).text()).toContain('PALLET-2')
+    expect(calls).toEqual([])
+    await view(dialog).get('[aria-label="候选货物分页"] button.btn-next').trigger('click'); await flushPromises()
+    expect(api.listDispatchCandidates).toHaveBeenLastCalledWith(expect.objectContaining({ page: 2, draftToken: 'server-token' }))
+    expect(view(dialog).get('[aria-label="待排订单"]').text()).toContain('ORDER-21')
+    expect(view(dialog).get('[aria-label="托盘明细"]').text()).toContain('请选择左侧订单')
+    expect(car(dialog, 1).text()).toContain('PALLET-1'); expect(car(dialog, 2).text()).toContain('PALLET-2')
+    expect(calls).toEqual([])
+  })
+  it('locks a shared physical group once and converts all authoritative members without duplicate writes', async () => {
+    catalog = sharedPalletCandidates()
+    const dialog = await render(); await warehouseSelected(dialog); await join(dialog, 'PALLET-1')
+    expect(api.lockDispatchDraftPallet).toHaveBeenCalledTimes(1)
+    expect(server!.containers[0]!.sourceKeys).toEqual(catalog.map(row => row.sourceKey))
+    for (const source of catalog) {
+      await view(dialog).get('[aria-label="待排订单"]').findAll('tbody tr').find(row => row.text().includes(source.orderNo!) && row.text().includes(source.customerName!))!.get('button').trigger('click')
+      expect(cargoRow(dialog, 'PALLET-1').get('button').text()).toBe('已加入第 1 辆车')
+      expect(cargoRow(dialog, 'PALLET-1').get('button').attributes('disabled')).toBeDefined()
+    }
+    await button(dialog, '生成排车单').trigger('click'); await flushPromises()
+    expect(api.convertDispatchDraft).toHaveBeenCalledTimes(1)
+    expect(vi.mocked(api.convertDispatchDraft).mock.calls[0]![0].groups[0]!.dispatch.cargo).toEqual(catalog.map(row => row.selection))
+    expect(api.lockDispatchDraftPallet).toHaveBeenCalledTimes(1)
+  })
+})

src/modules/overseas-warehouse/components/SmartDispatchDialog.test.ts

@@ -15,8 +15,34 @@ vi.mock('@/core/access/accessPreview', () => ({ useAccessPreviewStore: () => ({
 vi.mock('vue-router', () => ({ useRouter: () => ({ push }) }))
 vi.mock('@/modules/warehouses', () => ({ listAllPlatformWarehouses: vi.fn() }))
 vi.mock('./DispatchResourceFields.vue', () => ({ default: { template: '<div />' } }))
+vi.mock('./SmartDispatchExistingCargo.vue', () => ({ default: { name: 'SmartDispatchExistingCargo', emits: ['saved', 'busy'], template: '<div data-existing-cargo />' } }))
 vi.mock('../api/dispatches', () => ({ listDispatchDrafts: vi.fn(), listDispatchCandidates: vi.fn(), createDispatchDraft: vi.fn(), createDispatchDraftContainer: vi.fn(), lockDispatchDraftPallet: vi.fn(), unlockDispatchDraftPallet: vi.fn(), deleteDispatchDraftContainer: vi.fn(), releaseDispatchDraft: vi.fn(), convertDispatchDraft: vi.fn(), createDispatch: vi.fn(), getDispatch: vi.fn(), getDispatchCommand: vi.fn() }))
 const source = () => candidate(), draft = (): DispatchDraft => ({ draftToken: 'server-token', recordVersion: 0, status: 'ACTIVE', warehouseId: '321', containers: [{ draftContainerId: '100000000000000001', sequenceNo: 1, capacity: 30, sourceKeys: ['source-1'] }], sources: [source()], expiresAt: '2026-12-01T00:00:00Z' })
+it('switches to existing cargo inside the same dialog without creating a draft or submitting a new dispatch', async () => {
+  const wrapper = mount(SmartDispatchDialog, options); await flushPromises()
+  const dialog = wrapper.getComponent(AppDialog)
+  await wrapper.getComponent({ name: 'ElDialogContent' }).findAll('button').find(button => button.text() === '调整已有排车货物')!.trigger('click'); await flushPromises()
+  expect(wrapper.findComponent({ name: 'SmartDispatchExistingCargo' }).exists()).toBe(true)
+  expect(dialog.props('showConfirm')).toBe(false)
+  dialog.vm.$emit('confirm'); await flushPromises()
+  expect(api.createDispatch).not.toHaveBeenCalled()
+  expect(api.createDispatchDraft).not.toHaveBeenCalled()
+  expect(api.convertDispatchDraft).not.toHaveBeenCalled()
+  wrapper.getComponent({ name: 'SmartDispatchExistingCargo' }).vm.$emit('saved'); await flushPromises()
+  expect(wrapper.emitted('created')).toHaveLength(1)
+  expect(wrapper.emitted('update:modelValue')).toBeUndefined()
+  wrapper.unmount()
+})
+it.each(['ADD_CARGO', 'REMOVE_CARGO'] as const)('opens %s recovery in existing cargo without reading creation drafts', async action => {
+  const recovery = useDispatchCommandRecovery(() => identity.id)
+  recovery.begin('PC/1', action, { recordVersion: 0, idempotencyKey: 'existing-key' })
+  const wrapper = mount(SmartDispatchDialog, options); await flushPromises()
+  expect(wrapper.findComponent({ name: 'SmartDispatchExistingCargo' }).exists()).toBe(true)
+  expect(api.listDispatchDrafts).not.toHaveBeenCalled()
+  expect(listAllPlatformWarehouses).not.toHaveBeenCalled()
+  expect(recovery.pending.value?.body.idempotencyKey).toBe('existing-key')
+  wrapper.unmount()
+})
 it('converts a filtered relabel group with both authoritative sources and locks it through one HTTP command', async () => {
   const [first, second] = sharedPalletCandidates(), original = draft()
   original.sources = [first!]; original.containers[0]!.sourceKeys = [first!.sourceKey]
@@ -68,7 +94,8 @@ it.each([undefined, null, 'bad', 9007199254740992])('requires rereading a restor
     expect(api.convertDispatchDraft).not.toHaveBeenCalled(); expect(wrapper.getComponent({ name: 'ElDialogContent' }).text()).toContain('预约批次版本缺失或无效，请重新读取候选')
   } finally { wrapper.unmount() }
 })
-it('requires an explicit warehouse and allows saving a true empty dispatch with no fake cargo', async () => {
+it('requires a warehouse when the directory is empty and allows saving a true empty dispatch with no fake cargo', async () => {
+  vi.mocked(listAllPlatformWarehouses).mockResolvedValue([])
   const wrapper = mount(SmartDispatchDialog, options); await flushPromises()
   const state = wrapper.vm as unknown as { mode: string; warehouseId: string; submit: () => Promise<void> }
   state.mode = 'empty'; await wrapper.getComponent(AppDialog).vm.$emit('confirm'); await flushPromises(); expect(api.createDispatch).not.toHaveBeenCalled()
@@ -100,19 +127,19 @@ it('accepts a partial candidate page without requiring the filtered whole set',
   vi.mocked(api.listDispatchCandidates).mockResolvedValue({ total: 21, page: 1, size: 20, pages: 2, candidates: [source()], complete: false, snapshotAt: '' })
   const wrapper = mount(SmartDispatchDialog, options); await flushPromises(); const state = wrapper.vm as unknown as { restoreDraft: (token: string) => void }; state.restoreDraft('server-token'); await flushPromises(); expect(wrapper.getComponent({ name: 'ElDialogContent' }).text()).not.toContain('尚未完整返回'); wrapper.unmount()
 })
-it('keeps vehicle assignments independent between containers and reuses a proven conversion after a detail read fails', async () => {
+it('keeps planning remarks independent with unassigned resources and reuses a proven conversion after a detail read fails', async () => {
   const original = draft(); original.containers.push({ draftContainerId: 'container-B', sequenceNo: 2, capacity: 15, sourceKeys: ['source-B'] }); original.sources.push(candidate({ sourceKey: 'source-B', customerId: 'B' }))
   vi.mocked(api.listDispatchDrafts).mockResolvedValue([original])
   vi.mocked(api.convertDispatchDraft).mockImplementation(async request => ({ draftToken: request.draftToken, replayed: false, vehicles: request.groups.map((group, index) => ({ draftContainerId: group.draftContainerId, dispatch: command('CREATE', group.dispatch.idempotencyKey, `PC/${index + 1}`) })) }))
   vi.mocked(api.getDispatch).mockRejectedValueOnce(new Error('detail unavailable')).mockImplementation(async no => detail({ dispatchNo: no, recordVersion: 1 }))
   const wrapper = mount(SmartDispatchDialog, options); await flushPromises()
-  const state = wrapper.vm as unknown as { restoreDraft(token: string): void; submit(): Promise<void>; activeContainerId: string; vehicle: { vehicleId: string | null }; form: { remark: string } }
-  state.restoreDraft('server-token'); await flushPromises(); state.vehicle.vehicleId = 'vehicle-A'; state.form.remark = '车甲'
-  state.activeContainerId = 'container-B'; state.vehicle.vehicleId = 'vehicle-B'; state.form.remark = '车乙'
+  const state = wrapper.vm as unknown as { restoreDraft(token: string): void; submit(): Promise<void>; activeContainerId: string; form: { remark: string } }
+  state.restoreDraft('server-token'); await flushPromises(); state.form.remark = '车甲'
+  state.activeContainerId = 'container-B'; state.form.remark = '车乙'
   await state.submit(); expect(wrapper.emitted('created')).toBeUndefined()
   await state.submit(); expect(api.convertDispatchDraft).toHaveBeenCalledTimes(1)
   const groups = vi.mocked(api.convertDispatchDraft).mock.calls[0]![0].groups
-  expect(groups.map(group => [group.dispatch.vehicle?.vehicleId, group.dispatch.remark])).toEqual([['vehicle-A', '车甲'], ['vehicle-B', '车乙']])
+  expect(groups.map(group => [group.dispatch.vehicle, group.dispatch.driver, group.dispatch.remark])).toEqual([[null, null, '车甲'], [null, null, '车乙']])
   expect(wrapper.emitted('created')).toHaveLength(1); wrapper.unmount()
 })
 it('never sends an existing departure command through the empty creation transport', async () => {

src/modules/overseas-warehouse/components/SmartDispatchDialog.vue

@@ -2,7 +2,6 @@
 import '@/styles/adminWorkbench.css'
 import '@/styles/adminDensity.css'
 import { computed, reactive, ref, watch } from 'vue'
-import { ChevronRight } from '@lucide/vue'
 import { useRouter } from 'vue-router'
 import { ElMessage } from 'element-plus'
 import { useAuthStore } from '@/core/auth/auth'
@@ -11,17 +10,17 @@ import { listAllPlatformWarehouses, type PlatformWarehouseResource } from '@/mod
 import { getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
 import AppDialog from '@/shared/components/AppDialog.vue'
 import InlineHelp from '@/shared/components/InlineHelp.vue'
-import LineClampText from '@/shared/components/LineClampText.vue'
 import ApiErrorMeta from '@/shared/components/ApiErrorMeta.vue'
 import LoadErrorState from '@/shared/components/LoadErrorState.vue'
 import * as api from '../api/dispatches'
 import { useDispatchCandidates } from '../useDispatchCandidates'
-import type { Candidate, ConvertedDraft, ConvertDraft, CreateDispatch, DispatchDraft, Driver, DraftSelection, Vehicle, VersionCommand } from '../dispatchContracts'
-import { DispatchInputError, requireVersion, requireBatchVersions, requireSelectionGroup, expandSelectionGroups, selectionGroupBlockReason } from '../dispatchContracts'
+import type { Candidate, ConvertedDraft, ConvertDraft, CreateDispatch, DispatchDraft, DraftSelection, VersionCommand } from '../dispatchContracts'
+import { DispatchInputError, requireVersion, requireBatchVersions, requireSelectionGroup, expandSelectionGroups } from '../dispatchContracts'
 import { dispatchActionPermissions } from '../dispatchPresentation'
 import { useDispatchCommandRecovery, validateCurrentDispatch, isDefiniteDispatchRejection } from '../dispatchCommandRecovery'
 import type { InboundOrderListItem } from '../types'
-import DispatchResourceFields from './DispatchResourceFields.vue'
+import SmartDispatchCargoBoard from './SmartDispatchCargoBoard.vue'
+import SmartDispatchExistingCargo from './SmartDispatchExistingCargo.vue'
 import type { SmartDispatchWarehouseTab } from '../smartDispatchWarehouseTab'
 
 const props = defineProps<{ modelValue: boolean; orders: InboundOrderListItem[] }>()
@@ -29,39 +28,66 @@ const emit = defineEmits<{ 'update:modelValue': [value: boolean]; created: [] }>
 const router = useRouter(), auth = useAuthStore(), access = useAccessPreviewStore()
 const recovery = useDispatchCommandRecovery(() => auth.user?.id || '')
 const owner = auth.user?.id || '', storageKey = `dispatch-draft-command:${owner}`
-type DraftCommand = { action: 'CREATE' | 'CONTAINER' | 'LOCK' | 'UNLOCK' | 'DELETE' | 'RELEASE' | 'CONVERT'; body: Record<string, unknown>; containerId?: string; attempted: boolean; rejected: boolean; result?: ConvertedDraft }
+type DraftCommand = { action: 'CREATE' | 'CONTAINER' | 'LOCK' | 'UNLOCK' | 'DELETE' | 'RELEASE' | 'CONVERT'; body: Record<string, unknown>; containerId?: string; priorContainerIds?: string[]; attempted: boolean; rejected: boolean; result?: ConvertedDraft }
 const pending = ref<DraftCommand | null>(null)
 if (owner && sessionStorage.getItem(storageKey)) pending.value = JSON.parse(sessionStorage.getItem(storageKey)!) as DraftCommand
+const workspace = ref<'create' | 'existing'>('create'), existingBusy = ref(false)
+const settingsExpanded = ref(false)
 const mode = ref<'cargo' | 'empty'>('cargo'), warehouseId = ref(''), warehouses = ref<PlatformWarehouseResource[]>([])
 const draft = ref<DispatchDraft | null>(null), drafts = ref<DispatchDraft[]>([]), activeContainerId = ref(''), capacity = ref(30)
-const working = ref(false), saving = ref(false), error = ref<ApiErrorDetails | null>(null)
+const working = ref(false), saving = ref(false), preparing = ref(false), error = ref<ApiErrorDetails | null>(null)
 const candidatePage = useDispatchCandidates(error)
 const { candidates, page, size, total } = candidatePage
 const loading = computed(() => working.value || candidatePage.loading.value)
 const query = reactive({ orderNo: '', destinationWarehouseCode: '', sourceStage: '' })
 const warehouseTab = ref<SmartDispatchWarehouseTab>('ALL')
-const settings = reactive<Record<string, { form: { plannedDepartureAt: string; estimatedArrivalAt: string; remark: string }; vehicle: Vehicle; driver: Driver }>>({})
+const settings = reactive<Record<string, { form: { plannedDepartureAt: string; estimatedArrivalAt: string; remark: string } }>>({})
 const currentSettings = computed(() => {
   const key = mode.value === 'empty' ? 'empty' : activeContainerId.value || 'unselected'
-  settings[key] ||= { form: { plannedDepartureAt: '', estimatedArrivalAt: '', remark: '' }, vehicle: { mode: 'MASTER', vehicleId: null, plate: null, carrierName: null, capacity: { palletSpaces: null, maxLoadKg: null, maxVolumeCbm: null }, evidenceFileIds: [] }, driver: { mode: 'MASTER', driverId: null, name: null, phone: null, evidence: { licenseNo: null, licenseExpiresOn: null, fileIds: [], expectedTaskEndAt: null } } }
+  settings[key] ||= { form: { plannedDepartureAt: '', estimatedArrivalAt: '', remark: '' } }
   return settings[key]!
 })
 const form = computed(() => currentSettings.value.form)
-const vehicle = computed({ get: () => currentSettings.value.vehicle, set: (value: Vehicle) => { currentSettings.value.vehicle = value } })
-const driver = computed({ get: () => currentSettings.value.driver, set: (value: Driver) => { currentSettings.value.driver = value } })
-const frozen = computed(() => !canCreate.value || saving.value || Boolean(pending.value) || Boolean(recovery.pending.value))
+const frozen = computed(() => !canCreate.value || preparing.value || saving.value || Boolean(pending.value) || Boolean(recovery.pending.value))
 const canCreate = computed(() => access.can(dispatchActionPermissions.CREATE))
+const canEditCargo = computed(() => access.can(dispatchActionPermissions.ADD_CARGO))
+const workspaceFrozen = computed(() => loading.value || preparing.value || saving.value || existingBusy.value || Boolean(pending.value) || Boolean(recovery.pending.value))
 const planIds = computed(() => [...new Set(props.orders.map(row => row.planId).filter(Boolean))])
 const currentContainer = computed(() => draft.value?.containers.find(row => row.draftContainerId === activeContainerId.value))
 const populatedGroupCount = computed(() => draft.value?.containers.filter(row => row.sourceKeys.length).length || 0)
-const confirmDisabled = computed(() => loading.value || !canCreate.value || (!pending.value && !recovery.pending.value && (mode.value === 'empty' ? !warehouseId.value : !populatedGroupCount.value)))
+const confirmDisabled = computed(() => preparing.value || loading.value || !canCreate.value || (!pending.value && !recovery.pending.value && (mode.value === 'empty' ? !warehouseId.value : !populatedGroupCount.value)))
 function assignedGroup(row: Candidate) {
   return draft.value?.containers.find(group => group.sourceKeys.some(key => row.selectionGroup.sources.some(source => source.sourceKey === key)))
 }
-async function startCargo() {
+async function ensureFirstVehicle(sequence: number): Promise<string | null> {
+  if (!draft.value && !await draftAction('CREATE')) return null
+  if (sequence !== generation || !props.modelValue || !draft.value) return null
+  if (!draft.value.containers.length && !await draftAction('CONTAINER')) return null
+  if (sequence !== generation || !props.modelValue) return null
+  return currentContainer.value?.draftContainerId || null
+}
+async function addCargo(source: Candidate, targetContainerId = activeContainerId.value) {
+  if (frozen.value || loading.value || !warehouseId.value || assignedGroup(source)) return
+  const sequence = generation, target = targetContainerId
+  preparing.value = true
+  try {
+    requireSelectionGroup(source); candidatePage.assertCurrent([source])
+    const containerId = target || await ensureFirstVehicle(sequence)
+    if (!containerId || sequence !== generation || !props.modelValue) return
+    if (!draft.value?.containers.some(row => row.draftContainerId === containerId)) throw new DispatchInputError('所选车辆已变化，请重新选择')
+    activeContainerId.value = containerId
+    await draftAction('LOCK', source, containerId)
+  } catch (cause) { error.value = getApiErrorDetails(cause, cause instanceof DispatchInputError ? cause.message : '加入货物失败，请核对后重试') }
+  finally { preparing.value = false }
+}
+async function addVehicle() {
   if (frozen.value || loading.value || !warehouseId.value) return
-  if (!draft.value) await draftAction('CREATE')
-  if (draft.value && !error.value && !pending.value && !draft.value.containers.length) await draftAction('CONTAINER')
+  const sequence = generation
+  preparing.value = true
+  try {
+    if (!await ensureFirstVehicle(sequence)) return
+    if (sequence === generation && props.modelValue) await draftAction('CONTAINER')
+  } finally { preparing.value = false }
 }
 function changeWarehouse() { candidatePage.reset(); warehouseTab.value = 'ALL'; void search() }
 function changeTab(tab: SmartDispatchWarehouseTab) { warehouseTab.value = tab; void search() }
@@ -78,6 +104,10 @@ async function init() {
   const sequence = ++generation
   working.value = true; error.value = null
   try {
+    if (recovery.pending.value && ['ADD_CARGO', 'REMOVE_CARGO'].includes(recovery.pending.value.action)) workspace.value = 'existing'
+    else if (pending.value || recovery.pending.value?.action === 'CREATE') workspace.value = 'create'
+    else if (!canCreate.value && canEditCargo.value) workspace.value = 'existing'
+    if (workspace.value === 'existing' || !canCreate.value) return
     if (recovery.pending.value?.action === 'CREATE') { mode.value = 'empty'; warehouseId.value = String(recovery.pending.value.body.warehouseId || '') }
     const [directory, saved] = await Promise.all([listAllPlatformWarehouses({ warehouseType: 'OVERSEAS', status: 'ACTIVE' }), api.listDispatchDrafts()])
     if (sequence !== generation) return
@@ -87,17 +117,26 @@ async function init() {
     if (!warehouseId.value) {
       const selectedWarehouses = new Set(props.orders.map(row => row.originWarehouseId).filter(Boolean))
       if (selectedWarehouses.size === 1 && directory.some(row => String(row.id) === [...selectedWarehouses][0])) warehouseId.value = [...selectedWarehouses][0]!
+      else if (directory[0]) warehouseId.value = String(directory[0].id)
     }
     if (warehouseId.value) await loadCandidates(sequence)
   } catch (cause) { if (sequence === generation) error.value = getApiErrorDetails(cause, cause instanceof DispatchInputError ? cause.message : '排车候选或草稿恢复失败，请保留原选择重试') }
   finally { if (sequence === generation) working.value = false }
 }
+function switchWorkspace(value: 'create' | 'existing') {
+  if (workspaceFrozen.value || value === workspace.value || (value === 'create' ? !canCreate.value : !canEditCargo.value)) return
+  workspace.value = value
+  existingBusy.value = false
+  candidatePage.reset()
+  void init()
+}
 async function loadCandidates(sequence = generation) {
   if (sequence !== generation) return
   const filterKey = JSON.stringify([warehouseId.value, query, warehouseTab.value, planIds.value, draft.value?.draftToken])
   if (filterKey !== candidateFilterKey) { page.value = 1; candidateFilterKey = filterKey }
   await candidatePage.load({ warehouseId: warehouseId.value, page: page.value, size: size.value, warehouseTab: warehouseTab.value, orderNo: query.orderNo || undefined, destinationWarehouseCode: query.destinationWarehouseCode || undefined, sourceStage: query.sourceStage || undefined, ...(query.sourceStage !== 'RELABEL' && planIds.value.length ? { planIds: planIds.value } : {}), draftToken: draft.value?.draftToken })
 }
+function resetSearch() { if (frozen.value) return; query.orderNo = ''; query.destinationWarehouseCode = ''; query.sourceStage = ''; warehouseTab.value = 'ALL'; void search() }
 async function search() { if (frozen.value) return; page.value = 1; await loadCandidates() }
 function restoreDraft(token: string) { if (frozen.value) return; const value = drafts.value.find(row => row.draftToken === token); if (!value) return; draft.value = value; warehouseId.value = value.warehouseId; activeContainerId.value = value.containers[0]?.draftContainerId || ''; void search() }
 function creation(cargo: Candidate[], containerId?: string): CreateDispatch {
@@ -105,10 +144,10 @@ function creation(cargo: Candidate[], containerId?: string): CreateDispatch {
   requireBatchVersions(cargo.flatMap(row => row.appointmentBatches))
   if (cargo.some(row => row.warehouseId !== warehouseId.value || !row.sourceVersion || row.sourceVersion !== row.selection.sourceVersion || row.appointmentBatches.some(batch => batch.customerId !== row.customerId))) throw new DispatchInputError('货物仓库、来源版本或预约客户不一致，请重新读取')
   const config = containerId ? settings[containerId] : currentSettings.value
-  return { idempotencyKey: crypto.randomUUID(), warehouseId: warehouseId.value, vehicle: config && (config.vehicle.vehicleId || config.vehicle.plate) ? JSON.parse(JSON.stringify(config.vehicle)) as Vehicle : null, driver: config && (config.driver.driverId || config.driver.name) ? JSON.parse(JSON.stringify(config.driver)) as Driver : null, plannedDepartureAt: config?.form.plannedDepartureAt || null, estimatedArrivalAt: config?.form.estimatedArrivalAt || null, remark: config?.form.remark || null, cargo: expandSelectionGroups(cargo), batchAllocations: cargo.flatMap(row => row.appointmentBatches.flatMap(batch => batch.sources.map(source => { if (!row.selection.planPalletId) throw new DispatchInputError('批次分配缺少真实计划来源，请核对'); return { planPalletId: row.selection.planPalletId, batchKey: batch.batchKey, customerId: batch.customerId, ...source, recordVersion: batch.recordVersion } }))) }
+  return { idempotencyKey: crypto.randomUUID(), warehouseId: warehouseId.value, vehicle: null, driver: null, plannedDepartureAt: config?.form.plannedDepartureAt || null, estimatedArrivalAt: config?.form.estimatedArrivalAt || null, remark: config?.form.remark || null, cargo: expandSelectionGroups(cargo), batchAllocations: cargo.flatMap(row => row.appointmentBatches.flatMap(batch => batch.sources.map(source => { if (!row.selection.planPalletId) throw new DispatchInputError('批次分配缺少真实计划来源，请核对'); return { planPalletId: row.selection.planPalletId, batchKey: batch.batchKey, customerId: batch.customerId, ...source, recordVersion: batch.recordVersion } }))) }
 }
-async function draftAction(action: DraftCommand['action'], source?: Candidate, containerId?: string) {
-  if (!canCreate.value || loading.value || saving.value) return
+async function draftAction(action: DraftCommand['action'], source?: Candidate, containerId?: string): Promise<boolean> {
+  if (!canCreate.value || loading.value || saving.value) return false
   error.value = null
   try {
     if (!pending.value) {
@@ -133,10 +172,11 @@ async function draftAction(action: DraftCommand['action'], source?: Candidate, c
           body = { ...common, groups } satisfies ConvertDraft
         }
       }
-      pending.value = { action, body: JSON.parse(JSON.stringify(body)) as Record<string, unknown>, containerId, attempted: false, rejected: false }; persist()
+      pending.value = { action, body: JSON.parse(JSON.stringify(body)) as Record<string, unknown>, containerId, ...(action === 'CONTAINER' ? { priorContainerIds: current!.containers.map(row => row.draftContainerId) } : {}), attempted: false, rejected: false }; persist()
     }
     await retryDraft()
-  } catch (cause) { error.value = getApiErrorDetails(cause, cause instanceof DispatchInputError ? cause.message : '草稿操作结果未确认，原请求已保留') }
+    return true
+  } catch (cause) { error.value = getApiErrorDetails(cause, cause instanceof DispatchInputError ? cause.message : '草稿操作结果未确认，原请求已保留'); return false }
 }
 async function retryDraft() {
   if (!pending.value || saving.value) return
@@ -163,8 +203,15 @@ async function retryDraft() {
       pending.value = null; persist(); emit('created'); emit('update:modelValue', false); draft.value = null; ElMessage.success('整车排车单已创建'); await router.push({ name: 'overseas-dispatches' }); return
     }
     requireVersion((result as DispatchDraft).recordVersion)
+    let addedContainerId: string | undefined
+    if (command.action === 'CONTAINER') {
+      const updated = result as DispatchDraft, previous = command.priorContainerIds
+      const added = previous && updated.containers.filter(row => !previous.includes(row.draftContainerId))
+      if (!previous || !added || added.length !== 1 || added[0]!.capacity !== body.capacity || updated.containers.length !== previous.length + 1 || previous.some(id => !updated.containers.some(row => row.draftContainerId === id))) throw new DispatchInputError('新增车辆结果尚未核对，请保留原请求重试')
+      addedContainerId = added[0]!.draftContainerId
+    }
     draft.value = command.action === 'RELEASE' ? null : result as DispatchDraft
-    activeContainerId.value = draft.value?.containers.find(row => row.draftContainerId === activeContainerId.value)?.draftContainerId || draft.value?.containers[0]?.draftContainerId || ''
+    activeContainerId.value = addedContainerId || draft.value?.containers.find(row => row.draftContainerId === activeContainerId.value)?.draftContainerId || draft.value?.containers[0]?.draftContainerId || ''
     // No new source mutation before the original response has been validated.
     pending.value = null; persist()
     if (command.action !== 'CREATE' && command.action !== 'CONTAINER') await loadCandidates()
@@ -172,7 +219,8 @@ async function retryDraft() {
   finally { saving.value = false }
 }
 async function submit() {
-  if (!canCreate.value || saving.value || loading.value) return
+  if (workspace.value === 'existing') return
+  if (!canCreate.value || preparing.value || saving.value || loading.value) return
   error.value = null
   try {
     if (pending.value) { await retryDraft(); return }
@@ -186,93 +234,69 @@ async function submit() {
 watch(() => props.modelValue, value => { if (value) void init(); else { generation++; candidatePage.reset() } }, { immediate: true })
 </script>
 <template>
-  <AppDialog class="admin-density-dialog admin-density admin-density-workspace admin-workbench is-dialog" append-to-body :lock-scroll="true" :model-value="modelValue" title="新建排车" width="min(1800px, calc(100vw - 40px))" fullscreenable :loading="loading" :confirm-loading="saving || recovery.busy.value" :confirm-disabled="confirmDisabled" :confirm-text="pending || recovery.pending.value ? '重试原请求' : mode === 'empty' ? '保存空排车单' : '生成整车排车单'" @update:model-value="emit('update:modelValue', $event)" @confirm="submit">
-    <div class="density-dialog-sections">
+  <AppDialog class="admin-density-dialog admin-density admin-workbench is-dialog" append-to-body :lock-scroll="true" :model-value="modelValue" title="智能排车" width="min(1800px, calc(100vw - 40px))" fullscreenable :loading="loading" :show-confirm="workspace === 'create'" :confirm-loading="saving || recovery.busy.value || existingBusy" :confirm-disabled="confirmDisabled" :confirm-text="pending || recovery.pending.value ? '重试原请求' : mode === 'empty' ? '保存空排车单' : '生成排车单'" @update:model-value="emit('update:modelValue', $event)" @confirm="submit">
+    <div class="density-status-tabs" role="tablist" aria-label="智能排车工作方式">
+      <button v-if="canCreate" type="button" role="tab" :aria-selected="workspace === 'create'" :class="{ 'is-active': workspace === 'create' }" :disabled="workspaceFrozen" @click="switchWorkspace('create')">新建排车</button>
+      <button v-if="canEditCargo" type="button" role="tab" :aria-selected="workspace === 'existing'" :class="{ 'is-active': workspace === 'existing' }" :disabled="workspaceFrozen" @click="switchWorkspace('existing')">调整已有排车货物</button>
+    </div>
+    <SmartDispatchExistingCargo v-if="workspace === 'existing' && modelValue" @saved="emit('created')" @busy="existingBusy = $event" />
+    <template v-else-if="workspace === 'create'">
+    <div class="density-dialog-sections dispatch-workspace">
       <LoadErrorState v-if="error" title="排车未完成" :message="error.message" :loading="loading || saving || recovery.busy.value" @retry="pending || recovery.pending.value ? submit() : init()"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState>
       <el-alert v-if="pending || recovery.pending.value" role="status" title="原请求结果尚待核对，请勿更改选择、版本或重新建单。" type="warning" :closable="false" show-icon />
       <el-button v-if="pending?.rejected" :disabled="saving || loading" @click="pending = null; persist(); init()">按明确驳回结果重新核对</el-button>
-      <section class="density-dialog-section dispatch-setup" aria-label="排车设置">
-        <h3 class="density-dialog-section__title">1. 排车设置<InlineHelp title="在途预排说明"><p>货物离港并生成入库计划后，即可加入装车组。预排只安排运输，实际装车仍须完成海外仓实收和 PDA 拣货核平。</p></InlineHelp></h3>
+        <section class="density-dialog-section dispatch-search" aria-label="候选货物查询">
+          <div class="dispatch-candidate-query">
+            <el-select class="dispatch-warehouse-picker" aria-label="起运仓" v-model="warehouseId" :disabled="frozen || loading || Boolean(draft)" placeholder="请选择起运仓" @change="changeWarehouse"><el-option v-for="warehouse in warehouses" :key="String(warehouse.id)" :value="String(warehouse.id)" :label="warehouse.warehouseName" /></el-select>
+            <template v-if="mode === 'cargo'"><el-input v-model="query.orderNo" :disabled="frozen || loading" placeholder="订单号／入仓码" /><el-input v-model="query.destinationWarehouseCode" :disabled="frozen || loading" placeholder="目的仓码" /><el-select v-model="query.sourceStage" :disabled="frozen || loading" clearable placeholder="全部来源"><el-option label="在途预排（已离港）" value="PLAN" /><el-option label="已收货实物" value="RECEIVED" /><el-option label="待出库换标" value="RELABEL" /></el-select><el-button type="primary" :disabled="frozen || loading || !warehouseId" @click="search">查询</el-button><el-button :disabled="frozen || loading || !warehouseId" @click="resetSearch">重置</el-button></template><el-button :aria-expanded="settingsExpanded" aria-controls="smart-dispatch-settings" @click="settingsExpanded = !settingsExpanded">排车设置</el-button></div>
+        </section>
+      <section v-show="settingsExpanded" id="smart-dispatch-settings" class="dispatch-context-toolbar" aria-label="排车设置">
         <el-form inline label-position="left" label-width="70px" class="density-form dispatch-setup-fields" :disabled="frozen || loading">
-          <el-form-item label="建单方式"><el-radio-group v-model="mode" :disabled="frozen || loading"><el-radio value="cargo">选货排车</el-radio><el-radio value="empty">先建空单后加货</el-radio></el-radio-group></el-form-item>
-          <el-form-item class="dispatch-warehouse-field" label="起运仓" required><el-select class="dispatch-warehouse-picker" v-model="warehouseId" :disabled="frozen || loading || Boolean(draft)" placeholder="请选择起运仓" @change="changeWarehouse"><el-option v-for="warehouse in warehouses" :key="String(warehouse.id)" :value="String(warehouse.id)" :label="warehouse.warehouseName" /></el-select></el-form-item>
+          <el-form-item label="建单方式"><el-radio-group v-model="mode" :disabled="frozen || loading"><el-radio value="cargo">先选货再建单</el-radio><el-radio value="empty">先建空单后加货</el-radio></el-radio-group></el-form-item>
         </el-form>
+        <div v-if="mode === 'cargo'" class="dispatch-draft-tools density-actions" aria-label="车辆选货安排">
+            <el-select class="dispatch-draft-picker" :model-value="draft?.draftToken" :disabled="frozen || loading" placeholder="继续待完成排车" aria-label="继续待完成排车" @change="restoreDraft"><el-option v-for="saved in drafts" :key="saved.draftToken" :value="saved.draftToken" :label="(warehouses.find(row => String(row.id) === saved.warehouseId)?.warehouseName || '仓库待核实') + ' · ' + saved.containers.length + '辆车 · ' + saved.sources.length + '条货物'" /></el-select>
+            <el-button v-if="draft" :disabled="frozen || loading" @click="draftAction('RELEASE')">放弃本次安排</el-button>
+          <InlineHelp title="选货与草稿说明"><p>点击左侧订单查看托盘，将托盘拖入右侧车辆，或选择车辆后点击加入。添加车辆会保留已选货物；每辆有货的车生成一张排车单，同仓可混装多个客户和目的地。未生成的安排暂存并占用货物，可恢复或放弃。车辆和司机在建单后维护。</p></InlineHelp>
+        </div>
       </section>
       <el-alert v-if="mode === 'empty'" title="空单暂不能核平、装车或发车。" type="info" :closable="false" show-icon />
       <template v-if="mode === 'cargo'">
-        <section class="density-dialog-section dispatch-draft-toolbar" aria-label="整车草稿管理">
-          <h3 class="density-dialog-section__title">2. 选货分组<InlineHelp title="分组与草稿说明"><p>每个有货的装车组生成一张排车单，同仓可混装多个客户和目的地。草稿用于暂存选货并占用来源；退出后可继续已有草稿，放弃时释放草稿。</p></InlineHelp></h3>
-          <div class="dispatch-draft-tools density-actions">
-            <el-button v-if="!draft || !draft.containers.length" type="primary" :disabled="frozen || loading || !warehouseId" @click="startCargo">开始选货</el-button>
-            <el-select class="dispatch-draft-picker" :model-value="draft?.draftToken" :disabled="frozen || loading" placeholder="继续已有草稿" aria-label="继续已有草稿" @change="restoreDraft"><el-option v-for="saved in drafts" :key="saved.draftToken" :value="saved.draftToken" :label="(warehouses.find(row => String(row.id) === saved.warehouseId)?.warehouseName || '仓库待核实') + ' · ' + saved.containers.length + '组 · ' + saved.sources.length + '条货物'" /></el-select>
-            <label class="dispatch-capacity-field"><span>计划托位</span><el-select aria-label="新组计划托位" class="dispatch-capacity-picker" v-model="capacity" :disabled="frozen || loading" placeholder="计划托位"><el-option label="30托位" :value="30" /><el-option label="15托位" :value="15" /></el-select></label>
-            <el-button v-if="draft?.containers.length" :disabled="frozen || loading" @click="draftAction('CONTAINER')">添加装车组</el-button>
-            <InlineHelp title="计划托位说明"><p>此处只设置新组的预排容量，不代表车辆实际载重或容积。真实车辆容量与装车实测仍由服务端校验。</p></InlineHelp>
-            <el-button v-if="draft" :disabled="frozen || loading" @click="draftAction('RELEASE')">释放本草稿</el-button>
-          </div>
-        </section>
-        <div class="cargo-workspace">
-          <section class="density-dialog-section" aria-label="排车候选货物"><h3 class="density-dialog-section__title">候选货物 <small>重量／体积仅供预排参考</small></h3>
-            <div class="dispatch-candidate-query"><el-input v-model="query.orderNo" :disabled="frozen || loading" placeholder="订单号／入仓码" /><el-input v-model="query.destinationWarehouseCode" :disabled="frozen || loading" placeholder="目的仓码" /><el-select v-model="query.sourceStage" :disabled="frozen || loading" clearable placeholder="全部来源"><el-option label="在途预排（已离港）" value="PLAN" /><el-option label="已收货实物" value="RECEIVED" /><el-option label="待出库换标" value="RELABEL" /></el-select><el-button :disabled="frozen || loading || !warehouseId" @click="search">查询</el-button></div>
-            <div class="warehouse-tabs density-tabs" role="tablist" aria-label="候选仓库展示"><button type="button" v-for="tab in ([{ value: 'ALL', label: '全部' }, { value: 'LAX', label: '洛杉矶' }, { value: 'NYC', label: '纽约' }] as const)" :key="tab.value" role="tab" :aria-selected="warehouseTab === tab.value" :disabled="frozen || loading" @click="changeTab(tab.value)">{{ tab.label }}</button></div>
-            <el-table :data="candidates" border :empty-text="!warehouseId ? '请先选择起运仓' : '暂无符合条件的可排货物；在途货物请核对离港节点、入库计划和目的地'">
-              <el-table-column label="操作" width="115" fixed="left"><template #default="{ row }"><el-button link :disabled="frozen || loading || !currentContainer || Boolean(selectionGroupBlockReason(row as Candidate)) || Boolean(assignedGroup(row as Candidate))" @click="draftAction('LOCK', row as Candidate, activeContainerId)">{{ assignedGroup(row as Candidate) ? '已加入第' + assignedGroup(row as Candidate)!.sequenceNo + '组' : '加入本组' }}</el-button></template></el-table-column>
-              <el-table-column prop="customerName" label="客户" min-width="140" show-overflow-tooltip />
-              <el-table-column label="来源" min-width="130"><template #default="{ row }"><span class="density-dialog-note">{{ row.selection.sourceType === 'INBOUND_PLAN' ? (row.selection.warehousePalletId ? '已收货托盘' : '在途计划') : ({ RETURN_RECEIPT: '退回实收', RELABEL: '换标' } as Record<string, string>)[row.selection.sourceType] || '—' }}</span><LineClampText :content="row.selection.relabelNo || row.planNo || '—'" /></template></el-table-column>
-              <el-table-column prop="orderNo" label="订单号" min-width="170" show-overflow-tooltip /><el-table-column prop="inboundCode" label="入仓码" min-width="170" show-overflow-tooltip />
-              <el-table-column label="托盘与完整来源组" min-width="210"><template #default="{ row }"><details class="dispatch-source-group"><summary class="dispatch-group-summary"><ChevronRight class="dispatch-source-toggle" :size="14" aria-hidden="true" /><LineClampText :content="row.palletNo || '—'" /><span>{{ row.selectionGroup.pallets.length }}{{ row.selection.warehousePalletId ? '个实托' : '个计划托盘' }}</span></summary><ul class="dispatch-source-list"><li v-for="source in row.selectionGroup.sources" :key="source.sourceKey">{{ source.sourceBusinessNo || '—' }} · {{ source.customerName }} · {{ source.packages }}箱</li></ul></details></template></el-table-column>
-              <el-table-column prop="availablePackages" label="可排箱数" width="100" /><el-table-column label="目的仓" min-width="150" show-overflow-tooltip><template #default="{ row }">{{ [row.destination.warehouseCode || row.destination.address, row.destination.postalCode].filter(Boolean).join(' · ') || '—' }}</template></el-table-column>
-              <el-table-column label="参考重量／体积" min-width="150"><template #default="{ row }">{{ row.suggestedWeightKg ?? '—' }}kg／{{ row.suggestedVolumeCbm ?? '—' }}m³</template></el-table-column><el-table-column prop="containerNo" label="集装箱号" min-width="170" show-overflow-tooltip /><el-table-column label="资格" min-width="160" show-overflow-tooltip><template #default="{ row }">{{ selectionGroupBlockReason(row as Candidate) || '可排整组' }}</template></el-table-column>
-            </el-table>
-            <el-pagination aria-label="候选货物分页" :current-page="page" :page-size="size" :page-sizes="[10, 20, 50]" :total="total" :disabled="frozen || loading" layout="total, sizes, prev, pager, next" @update:current-page="changePage" @update:page-size="changeSize" />
-          </section>
-          <section class="density-dialog-section" aria-label="排车装车组"><h3 class="density-dialog-section__title">装车分组 <small>{{ populatedGroupCount }} 组有货</small><InlineHelp title="装车分组说明"><p>新建或恢复草稿后添加装车组。同仓可混装多个客户与目的仓。</p></InlineHelp></h3>
-            <p v-if="!draft?.containers.length" class="density-dialog-note">暂无装车组</p>
-            <table v-for="container in draft?.containers || []" :key="container.draftContainerId" class="density-table draft-group-table" :aria-label="`装车组 ${container.sequenceNo}`"><tbody>
-              <tr><td><el-radio v-model="activeContainerId" :disabled="frozen || loading" :value="container.draftContainerId">装车组 {{ container.sequenceNo }} · {{ container.capacity }}托位</el-radio></td><td><el-button link :disabled="frozen || loading" @click="draftAction('DELETE', undefined, container.draftContainerId)">移除本组</el-button></td></tr>
-              <tr><td colspan="2"><p v-if="!container.sourceKeys.length" class="density-dialog-note">暂无货物</p><ul class="dispatch-draft-sources"><li v-for="key in container.sourceKeys" :key="key" class="dispatch-draft-source"><LineClampText :content="draft?.sources.find(row => row.sourceKey === key)?.palletNo || '来源待恢复'" /><el-button link :disabled="frozen || loading || !draft?.sources.some(row => row.sourceKey === key)" @click="draftAction('UNLOCK', draft?.sources.find(row => row.sourceKey === key), container.draftContainerId)">移除货物</el-button></li></ul></td></tr>
-            </tbody></table>
-
-          </section>
-        </div>
+        <div class="warehouse-tabs density-actions" role="tablist" aria-label="候选仓库展示"><el-button v-for="tab in ([{ value: 'ALL', label: '全美' }, { value: 'LAX', label: '洛杉矶' }, { value: 'NYC', label: '纽约' }] as const)" :key="tab.value" role="tab" :aria-selected="warehouseTab === tab.value" :class="{ active: warehouseTab === tab.value }" :type="warehouseTab === tab.value ? 'primary' : undefined" :disabled="frozen || loading" @click="changeTab(tab.value)">{{ tab.label }}</el-button></div>
+        <SmartDispatchCargoBoard :candidates="candidates" :draft="draft" :active-container-id="activeContainerId" :capacity="capacity" :disabled="frozen || loading" :warehouse-selected="Boolean(warehouseId)" :page="page" :size="size" :total="total"
+          @add="addCargo" @select-container="activeContainerId = $event" @add-vehicle="addVehicle" @remove-cargo="(source, id) => draftAction('UNLOCK', source, id)" @remove-container="id => draftAction('DELETE', undefined, id)" @change-page="changePage" @change-size="changeSize">
+          <template #vehicle-controls>
+            <label class="dispatch-capacity-field"><span>托位</span><el-select aria-label="下一辆车计划托位" class="dispatch-capacity-picker" v-model="capacity" :disabled="frozen || loading" placeholder="计划托位"><el-option label="30托位" :value="30" /><el-option label="15托位" :value="15" /></el-select></label>
+          </template>
+        </SmartDispatchCargoBoard>
       </template>
       <el-form v-if="mode === 'empty' || currentContainer" label-position="left" label-width="130px" class="density-form density-dialog-sections" :disabled="frozen || loading">
-        <section class="density-dialog-section" aria-label="排车车辆与司机">
-          <h3 class="density-dialog-section__title">{{ mode === 'empty' ? '2. 车辆与时间' : '3. 车辆与时间 · 装车组 ' + currentContainer!.sequenceNo }}<small>可先保存，审核前补齐</small><InlineHelp title="车辆与时间说明"><p>车辆、司机、时间和备注分别保存在当前选中的装车组。切换右侧装车组，可分别填写每一趟的资料。</p></InlineHelp></h3>
+        <section class="density-dialog-section" aria-label="排车计划时间与备注">
+          <h3 class="density-dialog-section__title">{{ mode === 'empty' ? '计划时间与备注' : '第 ' + currentContainer!.sequenceNo + ' 辆车 · 计划时间与备注' }}<small>选填</small><InlineHelp title="计划时间与备注说明"><p>时间和备注分别保存在当前选中的排车安排中。车辆和司机在生成排车单后，通过“维护车辆信息”补充。</p></InlineHelp></h3>
           <table class="density-table density-table--editable dispatch-create-table"><tbody>
             <tr><td><el-form-item label="计划发车时间"><el-date-picker v-model="form.plannedDepartureAt" :disabled="frozen || loading || (mode === 'cargo' && !activeContainerId)" type="datetime" value-format="YYYY-MM-DDTHH:mm:ssZ" placeholder="可先保存，审核前补齐" /></el-form-item></td><td><el-form-item label="预计到达时间"><el-date-picker v-model="form.estimatedArrivalAt" :disabled="frozen || loading || (mode === 'cargo' && !activeContainerId)" type="datetime" value-format="YYYY-MM-DDTHH:mm:ssZ" placeholder="请选择预计到达时间（选填）" /></el-form-item></td></tr>
             <tr><td colspan="2"><el-form-item label="备注"><el-input v-model="form.remark" :disabled="frozen || loading || (mode === 'cargo' && !activeContainerId)" /></el-form-item></td></tr>
           </tbody></table>
-          <DispatchResourceFields continuous v-model:vehicle="vehicle" v-model:driver="driver" :disabled="frozen || loading" />
         </section>
       </el-form>
     </div>
+    </template>
   </AppDialog>
 </template>
 <style scoped>
 .dispatch-create-table { table-layout: fixed; }
 .dispatch-create-table td:not([colspan]) { width: 50%; }
-.cargo-workspace { display: grid; grid-template-columns: minmax(0, 1fr) 320px; gap: var(--admin-space-5); align-items: start; }
-.cargo-workspace > .density-dialog-section { margin: 0; }
-.cargo-workspace > .density-dialog-section > .density-dialog-section__title { min-height: 24px; align-items: center; }
-.dispatch-setup, .dispatch-draft-toolbar { display: grid; grid-template-columns: 160px minmax(0, 1fr); align-items: center; gap: var(--admin-space-5); }
-.dispatch-setup > .density-dialog-section__title, .dispatch-draft-toolbar > .density-dialog-section__title { align-items: center; margin: 0; }
+.dispatch-context-toolbar { display: flex; align-items: center; flex-wrap: wrap; gap: var(--admin-space-3) var(--admin-space-6); }
 .dispatch-setup-fields { display: flex; flex-wrap: wrap; align-items: center; gap: var(--admin-space-4) var(--admin-space-6); }
 .dispatch-setup-fields :deep(.el-form-item) { margin: 0; }
-.dispatch-setup-fields :deep(.dispatch-warehouse-field) { width: 310px; flex: 0 0 310px; }
-.dispatch-warehouse-picker { width: 100%; }
 .dispatch-draft-tools { flex-wrap: wrap; align-items: center; }
 .dispatch-draft-picker { width: 240px; }
-.dispatch-capacity-field { display: flex; align-items: center; gap: var(--admin-space-3); margin: 0; }
-.dispatch-capacity-picker { width: 100px; }
-.dispatch-candidate-query { display: grid; grid-template-columns: 240px 160px 170px auto; justify-content: start; gap: var(--admin-space-3); margin-bottom: var(--admin-space-4); }
-.dispatch-group-summary { display: grid; grid-template-columns: 14px minmax(0, 1fr) auto; list-style: none; align-items: center; gap: var(--admin-space-2); }
-.dispatch-source-group > summary { cursor: pointer; }
-.dispatch-source-group > summary::-webkit-details-marker { display: none; }
-.dispatch-source-group[open] .dispatch-source-toggle { transform: rotate(90deg); }
-.dispatch-source-list { margin: var(--admin-space-2) 0 0; padding-left: 18px; }
-.draft-group-table + .draft-group-table { margin-top: var(--admin-space-4); }
-.dispatch-draft-sources { margin: 0; padding: 0; list-style: none; }
-.dispatch-draft-source { display: flex; align-items: center; gap: var(--admin-space-3); }
-.dispatch-draft-source :deep(.line-clamp-text) { flex: 1; }
+.dispatch-capacity-field { display: inline-flex; align-items: center; gap: var(--admin-space-3); margin: 0; }
+.dispatch-capacity-picker { width: 92px; }
+.dispatch-candidate-query { display: flex; align-items: center; flex-wrap: wrap; gap: var(--admin-space-3); }
+.dispatch-candidate-query > .el-input { width: 180px; }
+.dispatch-candidate-query > .el-select { width: 170px; }
+.dispatch-candidate-query > .dispatch-warehouse-picker { width: 200px; }
+.dispatch-candidate-query > .el-button { margin-left: 0; }
+.dispatch-workspace { margin-top: var(--admin-space-5); }
 </style>

src/modules/overseas-warehouse/components/SmartDispatchExistingCargo.test.ts

@@ -0,0 +1,207 @@
+import ElementPlus from 'element-plus'
+import { enableAutoUnmount, flushPromises, mount, type VueWrapper } from '@vue/test-utils'
+import { afterEach, beforeEach, expect, it, vi } from 'vitest'
+import SmartDispatchExistingCargo from './SmartDispatchExistingCargo.vue'
+import * as api from '../api/dispatches'
+import { candidate, command, detail, listRow, page, sharedPalletCandidates } from '../dispatchTestFixtures'
+import type { DispatchCargoItem, DispatchDetail, DispatchItems } from '../dispatchContracts'
+import { useDispatchCommandRecovery } from '../dispatchCommandRecovery'
+
+const identity = vi.hoisted(() => ({ id: '', allowed: true }))
+vi.mock('@/core/auth/auth', () => ({ useAuthStore: () => ({ user: identity }) }))
+vi.mock('@/core/access/accessPreview', () => ({ useAccessPreviewStore: () => ({ can: () => identity.allowed }) }))
+vi.mock('../api/dispatches', () => ({ listDispatches: vi.fn(), getDispatch: vi.fn(), getDispatchItems: vi.fn(), listDispatchCandidates: vi.fn(), addDispatchCargo: vi.fn(), removeDispatchItem: vi.fn(), getDispatchCommand: vi.fn() }))
+enableAutoUnmount(afterEach)
+const allowed = { allowed: true, blockCode: null, blockReason: null }
+const current = (overrides: Partial<DispatchDetail> = {}) => detail({ taskType: 'DELIVERY', actions: { ADD_CARGO: allowed, REMOVE_CARGO: allowed }, ...overrides })
+function cargo(overrides: Partial<DispatchCargoItem> = {}): DispatchCargoItem {
+  const source = candidate()
+  return { ...source.selection, dispatchItemId: '9007199254740993', sourceKey: source.sourceKey, sourceVersion: source.sourceVersion, customerId: 'C1', customerName: '客户甲', palletNo: 'PALLET-1', orderNo: 'LM-1', inboundCode: 'IN-1', destination: source.destination, scheduledPackages: 2, pickedPackages: 0, remove: allowed, ...overrides }
+}
+const manifest = (overrides: Partial<DispatchItems> = {}): DispatchItems => ({ dispatchNo: 'PC/1', recordVersion: 0, status: 'ACTIVE', stage: 'BEFORE_LOADING', items: [cargo()], ...overrides })
+function button(wrapper: VueWrapper, text: string) { const found = wrapper.findAll('button').find(row => row.text() === text); if (!found) throw new Error(`Missing button ${text}`); return found }
+async function open(dispatchNo: string | null = 'PC/1') {
+  const wrapper = mount(SmartDispatchExistingCargo, { props: { dispatchNo: dispatchNo ?? undefined }, global: { plugins: [ElementPlus] } })
+  await flushPromises()
+  return wrapper
+}
+async function add(wrapper: VueWrapper) { await button(wrapper, '查看托盘').trigger('click'); await button(wrapper, '加入这辆车').trigger('click'); await flushPromises() }
+beforeEach(() => {
+  vi.clearAllMocks(); sessionStorage.clear(); identity.id = crypto.randomUUID(); identity.allowed = true
+  vi.stubGlobal('ResizeObserver', class { observe() {} unobserve() {} disconnect() {} })
+  vi.mocked(api.listDispatches).mockResolvedValue(page([listRow({ taskType: 'DELIVERY' })]))
+  vi.mocked(api.getDispatch).mockResolvedValue(current())
+  vi.mocked(api.getDispatchItems).mockResolvedValue(manifest())
+  vi.mocked(api.listDispatchCandidates).mockImplementation(async query => ({ candidates: [candidate()], page: query.page || 1, size: query.size || 20, total: 1, pages: 1, complete: true, snapshotAt: '' }))
+})
+
+it('keeps both searches in one panel and the manifest inside the shared board column', async () => {
+  const wrapper = await open()
+  const search = wrapper.get('[aria-label="已有排车查询"]')
+  expect(search.find('[aria-label="选择已有排车"]').exists()).toBe(true)
+  expect(search.text()).not.toContain('查询排车')
+  expect(search.find('input[aria-label="查找可排货物"]').exists()).toBe(true)
+  expect(search.findAll('.existing-cargo-query > label')).toHaveLength(0)
+  const column = wrapper.get('[aria-label="车辆装载"]')
+  expect(column.get(':scope > .cargo-board-heading').text()).toContain('本车货物 · PC/1')
+  expect(column.find(':scope > .cargo-board-vehicle-content [aria-label="当前排车货物"]').exists()).toBe(true)
+  expect(wrapper.get('.dispatch-cargo-board').findAll(':scope > section > .cargo-board-heading')).toHaveLength(3)
+  expect(column.text()).not.toContain('添加车辆')
+})
+
+it('adds the complete hidden shared-pallet group through real board buttons, then reloads current versions', async () => {
+  const [first, second] = sharedPalletCandidates()
+  vi.mocked(api.listDispatchCandidates).mockImplementation(async query => ({ candidates: query.size === 100 ? [first!, second!] : [first!], page: query.page!, size: query.size!, total: 2, pages: 1, complete: true, snapshotAt: '' }))
+  const wrapper = await open()
+  vi.mocked(api.addDispatchCargo).mockImplementation(async (_, body) => {
+    vi.mocked(api.getDispatch).mockResolvedValue(current({ recordVersion: 1 }))
+    vi.mocked(api.getDispatchItems).mockResolvedValue(manifest({ recordVersion: 1 }))
+    return command('ADD_CARGO', body.idempotencyKey)
+  })
+  await add(wrapper)
+  expect(api.addDispatchCargo).toHaveBeenCalledExactlyOnceWith('PC/1', expect.objectContaining({ recordVersion: 0, cargo: [first!.selection, second!.selection] }))
+  expect(wrapper.emitted('saved')).toHaveLength(1)
+  expect(api.getDispatchItems).toHaveBeenCalledTimes(3)
+  expect(api.listDispatchCandidates).toHaveBeenCalledTimes(3)
+  expect(wrapper.find('[aria-label="当前排车货物"]').text()).toContain('真实已拣 0 箱')
+  expect(wrapper.text()).not.toContain('添加车辆')
+})
+
+it.each(['complete', 'missing', 'changed'] as const)('reads appointments of a hidden second group source: %s', async scenario => {
+  const first = candidate()
+  const second = candidate({ sourceKey: 'source-2', customerId: 'C2', selection: { ...first.selection, planPalletId: '12' }, appointmentBatches: [{ batchKey: 'B2', batchNo: 'AP2', customerId: 'C2', recordVersion: '9007199254740993', sources: [{ sourceKey: 'S2', destinationKey: 'D2', packageCount: 2 }] }] })
+  const group = { ...first.selectionGroup, sources: [...first.selectionGroup.sources, ...second.selectionGroup.sources], pallets: [{ warehousePalletId: '21', palletNo: 'PALLET-1', sourceKeys: ['source-1', 'source-2'], packageCount: 4 }] }
+  first.selectionGroup = group; second.selectionGroup = group
+  vi.mocked(api.listDispatchCandidates).mockImplementation(async query => ({ candidates: query.size !== 100 ? [first] : query.page === 1 ? [first] : scenario === 'missing' ? [] : [{ ...second, selectionGroup: scenario === 'changed' ? { ...group, groupVersion: 'new-composition' } : group }], page: query.page!, size: query.size!, total: 101, pages: 2, complete: true, snapshotAt: '' }))
+  vi.mocked(api.addDispatchCargo).mockRejectedValue(new Error('unknown'))
+  const wrapper = await open(); await add(wrapper)
+  if (scenario === 'complete') {
+    expect(api.listDispatchCandidates).toHaveBeenCalledWith({ warehouseId: '321', warehouseTab: 'ALL', page: 2, size: 100 })
+    expect(api.addDispatchCargo).toHaveBeenCalledWith('PC/1', expect.objectContaining({ cargo: [first.selection, second.selection], batchAllocations: [{ planPalletId: '12', batchKey: 'B2', customerId: 'C2', recordVersion: '9007199254740993', sourceKey: 'S2', destinationKey: 'D2', packageCount: 2 }] }))
+    expect(wrapper.emitted('busy')?.at(-1)).toEqual([false])
+  } else {
+    expect(api.addDispatchCargo).not.toHaveBeenCalled()
+    expect(wrapper.text()).toContain(scenario === 'missing' ? '同托货物及预约资料未完整返回' : '选货组组成已变化')
+  }
+})
+
+it.each([0, '0', '9007199254740993'])('preserves precise appointment allocation version %s in additions', async recordVersion => {
+  const source = candidate({ appointmentBatches: [{ batchKey: 'B1', batchNo: 'AP1', customerId: 'C1', recordVersion, sources: [{ sourceKey: 'S1', destinationKey: 'D1', packageCount: 2 }] }] })
+  vi.mocked(api.listDispatchCandidates).mockResolvedValue({ candidates: [source], page: 1, size: 20, total: 1, pages: 1, complete: true, snapshotAt: '' })
+  vi.mocked(api.addDispatchCargo).mockRejectedValue(new Error('unknown'))
+  const wrapper = await open(); await add(wrapper)
+  expect(api.addDispatchCargo).toHaveBeenCalledWith('PC/1', expect.objectContaining({ batchAllocations: [{ planPalletId: '11', batchKey: 'B1', customerId: 'C1', recordVersion, sourceKey: 'S1', destinationKey: 'D1', packageCount: 2 }] }))
+  expect(button(wrapper, '加入这辆车').attributes('disabled')).toBeDefined()
+})
+
+it('requires a removal reason and submits the authoritative item ID and zero version', async () => {
+  const wrapper = await open()
+  await button(wrapper, '移除货物').trigger('click')
+  expect(button(wrapper, '确认移除').attributes('disabled')).toBeDefined()
+  await wrapper.get('textarea[aria-label="移除原因"]').setValue('本车计划调整')
+  vi.mocked(api.removeDispatchItem).mockImplementation(async (_, __, body) => {
+    vi.mocked(api.getDispatch).mockResolvedValue(current({ recordVersion: 1 }))
+    vi.mocked(api.getDispatchItems).mockResolvedValue(manifest({ recordVersion: 1, items: [] }))
+    return command('REMOVE_CARGO', body.idempotencyKey)
+  })
+  await button(wrapper, '确认移除').trigger('click'); await flushPromises()
+  expect(api.removeDispatchItem).toHaveBeenCalledExactlyOnceWith('PC/1', '9007199254740993', expect.objectContaining({ recordVersion: 0, reason: '本车计划调整' }))
+  expect(wrapper.text()).toContain('本车暂无货物')
+})
+
+it('rejects an addition whose authoritative appointment version is missing', async () => {
+  const source = candidate({ appointmentBatches: [{ batchKey: 'B1', batchNo: 'AP1', customerId: 'C1', recordVersion: undefined as unknown as number, sources: [] }] })
+  vi.mocked(api.listDispatchCandidates).mockResolvedValue({ candidates: [source], page: 1, size: 20, total: 1, pages: 1, complete: true, snapshotAt: '' })
+  const wrapper = await open(); await add(wrapper)
+  expect(api.addDispatchCargo).not.toHaveBeenCalled()
+  expect(wrapper.text()).toContain('预约批次版本缺失或无效')
+  expect(useDispatchCommandRecovery(() => identity.id).pending.value).toBeNull()
+})
+
+it('rejects a candidate page from another warehouse before exposing selectable cargo', async () => {
+  vi.mocked(api.listDispatchCandidates).mockResolvedValue({ candidates: [candidate({ warehouseId: 'OTHER' })], page: 1, size: 20, total: 1, pages: 1, complete: true, snapshotAt: '' })
+  const wrapper = await open()
+  expect(wrapper.text()).toContain('候选起运仓或来源版本不完整')
+  expect(wrapper.findAll('button').some(row => row.text() === '加入这辆车')).toBe(false)
+  expect(api.addDispatchCargo).not.toHaveBeenCalled()
+})
+
+it.each(['picked', 'item-gate', 'shared-pallet'] as const)('locks removal for %s instead of changing real picking facts', async scenario => {
+  vi.mocked(api.getDispatchItems).mockResolvedValue(manifest({ items: scenario === 'shared-pallet' ? [cargo(), cargo({ dispatchItemId: 'other', sourceKey: 'other' })] : [cargo(scenario === 'picked' ? { pickedPackages: 1 } : { remove: { allowed: false, blockCode: 'LOCK', blockReason: '正在作业' } })] }))
+  const wrapper = await open()
+  for (const row of wrapper.findAll('button').filter(row => row.text() === '移除货物')) expect(row.attributes('disabled')).toBeDefined()
+  expect(api.removeDispatchItem).not.toHaveBeenCalled()
+  if (scenario === 'shared-pallet') expect(wrapper.text()).toContain('同一实物托盘包含多个来源')
+})
+
+it.each(['loading', 'permission', 'task-type', 'version', 'read-failure'] as const)('fails closed when %s blocks editing', async scenario => {
+  if (scenario === 'loading') { vi.mocked(api.getDispatch).mockResolvedValue(current({ stage: 'LOADING' })); vi.mocked(api.getDispatchItems).mockResolvedValue(manifest({ stage: 'LOADING' })) }
+  if (scenario === 'permission') identity.allowed = false
+  if (scenario === 'task-type') vi.mocked(api.getDispatch).mockResolvedValue(current({ taskType: 'PICKUP' }))
+  if (scenario === 'version') vi.mocked(api.getDispatchItems).mockResolvedValue(manifest({ recordVersion: 2 }))
+  if (scenario === 'read-failure') vi.mocked(api.getDispatchItems).mockRejectedValue(new Error('read unavailable'))
+  const wrapper = await open()
+  expect(api.listDispatchCandidates).not.toHaveBeenCalled()
+  expect(wrapper.findAll('button').filter(row => row.text() === '移除货物').every(row => row.attributes('disabled') !== undefined)).toBe(true)
+  expect(api.addDispatchCargo).not.toHaveBeenCalled()
+  if (scenario === 'version') expect(wrapper.text()).toContain('一致版本')
+})
+
+it('auto-opens the original removal command after remount and checks its result without resending', async () => {
+  const wrapper = await open()
+  await button(wrapper, '移除货物').trigger('click')
+  await wrapper.get('textarea[aria-label="移除原因"]').setValue('原移除原因')
+  vi.mocked(api.removeDispatchItem).mockRejectedValue(new Error('unknown result'))
+  await button(wrapper, '确认移除').trigger('click'); await flushPromises()
+  const original = vi.mocked(api.removeDispatchItem).mock.calls[0]!
+  wrapper.unmount()
+  const resumed = await open(null)
+  expect(resumed.text()).toContain('PC/1')
+  const recovery = useDispatchCommandRecovery(() => identity.id)
+  expect(recovery.pending.value).toMatchObject({ dispatchNo: 'PC/1', itemId: '9007199254740993', body: original[2] })
+  vi.mocked(api.getDispatchCommand).mockImplementation(async (_, key) => command('REMOVE_CARGO', key))
+  vi.mocked(api.getDispatch).mockResolvedValue(current({ recordVersion: 1 }))
+  vi.mocked(api.getDispatchItems).mockResolvedValue(manifest({ recordVersion: 1, items: [] }))
+  await button(resumed, '核对并重试原请求').trigger('click'); await flushPromises()
+  expect(api.removeDispatchItem).toHaveBeenCalledTimes(1)
+  expect(recovery.pending.value).toBeNull()
+  expect(resumed.emitted('saved')).toHaveLength(1)
+})
+
+it('keeps a confirmed result pending if the subsequent manifest cannot be read', async () => {
+  const wrapper = await open()
+  vi.mocked(api.addDispatchCargo).mockImplementation(async (_, body) => {
+    vi.mocked(api.getDispatch).mockResolvedValue(current({ recordVersion: 1 }))
+    vi.mocked(api.getDispatchItems).mockRejectedValue(new Error('read unavailable'))
+    return command('ADD_CARGO', body.idempotencyKey)
+  })
+  await add(wrapper)
+  expect(useDispatchCommandRecovery(() => identity.id).pending.value?.result?.action).toBe('ADD_CARGO')
+  vi.mocked(api.getDispatchItems).mockResolvedValue(manifest({ recordVersion: 1 }))
+  await button(wrapper, '刷新当前资料').trigger('click'); await flushPromises()
+  expect(api.addDispatchCargo).toHaveBeenCalledTimes(1)
+  expect(wrapper.emitted('saved')).toHaveLength(1)
+})
+
+it('does not let a late previous dispatch read overwrite the selected dispatch', async () => {
+  let resolve!: (value: DispatchDetail) => void
+  vi.mocked(api.listDispatches).mockResolvedValue(page([listRow({ taskType: 'DELIVERY' }), listRow({ dispatchNo: 'PC/2', taskType: 'DELIVERY' })]))
+  vi.mocked(api.getDispatch).mockImplementation(no => no === 'PC/1' ? new Promise(done => { resolve = done }) : Promise.resolve(current({ dispatchNo: 'PC/2' })))
+  vi.mocked(api.getDispatchItems).mockImplementation(async no => manifest({ dispatchNo: no }))
+  const wrapper = await open()
+  await wrapper.setProps({ dispatchNo: 'PC/2' }); await flushPromises()
+  resolve(current()); await flushPromises()
+  expect(wrapper.get('[aria-label="车辆装载"] > .cargo-board-heading').text()).toContain('PC/2')
+  expect(wrapper.get('[aria-label="车辆装载"] > .cargo-board-heading').text()).not.toContain('PC/1')
+})
+
+it('queries and paginates active before-loading dispatches using the entered business number', async () => {
+  const wrapper = await open(null)
+  vi.mocked(api.listDispatches).mockImplementation(async query => ({ ...page([listRow({ taskType: 'DELIVERY' })]), page: query.page, size: query.size, total: 22, pages: 3 }))
+  const picker = wrapper.getComponent({ name: 'ElSelect' })
+  expect(picker.props('remote')).toBe(true)
+  await picker.get('.el-select__wrapper').trigger('click'); await flushPromises()
+  await picker.props('remoteMethod')('PC2026'); await flushPromises()
+  await wrapper.getComponent({ name: 'ElPagination' }).get('button.btn-next').trigger('click'); await flushPromises()
+  expect(api.listDispatches).toHaveBeenLastCalledWith({ page: 2, size: 10, status: 'ACTIVE', stage: 'BEFORE_LOADING', dispatchNo: 'PC2026' })
+})

src/modules/overseas-warehouse/components/SmartDispatchExistingCargo.vue

@@ -0,0 +1,259 @@
+<script setup lang="ts">
+import { computed, onBeforeUnmount, ref, watch } from 'vue'
+import { ElMessage } from 'element-plus'
+import { useAuthStore } from '@/core/auth/auth'
+import { useAccessPreviewStore } from '@/core/access/accessPreview'
+import { getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
+import ApiErrorMeta from '@/shared/components/ApiErrorMeta.vue'
+import LoadErrorState from '@/shared/components/LoadErrorState.vue'
+import InlineHelp from '@/shared/components/InlineHelp.vue'
+import * as api from '../api/dispatches'
+import { useDispatchCandidates } from '../useDispatchCandidates'
+import { useDispatchCommandRecovery, type PendingDispatchCommand } from '../dispatchCommandRecovery'
+import { canDispatchAction } from '../dispatchPresentation'
+import { DispatchInputError, expandSelectionGroups, requireBatchVersions, requireSelectionGroup, requireVersion, selectionIdentity } from '../dispatchContracts'
+import type { AddCargo, Candidate, DispatchCargoItem, DispatchDetail, DispatchItems, DispatchListRow, ReasonCommand } from '../dispatchContracts'
+import SmartDispatchCargoBoard from './SmartDispatchCargoBoard.vue'
+
+const props = defineProps<{ dispatchNo?: string }>()
+const emit = defineEmits<{ saved: []; busy: [value: boolean] }>()
+const auth = useAuthStore(), access = useAccessPreviewStore()
+const recovery = useDispatchCommandRecovery(() => auth.user?.id || '')
+const { pending, busy } = recovery
+const error = ref<ApiErrorDetails | null>(null)
+const candidatePage = useDispatchCandidates(error)
+const { candidates, page: cargoPage, size: cargoSize, total: cargoTotal } = candidatePage
+const rows = ref<DispatchListRow[]>([]), page = ref(1), size = ref(10), total = ref(0)
+const queriedKeyword = ref(''), cargoKeyword = ref(''), queriedCargoKeyword = ref('')
+const selectedNo = ref(''), warehouseId = ref(''), warehouseName = ref('')
+const detail = ref<DispatchDetail | null>(null), items = ref<DispatchItems | null>(null)
+const reading = ref(false), listing = ref(false), preparing = ref(false), stale = ref(true)
+const removing = ref<DispatchCargoItem | null>(null), reason = ref('')
+let generation = 0, listGeneration = 0, alive = true
+const cargoPending = computed(() => pending.value?.action === 'ADD_CARGO' || pending.value?.action === 'REMOVE_CARGO')
+const pendingMessage = computed(() => !cargoPending.value ? '另一个排车操作尚待核对，请返回原操作入口处理。' : pending.value?.result ? '货物调整已完成，请刷新当前资料；不会重复提交。' : '原货物调整结果尚待核对，保留原版本和原请求内容。')
+const frozen = computed(() => busy.value || preparing.value || Boolean(pending.value))
+const loading = computed(() => reading.value || candidatePage.loading.value)
+const editable = computed(() => !stale.value && detail.value?.status === 'ACTIVE' && detail.value.stage === 'BEFORE_LOADING' && detail.value.taskType === 'DELIVERY')
+const canAdd = computed(() => editable.value && canDispatchAction(detail.value?.actions, 'ADD_CARGO', access.can))
+const canRemove = computed(() => editable.value && canDispatchAction(detail.value?.actions, 'REMOVE_CARGO', access.can))
+const locked = computed(() => frozen.value || loading.value)
+const equalVersion = (left: unknown, right: unknown) => String(requireVersion(left)).replace(/^0+(?=\d)/, '') === String(requireVersion(right)).replace(/^0+(?=\d)/, '')
+
+function report(cause: unknown, fallback: string) {
+  error.value = getApiErrorDetails(cause, cause instanceof DispatchInputError ? cause.message : fallback)
+}
+async function loadList() {
+  const sequence = ++listGeneration
+  listing.value = true
+  try {
+    const result = await api.listDispatches({ page: page.value, size: size.value, status: 'ACTIVE', stage: 'BEFORE_LOADING', dispatchNo: queriedKeyword.value || undefined })
+    if (!alive || sequence !== listGeneration) return
+    if (result.page !== page.value || result.size !== size.value) throw new DispatchInputError('排车列表页码不一致，请重新查询')
+    rows.value = result.records; total.value = result.total
+  } catch (cause) { if (alive && sequence === listGeneration) { rows.value = []; report(cause, '排车列表读取失败') } }
+  finally { if (alive && sequence === listGeneration) listing.value = false }
+}
+async function searchDispatches(value: string) {
+  if (frozen.value) return
+  queriedKeyword.value = value.trim(); page.value = 1
+  await loadList()
+}
+async function changePage(value: number) { if (!frozen.value) { page.value = value; await loadList() } }
+async function readFacts(no: string) {
+  const [current, cargo] = await Promise.all([api.getDispatch(no), api.getDispatchItems(no)])
+  if (current.dispatchNo !== no || cargo.dispatchNo !== no || !equalVersion(current.recordVersion, cargo.recordVersion) || current.stage !== cargo.stage || current.status !== cargo.status) {
+    throw new DispatchInputError('排车与货物清单已变化，请重新读取一致版本后操作')
+  }
+  return { current, cargo }
+}
+async function loadCandidates() {
+  if (!warehouseId.value || !detail.value || !canAdd.value || frozen.value) return
+  await candidatePage.load({ warehouseId: warehouseId.value, warehouseTab: 'ALL', orderNo: queriedCargoKeyword.value || undefined, page: cargoPage.value, size: cargoSize.value })
+}
+async function selectDispatch(no: string, row?: DispatchListRow) {
+  if (!no || busy.value || pending.value && (!cargoPending.value || pending.value.dispatchNo !== no)) return
+  const sequence = ++generation
+  selectedNo.value = no; reading.value = true; stale.value = true; error.value = null
+  detail.value = null; items.value = null; removing.value = null; reason.value = ''
+  warehouseId.value = ''; warehouseName.value = ''; candidatePage.reset()
+  try {
+    const origin = row || (await api.listDispatches({ page: 1, size: 10, dispatchNo: no, status: 'ALL' })).records.find(value => value.dispatchNo === no)
+    if (!alive || sequence !== generation) return
+    if (!origin || origin.dispatchNo !== no || !origin.warehouseId) throw new DispatchInputError('排车起运仓未完整返回，请重新读取')
+    const facts = await readFacts(no)
+    if (!alive || sequence !== generation) return
+    warehouseId.value = origin.warehouseId; warehouseName.value = origin.warehouseName || origin.warehouseCode || '—'
+    detail.value = facts.current; items.value = facts.cargo; stale.value = false
+    if (!pending.value) await loadCandidates()
+  } catch (cause) { if (alive && sequence === generation) report(cause, '排车货物读取失败') }
+  finally { if (alive && sequence === generation) reading.value = false }
+}
+async function searchCargo() {
+  if (locked.value) return
+  queriedCargoKeyword.value = cargoKeyword.value.trim(); cargoPage.value = 1
+  await loadCandidates()
+}
+async function changeCargoPage(value: number) { if (!locked.value) { cargoPage.value = value; await loadCandidates() } }
+async function changeCargoSize(value: number) { if (!locked.value) { cargoSize.value = value; cargoPage.value = 1; await loadCandidates() } }
+async function completeGroup(row: Candidate): Promise<Candidate[]> {
+  const group = requireSelectionGroup(row)
+  const found = new Map<string, Candidate>()
+  function collect(values: Candidate[]) {
+    for (const value of values) {
+      const source = group.sources.find(source => source.sourceKey === value.sourceKey)
+      if (!source) continue
+      if (value.warehouseId !== warehouseId.value || value.customerId !== source.customerId || value.sourceVersion !== source.selection.sourceVersion || selectionIdentity(value.selection) !== selectionIdentity(source.selection) || value.selectionGroup.groupKey !== group.groupKey || value.selectionGroup.groupVersion !== group.groupVersion) throw new DispatchInputError('选货组组成已变化，请刷新后重试')
+      requireSelectionGroup(value)
+      found.set(value.sourceKey, value)
+    }
+  }
+  collect(candidates.value)
+  // A filtered page may hide another source on this physical pallet, including its appointments.
+  for (let next = 1; found.size < group.sources.length; next++) {
+    const result = await api.listDispatchCandidates({ warehouseId: warehouseId.value, warehouseTab: 'ALL', page: next, size: 100 })
+    if (result.page !== next || result.size !== 100) throw new DispatchInputError('货物来源页码不一致，请重新读取')
+    collect(result.candidates)
+    if (next >= result.pages || result.candidates.length === 0) break
+  }
+  if (found.size !== group.sources.length) throw new DispatchInputError('同托货物及预约资料未完整返回，请刷新后重试')
+  return group.sources.map(source => found.get(source.sourceKey)!)
+}
+function buildAddition(row: Candidate, sources: Candidate[]): AddCargo {
+  if (!canAdd.value || !detail.value || !candidates.value.includes(row)) throw new DispatchInputError('当前货物或排车不允许调整，请刷新核对')
+  candidatePage.assertCurrent(sources); requireBatchVersions(sources.flatMap(source => source.appointmentBatches))
+  if (sources.some(source => source.warehouseId !== warehouseId.value || source.blockReasons.length || !source.sourceVersion || source.sourceVersion !== source.selection.sourceVersion || source.appointmentBatches.some(batch => batch.customerId !== source.customerId))) throw new DispatchInputError('请选择同仓、来源完整且预约客户一致的货物')
+  return {
+    recordVersion: requireVersion(detail.value.recordVersion), idempotencyKey: crypto.randomUUID(), cargo: expandSelectionGroups(sources),
+    batchAllocations: sources.flatMap(member => member.appointmentBatches.flatMap(batch => batch.sources.map(source => {
+      if (!member.selection.planPalletId) throw new DispatchInputError('批次分配缺少真实计划来源，请核对')
+      return { planPalletId: member.selection.planPalletId, batchKey: batch.batchKey, customerId: batch.customerId, ...source, recordVersion: batch.recordVersion }
+    }))),
+  }
+}
+async function addCargo(row: Candidate) {
+  if (locked.value) return
+  error.value = null; preparing.value = true
+  const sequence = generation
+  try {
+    const sources = await completeGroup(row)
+    if (!alive || sequence !== generation) return
+    recovery.begin(selectedNo.value, 'ADD_CARGO', buildAddition(row, sources)); preparing.value = false; await execute()
+  }
+  catch (cause) { report(cause, '货物未加入，请核对来源') }
+  finally { preparing.value = false }
+}
+function removable(row: DispatchCargoItem) {
+  return canRemove.value && row.remove.allowed === true && row.pickedPackages === 0 && !sharedPallet(row) && Boolean(row.dispatchItemId) && items.value?.items.includes(row)
+}
+function sharedPallet(row: DispatchCargoItem) { return Boolean(row.warehousePalletId && (items.value?.items.filter(item => item.warehousePalletId === row.warehousePalletId).length || 0) > 1) }
+function chooseRemoval(row: DispatchCargoItem) {
+  if (locked.value || !removable(row)) return
+  removing.value = row; reason.value = ''
+}
+async function removeCargo() {
+  if (locked.value) return
+  error.value = null
+  try {
+    const row = removing.value
+    if (!row || !removable(row) || !reason.value.trim() || !items.value) throw new DispatchInputError('请选择允许移除的未扫码货物并填写原因')
+    const body: ReasonCommand = { recordVersion: requireVersion(items.value.recordVersion), idempotencyKey: crypto.randomUUID(), reason: reason.value.trim() }
+    recovery.begin(selectedNo.value, 'REMOVE_CARGO', body, { itemId: row.dispatchItemId })
+    await execute()
+  } catch (cause) { report(cause, '货物未移除，请核对当前作业情况') }
+}
+function send(command: PendingDispatchCommand) {
+  if (!access.can('platform:overseas-warehouse:dispatch:edit')) throw new DispatchInputError('当前账号没有调整排车货物权限')
+  if (command.action === 'ADD_CARGO') return api.addDispatchCargo(command.dispatchNo, command.body as unknown as AddCargo)
+  if (command.action === 'REMOVE_CARGO' && command.itemId) return api.removeDispatchItem(command.dispatchNo, command.itemId, command.body as unknown as ReasonCommand)
+  throw new DispatchInputError('请回到原操作入口核对该请求')
+}
+async function execute() {
+  if (busy.value || !cargoPending.value) return
+  const no = pending.value!.dispatchNo
+  error.value = null
+  try {
+    const result = await recovery.execute(send, async target => {
+      const facts = await readFacts(target)
+      return facts.current
+    }, api.getDispatchCommand)
+    if (!result || !alive) return
+    ElMessage.success(result.replayed ? '原货物调整结果已核对' : '本车货物已更新，请重新核对审核')
+    emit('saved')
+    await selectDispatch(no)
+    await loadList()
+  } catch (cause) {
+    if (!alive) return
+    stale.value = true
+    report(cause, pending.value?.result ? '货物已调整，当前资料待刷新' : pending.value ? '操作结果尚未确认，请核对原请求' : '本次货物调整未通过，请刷新当前资料')
+  }
+}
+async function retry() { if (cargoPending.value) await execute(); else if (selectedNo.value) await selectDispatch(selectedNo.value); else await loadList() }
+watch(() => [loading.value, listing.value, busy.value, preparing.value], () => emit('busy', loading.value || listing.value || busy.value || preparing.value), { immediate: true })
+watch(() => props.dispatchNo, no => {
+  const target = cargoPending.value ? pending.value!.dispatchNo : no
+  if (target) void selectDispatch(target)
+}, { immediate: true })
+void loadList()
+onBeforeUnmount(() => { alive = false; generation++; listGeneration++; candidatePage.reset(); emit('busy', false) })
+</script>
+
+<template>
+  <div class="existing-cargo density-dialog-sections">
+    <el-alert v-if="pending" :title="pendingMessage" type="warning" :closable="false" show-icon />
+    <el-button v-if="cargoPending" :loading="busy" @click="execute">{{ pending?.result ? '刷新当前资料' : '核对并重试原请求' }}</el-button>
+    <LoadErrorState v-if="error" title="排车货物资料待核对" :message="error.message" :loading="loading || busy" retry-text="重新核对" @retry="retry"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState>
+    <section class="density-dialog-section existing-cargo-search" aria-label="已有排车查询">
+    <div class="existing-cargo-query">
+      <el-select :model-value="selectedNo" aria-label="选择已有排车" placeholder="输入单号搜索并选择排车" filterable remote :remote-method="searchDispatches" :loading="listing" :disabled="frozen" @update:model-value="(value: string) => selectDispatch(value, rows.find(row => row.dispatchNo === value))">
+        <el-option v-for="row in rows" :key="row.dispatchNo" :value="row.dispatchNo" :label="`${row.dispatchNo} · ${row.warehouseName || row.warehouseCode || '—'}`" :disabled="row.taskType !== 'DELIVERY' || row.status !== 'ACTIVE' || row.stage !== 'BEFORE_LOADING'" />
+        <el-option v-if="selectedNo && !rows.some(row => row.dispatchNo === selectedNo)" :value="selectedNo" :label="selectedNo" disabled />
+        <template #footer><el-pagination aria-label="已有排车分页" :current-page="page" :page-size="size" :total="total" :disabled="frozen || listing" layout="total, prev, pager, next" @update:current-page="changePage" /></template>
+      </el-select>
+
+            <template v-if="selectedNo"><el-input id="existing-cargo-keyword" v-model="cargoKeyword" aria-label="查找可排货物" placeholder="订单号／入仓码" :disabled="locked || !canAdd" @keyup.enter="searchCargo" /><el-button type="primary" :disabled="locked || !canAdd" @click="searchCargo">查询货物</el-button><el-button :disabled="locked" @click="selectDispatch(selectedNo)">刷新本车</el-button></template>
+    </div>
+
+    </section>
+    <template v-if="selectedNo">
+
+      <p v-if="detail && !editable" class="density-dialog-note">仅有效、装车前的仓库派送排车允许调整计划货物。真实拣货仍在 PDA 完成。</p>
+      <p v-else-if="detail && !canAdd" class="density-dialog-note">{{ detail.actions.ADD_CARGO?.blockReason || '当前状态或权限不允许添加货物' }}</p>
+      <SmartDispatchCargoBoard :candidates="candidates" :draft="null" :active-container-id="selectedNo" :capacity="0" :disabled="locked || !canAdd" :warehouse-selected="Boolean(warehouseId)" :page="cargoPage" :size="cargoSize" :total="cargoTotal" @add="addCargo" @change-page="changeCargoPage" @change-size="changeCargoSize">
+        <template #vehicle-heading>
+          <h3 class="existing-cargo-title">本车货物 · {{ selectedNo }} · {{ warehouseName || '—' }}</h3>
+          <InlineHelp title="本车货物调整说明"><p>加入后立即保存；移除前填写原因并确认。货物变化后需重新核对审核。</p></InlineHelp>
+        </template>
+        <template #vehicles="{ dragOver, drop, dropTarget }">
+          <section class="existing-cargo-manifest" :class="{ 'is-drop-target': dropTarget === selectedNo }" aria-label="当前排车货物" @dragover="dragOver($event, selectedNo)" @drop="drop($event, selectedNo)">
+            <p v-if="!items" class="density-dialog-note">请读取完整货物清单</p>
+            <p v-else-if="!items.items.length" class="density-dialog-note">本车暂无货物，可从左侧选择托盘加入。</p>
+            <div v-for="row in items?.items || []" :key="row.dispatchItemId" class="existing-cargo-item">
+              <div><strong>{{ row.palletNo || row.inboundCode || row.orderNo || row.relabelNo || '—' }}</strong><p>{{ row.customerName || '—' }} · {{ row.orderNo || row.inboundCode || row.relabelNo || '—' }}</p><p>{{ row.scheduledPackages }} 箱 · 真实已拣 {{ row.pickedPackages }} 箱 · {{ row.destination.warehouseCode || row.destination.address || '—' }}</p><small v-if="!removable(row)">{{ sharedPallet(row) ? '同一实物托盘包含多个来源，不能单独移除此项' : row.remove.blockReason || detail?.actions.REMOVE_CARGO?.blockReason || '当前状态或权限不允许移除' }}</small></div>
+              <el-button link type="danger" :disabled="locked || !removable(row)" @click="chooseRemoval(row)">移除货物</el-button>
+            </div>
+            <div v-if="removing" class="existing-cargo-removal" aria-label="确认移除本车货物"><strong>移除 {{ removing.palletNo || removing.orderNo || removing.inboundCode || '所选货物' }}</strong><el-input v-model="reason" aria-label="移除原因" placeholder="请填写移除原因（必填）" type="textarea" :disabled="locked" /><el-button type="danger" :disabled="locked || !reason.trim() || !removable(removing)" @click="removeCargo">确认移除</el-button><el-button :disabled="locked" @click="removing = null">取消移除</el-button></div>
+          </section>
+        </template>
+      </SmartDispatchCargoBoard>
+    </template>
+  </div>
+</template>
+
+<style scoped>
+.existing-cargo { margin-top: var(--admin-space-5); }
+.existing-cargo-search { display: flex; flex-direction: column; gap: var(--admin-space-5); }
+.existing-cargo-query { display: flex; align-items: center; flex-wrap: wrap; gap: var(--admin-space-3); }
+.existing-cargo-query > .el-button { margin-left: 0; }
+.existing-cargo-query > .el-input { width: 240px; }
+.existing-cargo-query > .el-select { width: 350px; }
+.existing-cargo-manifest { min-width: 0; border: 1px solid var(--admin-table-border); border-radius: var(--admin-dialog-section-radius); padding: var(--admin-space-5); max-height: 58vh; overflow-y: auto; }
+.existing-cargo-manifest.is-drop-target { border-color: var(--cc-primary); background: var(--admin-action-primary-hover); }
+.existing-cargo-title { margin: 0; font-size: var(--admin-font-section); overflow-wrap: anywhere; }
+.existing-cargo-item { display: flex; gap: var(--admin-space-3); justify-content: space-between; padding: var(--admin-space-4) 0; border-bottom: 1px solid var(--admin-table-border); overflow-wrap: anywhere; }
+.existing-cargo-item > div { min-width: 0; }
+.existing-cargo-item > .el-button { flex: none; }
+.existing-cargo-item p { margin: var(--admin-space-2) 0; }
+.existing-cargo-item small { color: var(--cc-muted); }
+.existing-cargo-removal { display: flex; flex-wrap: wrap; gap: var(--admin-space-3); margin-top: var(--admin-space-5); }
+</style>

src/modules/overseas-warehouse/components/TransportExecutionPanel.vue

@@ -11,7 +11,7 @@ import { listVehicles, listDrivers, pickupStatusLabels, type VehicleDetail, type
 import { getTransport, assignTransport, transportOccupancy, cancelTransport, releaseTransport, commandTransport, uploadTransport, downloadTransportEvidence, transportLabels, type TransportDetail } from '../api/transportTasks'
 import { dispatchActionPermissions as permission } from '../dispatchPresentation'
 
-const props = defineProps<{ dispatchNo: string }>(), emit = defineEmits<{ saved: [] }>()
+const props = defineProps<{ dispatchNo: string; pickupApproved?: boolean }>(), emit = defineEmits<{ saved: [] }>()
 const access = useAccessPreviewStore(), detail = ref<TransportDetail | null>(null), error = ref<ApiErrorDetails | null>(null), busy = ref(false)
 const vehicles = ref<VehicleDetail[]>([]), drivers = ref<DriverDetail[]>([]), vehicleId = ref(''), driverId = ref(''), reason = ref('')
 const occupancy = ref<Record<string, boolean>>({}), candidateBusy = ref(false)
@@ -109,13 +109,13 @@ onBeforeRouteLeave(() => !locked.value || window.confirm('运输请求尚待核
         <el-button :loading="busy" :disabled="candidateBusy || !vehicleId || !driverId" @click="assign">保存车辆司机</el-button>
       </el-form>
       <div class="density-actions">
-        <el-button v-if="trip.status === 'PLANNED' && access.can(permission.DEPART)" :disabled="locked || !trip.vehicleId || !trip.driverId" @click="command('depart')">确认发车</el-button>
+        <el-button v-if="trip.status === 'PLANNED' && access.can(permission.DEPART)" :disabled="locked || !trip.vehicleId || !trip.driverId || (detail.taskType === 'PICKUP' && !props.pickupApproved)" @click="command('depart')">确认发车</el-button>
         <el-button v-if="trip.status === 'PLANNED' && access.can(permission.CANCEL)" :disabled="locked" @click="command('cancel')">取消排车</el-button>
         <el-button v-if="trip.status === 'IN_TRANSIT' && editable" :disabled="locked || (detail.taskType === 'PICKUP' ? !detail.pickups.length || detail.pickups.some(row => row.status !== 'ARRIVED') : !truckEvidence.length)" @click="command('complete')">确认运输完成</el-button>
         <template v-if="trip.status === 'COMPLETED' && editable"><el-button v-if="!trip.vehicleRelease" :disabled="locked" @click="openRelease('VEHICLE')">结束车辆任务</el-button><el-button v-if="!trip.driverRelease" :disabled="locked" @click="openRelease('DRIVER')">结束司机任务</el-button></template>
         <el-button :disabled="locked" @click="load">刷新运输进度</el-button>
       </div>
-      <p v-if="detail.taskType === 'PICKUP'">送仓后由仓库独立清点收货，取货数量保留为运输事实。</p>
+      <p v-if="detail.taskType === 'PICKUP'">{{ props.pickupApproved ? '两级审核已通过，可发车取货。' : '请维护车辆信息并提交调度审核，经调度和理货员审核通过后发车取货。' }}送仓后由仓库独立清点收货，取货数量保留为运输事实。</p>
       <el-table v-if="detail.taskType === 'PICKUP'" :data="detail.pickups"><el-table-column prop="transferNo" label="转运单号" min-width="190" /><el-table-column label="进度"><template #default="{ row }">{{ pickupStatusLabels[row.status] }}</template></el-table-column><el-table-column prop="packageCount" label="预报箱数" /><el-table-column prop="actualPackages" label="实提箱数" /><el-table-column label="凭证"><template #default="{ row }"><el-button v-for="file in row.evidence" :key="file.fileId" link @click="download(file, row as PickupTask)">{{ file.fileName }}</el-button></template></el-table-column><el-table-column label="操作" width="180"><template #default="{ row }"><template v-if="trip.status === 'IN_TRANSIT' && editable"><el-button v-if="row.status === 'ASSIGNED'" link :disabled="locked" @click="editPickup(row as PickupTask)">确认取货</el-button><el-button v-if="row.status === 'PICKED'" link :disabled="locked" @click="command('arrive', row as PickupTask)">确认送仓</el-button></template></template></el-table-column></el-table>
       <div v-if="detail.taskType === 'LOCAL_TRUCK' && trip.status === 'IN_TRANSIT' && editable"><label>运输完成凭证 <input type="file" :disabled="locked" @change="upload($event, false)" /></label><p v-for="file in truckEvidence" :key="file.fileId">{{ file.fileName }}</p></div>
       <div v-if="detail.completionEvidence?.length"><p>已确认的运输完成凭证</p><el-button v-for="file in detail.completionEvidence" :key="file.fileId" link @click="download(file)">{{ file.fileName }}</el-button></div>

src/modules/overseas-warehouse/dispatchCommandRecovery.test.ts

@@ -3,10 +3,19 @@ import { ApiResponseError } from '@/shared/api/http'
 import { useDispatchCommandRecovery } from './dispatchCommandRecovery'
 import { command } from './dispatchTestFixtures'
 beforeEach(() => sessionStorage.clear())
+it('does not accept an intermediate loading stage as completion of the original command', async () => {
+  const owner = crypto.randomUUID(), recovery = useDispatchCommandRecovery(() => owner)
+  recovery.begin('PC/1', 'LOADING_COMPLETE', { recordVersion: 0, idempotencyKey: 'key' })
+  const read = vi.fn()
+  await expect(recovery.execute(vi.fn().mockResolvedValue({ ...command('LOADING_COMPLETE'), stage: 'AFTER_LOADING' }), read, vi.fn())).rejects.toThrow('派送中')
+  expect(read).not.toHaveBeenCalled()
+  expect(recovery.pending.value?.result).toBeNull()
+  expect(recovery.pending.value?.body.idempotencyKey).toBe('key')
+})
 it('retains the exact original version and body when POST outcome is unknown and a newer detail was read', async () => {
   const owner = crypto.randomUUID(), recovery = useDispatchCommandRecovery(() => owner)
-  recovery.begin('PC/1', 'DEPART', { recordVersion: 0, idempotencyKey: 'key', remark: 'original' })
-  const send = vi.fn().mockRejectedValueOnce(new Error('network unknown')).mockResolvedValueOnce(command('DEPART'))
+  recovery.begin('PC/1', 'LOADING_COMPLETE', { recordVersion: 0, idempotencyKey: 'key', remark: 'original' })
+  const send = vi.fn().mockRejectedValueOnce(new Error('network unknown')).mockResolvedValueOnce(command('LOADING_COMPLETE'))
   const read = vi.fn().mockResolvedValue({ dispatchNo: 'PC/1', recordVersion: 50 }), find = vi.fn().mockRejectedValue(new ApiResponseError('not found', 'HTTP_404'))
   await expect(recovery.execute(send, read, find)).rejects.toThrow('network unknown')
   await recovery.execute(send, read, find)
@@ -18,7 +27,7 @@ it('keeps a proven result across GET failure and does not send the command a sec
   recovery.begin('PC/1', 'LOADING_COMPLETE', { recordVersion: 0, idempotencyKey: 'key' })
   const send = vi.fn().mockResolvedValue(command('LOADING_COMPLETE')), read = vi.fn().mockRejectedValueOnce(new Error('read failed')).mockResolvedValueOnce({ dispatchNo: 'PC/1', recordVersion: 1 }), find = vi.fn()
   await expect(recovery.execute(send, read, find)).rejects.toThrow('read failed')
-  expect(recovery.pending.value?.result?.stage).toBe('AFTER_LOADING')
+  expect(recovery.pending.value?.result?.stage).toBe('DELIVERING')
   expect(JSON.parse(sessionStorage.getItem(`dispatch-command:${owner}`)!).result).toEqual(command('LOADING_COMPLETE'))
   const reopened = useDispatchCommandRecovery(() => owner)
   expect(reopened.pending.value?.result).toEqual(command('LOADING_COMPLETE'))
@@ -51,15 +60,15 @@ it('does not discard an earlier unknown write on a later business rejection', as
 })
 it('rejects a mismatched business number/action/key instead of treating it as successful', async () => {
   const owner = crypto.randomUUID(), recovery = useDispatchCommandRecovery(() => owner)
-  recovery.begin('PC/1', 'DEPART', { recordVersion: 0, idempotencyKey: 'key' })
+  recovery.begin('PC/1', 'LOADING_COMPLETE', { recordVersion: 0, idempotencyKey: 'key' })
   const read = vi.fn()
-  await expect(recovery.execute(vi.fn().mockResolvedValue(command('DEPART', 'different')), read, vi.fn())).rejects.toThrow('不一致')
+  await expect(recovery.execute(vi.fn().mockResolvedValue(command('LOADING_COMPLETE', 'different')), read, vi.fn())).rejects.toThrow('不一致')
   expect(read).not.toHaveBeenCalled(); expect(recovery.pending.value).not.toBeNull()
 })
 it('does not release a proven result for an older detail version, including versions beyond safe integer precision', async () => {
   const owner = crypto.randomUUID(), recovery = useDispatchCommandRecovery(() => owner)
-  recovery.begin('PC/1', 'DEPART', { recordVersion: '9007199254740992', idempotencyKey: 'key' })
-  const send = vi.fn().mockResolvedValue({ ...command('DEPART'), recordVersion: '9007199254740993' }), find = vi.fn()
+  recovery.begin('PC/1', 'LOADING_COMPLETE', { recordVersion: '9007199254740992', idempotencyKey: 'key' })
+  const send = vi.fn().mockResolvedValue({ ...command('LOADING_COMPLETE'), recordVersion: '9007199254740993' }), find = vi.fn()
   await expect(recovery.execute(send, vi.fn().mockResolvedValue({ dispatchNo: 'PC/1', recordVersion: '9007199254740992' }), find)).rejects.toThrow('详情版本早于')
   expect(recovery.pending.value?.result).not.toBeNull()
   await recovery.execute(send, vi.fn().mockResolvedValue({ dispatchNo: 'PC/1', recordVersion: '9007199254740994' }), find)

src/modules/overseas-warehouse/dispatchCommandRecovery.ts

@@ -15,8 +15,7 @@ export function validateCommandResult(result: CommandResult, pending: PendingDis
     || result.action !== pending.action || result.idempotencyKey !== pending.body.idempotencyKey
     || !result.dispatchNo || !result.result) throw new Error('操作结果与原排车请求不一致，请保留原请求核对')
   requireVersion(result.recordVersion)
-  if (pending.action === 'DEPART' && result.stage !== 'DELIVERING') throw new Error('发车结果未确认派送中，请核对原请求')
-  if (pending.action === 'LOADING_COMPLETE' && result.stage !== 'AFTER_LOADING') throw new Error('装车结果未确认装车后，请核对原请求')
+  if (pending.action === 'LOADING_COMPLETE' && result.stage !== 'DELIVERING') throw new Error('装车结果未确认派送中，请核对原请求')
 }
 export function validateCurrentDispatch(value: unknown, result: CommandResult) {
   const current = value as { dispatchNo?: string; recordVersion?: unknown } | null