Merge pull request 'feat(admin): 同步档案照片带入与装车多图维护' (#29) from hotfix-gray-bugfix into main

Reviewed-on: https://git.buggoglobal.com/html/admin-web/pulls/28

docs/business-index.md

@@ -37,7 +37,7 @@
 | 货柜双工作台、排柜、预装/装柜清单、真实柜号后补与整柜报关 | 国内 `modules/container-loading/pages/DomesticContainersView.vue`、海外 `OverseasContainersView.vue`，共享详情实现 `ContainerDetailView.vue`；预装详情 `modules/loading-lists/pages/PreloadPlanDetailView.vue`，资料/PDA 证据 `components/ContainerOverviewPanel.vue`，报关 `components/ContainerCustomsPanel.vue` | 规则见下文「货柜工作台规则」 |
 | 合柜报关 / 同柜不可拆组 | `modules/unified-orders/api/coLoadGroups.ts`、`pages/UnifiedOrdersView.vue`；装柜消费 `modules/container-loading/pages/SmartLoadingWorkbenchView.vue` | 前端只提交订单 ID；Backend `firstleg/loading/coload/` 展开并冻结每票全部可用入仓片段。成员数是入仓片段数，不等于订单票数；只要求同国内仓、同渠道，允许跨客户及不同目的仓港；分配、移除、取消均整组处理 |
 | 全局智能装柜工作台、入仓码候选与箱数分配 | `modules/container-loading/components/SmartLoadingDialog.vue` 内嵌 `pages/GlobalSmartLoadingView.vue`，柜次页 `SmartLoadingWorkbenchView.vue`，以及 `smartLoadingChannelGroups.ts`、`smartLoadingItems.ts`、`api/platformContainerLoading.ts`；全局页当前不注册独立路由 | Backend `firstleg/` 的 `/inbound-candidates`、`/containers`、`/inbound-assignments`、`/plans/{planId}/pending-review-assignments`、`/group-assignments`、`/unpicked-items`。`orderStatuses` 最多四项且未传表示全部未完成状态；候选状态多选覆盖待审核、待测量、待分柜、装柜中，状态只用于筛选展示，按钮资格以服务端 `canAssign` 为准；待审核/待测量可提前占位但不得提前确认预装或启动 PDA。计划箱数编辑上限、已用和未用展示只消费服务端 `totalPackageCount/remainingPackageCount`，不得从候选页或本地规格重新拼算。人工加入允许跨渠道，智能推荐仍按柜次渠道。柜次容量和限重取服务端字段；同柜组作为单卡整组分页、分配和移除，任一成员已拣时整组保留 |
-| 国内货柜履约订舱资料、打印、关联候选与出仓前船期 | `modules/ocean-bookings/` 的 `components/OceanBookingDocumentsPanel.vue`、`OceanBookingPrintDialog.vue`，以及 `modules/container-loading/`、`modules/port-schedules/` | 订舱草稿按当前版本维护资料，放舱后运输/预报/关系方/柜型/附件只读；客服实货量经 `/actual-cargo` 按编辑权限、版本、幂等键和原因补录；打印对草稿与已放舱订舱均开放，按当前已保存资料生成，托运单取委值，提单确认件取手工实值，未填显示“—”且不以委值回退。`platformOceanBookings.ts` 的 `/link-candidates` 只消费服务端分页，`containerCount` 是柜型需求 `quantity` 总和；Backend `firstleg/oceanbooking/`、`file/`、`print/`、`firstleg/portschedule/` |
+| 国内货柜履约订舱资料、打印、关联候选与出仓前船期 | `modules/ocean-bookings/` 的 `components/OceanBookingDocumentsPanel.vue`、`OceanBookingPrintDialog.vue`，以及 `modules/container-loading/`、`modules/port-schedules/` | 订舱草稿按当前版本维护资料，放舱后预计到港经 `/estimated-arrival` 按编辑权限和版本单独维护，其余运输/预报/关系方/柜型/附件只读；客服实货量经 `/actual-cargo` 按编辑权限、版本、幂等键和原因补录；打印对草稿与已放舱订舱均开放，按当前已保存资料生成，托运单取委值，提单确认件取手工实值，未填显示“—”且不以委值回退。`platformOceanBookings.ts` 的 `/link-candidates` 只消费服务端分页，`containerCount` 是柜型需求 `quantity` 总和；Backend `firstleg/oceanbooking/`、`file/`、`print/`、`firstleg/portschedule/` |
 | 订舱级拖车预约 | `modules/trucking/api/platformTrucking.ts` 的 `/candidates`、`components/TruckAppointmentForm.vue`、`pages/TruckAppointmentCreateView.vue`、`TruckAppointmentsView.vue` | 表单只选择服务端返回的 `RELEASED` 订舱与 `TRUCKING + truckingScope=DOMESTIC` 国内拖车供应商，不选择或提交客户、柜次、装柜计划或真实集装箱号；清关提柜固定选择 `OVERSEAS` 海外车队，类型在供应商主档单选维护；提单号和仓库由订舱冻结事实带入。一个订舱最多一张非终态拖车单，重复创建转入现有单继续编辑；PDA 完成不自动推进拖车。附件为平台作用域且不重复提单文件；Backend `TruckAppointmentService`、`truck-appointments-v1.yaml` |
 | 目的港码头拖车与还空预警 | 海外清关提柜工作台/详情 `modules/container-loading/pages/OverseasContainersView.vue`、`OverseasContainerDetailView.vue`，API `modules/container-loading/api/terminalDrayages.ts`、`containerArrivalTimes.ts` | 与订舱级拖车预约是不同生命周期；按 `containerBookingId` 读取服务端状态、`allowedActions` 和历史，不能复用订舱级拖车表单或自行推进状态。列表“预计到仓”列直接提供人工日期时间选择器，保存时通过 Lastleg 柜级版本和幂等键原子更新该柜全部尾程订单，已有入库计划后禁止修改；“实际到仓”只读 `ll_receiving_container_session.receiving_at`，即海外 PDA 首次开始收货时间。还空截止、超时天/小时只展示服务端基于权威卸柜完成时间加 72 小时计算的结果；Backend `firstleg/terminaldrayage/`、`lastleg-service/`，邮件记录通过 `terminalDrayages.ts` 查询与重试。 |
 | 历史报关协同与国内出仓 | `modules/customs/`、`modules/outbound-dispatch/` | `modules/customs/` 是历史报关案件/清单/代理提交与回执入口；装柜完成后的整柜退税/买单资料从货柜详情进入，不在旧模块复制；Backend `firstleg/outbound/dispatch/`、`firstleg/customs/`、`file/` |

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

@@ -8,11 +8,11 @@ const event = (type: ScheduleEvent['type'], index = 0): ScheduleEvent => ({ key:
 const render = (events: ScheduleEvent[] = [], initialDate = '2026-10-19') => mount(AppointmentCalendarPanel, { props: { initialDate, events },
   global: { stubs: { ElButton: { template: '<button><slot /></button>' } } } })
 function reportedDispatch() {
-  const row: TripCalendarEntry = { sourceType: 'DISPATCH', dispatchNo: 'PC-CALENDAR-001', containerNumbers: ['TSTU1234567', 'TSTU7654321'], status: 'PLANNED', originWarehouseId: '1', originWarehouseCode: 'LAX', originWarehouseName: '洛杉矶仓', originCountryCode: 'US', originTimezone: 'America/Los_Angeles', originWarehouseStatus: 'ACTIVE', plannedDepartureAt: '2026-10-22T16:00:00Z', expectedDriverEndAt: null, departedAt: null, completedAt: null, stops: [{ name: '洛杉矶仓' }, { name: 'ONT8' }], incompleteReasons: [] }
+  const row: TripCalendarEntry = { sourceType: 'DISPATCH', dispatchNo: 'PC-CALENDAR-001', containerNumbers: ['TSTU1234567', 'TSTU7654321'], cabinetNumbers: ['D1821', 'D1822'], status: 'PLANNED', originWarehouseId: '1', originWarehouseCode: 'LAX', originWarehouseName: '洛杉矶仓', originCountryCode: 'US', originTimezone: 'America/Los_Angeles', originWarehouseStatus: 'ACTIVE', plannedDepartureAt: '2026-10-22T16:00:00Z', expectedDriverEndAt: null, departedAt: null, completedAt: null, stops: [{ name: '洛杉矶仓' }, { name: 'ONT8' }], incompleteReasons: [] }
   return projectTripCalendar({ records: [row, row], unresolvedRecords: [] }, { from: '2026-10-01', to: '2026-11-01' }).events
 }
 describe('four-type appointment calendar', () => {
-  it.each(['TSTU1234567', 'tstu1234567', 'TSTU7654321', ' tstu7654321 '])('finds the one shared dispatch by associated container %s on its origin-local date, not the Beijing date', async keyword => {
+  it.each(['TSTU1234567', 'tstu1234567', 'TSTU7654321', ' tstu7654321 ', 'D1821', ' d1821 ', 'D1822', '1821'])('finds the one shared dispatch by associated container %s on its origin-local date, not the Beijing date', async keyword => {
     const wrapper = render(reportedDispatch(), '2026-10-23')
     const search = wrapper.get('[aria-label="搜索当前日历"]')
     expect(search.attributes('placeholder')).toBe('柜号、排车单号、仓库')
@@ -26,6 +26,7 @@ describe('four-type appointment calendar', () => {
     expect(wrapper.get('.detail-event').text()).toContain('PC-CALENDAR-001')
     expect(wrapper.get('.detail-event').text()).toContain('09:00')
     expect(wrapper.get('.detail-event').text()).toContain('TSTU1234567、TSTU7654321')
+    expect(wrapper.get('.detail-event').text()).toContain('D1821、D1822')
     expect(wrapper.get('.detail-event').text()).toContain('2026-10-22 09:00')
     expect(wrapper.emitted('range')).toBeUndefined()
     wrapper.unmount()

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

@@ -14,10 +14,10 @@ vi.mock('@/core/access/accessPreview', () => ({ useAccessPreviewStore: () => ({
 vi.mock('./scheduleApi', () => ({ getCalendarSources: vi.fn(), getWarehouseArrivals: vi.fn(), saveWarehouseArrival: vi.fn() }))
 vi.mock('./tripCalendar', async original => ({ ...await original<typeof import('./tripCalendar')>(), listTripCalendar: vi.fn() }))
 vi.mock('element-plus', () => ({ ElMessage: { success: vi.fn() }, ElMessageBox: { confirm: vi.fn() } }))
-const warehouse: WarehouseArrival = { sourceContainerBookingId: '1', containerNo: 'TEST-CONT', warehouseName: '美国仓', warehouseCode: 'US-W', plannedAt: null, actualAt: null, version: 0, planCount: 0, canEdit: true }
+const warehouse: WarehouseArrival = { sourceContainerBookingId: '1', containerNo: 'TEST-CONT', warehouseName: '美国仓', warehouseCode: 'US-W', plannedAt: null, plannedDate: '2026-10-21', isDefault: true, actualAt: null, version: 0, planCount: 0, canEdit: true }
 const row: ScheduleEvent = { key: 'warehouse-1', type: 'warehouse', date: '2026-10-21', time: '', title: 'TEST-CONT 计划到仓', fields: [], warehouse, canEdit: true }
 function dispatchEntry(overrides: Partial<TripCalendarEntry> = {}): TripCalendarEntry {
-  return { sourceType: 'DISPATCH', dispatchNo: 'PC-CALENDAR-001', containerNumbers: ['TSTU1234567', 'TSTU7654321'], status: 'PLANNED', originWarehouseId: '1', originWarehouseCode: 'LAX', originWarehouseName: '洛杉矶仓', originCountryCode: 'US', originTimezone: 'America/Los_Angeles', originWarehouseStatus: 'ACTIVE', plannedDepartureAt: '2026-10-22T16:00:00Z', expectedDriverEndAt: null, departedAt: null, completedAt: null, stops: [{ name: '洛杉矶仓' }, { name: 'ONT8' }], incompleteReasons: [], ...overrides }
+  return { sourceType: 'DISPATCH', dispatchNo: 'PC-CALENDAR-001', containerNumbers: ['TSTU1234567', 'TSTU7654321'], cabinetNumbers: [], status: 'PLANNED', originWarehouseId: '1', originWarehouseCode: 'LAX', originWarehouseName: '洛杉矶仓', originCountryCode: 'US', originTimezone: 'America/Los_Angeles', originWarehouseStatus: 'ACTIVE', plannedDepartureAt: '2026-10-22T16:00:00Z', expectedDriverEndAt: null, departedAt: null, completedAt: null, stops: [{ name: '洛杉矶仓' }, { name: 'ONT8' }], incompleteReasons: [], ...overrides }
 }
 export function renderSchedule() {
   return mount(AppointmentCalendarView, { global: { stubs: {
@@ -34,7 +34,7 @@ export function renderSchedule() {
   } } })
 }
 beforeEach(() => {
-  vi.clearAllMocks(); routing.query = { date: '2026-10-19' }; routing.denied.clear()
+  vi.resetAllMocks(); routing.query = { date: '2026-10-19' }; routing.denied.clear()
   vi.mocked(getCalendarSources).mockResolvedValue({ containers: [{ containerBookingId: '1', cabinetNo: 'D0001', containerNo: 'TEST-CONT', vesselName: null, voyageNo: null, destinationPortName: null, destinationWarehouseCode: null, arrivalAt: '2026-10-19T10:00:00', arrivalType: 'ACTUAL' }], emptyReturns: [], emptyReturnsReadable: true })
   vi.mocked(getWarehouseArrivals).mockResolvedValue([warehouse])
   vi.mocked(listTripCalendar).mockResolvedValue({ records: [], unresolvedRecords: [] })
@@ -110,29 +110,24 @@ describe('simplified appointment entry', () => {
     expect(wrapper.getComponent({ name: 'AppointmentCalendarPanel' }).props('events')).toHaveLength(0)
     wrapper.unmount()
   })
-  it('retries an unknown save with the same payload and key, then only reloads reads', async () => {
+  it('releases an unknown save and sends the edited date with a fresh key', async () => {
     vi.mocked(saveWarehouseArrival).mockRejectedValueOnce(new Error('network interrupted')).mockResolvedValueOnce({})
     const wrapper = renderSchedule(); await flushPromises()
     wrapper.getComponent({ name: 'AppointmentCalendarPanel' }).vm.$emit('edit', row); await flushPromises()
-    await wrapper.get('input[data-temporal-picker]').setValue('2026-10-22T09:30')
-    await wrapper.get('[data-save]').trigger('click'); await flushPromises()
-    expect(wrapper.text()).toContain('提交结果尚未确认')
-    expect(wrapper.get('input').attributes('disabled')).toBeDefined()
-    const guard = vi.mocked(onBeforeRouteLeave).mock.calls.at(-1)![0] as () => Promise<boolean>
-    expect(await guard()).toBe(false)
-    await wrapper.get('[data-save]').trigger('click'); await flushPromises()
-    expect(vi.mocked(saveWarehouseArrival).mock.calls[1]).toEqual(vi.mocked(saveWarehouseArrival).mock.calls[0])
-    expect(saveWarehouseArrival).toHaveBeenCalledWith('1', { estimatedWarehouseArrivalAt: '2026-10-22T09:30:00', expectedVersion: 0 }, expect.any(String))
-    expect(wrapper.find('[data-dialog]').exists()).toBe(false)
-    wrapper.unmount()
+    await wrapper.get('input[data-temporal-picker]').setValue('2026-10-22T09:30'); await wrapper.get('[data-save]').trigger('click'); await flushPromises()
+    expect(wrapper.get('input').attributes('disabled')).toBeUndefined()
+    await wrapper.get('input[data-temporal-picker]').setValue('2026-10-23T09:30'); await wrapper.get('[data-save]').trigger('click'); await flushPromises()
+    const calls = vi.mocked(saveWarehouseArrival).mock.calls
+    expect(calls[1]![2]).not.toBe(calls[0]![2]); expect(calls[1]![1].estimatedWarehouseArrivalAt).toBe('2026-10-23T09:30:00')
+    expect(wrapper.find('[data-dialog]').exists()).toBe(false); wrapper.unmount()
   })
-  it('requires an explicit reread after a conflict and retains the entered date', async () => {
+  it('allows editing after a conflict and preserves input across an optional manual refresh', async () => {
     vi.mocked(saveWarehouseArrival).mockRejectedValueOnce(new ApiResponseError('版本已变化', 'A0409', 409))
     const wrapper = renderSchedule(); await flushPromises()
     wrapper.getComponent({ name: 'AppointmentCalendarPanel' }).vm.$emit('edit', row); await flushPromises()
     await wrapper.get('input').setValue('2026-10-22T09:30')
     await wrapper.get('[data-save]').trigger('click'); await flushPromises()
-    expect(wrapper.get('[data-save]').attributes('disabled')).toBeDefined()
+    expect(wrapper.get('[data-save]').attributes('disabled')).toBeUndefined()
     vi.mocked(getWarehouseArrivals).mockResolvedValueOnce([{ ...warehouse, version: 2 }])
     await wrapper.get('[data-retry]').trigger('click'); await flushPromises()
     expect((wrapper.get('input').element as HTMLInputElement).value).toBe('2026-10-22T09:30')

src/modules/appointment-calendar/AppointmentCalendarView.vue

@@ -87,30 +87,27 @@ async function openSource(event: ScheduleEvent) {
   await router.push(appointmentExternalTarget(event.sourcePath, context))
 }
 const editor = ref<ScheduleEvent | null>(null), plannedAt = ref(''), originalAt = ref(''), saving = ref(false)
-const saveError = ref<ApiErrorDetails | null>(null), unknownResult = ref(false), conflict = ref(false)
-let pending: { id: string; body: WarehouseArrivalChange; key: string } | null = null
+const saveError = ref<ApiErrorDetails | null>(null), conflict = ref(false)
 function edit(event: ScheduleEvent) {
   if (!event.canEdit || !event.warehouse) return
   editor.value = event; plannedAt.value = event.warehouse.plannedAt?.slice(0, 16) || ''; originalAt.value = plannedAt.value
-  pending = null; saveError.value = null; unknownResult.value = false; conflict.value = false
+  saveError.value = null; conflict.value = false
 }
 async function save() {
   const row = editor.value?.warehouse
-  if (!row || saving.value || conflict.value || !plannedAt.value) return
-  pending ||= { id: row.sourceContainerBookingId, body: { estimatedWarehouseArrivalAt: `${plannedAt.value}:00`, expectedVersion: row.version },
+  if (!row || saving.value || !plannedAt.value) return
+  const request = { id: row.sourceContainerBookingId, body: { estimatedWarehouseArrivalAt: `${plannedAt.value}:00`, expectedVersion: row.version },
     key: `calendar-arrival-${crypto.randomUUID()}` }
   saving.value = true; saveError.value = null
   try {
-    await saveWarehouseArrival(pending.id, pending.body, pending.key)
-    pending = null; unknownResult.value = false; editor.value = null
+    await saveWarehouseArrival(request.id, request.body, request.key)
+    editor.value = null
     ElMessage.success('计划到仓已保存')
     await load()
   } catch (cause) {
     saveError.value = getApiErrorDetails(cause, '计划到仓保存失败')
-    unknownResult.value = !rejectedCommand(cause)
     const status = cause instanceof ApiResponseError ? cause.status : isAxiosError(cause) ? cause.response?.status : undefined
     conflict.value = status === 409 || /409$/.test(saveError.value.code || '')
-    if (!unknownResult.value) pending = null
   } finally { saving.value = false }
 }
 async function rereadEditor() {
@@ -128,7 +125,7 @@ async function rereadEditor() {
 const guards = new Set<LeaveGuard>()
 provide('appointment-work-leave-guard', (guard: LeaveGuard) => { guards.add(guard); return () => guards.delete(guard) })
 async function canLeave() {
-  if (saving.value || unknownResult.value) return false
+  if (saving.value) return false
   for (const guard of guards) if (!await guard()) return false
   if (editor.value && plannedAt.value !== originalAt.value) {
     try { await ElMessageBox.confirm('计划到仓尚未保存，确定放弃本次修改？', '未保存修改', { type: 'warning', customClass: 'admin-density-confirm admin-workbench is-dialog' }) }
@@ -179,18 +176,17 @@ onBeforeUnmount(() => { ++generation; controller?.abort() })
     <AppDialog v-if="active && creating" :model-value="true" title="新增FBA送仓预约" class="admin-density-dialog admin-density business-dialog admin-workbench is-dialog" width="1080px" :show-footer="false" :before-close="closeCreate" :close-on-click-modal="true" append-to-body fullscreenable>
       <AppointmentCreatePanel :can-write="canCreate" :can-leave="canLeave" @created="load()" />
     </AppDialog>
-    <AppDialog v-if="active" :model-value="!!editor" title="调整计划到仓" class="admin-density-dialog admin-workbench is-dialog" width="520px" fullscreenable :confirm-loading="saving" :confirm-disabled="!plannedAt || conflict" :before-close="closeEditor" :confirm-text="unknownResult ? '重试确认保存结果' : '保存'" @confirm="save">
+    <AppDialog v-if="active" :model-value="!!editor" title="调整计划到仓" class="admin-density-dialog admin-workbench is-dialog" width="520px" fullscreenable :confirm-loading="saving" :confirm-disabled="!plannedAt" :before-close="closeEditor" confirm-text="保存" @confirm="save">
       <div v-if="editor" class="density-dialog-sections">
         <section class="density-dialog-section" data-tone="source" aria-label="到仓业务信息">
           <table class="density-table"><tbody><tr><th scope="row">业务</th><td>{{ editor.title }}</td></tr></tbody></table>
         </section>
 
         <section class="density-dialog-section" data-tone="work" aria-label="调整到仓时间">
-          <el-form class="density-form" label-position="left" label-width="150px" :disabled="saving || unknownResult">
-            <table class="density-table density-table--editable"><tbody><tr><td><el-form-item label="计划到仓时间" required><template #label>计划到仓时间<InlineHelp title="到仓时间说明"><p>自动计划为到港日期加2个自然日；人工保存后优先使用人工时间。填写接仓地点当地时间。</p></InlineHelp></template><el-date-picker v-model="plannedAt" type="datetime" :disabled="saving || unknownResult" required aria-label="计划到仓时间" placeholder="接仓地点当地时间" format="YYYY-MM-DD HH:mm" value-format="YYYY-MM-DDTHH:mm" clearable /></el-form-item></td></tr></tbody></table>
+          <el-form class="density-form" label-position="left" label-width="150px" :disabled="saving">
+            <table class="density-table density-table--editable"><tbody><tr><td><el-form-item label="计划到仓时间" required><template #label>计划到仓时间<InlineHelp title="到仓时间说明"><p>自动计划为到港日期加2个自然日；人工保存后优先使用人工时间。填写接仓地点当地时间。</p></InlineHelp></template><el-date-picker v-model="plannedAt" type="datetime" :disabled="saving" required aria-label="计划到仓时间" placeholder="接仓地点当地时间" format="YYYY-MM-DD HH:mm" value-format="YYYY-MM-DDTHH:mm" clearable /></el-form-item></td></tr></tbody></table>
           </el-form>
         </section>
-        <p v-if="unknownResult" role="status">上次提交结果尚未确认，请使用原请求重试，避免重复修改。</p>
         <LoadErrorState v-if="saveError" title="计划到仓未保存" :message="saveError.message" :loading="saving" @retry="conflict ? rereadEditor() : save()"><template #details><ApiErrorMeta :details="saveError" /></template></LoadErrorState>
         <p v-if="conflict" role="status">重试将重新读取当前资格和版本并保留输入，核对后再次点击保存。</p>
       </div>

src/modules/appointment-calendar/AppointmentCargoPanel.vue

@@ -82,9 +82,9 @@ async function saveArrangement() {
     pendingCreate.value = null; batchPreview.value = null; selected.value = {}
     ElMessage.success(`预约安排 ${result.appointmentNo} 已保存`); ++externalRevision.value; emit('created'); await load()
   } catch (cause) {
-    createError.value = getApiErrorDetails(cause, '保存结果待核实，请重试原请求')
+    createError.value = getApiErrorDetails(cause, '保存失败，请重新操作')
     if (['400','403','404','409','A0400','A0403','A0404','A0409'].includes(createError.value.code || '')) pendingCreate.value = null
-  } finally { creating.value = false }
+  } finally { pendingCreate.value = null; creating.value = false }
 }
 let followupRequest = 0
 const query = ref<QueryModel>({ keyword: '' })
@@ -202,7 +202,7 @@ onBeforeUnmount(() => { ++request; ++followupRequest; ++batchRequest; controller
     </template>
   </DataTable>
   <AppointmentFollowupDialog v-if="following" :source="following.source" :coverage="following.coverage" :can-write="access.can('platform:appointment:followup')" :can-arrange="access.can(overseasWarehousePermissions.inboundOrderAppointment)" @arrange="arrangeFollowing" @close="following = null" />
-  <AppDialog v-if="batchPreview" :model-value="true" class="admin-density-dialog" title="合批预约安排" width="min(1080px, calc(100vw - 48px))" :show-confirm="access.can(overseasWarehousePermissions.inboundOrderAppointment)" :confirm-text="pendingCreate ? '重试本次保存' : '保存预约安排'" :confirm-loading="creating" cancel-text="关闭" @confirm="saveArrangement" @update:model-value="closeBatch" :before-close="beforeClose">
+  <AppDialog v-if="batchPreview" :model-value="true" class="admin-density-dialog" title="合批预约安排" width="min(1080px, calc(100vw - 48px))" :show-confirm="access.can(overseasWarehousePermissions.inboundOrderAppointment)" :confirm-text="'保存预约安排'" :confirm-loading="creating" cancel-text="关闭" @confirm="saveArrangement" @update:model-value="closeBatch" :before-close="beforeClose">
     <p>{{ batchPreview.originWarehouseName }} → {{ batchPreview.destinationWarehouseCode }}</p>
     <p>{{ batchPreview.group.sourceCount }} 票 / {{ batchPreview.group.customerCount }} 个客户 / 预报 {{ batchPreview.group.packages ?? '待核实' }} 箱</p>
     <p v-if="batchPreview.group.readinessIncomplete">货物备妥窗口待核实；预计到港或预计到仓不能替代备妥时间。</p>

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

@@ -78,24 +78,17 @@ describe('appointment impact handling', () => {
     expect(wrapper.text()).toContain('认领跟进')
     expect(handleImpact).not.toHaveBeenCalled(); wrapper.unmount()
   })
-  it('freezes an uncertain command and retries exactly once with original version and key', async () => {
+  it('unlocks close and navigation after uncertainty and permits a fresh click', async () => {
     vi.mocked(handleImpact).mockRejectedValueOnce(new Error('connection lost')).mockResolvedValueOnce({ ...detail.impact, version: 2 })
-    vi.mocked(getImpact).mockResolvedValueOnce({...detail,transport:{trips:[{tripNo:'TRIP-1',status:'PLANNED',plannedDepartureAt:null}],sameTripBookings:[]}})
     const wrapper = render(); await flushPromises()
     await wrapper.findAll('button').find(b => b.text() === '认领跟进')!.trigger('click'); await flushPromises()
     const original = vi.mocked(handleImpact).mock.calls[0]![1]
-    expect(original).toMatchObject({ action: 'CLAIM', expectedVersion: 1, forecastToken: 'current' })
-    await wrapper.get('[data-close]').trigger('click'); expect(wrapper.emitted('close')).toBeUndefined()
-    const done=vi.fn(); wrapper.findComponent({name:'AppDialog'}).props('beforeClose')(done); expect(done).not.toHaveBeenCalled()
-    expect(guards.register.mock.calls[0]![0]()).toBe(false)
-    await wrapper.findAll('button').find(b=>b.text()==='TRIP-1')!.trigger('click');expect(guards.push).not.toHaveBeenCalled()
-    for (const hook of [onBeforeRouteLeave,onBeforeRouteUpdate]) expect((vi.mocked(hook).mock.calls[0]![0] as () => boolean)()).toBe(false)
-    await wrapper.findAll('button').find(b => b.text() === '重试本次处理')!.trigger('click'); await flushPromises()
-    expect(handleImpact).toHaveBeenNthCalledWith(2, '1', original)
-    expect(wrapper.emitted('saved')).toHaveLength(1)
-    expect(getImpact).toHaveBeenCalledTimes(2)
     expect(guards.register.mock.calls[0]![0]()).toBe(true)
-    wrapper.unmount(); expect(guards.unregister).toHaveBeenCalledOnce()
+    await wrapper.get('[data-close]').trigger('click'); expect(wrapper.emitted('close')).toHaveLength(1)
+    const done = vi.fn(); wrapper.findComponent({name:'AppDialog'}).props('beforeClose')(done); expect(done).toHaveBeenCalledOnce()
+    await wrapper.findAll('button').find(b => b.text() === '认领跟进')!.trigger('click'); await flushPromises()
+    expect(vi.mocked(handleImpact).mock.calls[1]![1].idempotencyKey).not.toBe(original.idempotencyKey)
+    expect(wrapper.emitted('saved')).toHaveLength(1); wrapper.unmount()
   })
   it('does not resolve without an actual handling result', async () => {
     const wrapper = render(); await flushPromises()

src/modules/appointment-calendar/AppointmentImpactDialog.vue

@@ -26,8 +26,8 @@ async function save(action: ImpactCommand['action']) {
   pending.value ||= { expectedVersion: detail.value.impact.version, forecastToken: detail.value.impact.forecastToken, idempotencyKey: crypto.randomUUID(), action, result: form.result.trim() || null, nextAction: form.nextAction.trim() || null, followupDate: form.followupDate || null }
   saving.value = true; error.value = null
   try { await handleImpact(props.containerId, pending.value); pending.value = null; emit('saved'); historyPage.value = 1; await load() }
-  catch (cause) { error.value = getApiErrorDetails(cause, '处理结果待核实，请重试原请求'); if (['400','403','404','409','A0400','A0403','A0404','A0409'].includes(error.value.code || '')) pending.value = null }
-  finally { saving.value = false }
+  catch (cause) { error.value = getApiErrorDetails(cause, '操作失败，请重新操作'); if (['400','403','404','409','A0400','A0403','A0404','A0409'].includes(error.value.code || '')) pending.value = null }
+  finally { pending.value = null; saving.value = false }
 }
 function canLeave() { if (saving.value || pending.value) { ElMessage.warning('请先核实本次处理结果，再关闭或切换'); return false } return true }
 function close() { if (canLeave()) emit('close') }
@@ -65,7 +65,7 @@ onMounted(load)
         <el-button v-if="!pending" :disabled="saving || loading" @click="save('CLAIM')">认领跟进</el-button>
         <el-button v-if="!pending" :disabled="saving || loading" @click="save('RECORD')">记录处理</el-button>
         <el-button v-if="!pending" type="primary" :disabled="saving || loading" @click="save('RESOLVE')">完成本次核对</el-button>
-        <el-button v-else type="primary" :loading="saving" @click="save(pending.action)">重试本次处理</el-button>
+
       </div>
       <details><summary>观察及处理历史（{{ detail.history.total }} 条）</summary><div class="impact-list"><p v-for="row in detail.history.records" :key="row.version">{{ actions[row.action] || '核对记录' }} · {{ row.operatorName || '—' }} · {{ row.createdAt }} UTC<br>{{ row.result || '记录来源观察' }} · {{ row.nextAction || '—' }} · {{ row.followupDate || '—' }}</p></div><el-pagination v-model:current-page="historyPage" :page-size="20" :total="detail.history.total" layout="prev, pager, next" :disabled="loading || saving || !!pending" @current-change="load" /></details>
     </template>

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

@@ -1,7 +1,7 @@
 import { flushPromises, mount } from '@vue/test-utils'
 import { beforeEach, expect, it, vi } from 'vitest'
 import WorkDispatchForm from './WorkDispatchForm.vue'
-import { getDispatch, getBatchDispatchCandidates, listDispatchCandidates, createDispatchDraft, createDispatchDraftContainer, listDispatchDrafts, lockDispatchDraftPallet, convertDispatchDraft, releaseDispatchDraft, type BatchDispatchCandidate, type Candidate, type CommandResult, type DispatchDetail, type DispatchDraft } from '@/modules/overseas-warehouse'
+import { createDispatch, getDispatch, getBatchDispatchCandidates, listDispatchCandidates, createDispatchDraft, createDispatchDraftContainer, listDispatchDrafts, lockDispatchDraftPallet, convertDispatchDraft, releaseDispatchDraft, type BatchDispatchCandidate, type Candidate, type CommandResult, type DispatchDetail, type DispatchDraft } from '@/modules/overseas-warehouse'
 import { ApiResponseError, http } from '@/shared/api/http'
 import { parseApiJsonResponse } from '@chongchong/shared'
 import { getReceivingContext, type ReceivingContext } from './receivingApi'
@@ -12,7 +12,7 @@ const identity = vi.hoisted(() => ({ id: '' }))
 vi.mock('@/core/access/accessPreview', () => ({ useAccessPreviewStore: () => ({ can: (permission: string) => access.allowed && !access.denied.includes(permission) }) }))
 vi.mock('@/core/auth/auth', () => ({ useAuthStore: () => ({ user: identity }) }))
 vi.mock('element-plus', () => ({ ElMessage: { warning: vi.fn(), success: vi.fn() }, ElMessageBox: { confirm: vi.fn() } }))
-vi.mock('@/modules/overseas-warehouse', async original => ({ ...await original<typeof import('@/modules/overseas-warehouse')>(), getDispatch: vi.fn(), getBatchDispatchCandidates: vi.fn(), listDispatchCandidates: vi.fn(), createDispatchDraft: vi.fn(), createDispatchDraftContainer: vi.fn(), listDispatchDrafts: vi.fn(), lockDispatchDraftPallet: vi.fn(), convertDispatchDraft: vi.fn(), releaseDispatchDraft: vi.fn() }))
+vi.mock('@/modules/overseas-warehouse', async original => ({ ...await original<typeof import('@/modules/overseas-warehouse')>(), createDispatch: vi.fn(), getDispatch: vi.fn(), getBatchDispatchCandidates: vi.fn(), listDispatchCandidates: vi.fn(), createDispatchDraft: vi.fn(), createDispatchDraftContainer: vi.fn(), listDispatchDrafts: vi.fn(), lockDispatchDraftPallet: vi.fn(), convertDispatchDraft: vi.fn(), releaseDispatchDraft: vi.fn() }))
 vi.mock('./receivingApi', async original => ({ ...await original<typeof import('./receivingApi')>(), getReceivingContext: vi.fn() }))
 const clone = <T,>(value: T): T => JSON.parse(JSON.stringify(value)) as T
 const batch = 'FBA_APPOINTMENT:1'
@@ -21,7 +21,7 @@ function row(id = '9007199254740993', customerId = 'customer-a', key = batch): B
 function candidate(value = row()): Candidate { const base = { selection: { sourceType: 'INBOUND_PLAN', planPalletId: value.planPalletId, returnReceiptId: null, relabelNo: null, warehousePalletId: `pallet-${value.planPalletId}`, sourceVersion: `source-${value.planPalletId}` }, sourceKey: `cargo-${value.planPalletId}`, sourceVersion: `source-${value.planPalletId}`, customerId: value.customerId, customerName: value.customerId === 'customer-a' ? '客户甲' : '客户乙', warehouseId: 'origin-1', warehouseCode: 'LAX', warehouseName: '真实起运仓', orderNo: 'LM-1', inboundCode: 'IN-A', planNo: value.planNo, palletNo: value.palletNo, containerNo: null, destination: { key: 'CODE:ONT8', type: 'FBA', warehouseId: null, warehouseCode: 'ONT8', warehouseName: 'ONT8', address: null, postalCode: null, contactName: null, contactPhone: null }, availablePackages: 12, suggestedWeightKg: null, suggestedVolumeCbm: null, measurementSource: null, appointmentBatches: [], blockReasons: [] }; return { ...base, selection: { ...base.selection, sourceType: 'INBOUND_PLAN' }, selectionGroup: { groupKey: base.sourceKey, groupVersion: 'group-1', sources: [{ selection: { ...base.selection, sourceType: 'INBOUND_PLAN' }, sourceKey: base.sourceKey, customerId: base.customerId, customerName: base.customerName, sourceBusinessType: null, sourceBusinessNo: null, packages: base.availablePackages }], pallets: [{ warehousePalletId: base.selection.warehousePalletId, palletNo: base.palletNo, sourceKeys: [base.sourceKey], packageCount: base.availablePackages }], complete: true, blockReasons: [] } } }
 function detail(no = 'DS/001', version = 1): DispatchDetail {
   const review = { status: 'NOT_SUBMITTED' as const, reason: null, reviewerId: null, reviewedAt: null, reviewRound: 0, basisHash: null, invalidatedReason: null }
-  return { dispatchNo: no, status: 'ACTIVE', stage: 'BEFORE_LOADING', recordVersion: version, reviewState: 'DRAFT', reviews: { dispatchReview: review, loadingReview: review }, counts: { itemCount: 1, palletCount: 1, packageCount: 12, pickedPackageCount: 0, shippedPackageCount: 0 }, pickingReconciled: false, actions: { EDIT: { allowed: true, blockCode: null, blockReason: null }, ADD_CARGO: { allowed: true, blockCode: null, blockReason: null } }, vehicleInfo: { vehicle: null, driver: null }, dispatchInfo: { route: null, plannedDepartureAt: null, departedAt: null, estimatedArrivalAt: null, fbaAppointments: [], appointmentBatches: [{ batchKey: batch, batchNo: 'AP-1', recordVersion: 4, customerId: 'customer-a', sources: [{ sourceKey: 'ORDER:1', destinationKey: 'FBA:ONT8', packageCount: 12 }] }] }, documents: { dispatchNo: no, outbounds: [], deliveries: [], createdAt: '', updatedAt: '', remark: null }, orderDetails: [] }
+  return { publishLooseboardDemand: false, dispatchNo: no, status: 'ACTIVE', stage: 'BEFORE_LOADING', recordVersion: version, reviewState: 'DRAFT', reviews: { dispatchReview: review, loadingReview: review }, counts: { itemCount: 1, palletCount: 1, packageCount: 12, pickedPackageCount: 0, shippedPackageCount: 0 }, pickingReconciled: false, actions: { EDIT: { allowed: true, blockCode: null, blockReason: null }, ADD_CARGO: { allowed: true, blockCode: null, blockReason: null } }, vehicleInfo: { vehicle: null, driver: null }, dispatchInfo: { route: null, plannedDepartureAt: null, departedAt: null, estimatedArrivalAt: null, fbaAppointments: [], exceptions: [], appointmentBatches: [{ batchKey: batch, batchNo: 'AP-1', recordVersion: 4, customerId: 'customer-a', sources: [{ sourceKey: 'ORDER:1', destinationKey: 'FBA:ONT8', packageCount: 12 }] }] }, documents: { dispatchNo: no, outbounds: [], deliveries: [], createdAt: '', updatedAt: '', remark: null }, orderDetails: [] }
 }
 function proof(key: string): CommandResult { return { dispatchNo: 'DS/001', action: 'CREATE', idempotencyKey: key, recordVersion: 1, status: 'ACTIVE', stage: 'BEFORE_LOADING', occurredAt: '2026-10-19T00:00:00Z', effect: 'APPLIED', counts: detail().counts, result: { dispatchNo: 'DS/001', changedItemIds: [] }, replayed: false, alreadyArranged: false } }
 let guard: LeaveGuard, natives: Candidate[], draft: DispatchDraft
@@ -33,7 +33,7 @@ it.each([0, '0', '9007199254740993'])('preserves authoritative allocation versio
   const wrapper = render()
   try {
     await flushPromises(); await button(wrapper, '创建整车排车单').trigger('click'); await flushPromises()
-    expect(vi.mocked(convertDispatchDraft).mock.calls[0]![0].groups[0]!.dispatch.batchAllocations[0]!.recordVersion).toBe(recordVersion)
+    expect(vi.mocked(createDispatch).mock.calls[0]![0].batchAllocations[0]!.recordVersion).toBe(recordVersion)
   } finally { wrapper.unmount() }
 })
 it.each([undefined, null, 'bad', 9007199254740992])('blocks an existing-batch candidate lacking a valid authoritative version: %s', async recordVersion => {
@@ -49,6 +49,7 @@ beforeEach(() => {
   vi.mocked(getReceivingContext).mockImplementation(async key => receiving(key))
   vi.mocked(getBatchDispatchCandidates).mockImplementation(async key => ({ batchKey: key, version: 4, candidates: [row('9007199254740993', 'customer-a', key)], blockReasons: [] }))
   vi.mocked(listDispatchCandidates).mockImplementation(async () => ({ total: 1, page: 1, size: 20, pages: 1, candidates: clone(natives), complete: true, snapshotAt: '2026-10-19T00:00:00Z' }))
+  vi.mocked(createDispatch).mockImplementation(async body => proof(body.idempotencyKey))
   vi.mocked(createDispatchDraft).mockImplementation(async () => clone(draft))
   vi.mocked(createDispatchDraftContainer).mockImplementation(async body => { draft.recordVersion = 1; draft.containers = [{ draftContainerId: 'container-1', sequenceNo: 1, capacity: body.capacity, sourceKeys: [] }]; return clone(draft) })
   vi.mocked(lockDispatchDraftPallet).mockImplementation(async body => { const source = natives.find(value => value.selection.planPalletId === body.source.planPalletId)!; draft.recordVersion = Number(draft.recordVersion) + 1; draft.sources.push(clone(source)); draft.containers[0]!.sourceKeys.push(source.sourceKey); return clone(draft) })
@@ -64,8 +65,8 @@ it('creates the whole dispatch when native Long candidate quantities arrive as s
   try {
     await flushPromises(); expect(wrapper.get('input').attributes('disabled')).toBeUndefined()
     await button(wrapper, '创建整车排车单').trigger('click'); await flushPromises()
-    expect(convertDispatchDraft).toHaveBeenCalledOnce(); expect(vi.mocked(convertDispatchDraft).mock.calls[0]![0].groups[0]!.dispatch.batchAllocations).toEqual(row().allocations)
-    expect(vi.mocked(lockDispatchDraftPallet).mock.calls[0]![0].source.planPalletId).toBe('9007199254740993'); expect(wrapper.emitted('updated')).toHaveLength(1)
+    expect(createDispatch).toHaveBeenCalledOnce(); expect(vi.mocked(createDispatch).mock.calls[0]![0].batchAllocations).toEqual(row().allocations)
+    expect(vi.mocked(createDispatch).mock.calls[0]![0].cargo[0]!.planPalletId).toBe('9007199254740993'); expect(wrapper.emitted('updated')).toHaveLength(1)
   } finally { wrapper.unmount(); get.mockRestore() }
 })
 it('restores existing batch dispatches after remount and navigates to the same whole dispatch without any creation', async () => {
@@ -74,7 +75,7 @@ it('restores existing batch dispatches after remount and navigates to the same w
     const wrapper = render(); await flushPromises(); expect(wrapper.text()).toContain('DS/EXISTING')
     await button(wrapper, '继续维护本车').trigger('click'); expect(wrapper.emitted('external')).toEqual([['/overseas-warehouse/dispatches/DS%2FEXISTING']]); expect(wrapper.text()).not.toContain('创建整车排车单'); wrapper.unmount()
   }
-  expect(getBatchDispatchCandidates).not.toHaveBeenCalled(); expect(createDispatchDraft).not.toHaveBeenCalled(); expect(convertDispatchDraft).not.toHaveBeenCalled()
+  expect(getBatchDispatchCandidates).not.toHaveBeenCalled(); expect(createDispatchDraft).not.toHaveBeenCalled(); expect(createDispatch).not.toHaveBeenCalled()
 })
 it('does not fall back to new creation when transport relations fail or their nested batch ownership differs', async () => {
   vi.mocked(getReceivingContext).mockRejectedValueOnce(new Error('unavailable')); const failed = render(); await flushPromises(); expect(failed.text()).toContain('批次可排实物读取失败'); expect(getBatchDispatchCandidates).not.toHaveBeenCalled(); failed.unmount()
@@ -84,71 +85,52 @@ it('does not fall back to new creation when transport relations fail or their ne
 it('reads remaining physical cargo only after an explicit choice while retaining the original dispatch', async () => {
   vi.mocked(getReceivingContext).mockImplementation(async key => receiving(key, [{ dispatchNo: 'DS-OLD', batchKey: key, customerId: 'customer-a', tripNo: null, version: null, status: 'ACTIVE', packageCount: 12 }]))
   const wrapper = render(); await flushPromises(); expect(getBatchDispatchCandidates).not.toHaveBeenCalled()
-  await button(wrapper, '核对本批剩余可排实物').trigger('click'); await flushPromises(); expect(getBatchDispatchCandidates).toHaveBeenCalledExactlyOnceWith(batch); expect(wrapper.text()).toContain('DS-OLD'); expect(convertDispatchDraft).not.toHaveBeenCalled(); wrapper.unmount()
+  await button(wrapper, '核对本批剩余可排实物').trigger('click'); await flushPromises(); expect(getBatchDispatchCandidates).toHaveBeenCalledExactlyOnceWith(batch); expect(wrapper.text()).toContain('DS-OLD'); expect(createDispatch).not.toHaveBeenCalled(); wrapper.unmount()
 })
-it('uses a server-owned draft, explicit zero versions, native source hashes and exact allocations for one whole dispatch', async () => {
+it('creates the whole dispatch with native source versions and exact batch allocations', async () => {
   const wrapper = render(); await flushPromises(); await button(wrapper, '创建整车排车单').trigger('click'); await flushPromises()
-  expect(createDispatchDraft).toHaveBeenCalledWith({ warehouseId: 'origin-1', idempotencyKey: expect.any(String) })
-  expect(createDispatchDraftContainer).toHaveBeenCalledWith({ draftToken: 'server-owned-token', recordVersion: 0, idempotencyKey: expect.any(String), capacity: 30 })
-  expect(lockDispatchDraftPallet).toHaveBeenCalledWith({ draftToken: 'server-owned-token', draftContainerId: 'container-1', recordVersion: 1, idempotencyKey: expect.any(String), source: natives[0]!.selection })
-  const request = vi.mocked(convertDispatchDraft).mock.calls[0]![0]
-  expect(request).toMatchObject({ draftToken: 'server-owned-token', recordVersion: 2, groups: [{ draftContainerId: 'container-1', dispatch: { warehouseId: 'origin-1', cargo: [natives[0]!.selection], batchAllocations: row().allocations, vehicle: null, driver: null } }] })
+  expect(createDispatch).toHaveBeenCalledWith(expect.objectContaining({ publishLooseboardDemand: false, warehouseId: 'origin-1', cargo: [natives[0]!.selection], batchAllocations: row().allocations, vehicle: null, driver: null }))
   expect(wrapper.text()).toContain('DS/001'); expect(wrapper.emitted('updated')).toHaveLength(1); expect(await guard()).toBe(true)
   await button(wrapper, '继续维护本车').trigger('click'); expect(wrapper.emitted('external')).toEqual([['/overseas-warehouse/dispatches/DS%2F001']]); wrapper.unmount()
 })
 it('combines same-warehouse real customers in one container and keeps each batch source owner', async () => {
   const second = row('9007199254740994', 'customer-b'); natives.push(candidate(second)); vi.mocked(getBatchDispatchCandidates).mockResolvedValue({ batchKey: batch, version: 4, candidates: [row(), second], blockReasons: [] })
   const wrapper = render(); await flushPromises(); expect(wrapper.findAll('input[type=checkbox]').map(input => (input.element as HTMLInputElement).checked)).toEqual([true, true])
-  await button(wrapper, '创建整车排车单').trigger('click'); await flushPromises(); const groups = vi.mocked(convertDispatchDraft).mock.calls[0]![0].groups
+  await button(wrapper, '创建整车排车单').trigger('click'); await flushPromises(); const groups = [{ dispatch: vi.mocked(createDispatch).mock.calls[0]![0] }]
   expect(groups).toHaveLength(1); expect(groups[0]!.dispatch.cargo).toEqual(natives.map(value => value.selection)); expect(groups[0]!.dispatch.batchAllocations.map(value => value.customerId)).toEqual(['customer-a', 'customer-b']); expect(wrapper.text()).not.toContain('共车'); wrapper.unmount()
 })
 it('preserves exact distinct batch allocations while combining selected same-warehouse batches', async () => {
   const otherKey = 'FBA_APPOINTMENT:2', second = row('9007199254740994', 'customer-b', otherKey); natives.push(candidate(second))
   vi.mocked(getBatchDispatchCandidates).mockImplementation(async key => ({ batchKey: key, version: 4, candidates: [key === batch ? row() : second], blockReasons: [] }))
   const wrapper = render({ batchKeys: [batch, otherKey] }); await flushPromises(); for (const input of wrapper.findAll('input[type="checkbox"]')) await input.setValue(true)
-  await button(wrapper, '创建整车排车单').trigger('click'); await flushPromises(); expect(vi.mocked(convertDispatchDraft).mock.calls[0]![0].groups[0]!.dispatch.batchAllocations).toEqual([...row().allocations, ...second.allocations]); wrapper.unmount()
+  await button(wrapper, '创建整车排车单').trigger('click'); await flushPromises(); expect(vi.mocked(createDispatch).mock.calls[0]![0].batchAllocations).toEqual([...row().allocations, ...second.allocations]); wrapper.unmount()
 })
 it('keeps blocked, mismatched-customer, wrong-source and unknown-quantity cargo out of the payload', async () => {
   const blocked = { ...row('2'), blockReasons: ['本托已被其他排车占用'] }, wrong = row('3'), unknown = { ...row('4'), packageCount: null }, wrongSource = row('5')
   wrong.allocations[0]!.customerId = 'customer-b'; wrongSource.allocations[0]!.sourceKey = 'ORDER:unrelated'; natives.push(...[blocked, wrong, unknown, wrongSource].map(value => candidate(value)))
   vi.mocked(getBatchDispatchCandidates).mockResolvedValue({ batchKey: batch, version: 4, candidates: [row(), blocked, wrong, unknown, wrongSource], blockReasons: [] })
   const wrapper = render(); await flushPromises(); expect(wrapper.findAll('input[type=checkbox]').map(input => (input.element as HTMLInputElement).checked)).toEqual([true, false, false, false, false])
-  expect(wrapper.text()).toContain('本托已被其他排车占用'); await button(wrapper, '创建整车排车单').trigger('click'); await flushPromises(); expect(vi.mocked(convertDispatchDraft).mock.calls[0]![0].groups[0]!.dispatch.batchAllocations).toEqual(row().allocations); wrapper.unmount()
+  expect(wrapper.text()).toContain('本托已被其他排车占用'); await button(wrapper, '创建整车排车单').trigger('click'); await flushPromises(); expect(vi.mocked(createDispatch).mock.calls[0]![0].batchAllocations).toEqual(row().allocations); wrapper.unmount()
 })
 it('accepts partial pages but fails closed on missing versions and cross-warehouse batches', async () => {
   vi.mocked(listDispatchCandidates).mockResolvedValueOnce({ total: 1, page: 1, size: 20, pages: 1, candidates: natives, complete: false, snapshotAt: '' }); const incomplete = render(); await flushPromises(); expect(incomplete.get('input[type=checkbox]').attributes('disabled')).toBeUndefined(); expect(createDispatchDraft).not.toHaveBeenCalled(); incomplete.unmount()
   natives[0]!.selection.sourceVersion = ''; const missing = render(); await flushPromises(); expect(missing.text()).toContain('来源版本不完整'); missing.unmount()
   vi.mocked(getReceivingContext).mockImplementation(async key => { const value = receiving(key); if (key !== batch) value.batch.originWarehouseId = 'another-warehouse'; return value })
-  const cross = render({ batchKeys: [batch, 'FBA_APPOINTMENT:2'] }); await flushPromises(); expect(cross.text()).toContain('相同的起运仓'); expect(convertDispatchDraft).not.toHaveBeenCalled(); cross.unmount()
+  const cross = render({ batchKeys: [batch, 'FBA_APPOINTMENT:2'] }); await flushPromises(); expect(cross.text()).toContain('相同的起运仓'); expect(createDispatch).not.toHaveBeenCalled(); cross.unmount()
 })
-it('retains the entire original conversion and skips all prior locks after an unknown response, even after remount with the work closed', async () => {
-  vi.mocked(convertDispatchDraft).mockRejectedValueOnce(new Error('lost response'))
-  const wrapper = render(); await flushPromises(); await button(wrapper, '创建整车排车单').trigger('click'); await flushPromises(); const original = clone(vi.mocked(convertDispatchDraft).mock.calls[0]![0])
-  expect(await guard()).toBe(false); wrapper.unmount()
-  const restored = render({ canWrite: false }); await flushPromises(); expect(restored.text()).toContain('原请求已保留'); await button(restored, '核对并重试原请求').trigger('click'); await flushPromises()
-  expect(convertDispatchDraft).toHaveBeenNthCalledWith(2, original); expect(lockDispatchDraftPallet).toHaveBeenCalledTimes(1); expect(createDispatchDraftContainer).toHaveBeenCalledTimes(1); expect(restored.emitted('updated')).toHaveLength(1); restored.unmount()
-})
-it('retries the exact container command after a lost response instead of generating another container key', async () => {
-  vi.mocked(createDispatchDraftContainer).mockRejectedValueOnce(new Error('unknown container'))
-  const wrapper = render(); await flushPromises(); await button(wrapper, '创建整车排车单').trigger('click'); await flushPromises(); const original = clone(vi.mocked(createDispatchDraftContainer).mock.calls[0]![0])
-  await button(wrapper, '核对并重试原请求').trigger('click'); await flushPromises(); expect(createDispatchDraftContainer).toHaveBeenNthCalledWith(2, original); expect(createDispatchDraft).toHaveBeenCalledTimes(1); expect(convertDispatchDraft).toHaveBeenCalledTimes(1); wrapper.unmount()
-})
-it('keeps a proven CREATE across failed current-detail GET and only repeats the read', async () => {
+
+
+it('shows the confirmed dispatch link even when its detail read fails', async () => {
   vi.mocked(getDispatch).mockRejectedValueOnce(new Error('GET unavailable'))
-  const wrapper = render(); await flushPromises(); await button(wrapper, '创建整车排车单').trigger('click'); await flushPromises(); expect(convertDispatchDraft).toHaveBeenCalledTimes(1); expect(wrapper.emitted('updated')).toBeUndefined()
-  await button(wrapper, '核对并重试原请求').trigger('click'); await flushPromises(); expect(convertDispatchDraft).toHaveBeenCalledTimes(1); expect(getDispatch).toHaveBeenCalledTimes(2); expect(wrapper.emitted('updated')).toHaveLength(1); wrapper.unmount()
-})
-it('never releases an unknown result for a later rejection, and releases only an explicitly rejected owned draft at its read-back version', async () => {
-  vi.mocked(lockDispatchDraftPallet).mockRejectedValueOnce(new Error('unknown')).mockRejectedValueOnce(new ApiResponseError('conflict', 'A0409', 409))
-  const unknown = render(); await flushPromises(); await button(unknown, '创建整车排车单').trigger('click'); await flushPromises(); await button(unknown, '核对并重试原请求').trigger('click'); await flushPromises(); expect(unknown.text()).not.toContain('按明确拒绝结果释放'); expect(await guard()).toBe(false); unknown.unmount()
-  sessionStorage.clear(); vi.mocked(lockDispatchDraftPallet).mockRejectedValueOnce(new ApiResponseError('conflict', 'A0409', 409)); draft = { ...draft, draftToken: 'another-owned-token', containers: [], recordVersion: 0 }
-  const rejected = render(); await flushPromises(); await button(rejected, '创建整车排车单').trigger('click'); await flushPromises(); draft.recordVersion = 9
-  await button(rejected, '按明确拒绝结果释放本草稿并重新核对').trigger('click'); await flushPromises(); expect(releaseDispatchDraft).toHaveBeenCalledWith({ draftToken: 'another-owned-token', recordVersion: 9, idempotencyKey: expect.any(String) }); rejected.unmount()
+  const wrapper = render(); await flushPromises(); await button(wrapper, '创建整车排车单').trigger('click'); await flushPromises()
+  expect(createDispatch).toHaveBeenCalledTimes(1); expect(wrapper.emitted('updated')).toHaveLength(1)
+  await button(wrapper, '继续维护本车').trigger('click'); expect(wrapper.emitted('external')).toEqual([['/overseas-warehouse/dispatches/DS%2F001']]); expect(await guard()).toBe(true); wrapper.unmount()
 })
+
 it('preserves quantity-split navigation and uses create permission rather than the removed smart-dispatch permission', async () => {
   access.denied = ['platform:overseas-warehouse:inbound-order:smart-dispatch']; const wrapper = render(); await flushPromises()
   await button(wrapper, '按当前批次箱数分批').trigger('click'); expect(wrapper.emitted('batch')).toEqual([[batch]]); expect(lockDispatchDraftPallet).not.toHaveBeenCalled()
-  await button(wrapper, '创建整车排车单').trigger('click'); await flushPromises(); expect(convertDispatchDraft).toHaveBeenCalledTimes(1)
+  await button(wrapper, '创建整车排车单').trigger('click'); await flushPromises(); expect(createDispatch).toHaveBeenCalledTimes(1)
   await button(wrapper, '为本车添加同仓货物').trigger('click'); expect(wrapper.getComponent({ name: 'WorkSharedTripForm' }).props('dispatchNo')).toBe('DS/001'); wrapper.unmount()
 })
 it('does not read scoped cargo without original permissions or create while only read access remains', async () => {
@@ -158,7 +140,7 @@ it('does not read scoped cargo without original permissions or create while only
 it('shows batch-level blockers even without rows and refuses duplicate physical candidates across batches', async () => {
   vi.mocked(getBatchDispatchCandidates).mockResolvedValueOnce({ batchKey: batch, version: 4, candidates: [], blockReasons: ['原批次已替代，请进入当前批次'] })
   const blocked = render(); await flushPromises(); expect(blocked.get('[role="alert"]').text()).toContain('原批次已替代'); expect(createDispatchDraft).not.toHaveBeenCalled(); blocked.unmount()
-  const duplicate = render({ batchKeys: [batch, 'FBA_APPOINTMENT:2'] }); await flushPromises(); expect(duplicate.findAll('input').every(input => input.attributes('disabled') !== undefined)).toBe(true); expect(duplicate.text()).toContain('同一实物'); expect(convertDispatchDraft).not.toHaveBeenCalled(); duplicate.unmount()
+  const duplicate = render({ batchKeys: [batch, 'FBA_APPOINTMENT:2'] }); await flushPromises(); expect(duplicate.findAll('input').every(input => input.attributes('disabled') !== undefined)).toBe(true); expect(duplicate.text()).toContain('同一实物'); expect(createDispatch).not.toHaveBeenCalled(); duplicate.unmount()
 })
 
 it('keeps original batch allocations and selected cargo while paging through associated plan candidates', async () => {
@@ -176,8 +158,8 @@ it('keeps original batch allocations and selected cargo while paging through ass
     expect(getBatchDispatchCandidates).toHaveBeenCalledTimes(1)
     expect(listDispatchCandidates).toHaveBeenCalledTimes(2)
     await button(wrapper, '创建整车排车单').trigger('click'); await flushPromises()
-    expect(convertDispatchDraft).toHaveBeenCalledTimes(1)
-    expect(vi.mocked(convertDispatchDraft).mock.calls[0]![0].groups[0]!.dispatch.batchAllocations).toEqual([...first.allocations, ...second.allocations])
+    expect(createDispatch).toHaveBeenCalledTimes(1)
+    expect(vi.mocked(createDispatch).mock.calls[0]![0].batchAllocations).toEqual([...first.allocations, ...second.allocations])
   } finally { wrapper.unmount() }
 })
 it('rejects a selected batch source whose group version changed on another candidate page', async () => {
@@ -195,3 +177,13 @@ it('rejects a selected batch source whose group version changed on another candi
     expect(createDispatchDraft).not.toHaveBeenCalled()
   } finally { wrapper.unmount() }
 })
+
+it('failure preserves selection, releases navigation and creates a fresh request on the next click', async () => {
+  vi.mocked(createDispatch).mockRejectedValueOnce(new Error('timeout'))
+  const wrapper = render(); await flushPromises(); await button(wrapper, '创建整车排车单').trigger('click'); await flushPromises()
+  const original = vi.mocked(createDispatch).mock.calls[0]![0]
+  expect(wrapper.get('input[type=checkbox]').attributes('disabled')).toBeUndefined(); expect((wrapper.get('input[type=checkbox]').element as HTMLInputElement).checked).toBe(true)
+  expect(await guard()).toBe(true); expect(sessionStorage.length).toBe(0)
+  await button(wrapper, '创建整车排车单').trigger('click'); await flushPromises()
+  expect(vi.mocked(createDispatch).mock.calls[1]![0].idempotencyKey).not.toBe(original.idempotencyKey); expect(getReceivingContext).toHaveBeenCalledTimes(1); wrapper.unmount()
+})

src/modules/appointment-calendar/WorkDispatchForm.vue

@@ -6,7 +6,7 @@ import { computed, onBeforeUnmount, onMounted, ref } from 'vue'
 import { ElMessage } from 'element-plus'
 import { useAccessPreviewStore } from '@/core/access/accessPreview'
 import { useAuthStore } from '@/core/auth/auth'
-import { getDispatch, getBatchDispatchCandidates, listDispatchCandidates, useDispatchCandidates, createDispatchDraft, createDispatchDraftContainer, listDispatchDrafts, lockDispatchDraftPallet, convertDispatchDraft, releaseDispatchDraft, dispatchVehicleSpecs, DispatchInputError, requireVersion, requireBatchVersions, requireSelectionGroup, expandSelectionGroups, assertSelectionGroupVersions, selectionGroupBlockReason, validateCommandResult, validateCurrentDispatch, isDefiniteDispatchRejection, type BatchDispatchCandidate, type BatchDispatchCandidates, type Candidate, type DispatchDetail, type DispatchDraft, type ConvertDraft, type ConvertedDraft, type DraftSelection, type VersionCommand } from '@/modules/overseas-warehouse'
+import { getDispatch, createDispatch, getBatchDispatchCandidates, listDispatchCandidates, useDispatchCandidates, dispatchVehicleSpecs, DispatchInputError, requireBatchVersions, expandSelectionGroups, selectionGroupBlockReason, validateCommandResult, validateCurrentDispatch, type BatchDispatchCandidate, type BatchDispatchCandidates, type DispatchDetail, type Candidate } from '@/modules/overseas-warehouse'
 import LoadErrorState from '@/shared/components/LoadErrorState.vue'
 import ApiErrorMeta from '@/shared/components/ApiErrorMeta.vue'
 import { getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
@@ -17,11 +17,8 @@ import { useWorkDraft } from './useWorkDraft'
 const props = defineProps<{ batchKeys: string[]; canWrite: boolean }>()
 const emit = defineEmits<{ updated: []; external: [path: string]; batch: [key: string] }>()
 type BatchRow = BatchDispatchCandidate & { key: string; batchKey: string; native: Candidate | null; blockReasons: string[] }
-type ReadyRow = BatchRow & { native: Candidate }
-type Step = { action: 'CREATE' | 'CONTAINER' | 'LOCK' | 'CONVERT' | 'RELEASE'; body: Record<string, unknown>; attempted: boolean; rejected: boolean }
-type Preparation = { warehouseId: string; capacity: number; rows: ReadyRow[]; dispatchKey: string; draft: DispatchDraft | null; containerId: string | null; lockedKeys: string[]; step: Step | null; converted: ConvertedDraft | null; releasing: boolean }
 const access = useAccessPreviewStore(), auth = useAuthStore(), owner = auth.user?.id || ''
-const scope = JSON.stringify([...new Set(props.batchKeys)].sort()), storageKey = `appointment-dispatch:${owner}:${scope}`
+const scope = JSON.stringify([...new Set(props.batchKeys)].sort())
 const contexts = ref<BatchDispatchCandidates[]>([]), rows = ref<BatchRow[]>([]), selected = ref<string[]>([]), warehouseId = ref('')
 const working = ref(false), saving = ref(false), error = ref<ApiErrorDetails | null>(null), saveError = ref<ApiErrorDetails | null>(null)
 const candidatePage = useDispatchCandidates(error, listDispatchCandidates)
@@ -30,26 +27,24 @@ const loading = computed(() => working.value || candidatePage.loading.value)
 const selectedRows = ref<Record<string, BatchRow>>({})
 let receivingContexts: Awaited<ReturnType<typeof getReceivingContext>>[] = []
 let nativeGeneration = 0
-const capacity = ref(30), result = ref<DispatchDetail | null>(null), pending = ref<Preparation | null>(null), corrupted = ref(false)
+const createdNo = ref('')
+const capacity = ref(30), result = ref<DispatchDetail | null>(null)
 const adding = ref(false), addingBusy = ref(false), arrangingRemaining = ref(false), existingReady = ref(false)
 const existing = ref<Array<{ batchKey: string; dispatchNo: string; customerId: string }>>([]), baseline = ref('[]')
 const readable = computed(() => ['platform:appointment:list', 'platform:overseas-warehouse:last-mile-order:list', 'platform:overseas-warehouse:inbound-order:list', 'platform:overseas-warehouse:dispatch:list'].every(permission => access.can(permission)))
 const canCreate = computed(() => readable.value && access.can('platform:overseas-warehouse:dispatch:create'))
-const writable = computed(() => props.canWrite && canCreate.value && !corrupted.value && (!existing.value.length || existingReady.value))
+const writable = computed(() => props.canWrite && canCreate.value && (!existing.value.length || existingReady.value))
 const chosen = computed(() => selected.value.map(key => selectedRows.value[key]).filter((row): row is BatchRow => Boolean(row)))
-const unresolved = computed(() => saving.value || Boolean(pending.value) || corrupted.value)
-useWorkDraft(computed(() => JSON.stringify(selected.value) !== baseline.value && !result.value), unresolved)
+const unresolved = computed(() => saving.value)
+useWorkDraft(computed(() => JSON.stringify(selected.value) !== baseline.value && !createdNo.value), unresolved)
 const clone = <T,>(value: T): T => JSON.parse(JSON.stringify(value)) as T
 let generation = 0
 function ensureOwner() { if (!owner || auth.user?.id !== owner || JSON.stringify([...new Set(props.batchKeys)].sort()) !== scope) throw new DispatchInputError('排车登录身份或批次范围已变化，请重新进入原事项') }
-function persist() { ensureOwner(); if (pending.value) sessionStorage.setItem(storageKey, JSON.stringify(pending.value)); else sessionStorage.removeItem(storageKey) }
-try { const saved = owner && sessionStorage.getItem(storageKey); if (saved) pending.value = JSON.parse(saved) as Preparation }
-catch { corrupted.value = true; saveError.value = { message: '原排车请求记录损坏，请保留现场核对，不能另建排车单' } }
 function reasons(row: BatchRow) { return row.blockReasons }
 function physicalCount(values: BatchRow[]) { return new Set(values.flatMap(row => row.native?.selectionGroup.pallets.map(pallet => pallet.warehousePalletId || pallet.palletNo || row.key) || [])).size }
 function detailPath(no: string) { return `/overseas-warehouse/dispatches/${encodeURIComponent(no)}` }
 async function load() {
-  if (!readable.value || pending.value || corrupted.value) return
+  if (!readable.value) return
   const current = ++generation, batches = [...new Set(props.batchKeys)]
   working.value = true; error.value = null; existingReady.value = false; rows.value = []; selected.value = []; baseline.value = '[]'; contexts.value = []; selectedRows.value = {}; candidatePage.reset(); nativeGeneration++
   try {
@@ -122,105 +117,24 @@ function select(row: BatchRow, event: Event) {
   }
   input.checked = selected.value.includes(row.key)
 }
-function step(action: Step['action'], body: object) { pending.value!.step = { action, body: clone(body) as Record<string, unknown>, attempted: false, rejected: false }; persist() }
-function common(draft: DispatchDraft) { return { recordVersion: requireVersion(draft.recordVersion), idempotencyKey: crypto.randomUUID(), draftToken: draft.draftToken } }
-async function executeStep() {
-  const request = pending.value!, command = request.step!, previouslyAttempted = command.attempted
-  command.attempted = true; persist()
-  try {
-    let value: DispatchDraft | ConvertedDraft
-    if (command.action === 'CREATE') value = await createDispatchDraft(command.body as unknown as { idempotencyKey: string; warehouseId: string })
-    else if (command.action === 'CONTAINER') value = await createDispatchDraftContainer(command.body as unknown as VersionCommand & { draftToken: string; capacity: number })
-    else if (command.action === 'LOCK') value = await lockDispatchDraftPallet(command.body as unknown as DraftSelection)
-    else if (command.action === 'RELEASE') value = await releaseDispatchDraft(command.body as unknown as VersionCommand & { draftToken: string })
-    else value = await convertDispatchDraft(command.body as unknown as ConvertDraft)
-    ensureOwner()
-    if (!value.draftToken || command.body.draftToken && value.draftToken !== command.body.draftToken) throw new DispatchInputError('草稿结果与原请求不一致，请保留原请求')
-    if (command.action === 'CONVERT') {
-      const converted = value as ConvertedDraft
-      if (converted.vehicles.length !== 1 || converted.vehicles[0]?.draftContainerId !== request.containerId) throw new DispatchInputError('整车结果与原装车容器不一致')
-      validateCommandResult(converted.vehicles[0]!.dispatch, { dispatchNo: '', action: 'CREATE', body: { idempotencyKey: request.dispatchKey } })
-      request.converted = converted
-    } else {
-      const draft = value as DispatchDraft; requireVersion(draft.recordVersion)
-      if (draft.warehouseId !== request.warehouseId) throw new DispatchInputError('草稿起运仓与原批次不一致')
-      if (command.action === 'CONTAINER') {
-        if (draft.containers.length !== 1) throw new DispatchInputError('本次草稿装车容器不唯一，请保留原请求核对')
-        request.containerId = draft.containers[0]!.draftContainerId
-      }
-      if (command.action === 'LOCK') {
-        const selectedSource = command.body.source as DraftSelection['source']
-        const expected = request.rows.find(row => row.native.selection.planPalletId === selectedSource.planPalletId && row.native.selection.sourceType === selectedSource.sourceType && row.native.sourceVersion === selectedSource.sourceVersion)
-        const source = expected && draft.sources.find(row => row.sourceKey === expected.native.sourceKey && row.customerId === expected.customerId)
-        if (!source || !draft.containers.find(row => row.draftContainerId === request.containerId)?.sourceKeys.includes(source.sourceKey)) throw new DispatchInputError('原来源未确认进入本装车组，请核对原请求')
-        const group = requireSelectionGroup(source)
-        assertSelectionGroupVersions([expected!.native], [source])
-        const boundKeys = draft.containers.find(row => row.draftContainerId === request.containerId)!.sourceKeys
-        if (group.sources.some(required => !boundKeys.includes(required.sourceKey))) throw new DispatchInputError('完整选货组尚未原子进入本装车组，请核对原请求')
-        request.lockedKeys.push(...group.sources.map(required => required.sourceKey))
-      }
-      request.draft = draft
-    }
-    request.step = null; persist()
-  } catch (cause) {
-    ensureOwner(); if (!previouslyAttempted && isDefiniteDispatchRejection(cause)) command.rejected = true
-    persist(); throw cause
-  }
-}
 async function save() {
-  if (saving.value || loading.value || corrupted.value || !canCreate.value) return
-  saveError.value = null
+  if (saving.value || loading.value || !canCreate.value) return
+  saveError.value = null; saving.value = true
   try {
     ensureOwner()
-    if (!pending.value) {
-      if (!writable.value || error.value || result.value || !chosen.value.length || chosen.value.some(row => reasons(row).length || !row.native) || physicalCount(chosen.value) > capacity.value) throw new DispatchInputError('请核对本仓实物资格、来源批次与计划托位')
-      candidatePage.assertCurrent(chosen.value.map(row => row.native!))
-      pending.value = { warehouseId: warehouseId.value, capacity: capacity.value, rows: clone(chosen.value) as ReadyRow[], dispatchKey: crypto.randomUUID(), draft: null, containerId: null, lockedKeys: [], step: null, converted: null, releasing: false }; persist()
-    }
-    saving.value = true
-    const request = pending.value
-    while (!request.converted) {
-      if (!request.step) {
-        if (request.releasing) { step('RELEASE', common(request.draft!)) }
-        else if (!request.draft) step('CREATE', { idempotencyKey: crypto.randomUUID(), warehouseId: request.warehouseId })
-        else if (!request.containerId) step('CONTAINER', { ...common(request.draft), capacity: request.capacity })
-        else {
-          const next = request.rows.find(row => !request.lockedKeys.includes(row.native.sourceKey))
-          if (next) step('LOCK', { ...common(request.draft), draftContainerId: request.containerId, source: next.native.selection })
-          else {
-            const cargo = [...new Set(request.rows.map(row => row.native.sourceKey))].map(key => request.draft!.sources.find(source => source.sourceKey === key))
-            if (cargo.some(source => !source || source.warehouseId !== request.warehouseId || !source.sourceVersion || source.selection.sourceVersion !== source.sourceVersion || request.rows.some(row => row.native.sourceKey === source.sourceKey && row.customerId !== source.customerId))) throw new DispatchInputError('草稿真实来源尚未完整恢复，请保留原请求核对')
-            step('CONVERT', { ...common(request.draft), groups: [{ draftContainerId: request.containerId, dispatch: { publishLooseboardDemand: true, idempotencyKey: request.dispatchKey, warehouseId: request.warehouseId, vehicle: null, driver: null, plannedDepartureAt: null, estimatedArrivalAt: null, remark: null, cargo: expandSelectionGroups(cargo as Candidate[]), batchAllocations: request.rows.flatMap(row => row.allocations) } }] } satisfies ConvertDraft)
-          }
-        }
-      }
-      await executeStep()
-      if (request.releasing) { pending.value = null; persist(); selected.value = []; await load(); return }
-    }
-    // Immutable CREATE proof is persisted before reading current facts; GET failure never reconverts.
-    const proof = request.converted!.vehicles[0]!.dispatch, latest = await getDispatch(proof.dispatchNo)
-    ensureOwner(); validateCurrentDispatch(latest, proof)
-    result.value = latest; pending.value = null; persist(); selected.value = []; baseline.value = '[]'
-    ElMessage.success(`整车排车单 ${latest.dispatchNo} 已创建`); emit('updated')
-  } catch (cause) { saveError.value = getApiErrorDetails(cause, cause instanceof DispatchInputError ? cause.message : '本次整车结果待确认，请核对并重试原请求') }
+    if (!writable.value || error.value || createdNo.value || !chosen.value.length || chosen.value.some(row => reasons(row).length || !row.native) || physicalCount(chosen.value) > capacity.value) throw new DispatchInputError('请核对本仓实物资格、来源批次与计划托位')
+    candidatePage.assertCurrent(chosen.value.map(row => row.native!))
+    const body = { publishLooseboardDemand: false, idempotencyKey: crypto.randomUUID(), warehouseId: warehouseId.value, vehicle: null, driver: null, plannedDepartureAt: null, estimatedArrivalAt: null, remark: null, cargo: expandSelectionGroups(chosen.value.map(row => row.native!)), batchAllocations: chosen.value.flatMap(row => row.allocations) }
+    const proof = await createDispatch(body); ensureOwner()
+    validateCommandResult(proof, { dispatchNo: '', action: 'CREATE', body: { idempotencyKey: body.idempotencyKey } })
+    createdNo.value = proof.dispatchNo; selected.value = []; baseline.value = '[]'; emit('updated')
+    const latest = await getDispatch(proof.dispatchNo); ensureOwner(); validateCurrentDispatch(latest, proof)
+    result.value = latest; selected.value = []; baseline.value = '[]'
+    ElMessage.success(`整车排车单 ${latest.dispatchNo} 已创建`)
+  } catch (cause) { saveError.value = getApiErrorDetails(cause, cause instanceof DispatchInputError ? cause.message : '排车创建失败，请刷新核对当前货物后重新操作') }
   finally { saving.value = false }
 }
-async function releaseRejected() {
-  if (saving.value || !pending.value?.step?.rejected || pending.value.converted) return
-  saving.value = true; saveError.value = null
-  try {
-    ensureOwner(); const request = pending.value
-    if (!request.draft) { pending.value = null; persist(); return }
-    const owned = (await listDispatchDrafts()).find(row => row.draftToken === request.draft!.draftToken)
-    ensureOwner()
-    if (!owned || owned.warehouseId !== request.warehouseId) throw new DispatchInputError('原拥有者草稿尚未读回，请保留现场核对')
-    request.draft = owned; request.releasing = true; request.step = null; persist()
-  } catch (cause) { saveError.value = getApiErrorDetails(cause, cause instanceof DispatchInputError ? cause.message : '原草稿版本读取失败') }
-  finally { saving.value = false }
-  if (pending.value?.releasing) await save()
-  else if (!pending.value) await load()
-}
-async function remaining() { if (!unresolved.value && !addingBusy.value) { result.value = null; adding.value = false; arrangingRemaining.value = true; await load() } }
+async function remaining() { if (!unresolved.value && !addingBusy.value) { createdNo.value = ''; result.value = null; adding.value = false; arrangingRemaining.value = true; await load() } }
 onMounted(load)
 onBeforeUnmount(() => { generation++; nativeGeneration++; candidatePage.reset() })
 </script>
@@ -230,12 +144,12 @@ onBeforeUnmount(() => { generation++; nativeGeneration++; candidatePage.reset()
     <p v-if="!readable">读取批次实物需要预约、尾程订单、入仓单和排车列表权限。</p>
     <LoadErrorState v-if="error" title="批次可排实物读取失败" :message="error.message" :loading="loading" @retry="load"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState>
     <p v-if="loading">正在核对批次、客户、起运仓与实物来源…</p>
-    <template v-if="existing.length && !loading && !error && !result && !pending">
+    <template v-if="existing.length && !loading && !error && !createdNo">
       <WorkExistingDispatchForm :key="JSON.stringify(existing)" :dispatches="existing" :can-write="canWrite" @ready="existingReady = $event" @updated="emit('updated')" @external="path => emit('external', path)" />
       <el-button v-if="!arrangingRemaining && writable" @click="remaining">核对本批剩余可排实物</el-button>
     </template>
-    <template v-if="result"><p>已创建整车排车单：{{ result.dispatchNo }}</p><el-button @click="emit('external', detailPath(result.dispatchNo))">继续维护本车</el-button><el-button v-if="canWrite && access.can('platform:overseas-warehouse:dispatch:edit') && result.actions.ADD_CARGO?.allowed === true" @click="adding = true">为本车添加同仓货物</el-button><WorkSharedTripForm v-if="adding" :dispatch-no="result.dispatchNo" :can-write="canWrite" @busy="addingBusy = $event" @updated="emit('updated')" @external="path => emit('external', path)" /><el-button :disabled="addingBusy" @click="remaining">继续核对剩余实物</el-button></template>
-    <template v-else-if="!pending && !corrupted && readable && !loading && !error && (!existing.length || arrangingRemaining && existingReady)">
+    <template v-if="createdNo"><p>已创建整车排车单：{{ createdNo }}</p><el-button @click="emit('external', detailPath(createdNo))">继续维护本车</el-button><el-button v-if="canWrite && access.can('platform:overseas-warehouse:dispatch:edit') && result?.actions.ADD_CARGO?.allowed === true" @click="adding = true">为本车添加同仓货物</el-button><WorkSharedTripForm v-if="adding" :dispatch-no="createdNo" :can-write="canWrite" @busy="addingBusy = $event" @updated="emit('updated')" @external="path => emit('external', path)" /><el-button :disabled="addingBusy" @click="remaining">继续核对剩余实物</el-button></template>
+    <template v-else-if="readable && !loading && !error && (!existing.length || arrangingRemaining && existingReady)">
       <p v-for="reason in [...new Set(contexts.flatMap(context => context.blockReasons))]" :key="reason" role="alert">{{ reason }}</p>
       <el-button v-if="batchKeys.length === 1" :disabled="!writable || unresolved" @click="emit('batch', batchKeys[0]!)">按当前批次箱数分批</el-button><p>部分箱数先按本批逐来源数量分批；不对应完整实物时，先在原库存作业拆托。</p>
       <label>本组计划托位<select v-model.number="capacity" :disabled="!writable || unresolved" class="workbench-input"><option v-for="spec in dispatchVehicleSpecs" :key="spec.value" :value="spec.capacity">{{ spec.label }}</option></select></label>
@@ -244,7 +158,6 @@ onBeforeUnmount(() => { generation++; nativeGeneration++; candidatePage.reset()
       <p>上方总数为关联计划的候选数；当前页展示其中属于本批次的实物。已选 {{ chosen.length }} 条（含其他页）。</p>
       <el-button type="primary" :disabled="!writable || !chosen.length" :loading="saving" @click="save">创建整车排车单</el-button>
     </template>
-    <p v-if="pending" role="status">本次草稿与原请求已保留，请勿改变来源、版本或另建排车单。<el-button :disabled="!canCreate || saving" :loading="saving" @click="save">核对并重试原请求</el-button></p>
-    <LoadErrorState v-if="saveError" title="排车尚未完成" :message="saveError.message" :show-retry="false"><template #details><ApiErrorMeta :details="saveError" /></template></LoadErrorState><el-button v-if="pending?.step?.rejected && !pending.converted" :loading="saving" @click="releaseRejected">按明确拒绝结果释放本草稿并重新核对</el-button>
+    <LoadErrorState v-if="saveError" title="排车尚未完成" :message="saveError.message" :show-retry="false"><template #details><ApiErrorMeta :details="saveError" /></template></LoadErrorState>
   </section>
 </template>

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

@@ -24,16 +24,16 @@ it('opens a real plan in the exact customer scope while leaving missing plans un
 it('does not read the container source without its original permission', async () => {
   state.canRead = false; const wrapper = render(); await flushPromises(); expect(getContainerPlanProgress).not.toHaveBeenCalled(); wrapper.unmount()
 })
-it('submits the actual preview snapshot and replays the same request after an unknown result', async () => {
+it('submits the actual preview snapshot and permits a fresh click after an unknown result', async () => {
   vi.mocked(getContainerInboundPlanPreview).mockResolvedValue(preview())
   vi.mocked(convertLastMileContainerToInboundPlans).mockRejectedValueOnce(new Error('lost response')).mockResolvedValueOnce([])
   const wrapper = render(); await flushPromises(); await button(wrapper, '核对本柜入库计划预览').trigger('click'); await flushPromises()
   await button(wrapper, '确认生成本柜计划').trigger('click'); await flushPromises()
   const original = vi.mocked(convertLastMileContainerToInboundPlans).mock.calls[0]!
   expect(original).toEqual([{ sourceContainerBookingId: '9007199254740993', snapshotVersion: 4, snapshotHash: 'snapshot-4' }, expect.any(String)])
-  expect(await guard()).toBe(false)
-  await button(wrapper, '重试本次计划生成').trigger('click'); await flushPromises()
-  expect(vi.mocked(convertLastMileContainerToInboundPlans).mock.calls[1]).toEqual(original)
+  expect(await guard()).toBe(true)
+  await button(wrapper, '确认生成本柜计划').trigger('click'); await flushPromises()
+  expect(vi.mocked(convertLastMileContainerToInboundPlans).mock.calls[1]![0]).toEqual(original[0]); expect(vi.mocked(convertLastMileContainerToInboundPlans).mock.calls[1]![1]).not.toBe(original[1])
   expect(wrapper.emitted('updated')).toHaveLength(1); wrapper.unmount()
 })
 it('uses the original resource recovery snapshot and key instead of creating new plans', async () => {

src/modules/appointment-calendar/WorkReceiptPlans.vue

@@ -35,9 +35,9 @@ async function createPlans() {
     await convertLastMileContainerToInboundPlans(pending.value.body, pending.value.key)
     pending.value = null; preview.value = null; ElMessage.success('本柜入库计划已确认，请查看原接仓记录'); emit('updated'); await load()
   } catch (cause) {
-    saveError.value = getApiErrorDetails(cause, '入库计划生成结果待确认，请重试原请求')
+    saveError.value = getApiErrorDetails(cause, '入库计划生成失败，请重新操作')
     if (rejectedCommand(cause)) { pending.value = null; preview.value = null }
-  } finally { saving.value = false }
+  } finally { pending.value = null; saving.value = false }
 }
 async function load() { if (!readable.value) return; loading.value = true; error.value = null; try { detail.value = await getContainerPlanProgress(props.containerBookingId) } catch (cause) { error.value = getApiErrorDetails(cause, '本柜入仓计划读取失败') } finally { loading.value = false } }
 onMounted(load)
@@ -48,7 +48,7 @@ onMounted(load)
     <template v-if="detail && !error"><p>{{ detail.summary.containerNo || '柜号待核实' }} · {{ detail.summary.overseasWarehouseName || '接仓仓库待核实' }}</p><p v-if="detail.summary.blockingReason">{{ detail.summary.blockingReason }}</p><table class="density-table"><thead><tr><th>操作</th><th>入库单号</th><th>入仓码 / 订单号</th></tr></thead><tbody><tr v-for="row in detail.orders" :key="`${row.customerId}:${row.orderId}`"><td><el-button :disabled="saving || !!pending || !row.planNo || !row.customerId || !row.planValid || !access.can('platform:overseas-warehouse:inbound-order:list')" @click="emit('external', `/overseas-warehouse/inbound-orders/${encodeURIComponent(row.planNo!)}?customerId=${encodeURIComponent(row.customerId)}`)">查看原接仓记录</el-button></td><td>{{ row.planNo || '尚未生成有效计划' }}</td><td>{{ row.inboundCode || row.orderNo || '—' }}</td></tr></tbody></table><p v-if="!detail.orders.length">本柜尚无可读取的入仓来源。</p></template>
     <el-button v-if="writable && !preview && !pending" :loading="previewLoading" @click="loadPreview">核对本柜入库计划预览</el-button>
     <LoadErrorState v-if="previewError" title="入库计划预览失败" :message="previewError.message" :loading="previewLoading" @retry="loadPreview"><template #details><ApiErrorMeta :details="previewError" /></template></LoadErrorState>
-    <div v-if="preview && !previewError"><h4>核对本柜计划与托盘</h4><p>{{ preview.containerNo || '柜号待核实' }} · {{ preview.overseasWarehouseName || '接仓仓库待核实' }} · {{ preview.pendingOrderCount }} 票待生成 · {{ preview.blockedOrderCount }} 票待处理</p><p>头程已有 {{ preview.sourcePalletCount }} 托；海外补充 {{ preview.supplementPalletCount }} 托；已保存计划 {{ preview.totalPlannedPalletCount }} 托。</p><table class="density-table"><thead><tr><th>客户</th><th>原票</th><th>目的地</th><th>箱数</th><th>目标托数</th><th>计划状态</th></tr></thead><tbody><tr v-for="row in preview.groups.flatMap(group => group.orders)" :key="`${row.customerId}:${row.orderId}`"><td>{{ row.customerName || '客户名称待核实' }}</td><td>{{ row.inboundCode || row.businessOrderNo || '—' }}</td><td>{{ row.destinationWarehouseName || row.fbaWarehouseCode || (row.destinationType === 'PRIVATE_ADDRESS' ? '客户地址' : '目的地待核实') }}</td><td>{{ row.packageCount }}</td><td>{{ row.targetPalletCount }}</td><td>{{ row.existingPlanNo || ({ READY: '可生成', RESOURCE_PENDING: '资源待确认', PLANNED: '已有计划', BLOCKED: '来源条件未就绪' }[row.readiness]) }}</td></tr></tbody></table><p v-if="!preview.ready">本柜尚不具备生成条件，请在原尾程订单核对阻塞来源。</p><el-button type="primary" :loading="saving" :disabled="!writable || (!pending && (!preview.ready || (!preview.resourceRetry && preview.pendingOrderCount <= 0)))" @click="createPlans">{{ pending ? '重试本次计划生成' : preview.resourceRetry ? '重试原资源确认' : '确认生成本柜计划' }}</el-button></div>
+    <div v-if="preview && !previewError"><h4>核对本柜计划与托盘</h4><p>{{ preview.containerNo || '柜号待核实' }} · {{ preview.overseasWarehouseName || '接仓仓库待核实' }} · {{ preview.pendingOrderCount }} 票待生成 · {{ preview.blockedOrderCount }} 票待处理</p><p>头程已有 {{ preview.sourcePalletCount }} 托；海外补充 {{ preview.supplementPalletCount }} 托；已保存计划 {{ preview.totalPlannedPalletCount }} 托。</p><table class="density-table"><thead><tr><th>客户</th><th>原票</th><th>目的地</th><th>箱数</th><th>目标托数</th><th>计划状态</th></tr></thead><tbody><tr v-for="row in preview.groups.flatMap(group => group.orders)" :key="`${row.customerId}:${row.orderId}`"><td>{{ row.customerName || '客户名称待核实' }}</td><td>{{ row.inboundCode || row.businessOrderNo || '—' }}</td><td>{{ row.destinationWarehouseName || row.fbaWarehouseCode || (row.destinationType === 'PRIVATE_ADDRESS' ? '客户地址' : '目的地待核实') }}</td><td>{{ row.packageCount }}</td><td>{{ row.targetPalletCount }}</td><td>{{ row.existingPlanNo || ({ READY: '可生成', RESOURCE_PENDING: '资源待确认', PLANNED: '已有计划', BLOCKED: '来源条件未就绪' }[row.readiness]) }}</td></tr></tbody></table><p v-if="!preview.ready">本柜尚不具备生成条件，请在原尾程订单核对阻塞来源。</p><el-button type="primary" :loading="saving" :disabled="!writable || (!pending && (!preview.ready || (!preview.resourceRetry && preview.pendingOrderCount <= 0)))" @click="createPlans">{{ preview.resourceRetry ? '重试原资源确认' : '确认生成本柜计划' }}</el-button></div>
     <LoadErrorState v-if="saveError" title="入库计划尚未确认" :message="saveError.message" :show-retry="false"><template #details><ApiErrorMeta :details="saveError" /></template></LoadErrorState>
   </section>
 </template>

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

@@ -4,15 +4,16 @@ import { http } from '@/shared/api/http'
 vi.mock('@/shared/api/http', () => ({ http: { get: vi.fn() }, unwrapApiResponse: (value: {data: unknown}) => value.data }))
 const range = { from: '2026-10-01', to: '2026-11-01' }
 function trip(dispatchNo: string, plannedDepartureAt: string, originTimezone = 'America/Los_Angeles'): TripCalendarEntry {
-  return { sourceType: 'DISPATCH', dispatchNo, containerNumbers: [], status: 'PLANNED', originWarehouseId: '1', originWarehouseCode: 'US-W', originWarehouseName: 'US warehouse', originCountryCode: 'US', originTimezone, originWarehouseStatus: 'ACTIVE', plannedDepartureAt, expectedDriverEndAt: null, departedAt: null, completedAt: null, stops: [{name:'US warehouse'}, {name:'FBA'}], incompleteReasons: [] }
+  return { sourceType: 'DISPATCH', dispatchNo, containerNumbers: [], cabinetNumbers: [], status: 'PLANNED', originWarehouseId: '1', originWarehouseCode: 'US-W', originWarehouseName: 'US warehouse', originCountryCode: 'US', originTimezone, originWarehouseStatus: 'ACTIVE', plannedDepartureAt, expectedDriverEndAt: null, departedAt: null, completedAt: null, stops: [{name:'US warehouse'}, {name:'FBA'}], incompleteReasons: [] }
 }
 describe('location-based trip calendar', () => {
   it('places the reported UTC plan on October 22 at 09:00 in Los Angeles and exposes every container in one event', () => {
-    const row = { ...trip('PC-CALENDAR-001', '2026-10-22T16:00:00Z'), containerNumbers: ['TSTU1234567', 'TSTU7654321'] }
+    const row = { ...trip('PC-CALENDAR-001', '2026-10-22T16:00:00Z'), containerNumbers: ['TSTU1234567', 'TSTU7654321'], cabinetNumbers: ['D1821', 'D1822'] }
     const projected = projectTripCalendar({ records: [row, row], unresolvedRecords: [] }, range)
     expect(projected.events).toHaveLength(1)
     expect(projected.events[0]).toMatchObject({ key: 'dispatch-PC-CALENDAR-001', date: '2026-10-22', time: '09:00', sourcePath: '/overseas-warehouse/dispatches/PC-CALENDAR-001' })
     expect(projected.events[0]!.fields).toContainEqual({ label: '关联柜号', value: 'TSTU1234567、TSTU7654321' })
+    expect(projected.events[0]!.fields).toContainEqual({ label: '关联柜次号', value: 'D1821、D1822' })
     expect(projected.events[0]!.fields).toContainEqual({ label: '计划出发（起运仓当地）', value: '2026-10-22 09:00' })
     expect(projected.events[0]!.fields).toContainEqual({ label: '计划出发（UTC）', value: '2026-10-22T16:00:00Z' })
     const beijing = new Intl.DateTimeFormat('en-CA', { timeZone: 'Asia/Shanghai', year: 'numeric', month: '2-digit', day: '2-digit', hour: '2-digit', minute: '2-digit', hourCycle: 'h23' })

src/modules/appointment-calendar/tripCalendar.ts

@@ -5,6 +5,7 @@ export interface TripCalendarEntry {
   sourceType: 'DISPATCH'
   dispatchNo: string
   containerNumbers: string[]
+  cabinetNumbers: string[]
   status: string
   originWarehouseId: string | null
   originWarehouseCode: string | null
@@ -81,6 +82,7 @@ export function projectTripCalendar(result: TripCalendarResult, range: { from: s
       fields: [
         { label: '运输状态', value: labels[row.status] || '待核实' },
         { label: '关联柜号', value: row.containerNumbers.join('、') },
+        { label: '关联柜次号', value: row.cabinetNumbers.join('、') },
         { label: '起运仓', value: row.originWarehouseName || row.originWarehouseCode },
         { label: '地点时区', value: row.originTimezone },
         { label: '计划出发（起运仓当地）', value: planned ? `${planned.date} ${planned.time}` : null },

src/modules/container-loading/api/platformContainerCustoms.test.ts

@@ -1,7 +1,7 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest'
-import { http } from '@/shared/api/http'
+import { ApiResponseError, http } from '@/shared/api/http'
 import { createDeclarationBatch, submitDeclarationBatch, recordClearanceResult, type DeclarationBatch } from './platformContainerCustoms'
-import { completeAllBuyContainerCustoms, downloadContainerCustomsReceipt, downloadContainerCustomsDocument, getContainerCustoms, sendContainerCustomsToBroker, startContainerCustoms, uploadContainerCustomsReceipt } from './platformContainerCustoms'
+import { completeAllBuyContainerCustoms, downloadContainerCustomsReceipt, downloadContainerCustomsDocument, downloadContainerCustomsFinal, getContainerCustoms, sendContainerCustomsToBroker, startContainerCustoms, uploadContainerCustomsReceipt } from './platformContainerCustoms'
 
 const customs = {
   aggregateId: 2092438843630391401n, loadingPlanId: 2092438843630391402n, containerBookingId: 2092438843630391403n,
@@ -99,7 +99,42 @@ describe('platform container customs API', () => {
 
     expect(get.mock.calls).toEqual([
       [`/platform/v1/customs/loading-plans/documents/${documentId}/download`, { responseType: 'blob' }],
-      [`/platform/v1/customs/loading-plans/documents/${documentId}/receipt/download`, { responseType: 'blob' }],
+      [`/platform/v1/customs/loading-plans/documents/${documentId}/completion/download`, { responseType: 'blob' }],
     ])
   })
+
+  it.each([downloadContainerCustomsDocument, downloadContainerCustomsReceipt, downloadContainerCustomsFinal])('拒绝 HTTP 200 中的真实 JSON Blob 业务错误 %#', async (download) => {
+    const body = new Blob([JSON.stringify({ code: 'A0404', message: '预录单不存在', data: null, requestId: 'request-customs-blob', traceId: 'trace-customs-blob' })], { type: 'application/json;charset=UTF-8' })
+    vi.spyOn(http, 'get').mockResolvedValue(body)
+
+    const error: unknown = await download('2092438843630391407').catch((reason: unknown) => reason)
+    expect(error).toBeInstanceOf(ApiResponseError)
+    expect(error).toMatchObject({ code: 'A0404', message: '预录单不存在', status: 200, requestId: 'request-customs-blob', traceId: 'trace-customs-blob' })
+  })
+
+  it('非 2xx 的 JSON Blob 也保留业务错误和诊断信息', async () => {
+    const body = new Blob([JSON.stringify({ code: 'A0403', message: '无权下载预录单', data: null, requestId: 'request-forbidden', traceId: 'trace-forbidden' })], { type: 'application/json' })
+    vi.spyOn(http, 'get').mockRejectedValue({ isAxiosError: true, response: { status: 403, data: body } })
+
+    await expect(downloadContainerCustomsReceipt('7')).rejects.toMatchObject({ code: 'A0403', message: '无权下载预录单', status: 403, requestId: 'request-forbidden', traceId: 'trace-forbidden' })
+  })
+
+  it.each([
+    ['application/pdf', '%PDF-1.7 原文件'],
+    ['application/octet-stream', '原始二进制'],
+    ['application/json', '{"product":"报关资料","code":"ITEM-1"}'],
+    ['application/json', '{invalid-json'],
+  ])('保留原文件内容与对象：%s', async (type, contents) => {
+    const body = new Blob([contents], { type })
+    vi.spyOn(http, 'get').mockResolvedValue(body)
+
+    await expect(downloadContainerCustomsFinal('7')).resolves.toBe(body)
+  })
+
+  it('非 JSON 的传输错误沿用原始错误', async () => {
+    const error = { isAxiosError: true, response: { status: 502, data: new Blob(['bad gateway'], { type: 'text/html' }) } }
+    vi.spyOn(http, 'get').mockRejectedValue(error)
+
+    await expect(downloadContainerCustomsReceipt('7')).rejects.toBe(error)
+  })
 })

src/modules/container-loading/api/platformContainerCustoms.ts

@@ -1,4 +1,5 @@
-import { http, unwrapApiResponse, type ApiEnvelope } from '@/shared/api/http'
+import axios from 'axios'
+import { ApiResponseError, http, unwrapApiResponse, type ApiEnvelope } from '@/shared/api/http'
 
 export type ContainerCustomsStatus = 'WAITING_CUSTOMER_DOCUMENTS' | 'READY_TO_START' | 'DECLARING' | 'COMPLETED'
 export type ContainerCustomsTaxMode = 'TAX_REFUND' | 'BUY_DECLARATION'
@@ -210,16 +211,45 @@ export async function getContainerCustoms(loadingPlanId: string) {
   return value ? normalize(value) : null
 }
 
+// 报关资料允许下载原始 JSON 文件，仅把统一业务错误信封识别为失败。
+async function customsDownloadError(blob: Blob, status: number): Promise<ApiResponseError | null> {
+  if (!blob.type.toLowerCase().includes('json')) return null
+  let payload: unknown
+  try { payload = JSON.parse(await blob.text()) } catch { return null }
+  if (!payload || typeof payload !== 'object' || Array.isArray(payload)) return null
+  const envelope = payload as Record<string, unknown>
+  if (typeof envelope.code !== 'string' || envelope.code === '200'
+    || typeof envelope.message !== 'string' || !('data' in envelope)) return null
+  return new ApiResponseError(envelope.message, envelope.code, status, envelope.data,
+    typeof envelope.requestId === 'string' ? envelope.requestId : undefined,
+    typeof envelope.traceId === 'string' ? envelope.traceId : undefined)
+}
+
+async function downloadCustomsFile(path: string) {
+  try {
+    const blob = await http.get<Blob, Blob>(path, { responseType: 'blob' })
+    const error = await customsDownloadError(blob, 200)
+    if (error) throw error
+    return blob
+  } catch (error) {
+    if (axios.isAxiosError(error) && error.response?.data instanceof Blob) {
+      const downloadError = await customsDownloadError(error.response.data, error.response.status)
+      if (downloadError) throw downloadError
+    }
+    throw error
+  }
+}
+
 export function downloadContainerCustomsDocument(documentId: string) {
-  return http.get<Blob, Blob>(`${basePath}/documents/${encodeURIComponent(documentId)}/download`, { responseType: 'blob' })
+  return downloadCustomsFile(`${basePath}/documents/${encodeURIComponent(documentId)}/download`)
 }
 
 export function downloadContainerCustomsReceipt(documentId: string) {
-  return http.get<Blob, Blob>(`${basePath}/documents/${encodeURIComponent(documentId)}/receipt/download`, { responseType: 'blob' })
+  return downloadCustomsFile(`${basePath}/documents/${encodeURIComponent(documentId)}/completion/download`)
 }
 
 export function downloadContainerCustomsFinal(documentId: string) {
-  return http.get<Blob, Blob>(`${basePath}/documents/${encodeURIComponent(documentId)}/final/download`, { responseType: 'blob' })
+  return downloadCustomsFile(`${basePath}/documents/${encodeURIComponent(documentId)}/final/download`)
 }
 
 async function action(loadingPlanId: string, name: 'start' | 'send-to-broker' | 'submit-to-broker' | 'complete-all-buy', expectedVersion: number, remark?: string) {

src/modules/container-loading/components/ContainerCustomsPanel.test.ts

@@ -2,7 +2,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { flushPromises, mount } from '@vue/test-utils'
 import ElementPlus, { ElMessageBox } from 'element-plus'
 import AppDialog from '@/shared/components/AppDialog.vue'
-import { ApiResponseError } from '@/shared/api/http'
+import { ApiResponseError, http } from '@/shared/api/http'
 import type { ContainerCustomsStatus, ContainerCustomsView, DeclarationBatch, ClearanceResultType } from '../api/platformContainerCustoms'
 
 const api = vi.hoisted(() => ({
@@ -94,6 +94,8 @@ describe('ContainerCustomsPanel', () => {
       global: { plugins: [ElementPlus] },
     })
     await flushPromises()
+    expect(wrapper.text()).toContain('ENTRY-001')
+    expect(wrapper.text()).not.toContain('版本')
     await wrapper.findAll('button').find(button => button.text() === '标记海关异常/结果')!.trigger('click')
     const state = (wrapper.vm.$ as unknown as { setupState: {
       clearanceBatch: DeclarationBatch; clearanceResultType: ClearanceResultType; clearanceRemark: string; clearanceDialogVisible: boolean
@@ -167,11 +169,11 @@ describe('ContainerCustomsPanel', () => {
     expect(wrapper.find('[aria-label="报关概况"]').exists()).toBe(false)
     expect(wrapper.text()).toContain('客户退税资料.pdf')
     expect(wrapper.text()).toContain('客户退税资料')
-    expect(wrapper.text()).toContain('报关行回执')
+    expect(wrapper.text()).toContain('预录单')
     expect(wrapper.text()).not.toContain('客户报关资料')
     expect(wrapper.find('[aria-label="下载客户退税资料 客户退税资料.pdf"]').exists()).toBe(true)
-    expect(buttonTexts(wrapper)).not.toContain('上传报关行回执')
-    expect(buttonTexts(wrapper)).not.toContain('覆盖报关行回执')
+    expect(buttonTexts(wrapper)).not.toContain('上传预录单')
+    expect(buttonTexts(wrapper)).not.toContain('覆盖预录单')
     expect(buttonTexts(wrapper)).not.toContain('提交')
   })
 
@@ -204,13 +206,13 @@ describe('ContainerCustomsPanel', () => {
   it('allows completion upload and overwrite only while DECLARING with manage permission', async () => {
     let wrapper = await render('DECLARING', true, false)
     expect(wrapper.text()).toContain('首次发送报关行')
-    expect(wrapper.text()).toContain('首次发送后上传回执')
-    expect(buttonTexts(wrapper)).not.toContain('上传报关行回执')
+    expect(wrapper.text()).toContain('首次发送后上传预录单')
+    expect(buttonTexts(wrapper)).not.toContain('上传预录单')
     wrapper.unmount()
 
     wrapper = await render('DECLARING', true, true)
     expect(wrapper.text()).toContain('发送报关行执行')
-    expect(wrapper.text()).toContain('覆盖报关行回执')
+    expect(wrapper.text()).toContain('覆盖预录单')
     expect(wrapper.text()).toContain('报关行回执.pdf')
     expect(wrapper.text()).toContain('真实报关完税文件.pdf')
     expect(wrapper.text()).toContain('确认 · 2026/8/29 11:15:00 · 客户一')
@@ -218,8 +220,8 @@ describe('ContainerCustomsPanel', () => {
 
     wrapper = await render('DECLARING', false, true)
     expect(wrapper.text()).toContain('只读')
-    expect(buttonTexts(wrapper)).not.toContain('上传报关行回执')
-    expect(buttonTexts(wrapper)).not.toContain('覆盖报关行回执')
+    expect(buttonTexts(wrapper)).not.toContain('上传预录单')
+    expect(buttonTexts(wrapper)).not.toContain('覆盖预录单')
     expect(buttonTexts(wrapper)).not.toContain('提交')
   })
 
@@ -235,14 +237,40 @@ describe('ContainerCustomsPanel', () => {
     wrapper.unmount()
   })
 
+  it('隐藏资料版本但保留预录单历史、原文件名和上传并发版本', async () => {
+    const value = customs('DECLARING', true)
+    const document = value.documents[0]!
+    document.receipt!.version = 7
+    document.receiptHistory = [{ version: 6, file: { ...document.receipt!, version: 6 }, operatorName: '报关员', createdAt: '2026-08-29T10:50:00' }]
+    api.get.mockResolvedValue(value)
+    const wrapper = mount(ContainerCustomsPanel, {
+      props: { loadingPlanId: value.loadingPlanId, canList: true, canManage: true, departureState: 'WAITING_OTHER_GATES' },
+      global: { plugins: [ElementPlus] },
+    })
+    await flushPromises()
+    expect(wrapper.findAll('th').map(header => header.text())).toEqual(['操作', '客户退税资料', '预录单', '真实报关完税文件', '关联入仓码', '报关行状态', '客户', '预录单情况'])
+    expect(wrapper.text()).not.toMatch(/版本|退税资料 v|回执 v|完税 v/)
+    expect(wrapper.text()).toContain('预录单历史：2026/8/29 10:50:00 · 报关员')
+    expect(wrapper.text()).toContain('确认 · 2026/8/29 11:15:00 · 客户一')
+    expect(wrapper.find('[aria-label="下载预录单 报关行回执.pdf"]').exists()).toBe(true)
+    const selected = new File(['receipt'], '新预录单.pdf', { type: 'application/pdf' })
+    const onChange = wrapper.findAllComponents({ name: 'ElUpload' })[0]!.props('onChange') as (upload: { raw: File }) => void
+    onChange({ raw: selected })
+    await flushPromises()
+    await wrapper.findAll('button').find(button => button.text() === '提交')!.trigger('click')
+    await flushPromises()
+    expect(api.upload).toHaveBeenCalledWith(document.documentId, selected, 7)
+    wrapper.unmount()
+  })
+
   it('keeps COMPLETED strictly read-only with both files visible and downloadable', async () => {
     const wrapper = await render('COMPLETED', true, true)
     expect(wrapper.text()).toContain('客户退税资料.pdf')
     expect(wrapper.text()).toContain('报关行回执.pdf')
     expect(wrapper.text()).toContain('真实报关完税文件.pdf')
     expect(wrapper.text()).toContain('报关已完成，待其他离仓条件')
-    expect(buttonTexts(wrapper)).not.toContain('上传报关行回执')
-    expect(buttonTexts(wrapper)).not.toContain('覆盖报关行回执')
+    expect(buttonTexts(wrapper)).not.toContain('上传预录单')
+    expect(buttonTexts(wrapper)).not.toContain('覆盖预录单')
     expect(buttonTexts(wrapper)).not.toContain('提交')
   })
 
@@ -253,7 +281,7 @@ describe('ContainerCustomsPanel', () => {
     expect(api.downloadSource).toHaveBeenCalledWith('2092438843630391407')
     expect(api.downloadReceipt).not.toHaveBeenCalled()
 
-    await wrapper.get('[aria-label="下载报关行回执 报关行回执.pdf"]').trigger('click')
+    await wrapper.get('[aria-label="下载预录单 报关行回执.pdf"]').trigger('click')
     await flushPromises()
     expect(api.downloadReceipt).toHaveBeenCalledWith('2092438843630391407')
     await wrapper.get('[aria-label="下载报关完税文件 真实报关完税文件.pdf"]').trigger('click')
@@ -277,4 +305,46 @@ describe('ContainerCustomsPanel', () => {
     expect(wrapper.text()).toContain('trace-customs-download')
     expect(api.downloadReceipt).not.toHaveBeenCalled()
   })
+
+  it('下载预录单失败时透传正式名称与诊断信息，保留原文件名', async () => {
+    const get = vi.spyOn(http, 'get').mockResolvedValueOnce(new Blob([JSON.stringify({ code: 'A0404', message: '预录单不存在', data: null, requestId: 'request-pre-entry', traceId: 'trace-pre-entry' })], { type: 'application/json' }))
+    api.downloadReceipt.mockImplementationOnce(async (documentId: string) => {
+      const actual = await vi.importActual<typeof import('../api/platformContainerCustoms')>('../api/platformContainerCustoms')
+      return actual.downloadContainerCustomsReceipt(documentId)
+    })
+    const wrapper = await render('COMPLETED', false, true)
+
+    await wrapper.get('[aria-label="下载预录单 报关行回执.pdf"]').trigger('click')
+    await flushPromises()
+
+    await vi.waitFor(() => expect(wrapper.text()).toContain('预录单不存在'))
+    expect(wrapper.text()).toContain('request-pre-entry')
+    expect(wrapper.text()).toContain('trace-pre-entry')
+    expect(wrapper.text()).toContain('报关行回执.pdf')
+    expect(wrapper.text()).not.toContain('报关行回执不存在')
+    expect(HTMLAnchorElement.prototype.click).not.toHaveBeenCalled()
+    expect(get).toHaveBeenCalledWith('/platform/v1/customs/loading-plans/documents/2092438843630391407/completion/download', { responseType: 'blob' })
+    get.mockRestore()
+    wrapper.unmount()
+  })
+
+  it('上传冲突时展示服务端预录单提示并保留待上传文件', async () => {
+    const message = '客户确认的预录单已发送给报关行，不可再修改预录单'
+    api.upload.mockRejectedValueOnce(new ApiResponseError(message, 'A0409', 200, undefined, 'request-pre-entry-upload', 'trace-pre-entry-upload'))
+    const wrapper = await render('DECLARING', true, true)
+    const selected = new File(['receipt'], '预录单.pdf', { type: 'application/pdf' })
+    const onChange = wrapper.findAllComponents({ name: 'ElUpload' })[0]!.props('onChange') as (upload: { raw: File }) => void
+    onChange({ raw: selected })
+    await flushPromises()
+    const submit = wrapper.findAll('button').find(button => button.text() === '提交')!
+    await submit.trigger('click')
+    await flushPromises()
+
+    expect(wrapper.text()).toContain(message)
+    expect(wrapper.text()).toContain('A0409')
+    expect(wrapper.text()).toContain('request-pre-entry-upload')
+    expect(wrapper.text()).toContain('trace-pre-entry-upload')
+    expect(submit.attributes('disabled')).toBeUndefined()
+    wrapper.unmount()
+  })
 })

src/modules/container-loading/components/ContainerCustomsPanel.vue

@@ -79,9 +79,6 @@ const statusText: Record<ContainerCustomsStatus, string> = {
 function documentCustomers(document: ContainerCustomsDocument) {
   return [...new Set((customs.value?.inbounds || []).filter((item) => document.inboundIds.includes(item.inboundId)).map((item) => item.customerName))].join('、') || '—'
 }
-function receiptHistoryLabel(document: ContainerCustomsDocument) {
-  return (document.receiptHistory || []).map((item) => `v${item.version}`).join('、') || '—'
-}
 function confirmationActionLabel(action: ContainerCustomsDocument['confirmationHistory'][number]['action']) {
   return action === 'CONFIRM' ? '确认' : '打回'
 }
@@ -126,7 +123,7 @@ function declarationStatusLabel(value: DeclarationBatch['status']) {
 
 async function createFormalDeclaration() {
   if (!customs.value || !['DECLARING', 'COMPLETED'].includes(customs.value.status) || !brokerSubmitted.value || openDeclarationBatch.value) return
-  try { await ElMessageBox.confirm('当前柜的资料、回执已确认并已发送报关行执行，确认创建正式申报批次？完税文件仍按报关行完成后回传。', customsDialogTitle('创建正式申报批次'), { customClass: 'admin-density-confirm', type: 'warning', confirmButtonText: '确认创建' }) } catch { return }
+  try { await ElMessageBox.confirm('当前柜的资料、预录单已确认并已发送报关行执行，确认创建正式申报批次？完税文件仍按报关行完成后回传。', customsDialogTitle('创建正式申报批次'), { customClass: 'admin-density-confirm', type: 'warning', confirmButtonText: '确认创建' }) } catch { return }
   actionLoading.value = true; actionError.value = null
   try { await createDeclarationBatch(props.loadingPlanId, customs.value.version); await load(); ElMessage.success('正式申报批次已创建') }
   catch (error) { actionError.value = getApiErrorDetails(error, '正式申报批次创建失败') }
@@ -194,15 +191,15 @@ async function start() {
 async function uploadReceipt(document: ContainerCustomsDocument) {
   if (!props.canManage || customs.value?.status !== 'DECLARING' || !brokerSubmission.value || brokerSubmitted.value) return
   const selected = receiptFiles[document.documentId]
-  if (!selected) { ElMessage.warning('请选择对应的报关行回执'); return }
+  if (!selected) { ElMessage.warning('请选择对应的预录单'); return }
   actionLoading.value = true; actionError.value = null
   try {
     await uploadContainerCustomsReceipt(document.documentId, selected, document.receipt?.version || 0)
     receiptFiles[document.documentId] = null
     await load()
     emit('refreshed')
-    ElMessage.success('报关行回执已上传，等待客户确认')
-  } catch (error) { actionError.value = getApiErrorDetails(error, '报关行回执上传失败') }
+    ElMessage.success('预录单已上传，等待客户确认')
+  } catch (error) { actionError.value = getApiErrorDetails(error, '预录单上传失败') }
   finally { actionLoading.value = false }
 }
 
@@ -239,9 +236,9 @@ async function downloadFile(document: ContainerCustomsDocument, kind: 'source' |
       ? await downloadContainerCustomsDocument(document.documentId)
       : kind === 'receipt' ? await downloadContainerCustomsReceipt(document.documentId) : await downloadContainerCustomsFinal(document.documentId)
     saveBlob(blob, target.fileName)
-    ElMessage.success(`${kind === 'source' ? '客户退税资料' : kind === 'receipt' ? '报关行回执' : '报关完税文件'}下载已开始`)
+    ElMessage.success(`${kind === 'source' ? '客户退税资料' : kind === 'receipt' ? '预录单' : '报关完税文件'}下载已开始`)
   } catch (error) {
-    actionError.value = getApiErrorDetails(error, `${kind === 'source' ? '客户退税资料' : '报关完成文件'}下载失败`)
+    actionError.value = getApiErrorDetails(error, `${kind === 'source' ? '客户退税资料' : kind === 'receipt' ? '预录单' : '报关完税文件'}下载失败`)
   } finally {
     downloadingKey.value = ''
   }
@@ -249,7 +246,7 @@ async function downloadFile(document: ContainerCustomsDocument, kind: 'source' |
 
 async function submitToBroker() {
   if (!customs.value || customs.value.status !== 'DECLARING' || !brokerSubmission.value || brokerSubmitted.value || !allReceiptsConfirmed.value) return
-  try { await ElMessageBox.confirm('确认已核对全部回执并把确认结果发送给报关行执行？', customsDialogTitle('发送报关行执行'), { customClass: 'admin-density-confirm', type: 'warning', confirmButtonText: '确认发送' }) } catch { return }
+  try { await ElMessageBox.confirm('确认已核对全部预录单并把确认结果发送给报关行执行？', customsDialogTitle('发送报关行执行'), { customClass: 'admin-density-confirm', type: 'warning', confirmButtonText: '确认发送' }) } catch { return }
   actionLoading.value = true; actionError.value = null
   try { customs.value = await submitContainerCustomsToBroker(props.loadingPlanId, customs.value.version); ElMessage.success('已发送给报关行执行') }
   catch (error) { actionError.value = getApiErrorDetails(error, '发送报关行执行失败') }
@@ -258,9 +255,9 @@ async function submitToBroker() {
 
 async function sendToBroker() {
   if (!customs.value || customs.value.status !== 'DECLARING' || brokerSubmission.value || brokerSubmitted.value) return
-  try { await ElMessageBox.confirm('确认将当前冻结的退税报关资料首次发送给报关行？发送后由报关行返回回执，资料版本和关联范围按当前快照处理。', customsDialogTitle('首次发送报关行'), { customClass: 'admin-density-confirm', type: 'warning', confirmButtonText: '确认发送' }) } catch { return }
+  try { await ElMessageBox.confirm('确认将当前冻结的退税报关资料首次发送给报关行？发送后由报关行返回预录单，关联范围按当前快照处理。', customsDialogTitle('首次发送报关行'), { customClass: 'admin-density-confirm', type: 'warning', confirmButtonText: '确认发送' }) } catch { return }
   actionLoading.value = true; actionError.value = null
-  try { customs.value = await sendContainerCustomsToBroker(props.loadingPlanId, customs.value.version); ElMessage.success('已首次发送给报关行，等待回执') }
+  try { customs.value = await sendContainerCustomsToBroker(props.loadingPlanId, customs.value.version); ElMessage.success('已首次发送给报关行，等待预录单') }
   catch (error) { actionError.value = getApiErrorDetails(error, '首次发送报关行失败') }
   finally { actionLoading.value = false }
 }
@@ -315,7 +312,7 @@ onMounted(load)
       <el-empty v-if="!customs.hasActualCargo" description="当前装柜计划没有实际装柜货物，无需报关" :image-size="56" />
       <template v-else>
       <dl v-if="brokerSubmission" class="density-fields customs-summary" aria-label="报关概况">
-        <div class="submission-batch"><dt>首次发送批次</dt><dd>{{ brokerSubmission.batchNo }}</dd></div><div><dt>发送状态</dt><dd>{{ brokerSubmission.status === 'SENT' ? '已发送' : brokerSubmission.status }}</dd></div><div><dt>资料版本</dt><dd>v{{ brokerSubmission.sourceVersion }}</dd></div>
+        <div class="submission-batch"><dt>首次发送批次</dt><dd>{{ brokerSubmission.batchNo }}</dd></div><div><dt>发送状态</dt><dd>{{ brokerSubmission.status === 'SENT' ? '已发送' : brokerSubmission.status }}</dd></div>
         <div class="submission-batch"><dt>发送人</dt><dd>{{ brokerSubmission.sentByName || '—' }}</dd></div><div class="submission-batch"><dt>发送时间</dt><dd>{{ formatDateTime(brokerSubmission.sentAt) }}</dd></div>
       </dl>
       <div v-if="missingInbounds.length" class="compact-table-wrap">
@@ -323,14 +320,14 @@ onMounted(load)
         <div class="workbench-evidence"><table class="compact-table density-table"><thead><tr><th>客户</th><th>订单号</th><th>入仓码</th></tr></thead><tbody><tr v-for="item in missingInbounds" :key="item.inboundId"><td>{{ item.customerName }}</td><td>{{ item.orderNo }}</td><td>{{ item.inboundCode }}</td></tr></tbody></table></div>
       </div>
       <div v-if="customs.documents.length" class="compact-table-wrap">
-        <h3>已冻结退税资料、报关行回执与完税文件</h3>
-        <div class="workbench-evidence"><table class="compact-table document-table density-table"><thead><tr><th>操作</th><th>客户退税资料</th><th>报关行回执</th><th>真实报关完税文件</th><th>关联入仓码</th><th>报关行状态</th><th>版本</th><th>客户</th><th>回执情况</th></tr></thead><tbody>
+        <h3>已冻结退税资料、预录单与完税文件</h3>
+        <div class="workbench-evidence"><table class="compact-table document-table density-table"><thead><tr><th>操作</th><th>客户退税资料</th><th>预录单</th><th>真实报关完税文件</th><th>关联入仓码</th><th>报关行状态</th><th>客户</th><th>预录单情况</th></tr></thead><tbody>
           <tr v-for="document in customs.documents" :key="document.documentId">
-            <td><div v-if="canManage && customs.status === 'DECLARING'" class="document-actions density-actions"><el-upload :disabled="!brokerSubmission || brokerSubmitted" :auto-upload="false" :limit="1" :show-file-list="false" :on-change="(upload: UploadFile) => selectReceipt(document.documentId, upload)"><el-button class="density-action" size="small" :disabled="!brokerSubmission || brokerSubmitted">{{ !brokerSubmission ? '首次发送后上传回执' : document.receipt ? '覆盖报关行回执' : '上传报关行回执' }}</el-button></el-upload><el-button data-tone="primary" class="density-action" size="small" type="primary" :disabled="!brokerSubmission || brokerSubmitted || !receiptFiles[document.documentId]" :loading="actionLoading" @click="uploadReceipt(document)">提交</el-button><el-upload :disabled="!brokerSubmitted" :auto-upload="false" :limit="1" :show-file-list="false" :on-change="(upload: UploadFile) => selectFinal(document.documentId, upload)"><el-button class="density-action" size="small" :disabled="!brokerSubmitted">{{ document.finalDocument ? '覆盖完税文件' : '上传完税文件' }}</el-button></el-upload><el-button data-tone="primary" class="density-action" size="small" type="primary" :disabled="!brokerSubmitted || !finalFiles[document.documentId]" :loading="actionLoading" @click="uploadFinal(document)">提交</el-button></div><span v-else class="readonly-label">只读</span></td>
+            <td><div v-if="canManage && customs.status === 'DECLARING'" class="document-actions density-actions"><el-upload :disabled="!brokerSubmission || brokerSubmitted" :auto-upload="false" :limit="1" :show-file-list="false" :on-change="(upload: UploadFile) => selectReceipt(document.documentId, upload)"><el-button class="density-action" size="small" :disabled="!brokerSubmission || brokerSubmitted">{{ !brokerSubmission ? '首次发送后上传预录单' : document.receipt ? '覆盖预录单' : '上传预录单' }}</el-button></el-upload><el-button data-tone="primary" class="density-action" size="small" type="primary" :disabled="!brokerSubmission || brokerSubmitted || !receiptFiles[document.documentId]" :loading="actionLoading" @click="uploadReceipt(document)">提交</el-button><el-upload :disabled="!brokerSubmitted" :auto-upload="false" :limit="1" :show-file-list="false" :on-change="(upload: UploadFile) => selectFinal(document.documentId, upload)"><el-button class="density-action" size="small" :disabled="!brokerSubmitted">{{ document.finalDocument ? '覆盖完税文件' : '上传完税文件' }}</el-button></el-upload><el-button data-tone="primary" class="density-action" size="small" type="primary" :disabled="!brokerSubmitted || !finalFiles[document.documentId]" :loading="actionLoading" @click="uploadFinal(document)">提交</el-button></div><span v-else class="readonly-label">只读</span></td>
             <td><div class="file-cell"><span :title="document.source.fileName">{{ document.source.fileName }}</span><el-button class="density-action" type="primary" :loading="downloadingKey === `source:${document.documentId}`" :aria-label="`下载客户退税资料 ${document.source.fileName}`" @click="downloadFile(document, 'source')">下载</el-button></div></td>
-            <td><div v-if="document.receipt" class="file-cell"><span :title="document.receipt.fileName">{{ document.receipt.fileName }}</span><el-button class="density-action" type="primary" :loading="downloadingKey === `receipt:${document.documentId}`" :aria-label="`下载报关行回执 ${document.receipt.fileName}`" @click="downloadFile(document, 'receipt')">下载</el-button></div><span v-else>未上传</span></td>
+            <td><div v-if="document.receipt" class="file-cell"><span :title="document.receipt.fileName">{{ document.receipt.fileName }}</span><el-button class="density-action" type="primary" :loading="downloadingKey === `receipt:${document.documentId}`" :aria-label="`下载预录单 ${document.receipt.fileName}`" @click="downloadFile(document, 'receipt')">下载</el-button></div><span v-else>未上传</span></td>
             <td><div v-if="document.finalDocument" class="file-cell"><span :title="document.finalDocument.fileName">{{ document.finalDocument.fileName }}</span><el-button class="density-action" type="primary" :loading="downloadingKey === `final:${document.documentId}`" :aria-label="`下载报关完税文件 ${document.finalDocument.fileName}`" @click="downloadFile(document, 'final')">下载</el-button></div><span v-else>未上传</span></td>
-            <td>{{ document.inboundCodes.join('、') || '—' }}</td><td>{{ brokerSubmitted ? '已发送报关行执行' : brokerSubmission ? '已首次发送，等待回执确认' : '待首次发送报关行' }}</td><td>退税资料 v{{ document.source.version }}<span v-if="document.receipt"> / 回执 v{{ document.receipt.version }}</span><span v-if="document.finalDocument"> / 完税 v{{ document.finalDocument.version }}</span><small v-if="document.receiptHistory?.length" class="receipt-history-note">回执历史：{{ receiptHistoryLabel(document) }}</small><small v-for="history in document.confirmationHistory" :key="history.id" class="confirmation-history-note">{{ confirmationActionLabel(history.action) }} · {{ formatDateTime(history.createdAt) }} · {{ history.operatorName || '—' }}<span v-if="history.reason"> · {{ history.reason }}</span></small></td><td>{{ documentCustomers(document) }}</td><td>{{ document.receipt ? (document.receiptStatus === 'CONFIRMED' ? '客户已确认回执' : document.receiptStatus === 'REJECTED' ? '客户已打回回执' : '待客户确认回执') : '待上传报关行回执' }}</td>
+            <td>{{ document.inboundCodes.join('、') || '—' }}</td><td>{{ brokerSubmitted ? '已发送报关行执行' : brokerSubmission ? '已首次发送，等待预录单确认' : '待首次发送报关行' }}</td><td>{{ documentCustomers(document) }}</td><td><small v-for="history in document.confirmationHistory" :key="history.id" class="confirmation-history-note">{{ confirmationActionLabel(history.action) }} · {{ formatDateTime(history.createdAt) }} · {{ history.operatorName || '—' }}<span v-if="history.reason"> · {{ history.reason }}</span></small><small v-for="history in document.receiptHistory" :key="history.version" class="receipt-history-note">预录单历史：{{ formatDateTime(history.createdAt) }} · {{ history.operatorName || '—' }}</small>{{ document.receipt ? (document.receiptStatus === 'CONFIRMED' ? '客户已确认预录单' : document.receiptStatus === 'REJECTED' ? '客户已打回预录单' : '待客户确认预录单') : '待上传预录单' }}</td>
           </tr>
         </tbody></table></div>
       </div>
@@ -339,7 +336,7 @@ onMounted(load)
         <el-empty v-if="!declarationBatches.length" description="尚未创建正式申报批次" :image-size="48" />
         <div v-else class="declaration-batch-list">
           <article v-for="batch in declarationBatches" :key="batch.id" class="declaration-batch-card">
-            <div class="declaration-batch-main"><strong>{{ batch.batchNo }}</strong><span>报关单号：{{ batch.customsEntryNo || '—' }} · 版本 {{ batch.version }}</span></div>
+            <div class="declaration-batch-main"><strong>{{ batch.batchNo }}</strong><span>报关单号：{{ batch.customsEntryNo || '—' }}</span></div>
             <el-tag size="small" :type="batch.status === 'CLOSED' ? 'success' : batch.status === 'CANCELLED' ? 'info' : 'warning'">{{ declarationStatusLabel(batch.status) }}</el-tag>
             <div class="declaration-batch-actions" v-if="canManage"><el-button v-if="batch.status === 'READY'" size="small" type="primary" :loading="actionLoading" @click="submitFormalDeclaration(batch)">提交正式申报</el-button><el-button v-if="['SUBMITTED','ACKNOWLEDGED','RESULT_PENDING'].includes(batch.status)" size="small" plain :loading="actionLoading" @click="openFormalResultDialog(batch)">标记海关异常/结果</el-button></div>
             <div v-if="batch.results.length" class="declaration-result-list"><div v-for="result in batch.results" :key="result.id" class="declaration-result-row"><span>{{ clearanceResultLabel(result.resultType) }}</span><el-tag size="small" :type="result.resultStatus === 'RESOLVED' ? 'success' : 'warning'">{{ result.resultStatus === 'RESOLVED' ? '已处理' : result.resultStatus === 'OPEN' ? '待处理' : '已取消' }}</el-tag><small>{{ result.resolution || '—' }}</small><el-button v-if="canManage && result.resultStatus === 'OPEN'" link type="primary" size="small" :loading="actionLoading" @click="resolveFormalResult(batch, result)">处理</el-button></div></div>

src/modules/container-loading/components/ContainerLastLegFeesPanel.vue

@@ -188,7 +188,7 @@ onMounted(load)
     <AppDialog class="admin-density-dialog admin-workbench is-dialog" v-model="dialogOpen" :title="containerDialogTitle(editing ? '调整尾程费用' : '新增尾程费用', props)" width="min(920px, calc(100vw - 28px))" fullscreenable confirm-text="保存" :confirm-loading="actionLoading" :confirm-disabled="voucherUploading" @confirm="save">
       <section class="density-dialog-section">
         <el-form class="density-form" label-position="left">
-          <div class="workbench-evidence"><table class="density-table fee-editor-table" aria-label="尾程费用填写"><tbody>
+          <div class="workbench-evidence"><table class="density-table density-table--editable fee-editor-table" aria-label="尾程费用填写"><tbody>
             <tr><td><el-form-item label-position="left" label-width="110px" label="客户" required><span v-if="editing">{{ customerName(form.customerId) || editing.customerName || '—' }}</span><el-select v-else v-model="form.customerId" :disabled="voucherUploading" placeholder="请选择柜内客户"><el-option v-for="customer in customers" :key="customer.customerId" :label="customer.customerName || '未命名客户'" :value="customer.customerId" /></el-select></el-form-item></td><td><el-form-item label-position="left" label-width="110px" label="费用项目" required><el-select v-model="form.feeItemCode"><el-option v-for="item in feeItems" :key="item.value" :label="item.label" :value="item.value" /></el-select></el-form-item></td></tr>
             <tr><td><el-form-item label-position="left" label-width="110px" label="费用方向" required><el-select v-model="form.direction"><el-option label="应收" value="RECEIVABLE" /><el-option label="应付" value="PAYABLE" /></el-select></el-form-item></td><td><el-form-item label-position="left" label-width="110px" label="业务日期" required><el-date-picker v-model="form.businessDate" type="date" value-format="YYYY-MM-DD" /></el-form-item></td></tr>
             <tr><td :colspan="form.direction === 'PAYABLE' ? 1 : 2"><el-form-item label-position="left" label-width="110px" label="金额（CNY）" required><el-input-number v-model="form.amount" :min="0.01" :precision="2" :step="10" placeholder="请输入费用金额" /></el-form-item></td><td v-if="form.direction === 'PAYABLE'"><el-form-item label-position="left" label-width="110px" label="供应商" required><el-select v-model="form.supplierId" filterable placeholder="请选择有效供应商"><el-option v-for="supplier in suppliers" :key="supplier.id" :label="supplier.supplierName" :value="supplier.id" /></el-select></el-form-item></td></tr>

src/modules/container-loading/components/OceanBookingLinkDialog.test.ts

@@ -47,6 +47,9 @@ describe('OceanBookingLinkDialog', () => {
 
   it.each([
     ['  mscu1234567  ', 'MSCU1234567'],
+    ['local-1', 'LOCAL-1'],
+    ['MSCU6639871', 'MSCU6639871'],
+    ['ABCU123456789012', 'ABCU123456789012'],
     ['', null],
   ])('normalizes and submits the optional real container number %#', async (input, expected) => {
     const wrapper = mount(OceanBookingLinkDialog, { props: { modelValue: true, container }, global: { plugins: [ElementPlus] } })

src/modules/container-loading/pages/ContainerDetailView.emptyReturn.behavior.test.ts

@@ -1,10 +1,10 @@
-import ElementPlus, { ElDatePicker, ElInput, ElFormItem, ElSelect } from 'element-plus'
+import ElementPlus, { ElDatePicker, ElInput, ElFormItem, ElSelect, ElUpload } from 'element-plus'
 import AppDialog from '@/shared/components/AppDialog.vue'
 import { createPinia } from 'pinia'
 import { enableAutoUnmount, flushPromises, mount } from '@vue/test-utils'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import ContainerDetailView from './ContainerDetailView.vue'
-import { getContainer, getContainerOverview, linkContainerOceanBooking } from '../api/platformContainerLoading'
+import { getContainer, getContainerOverview, linkContainerOceanBooking, getContainerClearance, uploadContainerClearance, uploadContainerDocument, completeContainerClearance } from '../api/platformContainerLoading'
 import { listOceanBookingLinkCandidates } from '@/modules/ocean-bookings'
 import { recordTerminalDrayageEmptyReturn, getDirectDeliveries, recordDirectDelivery, getTerminalDrayage, scheduleTerminalDrayagePickup, selectTerminalDrayageFleet, recordTerminalPickup } from '../api/terminalDrayages'
 import { listSuppliers } from '@/modules/suppliers'
@@ -59,7 +59,7 @@ function accessibleText(wrapper: { element: Element } | undefined) {
 describe('ContainerDetailView empty return', () => {
   it('shows the same default warehouse date as the calendar, with no fabricated midnight', async () => {
     vi.mocked(getContainer).mockResolvedValue({ ...base, estimatedPortArrivalAt: '2026-10-20T10:00:00', actualFacts: { arrivedDestinationPortAt: '2026-10-21T15:49:00' } } as never)
-    vi.mocked(listContainerArrivalTimes).mockResolvedValue([{ sourceContainerBookingId: '9001', estimatedWarehouseArrivalAt: null, actualWarehouseArrivalAt: null, version: 0, planCount: 0 }])
+    vi.mocked(listContainerArrivalTimes).mockResolvedValue([{ sourceContainerBookingId: '9001', estimatedWarehouseArrivalAt: null, actualWarehouseArrivalAt: null, version: 0, planCount: 0, plannedDate: '2026-10-23', isDefault: true }])
     const wrapper = await mountDetail()
     const value = wrapper.findAll('dt').find(item => item.text() === '预计到仓')!.element.nextElementSibling!.textContent
     expect(value).toBe('2026-10-23（默认推算）')
@@ -100,7 +100,8 @@ describe('ContainerDetailView empty return', () => {
     vi.mocked(recordDirectDelivery).mockRejectedValueOnce(new Error('connection lost')).mockResolvedValueOnce({ ...row, version: 1, actualAt: '2026-10-16T01:00:00' })
     const wrapper = await mountDetail()
     expect(getDirectDeliveries).not.toHaveBeenCalled()
-    await wrapper.findAll('button').find(button => button.text() === '直送卸货清单')!.trigger('click'); await flushPromises()
+    expect(wrapper.findAll('button').some(button => button.text() === '直送卸货清单')).toBe(false)
+    await (wrapper.vm as unknown as { openDirect(): Promise<void> }).openDirect(); await flushPromises()
     const dialog = wrapper.findAllComponents(AppDialog).find(component => component.props('title').startsWith('直送卸货登记'))!
     await dialog.findAll('button').find(button => button.text() === '登记本票')!.trigger('click'); await flushPromises()
     dialog.vm.$emit('confirm'); await flushPromises(); expect(recordDirectDelivery).not.toHaveBeenCalled()
@@ -123,7 +124,8 @@ describe('ContainerDetailView empty return', () => {
     canAccess.mockImplementation(code => code !== 'platform:firstleg:terminal-drayage:direct-unload:confirm')
     vi.mocked(getDirectDeliveries).mockResolvedValue([{ requirementKey: 'INBOUND:9', inboundCode: 'IN-TEST', orderNo: null, destinationName: '测试客户仓', packageCount: null, version: 1, actualAt: '2026-10-16T01:00:00', timezone: 'America/Los_Angeles', receivedBy: '签收人', evidenceNo: 'POD-001', remark: null }])
     const wrapper = await mountDetail()
-    await wrapper.findAll('button').find(button => button.text() === '直送卸货清单')!.trigger('click'); await flushPromises()
+    expect(wrapper.findAll('button').some(button => button.text() === '直送卸货清单')).toBe(false)
+    await (wrapper.vm as unknown as { openDirect(): Promise<void> }).openDirect(); await flushPromises()
     const dialog = wrapper.findAllComponents(AppDialog).find(component => component.props('title').startsWith('直送卸货登记'))!
     await dialog.findAll('button').find(button => button.text() === '查看签收')!.trigger('click'); await flushPromises()
     expect(dialog.props('showConfirm')).toBe(false); expect(dialog.text()).toContain('签收事实只读')
@@ -206,17 +208,20 @@ describe('ContainerDetailView empty return', () => {
     granted.value = true
     await flushPromises()
     expect(getContainerOutboundDispatch).toHaveBeenCalledTimes(1)
-    expect(wrapper.text()).toContain('已确认离仓')
+    expect(wrapper.find('[aria-label="国内出仓门禁"]').exists()).toBe(false)
+    expect((wrapper.vm as unknown as { customsDepartureState: string }).customsDepartureState).toBe('DEPARTED')
     expect(wrapper.text()).not.toContain('展开可查看去重后的完整门禁')
     expect(wrapper.text()).not.toContain('全部门禁已通过，可确认整柜离仓')
   })
 
   it('reloads authoritative departure state once on each newly opened domestic detail', async () => {
     const first = await mountDetail('DOMESTIC')
-    expect(first.text()).toContain('已确认离仓')
+    expect(first.find('[aria-label="国内出仓门禁"]').exists()).toBe(false)
+    expect((first.vm as unknown as { customsDepartureState: string }).customsDepartureState).toBe('DEPARTED')
     first.unmount()
     const reopened = await mountDetail('DOMESTIC')
-    expect(reopened.text()).toContain('已确认离仓')
+    expect(reopened.find('[aria-label="国内出仓门禁"]').exists()).toBe(false)
+    expect((reopened.vm as unknown as { customsDepartureState: string }).customsDepartureState).toBe('DEPARTED')
     expect(getContainerOutboundDispatch).toHaveBeenCalledTimes(2)
   })
 
@@ -437,3 +442,54 @@ describe('domestic container loading list and booking link', () => {
     expect(routerPush).not.toHaveBeenCalled()
   })
 })
+
+
+describe('destination document automatic upload', () => {
+  const uploaded = { id: 'doc-1', fileId: 'file-1', fileName: '资料.pdf', version: 1, completedAt: null }
+  beforeEach(() => {
+    canAccess.mockReset().mockReturnValue(true)
+    routeState.query = {}
+    vi.mocked(getContainer).mockReset().mockResolvedValue({ ...base, outboundConfirmedAt: '2026-10-20T08:00:00', allowedActions: ['MANAGE_DESTINATION_DOCUMENTS'] } as never)
+    vi.mocked(getContainerOverview).mockReset().mockResolvedValue(overview as never)
+    vi.mocked(getContainerClearance).mockReset().mockResolvedValue(null as never)
+    vi.mocked(uploadContainerDocument).mockReset().mockResolvedValue(uploaded as never)
+    vi.mocked(uploadContainerClearance).mockReset().mockResolvedValue(uploaded as never)
+    vi.mocked(completeContainerClearance).mockReset()
+  })
+  it.each(['DELIVERY_ORDER', 'DESTINATION_CLEARANCE'])('saves %s on selection without completing clearance', async type => {
+    const wrapper = await mountDetail()
+    await (wrapper.vm as unknown as { openDocument(type: string): void }).openDocument(type)
+    await flushPromises()
+    const dialog = wrapper.findAllComponents(AppDialog).find(item => item.props('modelValue') && item.findComponent(ElUpload).exists())!
+    expect(dialog.props('showConfirm')).toBe(false)
+    const file = new File(['data'], '资料.pdf', { type: 'application/pdf' })
+    const select = dialog.findComponent(ElUpload).props('onChange')!
+    select({ raw: file } as never, [])
+    select({ raw: file } as never, [])
+    await flushPromises()
+    const upload = type === 'DELIVERY_ORDER' ? uploadContainerDocument : uploadContainerClearance
+    expect(upload).toHaveBeenCalledTimes(1)
+    expect(upload).toHaveBeenCalledWith(...(type === 'DELIVERY_ORDER' ? ['9001', type, file, 0, expect.any(String)] : ['9001', file, 0, expect.any(String)]))
+    expect(completeContainerClearance).not.toHaveBeenCalled()
+    expect(dialog.props('modelValue')).toBe(false)
+  })
+  it.each(['DELIVERY_ORDER', 'DESTINATION_CLEARANCE'])('retains a failed %s upload and retries the same file', async type => {
+    const upload = type === 'DELIVERY_ORDER' ? uploadContainerDocument : uploadContainerClearance
+    vi.mocked(upload).mockRejectedValueOnce(new Error('网络中断'))
+    const wrapper = await mountDetail()
+    await (wrapper.vm as unknown as { openDocument(type: string): void }).openDocument(type)
+    await flushPromises()
+    const dialog = wrapper.findAllComponents(AppDialog).find(item => item.props('modelValue') && item.findComponent(ElUpload).exists())!
+    const file = new File(['data'], '资料.pdf', { type: 'application/pdf' })
+    dialog.findComponent(ElUpload).props('onChange')!({ raw: file } as never, [])
+    await flushPromises()
+    expect(dialog.props('modelValue')).toBe(true)
+    expect(dialog.text()).toContain('上传失败')
+    await dialog.findAll('button').find(button => button.text() === '重试上传')!.trigger('click')
+    await flushPromises()
+    expect(upload).toHaveBeenCalledTimes(2)
+    expect(vi.mocked(upload).mock.calls[1]).toEqual(vi.mocked(upload).mock.calls[0])
+    expect(dialog.props('modelValue')).toBe(false)
+    expect(completeContainerClearance).not.toHaveBeenCalled()
+  })
+})

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

@@ -19,10 +19,8 @@ import StatusBadge from '@/shared/components/StatusBadge.vue'
 import { CarrierScheduleQueryPanel, ContainerPortSchedulePanel } from '@/modules/port-schedules'
 import { ContainerFeesPanel, useLoadingListDetail, LoadingListDetailDrawer, PalletLabelPrintDialog, type LoadingListMode } from '@/modules/loading-lists'
 import {
-  confirmContainerOutboundDispatch,
   getContainerOutboundDispatch,
   type ContainerOutboundDispatchDetail,
-  type ContainerOutboundGateItem,
 } from '@/modules/outbound-dispatch'
 import ContainerCustomsPanel from '../components/ContainerCustomsPanel.vue'
 import ContainerLastLegFeesPanel from '../components/ContainerLastLegFeesPanel.vue'
@@ -244,7 +242,6 @@ async function saveDirect() {
 }
 const canListCustoms = computed(() => access.can('platform:firstleg:customs:list'))
 const canViewOutboundDispatch = computed(() => access.can('platform:firstleg:outbound-dispatch:view'))
-const canConfirmOutboundDispatch = computed(() => access.can('platform:firstleg:outbound-dispatch:confirm'))
 const canViewPreload = computed(() => access.can('platform:firstleg:preload:list'))
 const canViewLoadingList = computed(() => access.can('platform:firstleg:loading-list:list'))
 const canViewCurrentLoadingList = computed(() => {
@@ -274,6 +271,7 @@ const pickupCodeSaving = ref(false)
 const clearanceOpen = ref(false)
 const clearanceDocument = ref<BusinessDocument | null>(null)
 const clearanceFile = ref<File | null>(null)
+const clearanceUploadKey = ref(0)
 const clearanceLoading = ref(false)
 const clearanceSaving = ref(false)
 const clearanceError = ref<ApiErrorDetails | null>(null)
@@ -282,10 +280,8 @@ const exceptionReason = ref('')
 const exceptionSaving = ref(false)
 const exceptionError = ref<ApiErrorDetails | null>(null)
 const outboundLoading = ref(false)
-const outboundConfirming = ref(false)
 const outboundDetail = ref<ContainerOutboundDispatchDetail | null>(null)
 const outboundError = ref<ApiErrorDetails | null>(null)
-const showPassedGates = ref(false)
 const carrierRefreshKey = ref(0)
 const { detail: loadingDetail, loading: loadingDetailLoading, error: loadingDetailError, load: loadListDetail, reset: resetLoadingDetail } = useLoadingListDetail()
 const emptyReturnOpen = ref(false)
@@ -337,32 +333,6 @@ const emptyReturnWarningText = computed(() => {
   return `${overdue}${warning.deadlineAt ? ` · 截止 ${formatTime(warning.deadlineAt)}` : ''}`
 })
 const exceptionTitle = computed(() => overview.value?.exception.active ? '取消货柜异常' : '标记货柜异常')
-type AggregatedGateRow = ContainerOutboundGateItem & { key: string; inboundCodes: string[] }
-const referenceOnlyGateCodes = new Set(['TRUCK_DEPARTED', 'SAILING_SCHEDULE'])
-const outboundGateRows = computed<AggregatedGateRow[]>(() => {
-  const grouped = new Map<string, AggregatedGateRow>()
-  for (const inbound of outboundDetail.value?.aggregate.gate.inbounds || []) {
-    for (const item of inbound.gate.items || []) {
-      if (referenceOnlyGateCodes.has(item.code)) continue
-      const key = JSON.stringify([item.code, item.passed, item.actual ?? null, item.requirement ?? null, item.name])
-      const existing = grouped.get(key)
-      if (existing) {
-        if (!existing.inboundCodes.includes(inbound.inboundCode)) existing.inboundCodes.push(inbound.inboundCode)
-      } else grouped.set(key, { ...item, key, inboundCodes: [inbound.inboundCode] })
-    }
-  }
-  return [...grouped.values()]
-})
-const visibleOutboundGateRows = computed(() => showPassedGates.value ? outboundGateRows.value : outboundGateRows.value.filter((row) => !row.passed))
-const outboundGateSummary = computed(() => ({
-  total: outboundGateRows.value.length,
-  passed: outboundGateRows.value.filter((row) => row.passed).length,
-  blocked: outboundGateRows.value.filter((row) => !row.passed).length,
-}))
-const canConfirmDeparture = computed(() => canConfirmOutboundDispatch.value
-  && hasAction('CONFIRM_OUTBOUND')
-  && outboundDetail.value?.aggregate.dispatchStatus === 'READY_FOR_DISPATCH'
-  && outboundGateSummary.value.blocked === 0)
 const customsDepartureState = computed<'DEPARTED' | 'WAITING_OTHER_GATES' | 'UNKNOWN'>(() =>
   !outboundDetail.value ? 'UNKNOWN'
     : outboundDetail.value.aggregate.dispatchStatus === 'WAITING_FOR_LOADING' ? 'DEPARTED' : 'WAITING_OTHER_GATES')
@@ -469,7 +439,7 @@ watch(
 
 async function loadOutboundDispatch() {
   if (!containerId.value || !canViewOutboundDispatch.value) return
-  outboundLoading.value = true; outboundError.value = null; showPassedGates.value = false
+  outboundLoading.value = true; outboundError.value = null
   try { outboundDetail.value = await getContainerOutboundDispatch(containerId.value) }
   catch (cause) { outboundDetail.value = null; outboundError.value = getApiErrorDetails(cause, '国内出仓门禁加载失败') }
   finally { outboundLoading.value = false }
@@ -488,37 +458,6 @@ async function refreshAfterCustoms() {
   try { overview.value = await getContainerOverview(containerId.value) } catch { /* 报关操作已成功，保留组件返回事实 */ }
 }
 
-async function confirmDeparture() {
-  const aggregate = outboundDetail.value?.aggregate
-  if (!aggregate || !canConfirmDeparture.value || outboundConfirming.value) return
-  outboundConfirming.value = true
-  try {
-    await ElMessageBox.confirm('确认整柜已离开国内仓？系统将再次校验柜内全部入库绑定，成功后自动创建船节点查询任务。', containerDialogTitle('确认国内出仓', detail.value), { customClass: 'admin-density-confirm', type: 'warning', confirmButtonText: '确认离仓' })
-  } catch { outboundConfirming.value = false; return }
-  outboundError.value = null
-  try {
-    outboundDetail.value = await confirmContainerOutboundDispatch(containerId.value, {
-      expectedVersion: aggregate.version,
-      remark: '货柜详情确认国内出仓',
-    })
-    carrierRefreshKey.value += 1
-    ElMessage.success('整柜国内出仓已确认，船节点查询任务正在刷新')
-    try { overview.value = await getContainerOverview(containerId.value) }
-    catch (cause) { outboundError.value = getApiErrorDetails(cause, '离仓已确认，但货柜履约摘要刷新失败') }
-  } catch (cause) {
-    const details = getApiErrorDetails(cause, '确认国内出仓失败')
-    if (details.code === 'A0409') await loadOutboundDispatch()
-    outboundError.value = details
-  } finally { outboundConfirming.value = false }
-}
-
-function outboundStatusText(status?: string | null) {
-  return ({ READY_FOR_DISPATCH: '待确认离仓', WAITING_FOR_LOADING: '已确认离仓' } as Record<string, string>)[status || ''] || status || '—'
-}
-function truckReferenceText(status?: string | null) {
-  return ({ SCHEDULED: '已预约', ARRIVED: '已到仓', DEPARTED: '已离仓', COMPLETED: '已完成' } as Record<string, string>)[status || ''] || status || '未关联'
-}
-
 function openDocument(type: string) {
   if (type === 'DESTINATION_CLEARANCE') { if (canManageDestinationDocuments.value) void openClearance(); return }
   if (type !== 'DELIVERY_ORDER' || !canManageDestinationDocuments.value) return
@@ -526,9 +465,14 @@ function openDocument(type: string) {
   documentType.value = type as UploadDocumentType
   documentFile.value = null; documentError.value = null; documentRefreshWarning.value = null; documentUploadKey.value += 1; documentOpen.value = true
 }
-function selectDocumentFile(file: UploadFile) { documentFile.value = file.raw || null; documentError.value = null }
+function selectDocumentFile(file: UploadFile) {
+  if (documentSaving.value) return
+  documentFile.value = file.raw || null; documentError.value = null
+  if (documentFile.value) void saveDocument()
+}
 function removeDocumentFile() { documentFile.value = null }
 async function saveDocument() {
+  if (documentSaving.value || !canManageDestinationDocuments.value) return
   if (!documentFile.value || !overview.value || !detail.value) { documentError.value = { code: 'FILE_REQUIRED', message: '请选择需要上传的资料文件' }; return }
   documentSaving.value = true; documentError.value = null; documentRefreshWarning.value = null
   try {
@@ -601,14 +545,20 @@ async function saveException() {
 }
 
 async function openClearance() {
+  clearanceUploadKey.value += 1
   clearanceOpen.value = true; clearanceDocument.value = null; clearanceFile.value = null; clearanceError.value = null; documentRefreshWarning.value = null; clearanceLoading.value = true
   try { clearanceDocument.value = await getContainerClearance(containerId.value) }
   catch (cause) { const details = getApiErrorDetails(cause); if (details.code !== 'A0404') clearanceError.value = details }
   finally { clearanceLoading.value = false }
 }
-function selectClearanceFile(file: UploadFile) { clearanceFile.value = file.raw || null; clearanceError.value = null }
+function selectClearanceFile(file: UploadFile) {
+  if (clearanceSaving.value || clearanceLoading.value) return
+  clearanceFile.value = file.raw || null; clearanceError.value = null
+  if (clearanceFile.value) void uploadClearance()
+}
 function removeClearanceFile() { clearanceFile.value = null }
 async function uploadClearance() {
+  if (clearanceSaving.value || clearanceLoading.value || !canManageDestinationDocuments.value || clearanceDocument.value?.completedAt) return
   if (!clearanceFile.value) { clearanceError.value = { code: 'FILE_REQUIRED', message: '请选择目的港清关资料文件' }; return }
   clearanceSaving.value = true; clearanceError.value = null; documentRefreshWarning.value = null
   try {
@@ -697,7 +647,7 @@ onMounted(async () => {
       <section v-show="activeTab === 'overview'" class="detail-section workbench-panel is-compact" aria-labelledby="container-voyage-heading">
         <header class="detail-section__heading"><h2 id="container-voyage-heading">船名航次信息</h2><ContainerPortSchedulePanel :container="detail" @saved="load" /></header>
         <div class="detail-fields"><dl class="density-fields"><div><dt>船公司</dt><dd>{{ detail.shippingCompanyName || '—' }}</dd></div><div><dt>船名 / 航次</dt><dd>{{ [detail.vesselName, detail.voyageNo].filter(Boolean).join(' / ') || '—' }}</dd></div><div><dt>预计开船</dt><dd>{{ formatTime(detail.estimatedSailingAt) }}</dd></div><div><dt>预计到港</dt><dd>{{ formatTime(detail.estimatedPortArrivalAt) }}</dd></div></dl></div>
-        <div class="carrier-panel"><CarrierScheduleQueryPanel dense :cabinet-no="detail.cabinetNo" :container-no="detail.containerNo" :key="carrierRefreshKey" :ocean-booking-id="detail.oceanBookingId" :container-booking-id="detail.id" :warehouse-timeline="overview?.timeline || []" /></div>
+        <div class="carrier-panel"><CarrierScheduleQueryPanel dense hide-technical-details :cabinet-no="detail.cabinetNo" :container-no="detail.containerNo" :key="carrierRefreshKey" :ocean-booking-id="detail.oceanBookingId" :container-booking-id="detail.id" :warehouse-timeline="overview?.timeline || []" /></div>
       </section>
 
       <section v-show="activeTab === 'overview'" class="detail-section workbench-panel is-compact" aria-labelledby="container-customs-heading">
@@ -710,26 +660,10 @@ onMounted(async () => {
       <section v-if="isDomestic" v-show="activeTab === 'overview'" class="detail-section workbench-panel is-compact" aria-labelledby="container-receiving-heading">
         <h2 id="container-receiving-heading">装柜作业与国内出仓</h2>
         <ContainerOverviewPanel v-if="overview" :overview="overview" :sections="['pda']" :can-manage-documents="canEdit" :can-manage-customs="canManageCustoms" :can-manage-exception="canEdit" />
-        <div v-if="detail.planStatus === 'COMPLETED' && canViewOutboundDispatch" class="outbound-panel" aria-label="国内出仓门禁">
-        <header class="outbound-panel__header"><div><h2>国内出仓门禁<InlineHelp title="离仓核验规则"><p>按整柜核验全部入库绑定，仅确认一次离仓。</p></InlineHelp></h2></div><div v-if="outboundDetail" class="outbound-panel__actions"><el-tag :type="outboundGateSummary.blocked === 0 ? 'success' : 'danger'">{{ outboundGateSummary.blocked === 0 ? '门禁通过' : '门禁阻断' }}</el-tag><StatusBadge :status="outboundStatusText(outboundDetail.aggregate.dispatchStatus)" /><el-button v-if="canConfirmDeparture" type="primary" :loading="outboundConfirming" @click="confirmDeparture">确认离仓</el-button></div></header>
-        <LoadErrorState v-if="outboundError" compact title="国内出仓操作失败" :message="outboundError.message" :loading="outboundLoading" @retry="loadOutboundDispatch"><template #details><ApiErrorMeta :details="outboundError" /></template></LoadErrorState>
-        <div v-else-if="outboundLoading" class="outbound-panel__loading"><el-skeleton :rows="2" animated /></div>
-        <template v-else-if="outboundDetail">
-          <div class="gate-summary"><span>总门禁 <strong>{{ outboundGateSummary.total }}</strong></span><span class="gate-summary__passed">已通过 <strong>{{ outboundGateSummary.passed }}</strong></span><span :class="{ 'gate-summary__blocked': outboundGateSummary.blocked }">阻断 <strong>{{ outboundGateSummary.blocked }}</strong></span><span class="gate-summary__reference">拖车状态（参考）：{{ truckReferenceText(outboundDetail.aggregate.truckAppointmentStatus) }}</span><el-button v-if="outboundGateSummary.passed" link type="primary" @click="showPassedGates = !showPassedGates">{{ showPassedGates ? '收起已通过项' : `查看全部门禁（${outboundGateSummary.total}）` }}</el-button></div>
-
-
-          <div class="gate-list">
-            <article v-for="row in visibleOutboundGateRows" :key="row.key" class="gate-row">
-              <el-tag size="small" :type="row.passed ? 'success' : 'danger'">{{ row.passed ? '通过' : '阻断' }}</el-tag><strong>{{ row.name }}</strong><span class="gate-row__actual">{{ row.actual || '暂无事实' }}</span><small>要求：{{ row.requirement || '—' }}</small>
-              <div class="gate-row__coverage"><span>{{ row.passed ? '覆盖' : '影响' }} {{ row.inboundCodes.length }} 个入库码</span><el-tag v-for="code in row.inboundCodes.slice(0, 3)" :key="code" size="small" effect="plain">{{ code }}</el-tag><span v-if="row.inboundCodes.length > 3">+{{ row.inboundCodes.length - 3 }}</span></div>
-            </article>
-          </div>
-        </template>
-        </div>
       </section>
 
       <section v-if="isOverseas" v-show="activeTab === 'overview'" class="detail-section workbench-panel is-compact" aria-labelledby="container-overseas-receiving-heading">
-        <header class="detail-section__heading"><h2 id="container-overseas-receiving-heading">提柜、卸柜与还空</h2><div class="density-actions"><el-button v-if="canReadDirect" @click="openTerminal">提柜安排与执行</el-button><el-button v-if="canReadDirect" @click="openDirect">直送卸货清单</el-button><el-button v-if="canRecordEmptyReturn" type="primary" :loading="emptyReturnSaving" @click="openEmptyReturn">确认还柜</el-button></div></header>
+        <header class="detail-section__heading"><h2 id="container-overseas-receiving-heading">提柜、卸柜与还空</h2><div class="density-actions"><el-button v-if="canReadDirect" @click="openTerminal">提柜安排与执行</el-button><el-button v-if="canRecordEmptyReturn" type="primary" :loading="emptyReturnSaving" @click="openEmptyReturn">确认还柜</el-button></div></header>
         <div class="detail-fields"><dl class="density-fields"><div><dt>码头拖车状态</dt><dd>{{ workbenchDetail?.statusSummary?.terminalDrayageStatus || '—' }}</dd></div><div><dt>码头车队</dt><dd>{{ workbenchDetail?.terminalDrayage?.fleetSupplierName || '—' }}</dd></div><div><dt>预计到仓</dt><dd>{{ expectedArrivalText }}</dd></div><div><dt>实际到仓</dt><dd>{{ formatTime(arrivalTime?.actualWarehouseArrivalAt) }}</dd></div><div><dt>卸柜完成</dt><dd>{{ formatTime((workbenchDetail?.actualFacts?.unloadingCompletedAt || workbenchDetail?.terminalDrayage?.unloadingCompletedAt) as string | null) }}</dd></div><div><dt>实际还柜</dt><dd>{{ formatTime(workbenchDetail?.terminalDrayage?.actualEmptyReturnAt) }}</dd></div></dl></div>
       </section>
 
@@ -753,9 +687,9 @@ onMounted(async () => {
 
     <OceanBookingLinkDialog v-model="oceanBookingLinkOpen" :container="detail" @linked="load" />
     <AppDialog class="container-detail-dialog admin-density-dialog admin-workbench is-dialog" v-model="emptyReturnOpen" :title="containerDialogTitle('确认还柜', detail)" width="min(520px, calc(100vw - 28px))" :confirm-text="emptyReturnPending ? '重试本次还空登记' : '确认还柜'" :before-close="closeEmptyReturn" :confirm-loading="emptyReturnSaving" :confirm-disabled="!emptyReturnAt || !canRecordEmptyReturn" @confirm="confirmEmptyReturn"><el-alert title="提交后货柜将进入已还柜状态，请核对实际还柜时间。" type="warning" :closable="false" show-icon /><el-form class="density-form density-form--flush-end" label-position="top" :disabled="emptyReturnSaving || !!emptyReturnPending"><el-form-item label="实际还柜当地时间" required><el-date-picker v-model="emptyReturnAt" type="datetime" value-format="YYYY-MM-DDTHH:mm:ss" placeholder="请选择实际还柜时间" /></el-form-item><el-form-item label="备注"><el-input v-model="emptyReturnReason" type="textarea" :rows="3" maxlength="500" show-word-limit /></el-form-item></el-form><LoadErrorState v-if="emptyReturnError" compact title="确认还柜失败" :message="emptyReturnError.message" :show-retry="false"><template #details><ApiErrorMeta :details="emptyReturnError" /></template></LoadErrorState></AppDialog>
-    <AppDialog class="container-detail-dialog admin-density-dialog admin-workbench is-dialog" v-model="documentOpen" :title="containerDialogTitle(documentTitle, detail)" width="min(520px, calc(100vw - 28px))" confirm-text="上传资料" :confirm-loading="documentSaving" :confirm-disabled="!documentFile" @confirm="saveDocument"><section class="density-dialog-section"><el-form class="density-form density-form--flush-end" label-position="top"><el-form-item :label="documentTitle"><el-upload :key="documentUploadKey" :auto-upload="false" :limit="1" :on-change="selectDocumentFile" :on-remove="removeDocumentFile"><el-button><FileUp :size="16" />选择文件</el-button><template #tip><div class="el-upload__tip">{{ selectedDocument ? '上传新文件将替换当前资料并保留历史。' : `请选择需要提交的${documentTitle}。` }}</div></template></el-upload></el-form-item></el-form></section><LoadErrorState v-if="documentError" compact title="资料上传失败" :message="documentError.message" :show-retry="false"><template #details><ApiErrorMeta :details="documentError" /></template></LoadErrorState></AppDialog>
+    <AppDialog class="container-detail-dialog admin-density-dialog admin-workbench is-dialog" v-model="documentOpen" :title="containerDialogTitle(documentTitle, detail)" width="min(520px, calc(100vw - 28px))" :show-confirm="!!documentError && !!documentFile" confirm-text="重试上传" :confirm-loading="documentSaving" :confirm-disabled="!documentFile" @confirm="saveDocument"><section class="density-dialog-section"><el-form class="density-form density-form--flush-end" label-position="top"><el-form-item :label="documentTitle"><el-upload :disabled="documentSaving" :key="documentUploadKey" :auto-upload="false" :limit="1" :on-change="selectDocumentFile" :on-remove="removeDocumentFile"><el-button :loading="documentSaving"><FileUp :size="16" />选择文件</el-button><template #tip><div class="el-upload__tip">{{ selectedDocument ? '上传新文件将替换当前资料并保留历史。' : `请选择${documentTitle}。` }}</div></template></el-upload></el-form-item></el-form></section><LoadErrorState v-if="documentError" compact title="资料上传失败" :message="documentError.message" :show-retry="false"><template #details><ApiErrorMeta :details="documentError" /></template></LoadErrorState></AppDialog>
     <AppDialog class="container-detail-dialog admin-density-dialog admin-workbench is-dialog" v-model="exceptionOpen" :title="containerDialogTitle(exceptionTitle, detail)" width="min(520px, calc(100vw - 28px))" :confirm-text="overview?.exception.active ? '确认取消' : '确认标记'" :confirm-loading="exceptionSaving" :confirm-disabled="!exceptionReason.trim()" @confirm="saveException"><el-alert :title="overview?.exception.active ? '取消备注为必填项，提交后将保留历史记录。' : '异常原因将同步记录在货柜详情和操作日志中。'" :type="overview?.exception.active ? 'warning' : 'error'" :closable="false" /><el-form class="density-form density-form--flush-end" label-position="top"><el-form-item :label="overview?.exception.active ? '取消备注' : '异常原因'" required><el-input v-model="exceptionReason" type="textarea" :rows="4" maxlength="500" show-word-limit /></el-form-item></el-form><LoadErrorState v-if="exceptionError" compact title="异常处理失败" :message="exceptionError.message" :show-retry="false" /></AppDialog>
-    <AppDialog class="container-detail-dialog admin-density-dialog admin-workbench is-dialog" v-model="clearanceOpen" :title="containerDialogTitle('目的港清关资料', detail)" width="min(520px, calc(100vw - 28px))" :loading="clearanceLoading" :show-confirm="!clearanceDocument?.completedAt" confirm-text="上传资料" :confirm-loading="clearanceSaving" :confirm-disabled="!clearanceFile" @confirm="uploadClearance"><el-alert v-if="clearanceDocument?.completedAt" type="success" :closable="false" :title="`目的港清关已完成：${clearanceDocument.fileName}`" /><template v-else><section class="density-dialog-section"><el-form class="density-form density-form--flush-end" label-position="top"><el-form-item label="目的港清关资料"><el-upload :auto-upload="false" :limit="1" :on-change="selectClearanceFile" :on-remove="removeClearanceFile"><el-button><FileUp :size="16" />选择文件</el-button></el-upload></el-form-item></el-form></section></template><LoadErrorState v-if="clearanceError" compact title="目的港清关资料操作失败" :message="clearanceError.message" :show-retry="false"><template #details><ApiErrorMeta :details="clearanceError" /></template></LoadErrorState><template #footer="{ close }"><div class="density-actions density-actions--footer"><el-button :disabled="clearanceSaving" @click="close">取消</el-button><el-button v-if="clearanceDocument && !clearanceDocument.completedAt" :disabled="clearanceLoading" type="success" plain :loading="clearanceSaving" @click="completeClearance">确认目的港清关完成</el-button><el-button v-if="!clearanceDocument?.completedAt" type="primary" :loading="clearanceSaving" :disabled="clearanceLoading || !clearanceFile" @click="uploadClearance">上传资料</el-button></div></template></AppDialog>
+    <AppDialog class="container-detail-dialog admin-density-dialog admin-workbench is-dialog" v-model="clearanceOpen" :title="containerDialogTitle('目的港清关资料', detail)" width="min(520px, calc(100vw - 28px))" :loading="clearanceLoading" :show-confirm="false" :confirm-loading="clearanceSaving" :confirm-disabled="!clearanceFile" @confirm="uploadClearance"><el-alert v-if="clearanceDocument?.completedAt" type="success" :closable="false" :title="`目的港清关已完成：${clearanceDocument.fileName}`" /><template v-else><section class="density-dialog-section"><el-form class="density-form density-form--flush-end" label-position="top"><el-form-item label="目的港清关资料"><el-upload :key="clearanceUploadKey" :disabled="clearanceSaving || clearanceLoading" :auto-upload="false" :limit="1" :on-change="selectClearanceFile" :on-remove="removeClearanceFile"><el-button :loading="clearanceSaving"><FileUp :size="16" />选择文件</el-button></el-upload></el-form-item></el-form></section></template><LoadErrorState v-if="clearanceError" compact title="目的港清关资料操作失败" :message="clearanceError.message" :show-retry="false"><template #details><ApiErrorMeta :details="clearanceError" /></template></LoadErrorState><template #footer="{ close }"><div class="density-actions density-actions--footer"><el-button :disabled="clearanceSaving" @click="close">取消</el-button><el-button v-if="clearanceDocument && !clearanceDocument.completedAt" :disabled="clearanceLoading" type="success" plain :loading="clearanceSaving" @click="completeClearance">确认目的港清关完成</el-button><el-button v-if="clearanceError && clearanceFile && !clearanceDocument?.completedAt" type="primary" :loading="clearanceSaving" :disabled="clearanceLoading" @click="uploadClearance">重试上传</el-button></div></template></AppDialog>
     <AppDialog class="container-detail-dialog admin-density-dialog admin-workbench is-dialog" v-model="directOpen" :title="containerDialogTitle('直送卸货登记', detail)" width="1080px" fullscreenable :show-confirm="canWriteDirect && !!directSelected && !directSelected.actualAt" :confirm-text="directPending ? '重试本次登记' : '确认本票卸货'" :confirm-loading="directSaving" :confirm-disabled="directLoading || !!directError" :before-close="closeDirect" @confirm="saveDirect">
 
       <LoadErrorState v-if="directError" title="直送卸货清单读取失败" :message="directError.message" :loading="directLoading" @retry="loadDirect"><template #details><ApiErrorMeta :details="directError" /></template></LoadErrorState>

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

@@ -10,6 +10,7 @@ import { listPlatformTenants, type PlatformTenantResource } from '@/modules/iam'
 import GlobalSmartLoadingView from './GlobalSmartLoadingView.vue'
 import AppDialog from '@/shared/components/AppDialog.vue'
 import SmartLoadingDialog from '../components/SmartLoadingDialog.vue'
+import { loadSmartLoadingPlanCoLoadGroups } from '../smartLoadingPlanGroups'
 import type { ContainerBookingResource } from '../types'
 import {
   assignPendingReviewSmartLoadingOrder,
@@ -210,9 +211,9 @@ describe('GlobalSmartLoadingView', () => {
     wrapper.unmount()
   })
 
-  it('uses one-line shared text clamps for co-load and assigned-count summaries', () => {
+  it('uses one-line shared text clamps for block reasons and assigned-count summaries', () => {
     const source = readFileSync(resolve(process.cwd(), 'src/modules/container-loading/pages/GlobalSmartLoadingView.vue'), 'utf8')
-    expect(source).toContain('<LineClampText :content="row.memberOrderSummaries.join(\'；\')" />')
+    expect(source).toContain('<LineClampText v-if="row.blockReason" class="candidate-block" :content="row.blockReason" />')
     expect(source).toContain('<LineClampText v-else-if="row.coLoadGroup" :content="`${row.packageCount} 箱（整组固定）`" />')
     expect(source).toContain("row.unitType === 'SEALED_PALLET'")
     expect(source).toContain('.candidate-group { display: grid; width: 100%; min-width: 0;')
@@ -608,9 +609,11 @@ describe('GlobalSmartLoadingView', () => {
     const wrapper = mount(GlobalSmartLoadingView, { attachTo: document.body, global: { plugins: [ElementPlus] } })
     await flushPromises()
 
-    expect(wrapper.text()).toContain('CLG-2093539779795795969 · 2 票')
-    expect(wrapper.text()).toContain('3 个入仓片段')
-    expect(wrapper.text()).toContain('ORD-201：NYEXX2608290051、NYEXX2608290051-B')
+    const candidatePane = wrapper.get('.candidate-pane')
+    expect(candidatePane.get('.candidate-group').text()).toBe('合柜报关 · 2票整组不可拆')
+    expect(candidatePane.text()).toContain('NYEXX2608290051、NYEXX2608290051-B、NYEXX2608290052')
+    expect(candidatePane.text()).not.toContain('CLG-2093539779795795969')
+    expect(candidatePane.text()).not.toContain('ORD-201')
     const buttons = wrapper.findAll('.el-table__body-wrapper button').filter((button) => button.text() === '加入')
     expect(buttons).toHaveLength(1)
     await buttons[0].trigger('click')
@@ -623,6 +626,8 @@ describe('GlobalSmartLoadingView', () => {
     expect(contextRows[1]!.findAll('td').map(cell => cell.text())).toEqual(['义乌仓', '美森正班'])
     await assignmentDialog().get('[aria-label="展开全屏"]').trigger('click')
     expect(assignmentDialog().get('table[aria-label="全局装柜同柜组成员"]').text()).toContain('NYEXX2608290051-B')
+    expect(assignmentDialog().get('table[aria-label="全局装柜同柜组成员"]').text()).toContain('ORD-201：NYEXX2608290051、NYEXX2608290051-B')
+    expect(assignmentDialog().text()).toContain('3 个入仓片段')
     expect(document.body.textContent).not.toContain('本次分配箱数')
     ;([...document.body.querySelectorAll('button')].find((button) => button.textContent?.includes('确认整组分配')) as HTMLButtonElement).click()
     await flushPromises()
@@ -684,7 +689,7 @@ describe('GlobalSmartLoadingView', () => {
     const wrapper = mount(GlobalSmartLoadingView, { global: { plugins: [ElementPlus] } })
     await flushPromises()
 
-    expect(wrapper.text()).toContain('CLG-9900 · 3 票')
+    expect(wrapper.text()).toContain('合柜报关 · 3票')
     expect(wrapper.text()).toContain('同柜不可拆组成员候选不齐，缺少 1 票')
     const button = wrapper.findAll('.el-table__body-wrapper button').find((item) => item.text() === '加入')!
     expect(button.attributes('disabled')).toBeDefined()
@@ -749,16 +754,36 @@ describe('GlobalSmartLoadingView', () => {
     wrapper.unmount()
   })
 
-  it('uses one loading-rule column and expandable group details in both workbenches', () => {
+  it('uses one loading-rule column in both workbenches and keeps global list summaries compact', () => {
     for (const page of ['GlobalSmartLoadingView.vue', 'SmartLoadingWorkbenchView.vue']) {
       const source = readFileSync(resolve(process.cwd(), `src/modules/container-loading/pages/${page}`), 'utf8')
       expect(source.match(/label: '装柜规则'/g)).toHaveLength(2)
       expect(source).not.toContain("label: '分配单位'")
       expect(source).not.toContain('<template #unitType=')
-      expect(source.match(/<summary>整组加入 · 不可拆<\/summary>/g)).toHaveLength(2)
       expect(source.match(/'整托加入 · 不可拆' : '按箱加入'/g)).toHaveLength(2)
-      expect(source).toContain("row.memberOrderSummaries.join('；')")
     }
+    const source = readFileSync(resolve(process.cwd(), 'src/modules/container-loading/pages/GlobalSmartLoadingView.vue'), 'utf8')
+    expect(source.match(/slotName: 'coLoadGroup', showOverflowTooltip: false/g)).toHaveLength(2)
+    expect(source).not.toContain("row.memberOrderSummaries.join('；')")
+  })
+
+  it('shows compact locked plan groups with all inbound codes and fixed package totals', async () => {
+    const group = { groupId: 'G-1', groupNo: 'CLG-1', lockedPlanId: plan.id, memberOrderCount: 2, inboundFragmentCount: 3, fullPackageCount: 18 }
+    vi.mocked(loadSmartLoadingPlanCoLoadGroups).mockReturnValueOnce(new Map(['2', '3', '4'].map(id => [id, group])))
+    vi.mocked(getSmartLoadingPlanByBooking).mockResolvedValue({
+      ...plan,
+      items: ['2', '3', '4'].map((inboundId, index) => ({ ...plan.items[0]!, id: `item-${inboundId}`, inboundId, inboundCode: `IN-${inboundId}`, orderId: index < 2 ? 'order-1' : 'order-2' })),
+    })
+    const wrapper = mount(GlobalSmartLoadingView, { global: { plugins: [ElementPlus] } })
+    await flushPromises()
+
+    const pane = wrapper.get('.plan-pane')
+    expect(pane.get('.candidate-group').text()).toBe('合柜报关 · 2票整组不可拆 · 已锁定')
+    expect(pane.text()).toContain('IN-2、IN-3、IN-4')
+    expect(pane.text()).toContain('18 箱（整组固定）')
+    expect(pane.text()).not.toContain('CLG-1')
+    expect(pane.text()).not.toContain('ORD-1')
+    expect(pane.findAll('.el-table__body-wrapper tr')).toHaveLength(1)
   })
 
   it('searches any shared-pallet inbound, retains its complete composition across pages, and resets the search', async () => {

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

@@ -157,7 +157,7 @@ const displayedCandidates = computed<SmartLoadingCandidateRow[]>(() => {
 const planPalletMembersByPalletId = computed(() => new Map(
   (plan.value?.palletMembers || []).map((entry) => [entry.palletId, entry.members]),
 ))
-type SmartLoadingPlanRow = SmartLoadingInboundItem & { coLoadGroup: SmartLoadingPlanCoLoadGroup | null; palletMembers: SmartLoadingCandidateGroupMember[]; memberInboundCodes: string[]; memberOrderSummaries: string[] }
+type SmartLoadingPlanRow = SmartLoadingInboundItem & { coLoadGroup: SmartLoadingPlanCoLoadGroup | null; palletMembers: SmartLoadingCandidateGroupMember[]; memberInboundCodes: string[] }
 const displayedPlanItems = computed<SmartLoadingPlanRow[]>(() => {
   const inboundRows = groupSmartLoadingItems(plan.value?.items || [])
   const result: SmartLoadingPlanRow[] = []
@@ -165,7 +165,7 @@ const displayedPlanItems = computed<SmartLoadingPlanRow[]>(() => {
   for (const row of inboundRows) {
     const group = planGroupsByInboundId.value.get(row.inboundId)
     if (!group) {
-      result.push({ ...row, coLoadGroup: null, palletMembers: row.palletId ? planPalletMembersByPalletId.value.get(row.palletId) || [] : [], memberInboundCodes: [row.inboundCode || '入仓码暂缺'], memberOrderSummaries: memberOrderSummaries([row]) })
+      result.push({ ...row, coLoadGroup: null, palletMembers: row.palletId ? planPalletMembersByPalletId.value.get(row.palletId) || [] : [], memberInboundCodes: [row.inboundCode || '入仓码暂缺'] })
       continue
     }
     grouped.set(group.groupId, [...(grouped.get(group.groupId) || []), row])
@@ -191,7 +191,6 @@ const displayedPlanItems = computed<SmartLoadingPlanRow[]>(() => {
       coLoadGroup: group,
       palletMembers: [],
       memberInboundCodes: rows.map((row) => row.inboundCode || '入仓码暂缺'),
-      memberOrderSummaries: memberOrderSummaries(rows),
     })
   }
   return result
@@ -247,7 +246,7 @@ const candidateColumns: DataTableColumn[] = [
   { key: 'totalGrossWeightKg', label: '重量', width: 100, slotName: 'candidateTotalWeight' },
   { key: 'totalVolumeCbm', label: '体积', width: 100, slotName: 'candidateTotalVolume' },
   { key: 'palletNo', prop: 'palletNo', label: '托盘号', minWidth: 145, showOverflowTooltip: true },
-  { key: 'coLoadGroup', label: '装柜规则', minWidth: 170, slotName: 'coLoadGroup' },
+  { key: 'coLoadGroup', label: '装柜规则', minWidth: 170, slotName: 'coLoadGroup', showOverflowTooltip: false },
   { key: 'unitGrossWeightKg', label: '单位毛重', width: 90, slotName: 'unitGrossWeight' },
   { key: 'averageUnitVolumeCbm', label: '单位体积', width: 90, slotName: 'averageUnitVolume' },
   { key: 'estimatedVolumeCbm', label: '预估体积', width: 100, slotName: 'estimatedVolume' },
@@ -260,7 +259,7 @@ const itemColumns: DataTableColumn[] = [
   { key: 'grossWeightKg', label: '毛重', width: 90, slotName: 'weight' },
   { key: 'volumeCbm', label: '体积', width: 90, slotName: 'volume' },
   { key: 'palletNo', prop: 'palletNo', label: '托盘号', minWidth: 145, showOverflowTooltip: true },
-  { key: 'coLoadGroup', label: '装柜规则', minWidth: 170, slotName: 'coLoadGroup' },
+  { key: 'coLoadGroup', label: '装柜规则', minWidth: 170, slotName: 'coLoadGroup', showOverflowTooltip: false },
 ]
 
 function formatNumber(value: number, digits = 3) {
@@ -753,9 +752,16 @@ onMounted(() => { void load(); void loadCustomers() })
                   @click="openAssign(row)"
                 >加入</el-button>
               </template>
-              <template #candidateInbounds="{ row }"><SmartLoadingCandidateInbounds :candidate="row as SmartLoadingCandidate" /></template>
+              <template #candidateInbounds="{ row }"><span v-if="row.coLoadGroupId">{{ row.memberInboundCodes.join('、') }}</span><SmartLoadingCandidateInbounds v-else :candidate="row as SmartLoadingCandidate" /></template>
               <template #customerName="{ row }"><LineClampText :content="row.customerName" /></template>
-              <template #coLoadGroup="{ row }"><details v-if="row.coLoadGroupId" class="candidate-group"><summary>整组加入 · 不可拆</summary><el-tag size="small" type="warning"><LineClampText :content="`${row.groupNo} · ${row.memberOrderCount} 票 · ${row.inboundFragmentCount} 个入仓片段`" /></el-tag><LineClampText :content="row.memberOrderSummaries.join('；')" /><LineClampText :content="`整组 ${row.groupTotalBoxes} 箱，必须全量进入同一柜`" /><LineClampText v-if="row.blockReason" class="candidate-block" :content="row.blockReason" /><LineClampText v-else-if="row.locked" content="该组已锁定，不能重复分配" /></details><LineClampText v-else :content="row.unitType === 'SEALED_PALLET' ? '整托加入 · 不可拆' : '按箱加入'" /></template>
+              <template #coLoadGroup="{ row }">
+                <div v-if="row.coLoadGroupId" class="candidate-group">
+                  <el-tag size="small" type="warning">合柜报关 · {{ row.memberOrderCount }}票</el-tag>
+                  <span>整组不可拆{{ row.locked ? ' · 已锁定' : '' }}</span>
+                  <LineClampText v-if="row.blockReason" class="candidate-block" :content="row.blockReason" />
+                </div>
+                <LineClampText v-else :content="row.unitType === 'SEALED_PALLET' ? '整托加入 · 不可拆' : '按箱加入'" />
+              </template>
               <template #orderStatusSnapshot="{ row }"><el-tag size="small" effect="plain">{{ candidateStatusLabel(row.orderStatusSnapshot) }}</el-tag></template>
               <template #unitGrossWeight="{ row }">{{ formatMeasurement(row.unitGrossWeightKg, 'kg', 1) }}</template>
               <template #candidateTotalWeight="{ row }">{{ formatMeasurement(row.totalGrossWeightKg, 'kg', 1) }}</template>
@@ -828,9 +834,15 @@ onMounted(() => { void load(); void loadCustomers() })
               </div>
               <div class="workbench-table"><DataTable :data="displayedPlanItems" :columns="itemColumns" :loading="selectionLoading || mutating" stripe preference-key="global-smart-loading-items" column-settings-mode="hide" empty-text="当前柜次暂无装柜明细">
                 <template #actions="{ row }"><div class="row-actions density-actions"><el-button class="density-action" data-tone="danger" v-if="canDelete && editable && row.canRemove" size="small" type="danger" plain :disabled="mutating" @click="remove(row)"><Trash2 :size="15" />删除</el-button></div></template>
-                <template #planInbounds="{ row }"><SmartLoadingCandidateInbounds :members="row.palletMembers" :sealed-pallet="row.unitType === 'SEALED_PALLET'" :fallback-inbound-code="row.inboundCode" /></template>
+                <template #planInbounds="{ row }"><span v-if="row.coLoadGroup">{{ row.memberInboundCodes.join('、') }}</span><SmartLoadingCandidateInbounds v-else :members="row.palletMembers" :sealed-pallet="row.unitType === 'SEALED_PALLET'" :fallback-inbound-code="row.inboundCode" /></template>
                 <template #customerName="{ row }"><LineClampText :content="row.customerName" /></template>
-                <template #coLoadGroup="{ row }"><details v-if="row.coLoadGroup" class="candidate-group"><summary>整组加入 · 不可拆</summary><el-tag size="small" type="warning"><LineClampText :content="`${row.coLoadGroup.groupNo} · ${groupMemberLabel(row.coLoadGroup)}`" /></el-tag><LineClampText :content="row.memberOrderSummaries.join('；')" /><LineClampText :content="`固定 ${row.coLoadGroup.fullPackageCount} 箱 · ${row.coLoadGroup.lockedPlanId ? '已锁定' : '未锁定'}`" /></details><LineClampText v-else :content="row.unitType === 'SEALED_PALLET' ? '整托加入 · 不可拆' : '按箱加入'" /></template>
+                <template #coLoadGroup="{ row }">
+                  <div v-if="row.coLoadGroup" class="candidate-group">
+                    <el-tag size="small" type="warning">合柜报关 · {{ row.coLoadGroup.memberOrderCount }}票</el-tag>
+                    <span>整组不可拆 · {{ row.coLoadGroup.lockedPlanId ? '已锁定' : '未锁定' }}</span>
+                  </div>
+                  <LineClampText v-else :content="row.unitType === 'SEALED_PALLET' ? '整托加入 · 不可拆' : '按箱加入'" />
+                </template>
                 <template #packageCount="{ row }"><LineClampText v-if="row.unitType === 'SEALED_PALLET'" :content="`${row.packageCount} 箱（整托固定）`" /><LineClampText v-else-if="row.coLoadGroup" :content="`${row.packageCount} 箱（整组固定）`" /><div v-else class="package-count-editor"><el-input-number v-if="editingQuantityId === row.id" v-model="quantityDrafts[row.id]" :min="row.minPackageCount" :max="adjustmentMax(row)" :step="1" :controls="false" :disabled="mutating" placeholder="请输入使用箱数" @blur="adjust(row)" @keyup.enter="adjust(row)" /><div v-else class="package-count-summary"><div class="package-count-used"><strong>使用：{{ row.packageCount }}</strong><el-button v-if="canAssign && editable && row.canAdjust" link circle :disabled="mutating" aria-label="调整箱数" @click="startQuantityEdit(row)"><Pencil :size="14" /></el-button></div><small v-if="(row.remainingPackageCount ?? 0) > 0">未用：{{ row.remainingPackageCount }}</small></div><LineClampText v-if="row.detailCount > 1 && editable" content="多规格，需删除后重加" /><LineClampText v-if="row.pickedPackageCount > 0" :content="`已拣 ${row.pickedPackageCount} 箱`" /></div></template>
                 <template #weight="{ row }">{{ formatNumber(Number(row.grossWeightKg || 0), 1) }} kg</template>
                 <template #volume="{ row }">{{ formatNumber(Number(row.volumeCbm || 0)) }} m³</template>

src/modules/inbounds/components/InboundTaskList.test.ts

@@ -69,6 +69,7 @@ describe('InboundTaskList measurement scope', () => {
     expect(source).toContain(':show-actions="false"')
     expect(source).toContain('<template #footer="{ close }">')
     expect(source).toContain('reviewPanelRef?.confirmApprove()')
+    expect(source).not.toContain('修改重量')
   })
 
   it('loads only active customers and exposes a searchable name-only select', () => {

src/modules/inbounds/components/InboundTaskList.vue

@@ -469,7 +469,6 @@ onBeforeUnmount(() => { disposed = true; requestSerial += 1; optionsRequestSeria
         <div class="review-dialog-footer">
           <el-button :disabled="reviewNavigationLoading" @click="close">关闭</el-button>
           <template v-if="reviewPanelRef?.isPending && reviewPanelRef?.canReview">
-            <el-button type="primary" plain @click="reviewPanelRef?.enableWeightCorrection()">修改重量</el-button>
             <el-button type="primary" :loading="reviewPanelRef?.actionLoading === 'approve' || reviewNavigationLoading" :disabled="reviewApproved" @click="reviewPanelRef?.confirmApprove()">{{ reviewApproved ? '审核已通过' : reviewPanelRef?.approvalButtonLabel }}</el-button>
           </template>
         </div>

src/modules/inbounds/review/MeasurementReviewPanel.test.ts

@@ -62,13 +62,19 @@ describe('MeasurementReviewPanel', () => {
     vi.mocked(listMeasurementReviewHistory).mockResolvedValue({ records: [], page: 1, size: 20, total: 0, pages: 0 })
   })
 
-  it('keeps customer context and pending actions in one sticky toolbar while reviewing long content', async () => {
+  it('keeps context in a scrolling toolbar and moves weight actions and totals to the weight details', async () => {
     const wrapper = mount(MeasurementReviewPanel, { props: { customerId: '10001', inboundId: '90001' }, global: { plugins: [ElementPlus] } })
     await flushPromises()
 
     const toolbar = wrapper.get('.review-toolbar')
     expect(toolbar.text()).toContain('待审核')
-    expect(toolbar.text()).toContain('修改重量')
+    expect(toolbar.text()).not.toContain('修改重量')
+    const weightHeading = wrapper.get('.review-weight-items header')
+    expect(weightHeading.text()).toContain('修改重量')
+    expect(weightHeading.text()).toContain('实测毛重 120 kg')
+    expect(weightHeading.text()).toContain('货物重量 110 kg')
+    expect(weightHeading.find('.lucide-scale').exists()).toBe(true)
+    expect(weightHeading.find('.lucide-pencil').exists()).toBe(true)
     expect(toolbar.findAll('button').map(button => button.text())).toContain('通过')
     expect(toolbar.text()).toContain('刷新')
     expect(toolbar.text()).toContain('客户：柏悦客户')
@@ -83,7 +89,7 @@ describe('MeasurementReviewPanel', () => {
     expect(wrapper.text()).not.toContain('审核历史')
     expect(listMeasurementReviewHistory).not.toHaveBeenCalled()
     const source = await import('./MeasurementReviewPanel.vue?raw').then((module) => module.default)
-    expect(source).toContain('position: sticky')
+    expect(source).not.toContain('position: sticky')
     expect(source).toContain('review-toolbar__context')
     expect(source.indexOf('class="review-toolbar"')).toBeLessThan(source.indexOf('<WeightOcrPanel'))
     expect(source).not.toContain('reasonDialog')
@@ -102,7 +108,7 @@ describe('MeasurementReviewPanel', () => {
     expect(wrapper.text()).not.toContain('通过并进入')
     await wrapper.findAll('button').find((button) => button.text() === '通过')!.trigger('click')
     await flushPromises()
-    expect(confirmation).toHaveBeenCalledWith(expect.stringContaining('进入待一件代发组托'), '确认测量审核通过', expect.objectContaining({ confirmButtonText: '通过' }))
+    expect(confirmation).toHaveBeenCalledWith('审核通过后，入库单将进入待分柜', '确认测量', expect.objectContaining({ confirmButtonText: '通过' }))
     expect(initialPricingSucceeded ? success : warning).toHaveBeenCalledWith(expect.stringContaining('入库单已进入待一件代发组托'))
     expect(approveMeasurement).toHaveBeenCalledTimes(1)
     expect(wrapper.emitted('changed')).toHaveLength(1)
@@ -193,7 +199,6 @@ describe('MeasurementReviewPanel', () => {
 
     const weightPanel = wrapper.getComponent({ name: 'WeightOcrPanel' })
     expect(weightPanel.props('reviewMode')).toBe(true)
-    expect(weightPanel.props('tableMode')).toBe(true)
     expect(weightPanel.props('correctionMode')).toBe(false)
     await wrapper.findAll('button').find((button) => button.text().includes('修改重量'))?.trigger('click')
     expect(weightPanel.props('correctionMode')).toBe(true)
@@ -229,7 +234,7 @@ describe('MeasurementReviewPanel', () => {
     expect(wrapper.find('.review-toolbar__actions').exists()).toBe(false)
     expect(wrapper.get('.review-toolbar__context').text()).toContain('客户：柏悦客户')
     expect(wrapper.vm.approvalButtonLabel).toBe('通过')
-    wrapper.vm.enableWeightCorrection()
+    await wrapper.get('.review-weight-summary button').trigger('click')
     await flushPromises()
     expect(wrapper.getComponent({ name: 'WeightOcrPanel' }).props('correctionMode')).toBe(true)
     await wrapper.vm.confirmApprove()

src/modules/inbounds/review/MeasurementReviewPanel.vue

@@ -3,7 +3,7 @@ import '@/styles/adminDensity.css'
 import '@/styles/adminWorkbench.css'
 import { computed, onBeforeUnmount, onMounted, ref, watch } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import { Check, Pencil, RotateCcw } from '@lucide/vue'
+import { Check, Pencil, RotateCcw, Ruler, Scale } from '@lucide/vue'
 import { useAccessPreviewStore } from '@/core/access/accessPreview'
 import { getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
 import ApiErrorMeta from '@/shared/components/ApiErrorMeta.vue'
@@ -13,6 +13,7 @@ import { downloadInboundMeasurementImage } from '../measurement/api'
 import MeasurementEvidenceThumbnail from '../measurement/components/MeasurementEvidenceThumbnail.vue'
 import { inboundProcessStatusLabels, inboundReviewStatusLabels, inboundStatusLabel } from '../status'
 import WeightOcrPanel from '../weight/components/WeightOcrPanel.vue'
+import type { WeightResultResource } from '../weight/types'
 import { approveMeasurement, getMeasurementReviewDetail } from './api'
 import type { MeasurementReviewDetail } from './types'
 
@@ -38,6 +39,7 @@ const loading = ref(false)
 const actionLoading = ref('')
 const loadError = ref<ApiErrorDetails | null>(null)
 const correctionMode = ref(false)
+const weightPanelRef = ref<InstanceType<typeof WeightOcrPanel> | null>(null)
 const requestSerial = ref(0)
 const imagePreviewOpen = ref(false)
 const imagePreviewTitle = ref('测量图片')
@@ -125,7 +127,7 @@ async function loadReview() {
 }
 
 async function reload() {
-  await loadReview()
+  await Promise.all([loadReview(), weightPanelRef.value?.reload()])
 }
 
 async function handleWeightChanged() {
@@ -140,8 +142,8 @@ async function confirmApprove() {
   if (!detail.value || !isPending.value || !canReview.value || actionLoading.value || props.postApproveLoading || props.approvalCompleted) return
   try {
     await ElMessageBox.confirm(
-      `审核通过后，入库单将进入${approvalTargetLabel.value}。系统会尝试生成初算费用，但初算失败不影响审核通过，后续可由平台人员补充调整。是否继续？`,
-      '确认测量审核通过',
+      '审核通过后，入库单将进入待分柜',
+      '确认测量',
       { customClass: 'admin-density-confirm', confirmButtonText: approvalButtonLabel.value, cancelButtonText: '返回', type: 'warning' },
     )
   } catch {
@@ -175,7 +177,7 @@ onMounted(() => {
 })
 onBeforeUnmount(releaseImagePreview)
 
-defineExpose({ confirmApprove, enableWeightCorrection, approvalButtonLabel, isPending, canReview, actionLoading })
+defineExpose({ confirmApprove, approvalButtonLabel, isPending, canReview, actionLoading })
 </script>
 
 <template>
@@ -183,7 +185,6 @@ defineExpose({ confirmApprove, enableWeightCorrection, approvalButtonLabel, isPe
     <h2 id="measurement-review-title" class="sr-only">测量审核内容</h2>
     <div class="review-toolbar" aria-label="测量审核操作">
       <div v-if="showActions" class="review-toolbar__actions">
-        <el-button v-if="isPending && canReview" type="primary" plain @click="enableWeightCorrection"><Pencil :size="16" />修改重量</el-button>
         <el-button v-if="isPending && canReview" type="primary" :loading="actionLoading === 'approve' || postApproveLoading" :disabled="approvalCompleted" @click="confirmApprove"><Check :size="16" />{{ approvalCompleted ? '审核已通过' : approvalButtonLabel }}</el-button>
       </div>
       <div class="review-toolbar__status">
@@ -220,18 +221,13 @@ defineExpose({ confirmApprove, enableWeightCorrection, approvalButtonLabel, isPe
 
       <section class="review-items density-dialog-section" data-tone="source" aria-labelledby="review-items-title">
         <header class="review-section-heading density-dialog-section__title">
-          <div>
-            <h3 id="review-items-title">箱规测量明细</h3>
-          </div>
+          <h3 id="review-items-title" class="review-detail-heading"><Ruler :size="18" aria-hidden="true" />箱规测量明细</h3>
           <span>{{ measurementCount }} 条</span>
         </header>
         <div v-if="detail.items.length" class="review-table-scroll">
           <el-table :data="detail.items" border stripe table-layout="fixed" class="review-table">
             <el-table-column type="index" label="#" width="44" align="center" />
-            <el-table-column label="箱号" width="160" show-overflow-tooltip>
-              <template #default="{ row }">{{ row.boxCode || row.itemNo || '—' }}</template>
-            </el-table-column>
-            <el-table-column label="测量图片" width="98" align="center">
+            <el-table-column label="测量图片" width="112" align="center">
               <template #default="{ row }">
                 <MeasurementEvidenceThumbnail
                   :customer-id="customerId"
@@ -243,6 +239,9 @@ defineExpose({ confirmApprove, enableWeightCorrection, approvalButtonLabel, isPe
                 />
               </template>
             </el-table-column>
+            <el-table-column label="箱号" width="160" show-overflow-tooltip>
+              <template #default="{ row }">{{ row.boxCode || row.itemNo || '—' }}</template>
+            </el-table-column>
             <el-table-column label="尺寸 长×宽×高(cm)" min-width="200" align="center">
               <template #default="{ row }">{{ formatNumber(row.lengthCm) }} × {{ formatNumber(row.widthCm) }} × {{ formatNumber(row.heightCm) }}</template>
             </el-table-column>
@@ -258,7 +257,7 @@ defineExpose({ confirmApprove, enableWeightCorrection, approvalButtonLabel, isPe
             <el-table-column label="体积重(kg)" width="96" align="right">
               <template #default="{ row }">{{ formatNumber(row.volumeWeightKg) }}</template>
             </el-table-column>
-            <el-table-column label="测量时间" width="190" class-name="review-time-cell">
+            <el-table-column label="测量时间" width="220" class-name="review-time-cell">
               <template #default="{ row }">{{ formatDate(row.deviceMeasuredAt) }}</template>
             </el-table-column>
           </el-table>
@@ -267,32 +266,45 @@ defineExpose({ confirmApprove, enableWeightCorrection, approvalButtonLabel, isPe
       </section>
 
       <section class="review-items review-weight-items density-dialog-section" data-tone="source" aria-labelledby="review-weight-title">
-        <header class="review-section-heading density-dialog-section__title"><h3 id="review-weight-title">称重明细</h3><span>{{ weightCount }} 条</span></header>
-        <div v-if="weightCount" class="review-table-scroll">
-          <el-table :data="detail.weightResults" border stripe table-layout="fixed" class="review-table review-weight-table">
-            <el-table-column type="index" label="#" width="44" align="center" />
-            <el-table-column label="称重图片" width="112" align="center"><template #default="{ row }"><MeasurementEvidenceThumbnail :customer-id="customerId" :inbound-id="inboundId" :file-id="row.fileId" :alt="`${row.palletCode || '托盘'}称重图片`" empty-text="无图片" @open="openImagePreview(row.fileId, row.palletCode || '托盘')" /></template></el-table-column>
-            <el-table-column prop="palletCode" label="托盘编码" min-width="120" />
-            <el-table-column prop="palletType" label="托盘类型" min-width="120" />
-            <el-table-column label="库位" min-width="130"><template #default="{ row }"><span class="review-location">{{ row.locationCode || '—' }}<template v-if="row.locationCode"> · {{ row.slotStatus === 'BOUND' ? '待上架' : row.slotStatus || '待上架' }}</template></span></template></el-table-column>
-            <el-table-column label="毛重（KG）" min-width="120" align="right"><template #default="{ row }">{{ formatNumber(row.grossWeightKg, 3) }}</template></el-table-column>
-            <el-table-column label="托盘皮重(kg)" min-width="120" align="right"><template #default="{ row }">{{ formatNumber(row.palletTareWeightKg, 3) }}</template></el-table-column>
-            <el-table-column label="货物重量(kg)" min-width="120" align="right"><template #default="{ row }"><strong class="review-weight-value">{{ formatNumber(row.netWeightKg, 3) }}</strong></template></el-table-column>
-            <el-table-column label="称重时间" min-width="150"><template #default="{ row }">{{ formatDate(row.confirmedAt || row.adjustedAt) }}</template></el-table-column>
-          </el-table>
-        </div>
-        <el-empty v-else description="暂无称重明细" :image-size="48" />
+        <header class="review-section-heading density-dialog-section__title">
+          <h3 id="review-weight-title" class="review-detail-heading"><Scale :size="18" aria-hidden="true" />称重明细</h3>
+          <div class="review-weight-summary">
+            <span>实测毛重 <strong>{{ formatNumber(detail.actualGrossWeightKg) }}</strong> kg</span>
+            <span>货物重量 <strong>{{ formatNumber(detail.actualNetWeightKg) }}</strong> kg</span>
+            <el-button v-if="isPending && canReview" type="primary" plain @click="enableWeightCorrection"><Pencil :size="16" />修改重量</el-button>
+            <span>{{ weightCount }} 条</span>
+          </div>
+        </header>
+        <WeightOcrPanel
+          ref="weightPanelRef"
+          review-mode
+          :correction-mode="correctionMode && isPending && canReview"
+          :customer-id="customerId"
+          :inbound-id="inboundId"
+          @changed="handleWeightChanged"
+        >
+          <template #heading><span id="weight-ocr-title" class="sr-only">称重图片预览与修正</span></template>
+          <template #results="{ rows, openPreview, canCorrect, busy }">
+            <div v-if="rows.length" class="review-table-scroll">
+              <el-table :data="rows" border stripe table-layout="fixed" class="review-table review-weight-table">
+                <el-table-column v-if="canCorrect" label="操作" width="100">
+                  <template #default="{ row, $index }"><el-button v-if="row.recognitionStatus === 'CONFIRMED'" link type="primary" :aria-label="`修改重量 ${$index + 1}`" :disabled="busy" @click="openPreview(row as WeightResultResource)">修改重量</el-button><span v-else>—</span></template>
+                </el-table-column>
+                <el-table-column type="index" label="#" width="44" align="center" />
+                <el-table-column label="称重图片" width="112" align="center"><template #default="{ row }"><MeasurementEvidenceThumbnail :customer-id="customerId" :inbound-id="inboundId" :file-id="row.fileId" :alt="`${row.palletCode || '托盘'}称重图片`" empty-text="无图片" @open="openPreview(row as WeightResultResource)" /></template></el-table-column>
+                <el-table-column prop="palletCode" label="托盘编码" width="160" show-overflow-tooltip />
+                <el-table-column prop="palletType" label="托盘类型" min-width="120" />
+                <el-table-column label="库位" min-width="130"><template #default="{ row }"><span class="review-location">{{ row.locationCode || '—' }}<template v-if="row.locationCode"> · {{ row.slotStatus === 'BOUND' ? '待上架' : row.slotStatus || '待上架' }}</template></span></template></el-table-column>
+                <el-table-column label="毛重（KG）" min-width="120" align="right"><template #default="{ row }">{{ formatNumber(row.grossWeightKg, 3) }}</template></el-table-column>
+                <el-table-column label="托盘皮重(kg)" min-width="120" align="right"><template #default="{ row }">{{ formatNumber(row.palletTareWeightKg, 3) }}</template></el-table-column>
+                <el-table-column label="货物重量(kg)" min-width="120" align="right"><template #default="{ row }"><strong class="review-weight-value">{{ formatNumber(row.netWeightKg, 3) }}</strong></template></el-table-column>
+                <el-table-column label="称重时间" width="220" class-name="review-time-cell"><template #default="{ row }">{{ formatDate(row.confirmedAt || row.adjustedAt) }}</template></el-table-column>
+              </el-table>
+            </div>
+            <el-empty v-else-if="!busy" description="暂无称重明细" :image-size="48" />
+          </template>
+        </WeightOcrPanel>
       </section>
-
-      <WeightOcrPanel
-        review-mode
-        table-mode
-        :correction-mode="correctionMode"
-        :customer-id="customerId"
-        :inbound-id="inboundId"
-        @changed="handleWeightChanged"
-        :class="{ 'review-weight-editor--hidden': !correctionMode }"
-      />
     </template>
 
     <AppDialog class="admin-density-dialog admin-workbench is-dialog" v-model="imagePreviewOpen" :title="imagePreviewTitle" width="min(760px, 92vw)" fullscreenable :show-footer="false" :close-on-click-modal="true" destroy-on-close append-to-body @closed="releaseImagePreview">
@@ -310,8 +322,8 @@ defineExpose({ confirmApprove, enableWeightCorrection, approvalButtonLabel, isPe
 </template>
 
 <style scoped>
-.review-panel { display: grid; gap: var(--admin-space-5, 12px); color: var(--workbench-text); }
-.review-toolbar { display: flex; align-items: center; justify-content: space-between; gap: var(--admin-space-5, 12px); position: sticky; top: 0; z-index: 3; flex-wrap: wrap; padding: var(--admin-space-3, 8px) 0; border-bottom: 1px solid var(--workbench-border); background: var(--admin-surface, #fff); }
+.review-panel { display: grid; grid-template-columns: minmax(0, 1fr); gap: var(--admin-space-5, 12px); color: var(--workbench-text); }
+.review-toolbar { display: flex; align-items: center; justify-content: space-between; gap: var(--admin-space-5, 12px); flex-wrap: wrap; padding: var(--admin-space-3, 8px) 0; border-bottom: 1px solid var(--workbench-border); background: var(--admin-surface, #fff); }
 .review-toolbar__status, .review-toolbar__actions { display: flex; min-width: 0; align-items: center; flex-wrap: wrap; gap: var(--admin-space-3, 8px); }
 .review-toolbar__status > span { color: var(--workbench-muted); font-size: var(--admin-font-caption, 12px); }
 .review-toolbar__actions { justify-content: flex-end; }
@@ -323,6 +335,8 @@ defineExpose({ confirmApprove, enableWeightCorrection, approvalButtonLabel, isPe
 .review-section-heading > div { min-width: 0; }
 .review-section-heading h3 { margin: 0; color: var(--workbench-text); font-size: var(--admin-font-section, 14px); line-height: 1.35; }
 .review-section-heading > span { color: var(--workbench-muted); font-size: var(--admin-font-caption, 12px); white-space: nowrap; }
+.review-items > .review-section-heading { min-height: var(--admin-control-height, 32px); }
+.review-weight-items :deep(.weight-list) { margin-top: 0; }
 .review-comparison { table-layout: fixed; }
 .review-extra-facts { display: flex; align-items: baseline; flex-wrap: wrap; gap: var(--admin-space-5, 12px); margin-top: var(--admin-space-3, 8px); color: var(--workbench-muted); font-size: var(--admin-font-caption, 12px); }
 .review-extra-facts strong { color: var(--workbench-text); }
@@ -332,7 +346,10 @@ defineExpose({ confirmApprove, enableWeightCorrection, approvalButtonLabel, isPe
 .review-table :deep(.measurement-evidence-thumb) { min-width: 72px; border-radius: var(--admin-radius, 4px); }
 .review-weight-value { color: var(--el-color-success-dark-2); font-weight: 600; }
 .review-location { white-space: nowrap; }
-.review-weight-editor--hidden { display: none; }
+.review-detail-heading, .review-weight-summary { display: flex; align-items: center; gap: var(--admin-space-5, 12px); }
+.review-detail-heading > svg { flex-shrink: 0; }
+.review-weight-summary { flex-wrap: wrap; color: var(--workbench-muted); font-size: var(--admin-font-caption, 12px); }
+.review-weight-summary strong { color: var(--el-color-success-dark-2); }
 .review-image-preview { display: grid; min-height: 240px; place-items: center; }
 .review-image-preview img { display: block; width: auto; max-width: 100%; max-height: 70vh; object-fit: contain; }
 .review-image-preview__error { display: grid; justify-items: center; gap: var(--admin-space-3, 8px); color: var(--el-color-danger); }

src/modules/inbounds/weight/components/WeightOcrPanel.behavior.test.ts

@@ -22,6 +22,10 @@ import {
 import type { WeightResultResource, WeightWorkspaceResource } from '../types'
 import WeightOcrPanel from './WeightOcrPanel.vue'
 import InboundMeasurementDialog from '../../measurement/InboundMeasurementDialog.vue'
+import MeasurementReviewPanel from '../../review/MeasurementReviewPanel.vue'
+import { getMeasurementReviewDetail } from '../../review/api'
+
+vi.mock('../../review/api', () => ({ getMeasurementReviewDetail: vi.fn(), approveMeasurement: vi.fn() }))
 
 vi.mock('../api/weightOcr', async () => {
   const actual = await vi.importActual<typeof import('../api/weightOcr')>('../api/weightOcr')
@@ -100,6 +104,17 @@ const workspace: WeightWorkspaceResource = {
   },
 }
 
+const confirmedReviewWorkspace: WeightWorkspaceResource = {
+  ...workspace,
+  processStatus: 'MEASURE_PENDING',
+  actualGrossWeightKg: 120,
+  actualNetWeightKg: 108,
+  weightResults: [{
+    ...pendingWeight, recognitionStatus: 'CONFIRMED', adjustedWeightValue: 120,
+    adjustedWeightUnit: 'KG', grossWeightKg: 120, netWeightKg: 108, version: 1,
+  }],
+}
+
 function palletPage(records = [{
   palletId: '50001', palletCode: 'TP-001', palletType: '木托盘', capacityCbm: 1.2, tareWeightKg: 12,
 }]) {
@@ -128,7 +143,7 @@ function mountPanel(permissions = allWeightPermissions, props: Record<string, un
   })
 }
 
-async function openWeightDialog(wrapper: VueWrapper) {
+async function openWeightDialog(wrapper: Pick<VueWrapper, 'get'>) {
   await wrapper.get('button[aria-label="查看称重图片 1"]').trigger('click')
   await flushPromises()
 }
@@ -496,7 +511,59 @@ describe('WeightOcrPanel confirmation behavior', () => {
     expect(wrapper.text()).toContain('1747.500 KG')
   })
 
-  it('opens a table image and atomically corrects and confirms an approved weight during measurement review', async () => {
+  it('corrects a weight in the single review details table and refreshes totals without adding an image section', async () => {
+    vi.mocked(getWeightWorkspace).mockResolvedValue(confirmedReviewWorkspace)
+    const reviewDetail = {
+      inboundId: '20001', inboundCode: 'RK-20001', companyName: '测试客户', channelCode: 'SEA', channelName: '海运',
+      processStatus: 'MEASURE_PENDING', measureReviewStatus: 'PENDING', recommendedPalletType: null,
+      reviewReason: null, reviewerId: null, reviewerName: null, measurementId: '70001', sourceType: 'DEVICE',
+      measurementStatus: 'SUBMITTED', inboundVersion: 1, version: 1, originalDocumentNo: null,
+      originalGrossWeightKg: 100, originalVolumeCbm: 1, originalPackageCount: 1, actualPackageCount: 1,
+      actualGrossWeightKg: 120, actualNetWeightKg: 108, actualVolumeCbm: 1, volumeWeightKg: 167,
+      actualGoodsName: null, items: [], weightResults: confirmedReviewWorkspace.weightResults,
+    }
+    vi.mocked(getMeasurementReviewDetail).mockResolvedValue(reviewDetail)
+    const pinia = createPinia()
+    setActivePinia(pinia)
+    const auth = useAuthStore()
+    auth.token = 'token'
+    auth.permissions = [...allWeightPermissions, 'firstleg:inbound:measurement-review']
+    useAccessPreviewStore().initializeAfterLogin()
+    const wrapper = mount(MeasurementReviewPanel, {
+      attachTo: document.body,
+      props: { customerId: '10001', inboundId: '20001', showActions: false },
+      global: { plugins: [pinia, ElementPlus] },
+    })
+    await flushPromises()
+    expect(wrapper.findAll('.review-weight-table')).toHaveLength(1)
+    expect(wrapper.find('.weight-data-table').exists()).toBe(false)
+    expect(wrapper.find('.weight-heading').exists()).toBe(false)
+    expect(wrapper.find('button[aria-label="修改重量 1"]').exists()).toBe(false)
+    await wrapper.get('.review-weight-summary button').trigger('click')
+    await wrapper.get('button[aria-label="修改重量 1"]').trigger('click')
+    await flushPromises()
+    await dialogWeightInput().setValue('125')
+    await new DOMWrapper(document.body.querySelector<HTMLTextAreaElement>('#weight-correction-reason')!).setValue('复核磅秤读数')
+    const updatedWeight = { ...confirmedReviewWorkspace.weightResults[0], grossWeightKg: 125, netWeightKg: 113, version: 2 }
+    vi.mocked(confirmWeightResult).mockResolvedValue(updatedWeight)
+    vi.mocked(getWeightWorkspace).mockResolvedValue({ ...confirmedReviewWorkspace, actualGrossWeightKg: 125, actualNetWeightKg: 113, weightResults: [updatedWeight] })
+    vi.mocked(getMeasurementReviewDetail).mockResolvedValue({ ...reviewDetail, actualGrossWeightKg: 125, actualNetWeightKg: 113, inboundVersion: 2 })
+    await dialogConfirmButton('保存重量修正').trigger('click')
+    await flushPromises()
+    expect(confirmWeightResult).toHaveBeenCalledWith('10001', '20001', '30001', {
+      version: 1, adjustedWeightValue: 125, adjustedWeightUnit: 'KG', adjustmentReason: '复核磅秤读数',
+    })
+    expect(wrapper.get('.review-weight-summary').text()).toContain('实测毛重 125 kg')
+    expect(wrapper.get('.review-weight-summary').text()).toContain('货物重量 113 kg')
+    expect(wrapper.get('.review-weight-table').text()).toContain('125')
+    expect(wrapper.findAll('.review-weight-table')).toHaveLength(1)
+    const workspaceCalls = vi.mocked(getWeightWorkspace).mock.calls.length
+    await wrapper.get('.review-refresh').trigger('click')
+    await flushPromises()
+    expect(getWeightWorkspace).toHaveBeenCalledTimes(workspaceCalls + 1)
+  })
+
+  it('opens the explicit table correction action and atomically confirms an approved weight during measurement review', async () => {
     const confirmed = {
       ...pendingWeight,
       recognitionStatus: 'CONFIRMED',
@@ -521,7 +588,10 @@ describe('WeightOcrPanel confirmation behavior', () => {
     expect(wrapper.text()).not.toContain('删除图片')
     expect(wrapper.find('.weight-data-table').exists()).toBe(true)
     expect(wrapper.find('.weight-grid').exists()).toBe(false)
-    await openWeightDialog(wrapper)
+    expect(wrapper.get('.weight-data-table thead th').text()).toBe('操作')
+    expect(wrapper.find('.pallet-picker').exists()).toBe(false)
+    await wrapper.get('button[aria-label="修改重量 1"]').trigger('click')
+    await flushPromises()
     await dialogWeightInput().setValue('125')
     const reason = document.body.querySelector<HTMLTextAreaElement>('textarea[placeholder="请填写本次毛重修正原因"]')
     expect(reason).not.toBeNull()
@@ -538,6 +608,58 @@ describe('WeightOcrPanel confirmation behavior', () => {
     expect(correctWeightResult).not.toHaveBeenCalled()
   })
 
+  it.each([
+    { permissions: allWeightPermissions.filter(permission => !permission.endsWith('weight:edit')), status: 'MEASURE_PENDING', correctionMode: true },
+    { permissions: allWeightPermissions.filter(permission => !permission.endsWith('weight:confirm')), status: 'MEASURE_PENDING', correctionMode: true },
+    { permissions: allWeightPermissions, status: 'WAIT_SPLIT', correctionMode: true },
+    { permissions: allWeightPermissions, status: 'MEASURE_REJECTED', correctionMode: true },
+    { permissions: allWeightPermissions, status: 'MEASURE_PENDING', correctionMode: false },
+  ])('keeps table correction unavailable for missing permissions or inactive review: %j', async ({ permissions, status, correctionMode }) => {
+    vi.mocked(getWeightWorkspace).mockResolvedValue({ ...confirmedReviewWorkspace, processStatus: status })
+    const wrapper = mountPanel(permissions, { reviewMode: true, correctionMode, tableMode: true })
+    await flushPromises()
+
+    expect(wrapper.find('button[aria-label="修改重量 1"]').exists()).toBe(false)
+    await openWeightDialog(wrapper)
+    expect(dialogWeightInput().attributes('disabled')).toBeDefined()
+    expect(wrapper.getComponent(AppDialog).props('showConfirm')).toBe(false)
+    expect(confirmWeightResult).not.toHaveBeenCalled()
+  })
+
+  it('allows cancelling and reopening correction, and preserves the draft for retry after a save fails', async () => {
+    vi.mocked(getWeightWorkspace).mockResolvedValue(confirmedReviewWorkspace)
+    vi.mocked(confirmWeightResult)
+      .mockRejectedValueOnce(new Error('重量写入失败'))
+      .mockResolvedValueOnce({ ...confirmedReviewWorkspace.weightResults[0], grossWeightKg: 125, netWeightKg: 113, version: 2 })
+    const wrapper = mountPanel(allWeightPermissions, { reviewMode: true, correctionMode: true, tableMode: true })
+    await flushPromises()
+    const correctionButton = wrapper.get('button[aria-label="修改重量 1"]')
+    await correctionButton.trigger('click')
+    await flushPromises()
+    await dialogWeightInput().setValue('125')
+    await new DOMWrapper(document.body.querySelector<HTMLTextAreaElement>('#weight-correction-reason')!).setValue('复核磅秤读数')
+    const cancelButton = [...document.body.querySelectorAll<HTMLButtonElement>('.el-dialog__footer button')].find(button => button.textContent?.trim() === '取消')!
+    await new DOMWrapper(cancelButton).trigger('click')
+    await flushPromises()
+    expect(wrapper.getComponent(AppDialog).props('modelValue')).toBe(false)
+    expect(confirmWeightResult).not.toHaveBeenCalled()
+
+    await correctionButton.trigger('click')
+    await flushPromises()
+    expect(Number(dialogWeightInput().element.value)).toBe(125)
+    await dialogConfirmButton('保存重量修正').trigger('click')
+    await flushPromises()
+    expect(wrapper.getComponent(AppDialog).props('modelValue')).toBe(true)
+    expect(Number(dialogWeightInput().element.value)).toBe(125)
+    expect(dialogConfirmButton('保存重量修正').attributes('disabled')).toBeUndefined()
+    expect(wrapper.emitted('changed')).toBeUndefined()
+    await dialogConfirmButton('保存重量修正').trigger('click')
+    await flushPromises()
+    expect(confirmWeightResult).toHaveBeenCalledTimes(2)
+    expect(wrapper.getComponent(AppDialog).props('modelValue')).toBe(false)
+    expect(wrapper.emitted('changed')).toHaveLength(1)
+  })
+
   it('closes the confirmation dialog immediately after a successful confirmation', async () => {
     const wrapper = mountPanel()
     await flushPromises()

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

@@ -109,9 +109,9 @@ const previewConfirmDisabled = computed(() => {
     || Boolean(activeAction.value)
 })
 const previewCanConfirm = computed(() => Boolean(previewResult.value && canConfirm.value
-  && (editable.value || (reviewCorrectionEnabled.value && canEdit.value))))
+  && ((!props.reviewMode && editable.value) || (reviewCorrectionEnabled.value && canEdit.value))))
 const previewInputEditable = computed(() => Boolean(previewResult.value && canEdit.value && canConfirm.value
-  && (editable.value || reviewCorrectionEnabled.value)))
+  && ((!props.reviewMode && editable.value) || reviewCorrectionEnabled.value)))
 const previewConfirmText = computed(() => previewResult.value?.recognitionStatus === 'CONFIRMED'
   ? '保存重量修正'
   : '确认重量')
@@ -495,6 +495,7 @@ defineExpose({ reload: loadWorkspace })
 
 <template>
   <section class="weight-workspace admin-workbench" aria-labelledby="weight-ocr-title">
+    <slot name="heading">
     <header class="weight-heading">
       <div>
         <h3 id="weight-ocr-title"><Scale :size="18" aria-hidden="true" />称重图片</h3>
@@ -504,9 +505,8 @@ defineExpose({ reload: loadWorkspace })
           <div class="weight-summary"><span>实测毛重</span><strong>{{ formatWeight(workspace.actualGrossWeightKg) }}</strong></div>
           <div class="weight-summary"><span>货物重量</span><strong>{{ formatWeight(workspace.actualNetWeightKg) }}</strong></div>
         </div>
-        <div class="pallet-picker">
+        <div v-if="canEdit && !reviewMode" class="pallet-picker">
           <el-select-v2
-            v-if="canEdit && !reviewMode"
             v-model="selectedPalletId"
             :options="virtualPalletOptions"
             aria-label="选择称重托盘"
@@ -536,6 +536,7 @@ defineExpose({ reload: loadWorkspace })
         ><ImagePlus :size="16" />上传称重图片</el-button>
       </div>
     </header>
+    </slot>
 
     <el-alert v-if="!canView" type="warning" :closable="false" show-icon>
       当前账号缺少入库测量查看权限。
@@ -566,7 +567,7 @@ defineExpose({ reload: loadWorkspace })
           <template #details><ApiErrorMeta :details="palletError" /></template>
         </LoadErrorState>
         <el-alert
-          v-else-if="!palletLoading && palletOptions.length === 0 && editable && canEdit"
+          v-else-if="!reviewMode && !palletLoading && palletOptions.length === 0 && editable && canEdit"
           type="warning"
           :closable="false"
           show-icon
@@ -576,15 +577,22 @@ defineExpose({ reload: loadWorkspace })
           <el-button size="small" @click="reloadPalletOptions"><RefreshCw :size="14" />重新加载</el-button>
         </el-alert>
         <div v-loading="loading" class="weight-list" aria-live="polite">
+          <slot name="results" :rows="rows" :open-preview="openPreview" :can-correct="reviewCorrectionEnabled && canEdit && canConfirm" :busy="loading || Boolean(activeAction)">
           <div v-if="!loading && rows.length === 0" class="weight-empty">
             <strong>尚未上传称重图片</strong>
           </div>
 
           <div v-else-if="tableMode" class="weight-table-wrap">
             <div class="workbench-evidence"><table class="weight-data-table">
-              <thead><tr><th>#</th><th>称重图片</th><th>托盘编码</th><th>托盘类型</th><th>库位</th><th>实测毛重(KG)</th><th>服务端确认毛重(KG)</th><th>托盘皮重(KG)</th><th>货物重量(KG)</th><th>操作</th></tr></thead>
+              <colgroup v-if="reviewMode"><col /><col class="weight-index-column" /><col span="8" /></colgroup>
+              <thead><tr><th>操作</th><th>#</th><th>称重图片</th><th>托盘编码</th><th>托盘类型</th><th>库位</th><th>实测毛重(KG)</th><th>服务端确认毛重(KG)</th><th>托盘皮重(KG)</th><th>货物重量(KG)</th></tr></thead>
               <tbody>
                 <tr v-for="(row, index) in rows" :key="row.id">
+                  <td>
+                    <el-button v-if="reviewCorrectionEnabled && row.recognitionStatus === 'CONFIRMED' && canEdit && canConfirm" link type="primary" :aria-label="`修改重量 ${index + 1}`" :disabled="Boolean(activeAction)" @click="openPreview(row)">修改重量</el-button>
+                    <el-tooltip v-else-if="canEdit && editable && !reviewMode" content="删除图片" placement="top"><el-button text type="danger" :aria-label="`删除称重图片 ${index + 1}`" :loading="isActionLoading('delete', row.id)" :disabled="Boolean(activeAction)" @click="removeResult(row)"><Trash2 :size="16" /></el-button></el-tooltip>
+                    <span v-else>—</span>
+                  </td>
                   <td>{{ index + 1 }}</td>
                   <td><WeightImageThumbnail :customer-id="customerId" :inbound-id="inboundId" :file-id="row.fileId" :alt="`称重图片 ${index + 1}`" @open="openPreview(row)" /></td>
                   <td>{{ row.palletCode || '—' }}</td>
@@ -594,7 +602,6 @@ defineExpose({ reload: loadWorkspace })
                   <td>{{ formatWeight(row.grossWeightKg) }}</td>
                   <td>{{ formatWeight(row.palletTareWeightKg) }}</td>
                   <td class="weight-net-value">{{ formatWeight(row.netWeightKg) }}</td>
-                  <td><el-tooltip v-if="canEdit && editable && !reviewMode" content="删除图片" placement="top"><el-button text type="danger" :aria-label="`删除称重图片 ${index + 1}`" :loading="isActionLoading('delete', row.id)" :disabled="Boolean(activeAction)" @click="removeResult(row)"><Trash2 :size="16" /></el-button></el-tooltip><span v-else>—</span></td>
                 </tr>
               </tbody>
             </table></div>
@@ -644,6 +651,7 @@ defineExpose({ reload: loadWorkspace })
               </div>
             </article>
           </div>
+          </slot>
         </div>
       </template>
     </template>
@@ -744,6 +752,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 .weight-index-column { width: 44px; }
 .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); }

src/modules/loading-lists/AGENTS.md

@@ -20,7 +20,7 @@
 ## 关键边界
 
 - 预装详情进入后先调 `/loading-plans/{planId}/lifecycle`，再按返回状态决定可操作项；不自行推断生命周期阶段。
-- 托盘码格式为“真实柜号-FBA 地址内部编号-三位序号”，清单只取服务端按 FBA 仓分组的冻结结果，前端不生成、不改码、不重新编号；一件代发托盘不进入该清单。
+- 托盘码格式为“柜次号-FBA 地址内部编号-三位序号”，清单只取服务端按 FBA 仓分组的冻结结果，前端不生成、不改码、不重新编号；一件代发托盘不进入该清单。
 - 确认预装和创建 PDA 任务前必须补齐真实集装箱号；历史上已建缺号任务可在预装详情首次补录，保存后恢复 PDA 可进入状态。
 - 柜级公共费用只按服务端柜内客户/订单事实分摊，创建、审核、驳回、调整、作废均整组原子，金额必须守恒；待确认时禁止调整或重复作废。
 - 独立清单详情与货柜详情页签共用同一套清单 API 与详情组件；改展示或打印时同步检查 `container-loading` 的装柜清单页签。

src/modules/ocean-bookings/AGENTS.md

@@ -13,14 +13,14 @@
 | 订舱列表、放舱状态与关联候选 | `pages/OceanBookingsView.vue`；`ocean-bookings` | `api/platformOceanBookings.ts`；`firstleg/oceanbooking/` |
 | 新增订舱（登记线下已确认订舱） | `pages/OceanBookingDetailView.vue`；`ocean-bookings/new` | `api/platformOceanBookings.ts` |
 | 订舱详情、资料维护与版本 | `pages/OceanBookingDetailView.vue`；`ocean-bookings/:bookingId` | `api/platformOceanBookings.ts` |
-| 订舱资料面板与字段边界 | `components/OceanBookingDocumentsPanel.vue` | `firstleg/oceanbooking/`；附件归 `file/` |
+| 订舱附件组件（详情页已移除入口） | `components/OceanBookingDocumentsPanel.vue` | `firstleg/oceanbooking/`；附件归 `file/` |
 | 订舱资料打印 | `components/OceanBookingPrintDialog.vue` | `print/` 单据模板 |
 | 柜型需求与数量换算 | `containerRequirements.ts` | `containerCount` 为柜型需求 `quantity` 总和 |
 | 订舱代理候选 | `bookingAgents.ts` | 公共供应商列表，仅 `ACTIVE` 且类别/范围匹配 |
 
 ## 关键边界
 
-- 订舱草稿按当前版本维护资料；放舱后运输、关系方、柜型需求、预报货量和附件只读；仅实货量可由订舱编辑权限通过 `/actual-cargo` 按版本、幂等键和原因补录并审计，禁止绕过运输冻结边界。
+- 订舱草稿按当前版本维护资料；放舱后除预计到港外的运输、关系方、柜型需求、预报货量和附件只读；预计到港经 `/estimated-arrival` 按编辑权限、版本和幂等键单独维护，不得清空或早于预计开船；实货量可由订舱编辑权限通过 `/actual-cargo` 按版本、幂等键和原因补录并审计，禁止绕过运输冻结边界。
 - 打印对草稿与已放舱订舱均开放，按当前**已保存**资料生成，未填写字段显示“—”，不用未保存的表单值。托运单取委值，提单确认件取实值；实值由客服手工录入，不回退为委值，不生成正式提单。
 - 关联候选只消费服务端 `/link-candidates` 分页结果，不在浏览器重排或本地拼接候选。
 - 订舱是拖车预约的唯一归属：拖车由 `../trucking/` 创建，本模块不直接建拖车单。

src/modules/ocean-bookings/PROTOTYPE_MATRIX.md

@@ -1,13 +1,28 @@
 # 订舱页面受影响操作核对
 
-业务依据为用户提供的《订舱信息页面说明.docx》及页面截图；本轮确认：放舱后仅补实货量、客服手工录入、保留现有提单确认件，正式提单从外部附件接收。样式使用 `docs/Admin高密度界面规范.md` 的详情与基本信息、蓝白主题及既有公共密度。用户后续提供现页与产品稿对比，确认现页缺少层次、重点且间距过大；订舱页以该产品稿为局部视觉依据：紧凑页头、蓝色圆点连线流程、编号区块、细线小标题、浅底三方卡片及右下主打印按钮。可编辑输入、下拉和文本域使用白底、清晰边框与文字，悬停/聚焦使用蓝色反馈；灰底和禁止光标仅用于真实禁用状态，校验错误仍保留组件错误色。
+业务依据为用户提供的《订舱信息页面说明.docx》及页面截图；本轮确认：放舱后允许单独维护预计到港及补实货量、客服手工录入、保留现有提单确认件，正式提单从外部附件接收。样式使用 `docs/Admin高密度界面规范.md` 的详情与基本信息、蓝白主题及既有公共密度。用户后续提供现页与产品稿对比，确认现页缺少层次、重点且间距过大；订舱页以该产品稿为局部视觉依据：紧凑页头、蓝色圆点连线流程、编号区块、细线小标题、浅底三方卡片及右下主打印按钮。可编辑输入、下拉和文本域使用白底、清晰边框与文字，悬停/聚焦使用蓝色反馈；灰底和禁止光标仅用于真实禁用状态，校验错误仍保留组件错误色。
 
-流程条根据已保存订舱、当前未保存修改、放舱状态及实货量推进：当前步骤蓝底，已完成节点勾选，待处理灰色。第一步的“已保存”不代替放舱完整性校验；打印节点仅在本次页面成功生成对应数据的 PDF 预览后显示“已预览”，失败或只点击按钮不推进，也不声称实际打印完成。预览标记随本次页面保留，刷新后按服务端保存/放舱/实值恢复进度，打印仍可重新预览；单据消费的数据改变后，该单据重新进入待预览。
+订舱详情按用户 2026-10-23 截图确认移除“订舱资料”模块及两类文件上传入口，放舱不再要求上传订舱确认文件或提单文件；其他业务资料校验保留。修改后页面待人工截图确认。
 
-| 页面/路由 | 操作 | 参考承载与布局 | 当前实现 | 人工结论 |
+流程条根据已保存订舱、当前未保存修改、放舱状态及实货量推进：当前步骤蓝底，已通过阶段勾选，待处理灰色。第一步的“已保存”不代替放舱完整性校验；打印节点仅在本次页面成功生成对应数据的 PDF 预览后显示“已预览”，失败或只点击按钮不产生预览事实，也不声称实际打印完成。预览标记随本次页面保留；刷新后按服务端保存/放舱/实值恢复进度，已放舱时托运单阶段保持通过，提示“可重新预览 / 打印”，避免前面灰色、后面完成的断开。放舱前托运单数据改变须重新预览；提单确认件始终要求已保存实值和对应 PDF 成功预览后才完成。
+
+| 页面/路由 | 操作 | 参考承载与布局 | 当前实现 | 页面核对 |
 |---|---|---|---|---|
-| `/ocean-bookings/new`、`/ocean-bookings/:bookingId` | 草稿新增、维护 | 独立页面；左主资料、右三方并排，下方放舱资料 | 独立页面；按产品稿重排视觉层级，保留仓库、渠道、预计到港、多柜型和附件；港代码与港名成组、委实成对输入，新增保存留在详情 | 待人工截图确认 |
-| `/ocean-bookings/:bookingId` | 已放舱补实 | 客服补录实际货量 | 运输及预报只读，实值可按编辑权限补录，原因必填并版本审计 | 待人工截图确认 |
-| `/ocean-bookings/:bookingId` | 托运单、提单确认件 | 两个作业入口，A4单据预览 | 两张业务卡片底部右侧的蓝色主按钮，分别直达现有PDF预览；读已保存委/实数据，缺失显示“—” | 待人工截图确认 |
+| `/ocean-bookings/new`、`/ocean-bookings/:bookingId` | 草稿新增、维护 | 独立页面；左主资料、右三方并排，下方放舱资料 | 移除客户选择、港名、箱种、容量、限重、备注及包装单位选择；预计到港恢复在预计开船旁，并在放舱确认摘要展示；仓库和渠道保留在默认收起的“作业配置”，放舱缺配置时自动展开；委实成对输入，新增保存留在详情 | TEST #702 已核对预计到港恢复、录入保存和刷新回显；完整长字段展示待人工确认 |
+| `/ocean-bookings/:bookingId` | 放舱后维护预计到港 | 本轮用户确认仅开放预计到港；沿用现有单字段AppDialog | 页头独立入口，560px紧凑时间表单，仅提交预计到港和版本，不触及其他冻结资料 | 待1920×1080、100%人工截图确认 |
+| `/ocean-bookings/:bookingId` | 已放舱补实 | 客服补录实际货量 | 运输及预报只读，实值可按编辑权限补录，原因必填并版本审计 | 已核对放舱、原因校验、补实保存和历史；最终 TEST #698 回验实值保存后立即回显，无需刷新 |
+| `/ocean-bookings/:bookingId` | 托运单、提单确认件 | 两个作业入口，A4单据预览 | 两张业务卡片底部右侧的蓝色主按钮，分别直达现有PDF预览；读已保存委/实数据，缺失显示“—” | 弹框开关/重开、PDF 生成与数据映射已核对；内嵌 PDF 空白，显示未通过 |
 
 人工按 1920×1080、100% 缩放核对三方长名称/地址、两类货量、保存失败与版本冲突、冻结/无编辑权限，以及两类 PDF 预览的打开、关闭和重开。自动检查结果在交付中单独报告，不能代替人工截图。
+
+新增订舱默认运费条款 `FREIGHT PREPAID`、运输条款 `CY-CY`、委值 `500 / 15000 / 68`，实值留空；包装按 `CARTONS` 保存，新柜需求为整箱 FCL，容量和限重沿平台柜型规格计算。默认值只用于新增，不覆盖已保存资料。预计到港草稿可留空，放舱前必填且不得早于预计开船；放舱后预计到港允许独立窄命令维护，其余运输资料仍冻结。
+
+用户后续确认预计到港供日历和入库操作使用，恢复该字段及前后端放舱门禁。代码核对：关联柜次时 `ContainerRepository.linkReleasedBooking` 传入订舱预计到港；日历在无实际到港时读柜级预计到港；海外 `ContainerWarehouseArrivalService` 在无人工或计划冻结日期时按到港当地日期加 2 天解析默认到仓，入库计划使用该解析结果，不能把订舱预计到港直接当成计划到仓日期。
+
+恢复版本 Admin #702 / Firstleg #513 均 SUCCESS、容器 healthy，Jenkins Admin 原检出配置已恢复。前端 22 项及后端订舱/船期相关 32 项定向测试通过；真实 TEST 草稿 `OB202610220013` 录入预计到港 `2026-11-15T10:00:00` 后保存到版本 1，服务端读回和页面刷新回显一致。证据 `ui-arrival-restored.png`、`arrival-restored-verification.json` 位于同一证据目录；日历至入库日期链路完成代码核对，本轮未推进真实柜次和入库计划，不据此宣称全流程验收。
+
+该轮经 Admin #700、Firstleg #512 发布，运行容器 healthy；前端 28 项、后端订舱 26 项定向测试及前端类型检查通过。真实 TEST 新增页以默认值保存为 `OB202610220013`，服务端读回条款和委值一致，实值及预计到港未填写；本轮没有再次推进放舱，取消预计到港必填由前后端定向测试覆盖。页面证据 `ui-booking-simplified-new.png`、`ui-booking-simplified-saved.png` 和 `simplified-form-verification.json` 位于同一证据目录。
+
+同日流程断开修复经 TEST #699 发布：刷新已放舱测试单后，第 1～3 步保持通过、连接线连续，第 4 步仍为当前待预览；托运单提示“可重新预览 / 打印”。两份定向测试 24 项通过；截图为同一证据目录的 `ui-workflow-continuous.png`。本次未修改后端或测试业务数据，未重新验收内嵌 PDF 显示。
+
+2026-10-22 用户明确授权 AI 操作 TEST 页面并单独授权结构 SQL 后，已接续同一测试订舱 `OB202610220011` 完成保存、确认放舱、手工补实及两类 PDF 请求的页面核对，委实分离、版本与原因历史正确。发现并修复数字控件过期禁用辅助标记和保存后的输入缓存；两份定向测试 23 项通过，最终版本经 TEST #698 发布并回验：修正件数为 481 后无需刷新，输入显示与服务器版本 5 一致，毛重和体积保持，委值仍为 500。截图及脱敏证据在本机 `C:/Users/BY-OY/.codex/booking-ui-acceptance-20261022/`；两类 PDF 可下载且外部渲染正常，但内置浏览器的内嵌显示为空白，不能记为完整打印显示通过。环境事实以部署主契约“订舱 TEST 结构同步与页面验收”为准。

src/modules/ocean-bookings/api/platformOceanBookings.test.ts

@@ -1,6 +1,7 @@
 import { describe, expect, it, vi } from 'vitest'
 import { createOceanBooking, deleteOceanBookingDraft, downloadOceanBookingDocument, downloadOceanBookingPrint, invalidateOceanBookingDocument, listOceanBookingAgents, listOceanBookingDocuments, listOceanBookingLinkCandidates, listOceanBookings, listWarehouseLogisticsChannels, referenceOceanBookingDocument, releaseOceanBooking, updateOceanBookingActualCargo, updateOceanBookingDraft, uploadOceanBookingDocument } from './platformOceanBookings'
 import { http } from '@/shared/api/http'
+import { updateOceanBookingEstimatedArrival } from './platformOceanBookings'
 
 const detailResponse = (version = 0, status = 'DRAFT') => ({
   oceanBooking: {
@@ -14,6 +15,31 @@ const detailResponse = (version = 0, status = 'DRAFT') => ({
 })
 
 describe('ocean bookings api', () => {
+  it.each([
+    ['宁波', '洛杉矶', 'CNNGB', 'USLAX', '宁波', '洛杉矶'],
+    [null, null, 'CNNGB', 'USLAX', 'CNNGB', 'USLAX'],
+    ['', '   ', 'CNNGB', 'USLAX', 'CNNGB', 'USLAX'],
+    ['宁波', '洛杉矶', null, null, '宁波', '洛杉矶'],
+    [null, '', null, '   ', null, null],
+  ])('列表港口名称 %s / %s 为空时展示已保存代码', async (departurePortName, destinationPortName, departurePortCode, destinationPortCode, pol, pod) => {
+    vi.spyOn(http, 'get').mockResolvedValue({ code: '200', data: {
+      records: [{ ...detailResponse().oceanBooking, departurePortName, destinationPortName, departurePortCode, destinationPortCode }],
+      page: 1, size: 20, total: 1, pages: 1,
+    } })
+    const result = await listOceanBookings({ page: 1, size: 20 })
+    expect(result.records[0]).toMatchObject({ pol, pod, departurePortName, destinationPortName, departurePortCode, destinationPortCode })
+  })
+
+  it('预计到港使用窄命令并规范化详情回显与列表到港字段', async () => {
+    const payload = { expectedVersion: 3, estimatedArrivalAt: '2026-10-25T10:00:00' }
+    const raw = detailResponse(4, 'RELEASED')
+    const put = vi.spyOn(http, 'put').mockResolvedValue({ code: '200', data: { ...raw, oceanBooking: { ...raw.oceanBooking, estimatedArrivalAt: payload.estimatedArrivalAt } } })
+    const saved = await updateOceanBookingEstimatedArrival('123', payload)
+    expect(put).toHaveBeenCalledWith('/platform/v1/ocean-bookings/123/estimated-arrival', payload, expect.objectContaining({ headers: { 'Idempotency-Key': expect.any(String) } }))
+    expect(saved.estimatedArrivalAt).toBe(payload.estimatedArrivalAt)
+    expect(saved.eta).toBe(payload.estimatedArrivalAt)
+    expect(saved.version).toBe(4)
+  })
   it('sends actual cargo only to the versioned supplement endpoint and normalizes decimal responses', async () => {
     const payload = { expectedVersion: 3, actualPackageCount: 480, actualGrossWeightKg: 14000.125, actualVolumeCbm: 65.321, reason: '客服补录' }
     const response = detailResponse(4, 'RELEASED')

src/modules/ocean-bookings/api/platformOceanBookings.ts

@@ -27,8 +27,8 @@ function booking(raw: OceanBookingResource): OceanBookingResource {
     actualPackageCount: raw.actualPackageCount == null ? null : Number(raw.actualPackageCount),
     actualGrossWeightKg: raw.actualGrossWeightKg == null ? null : Number(raw.actualGrossWeightKg),
     actualVolumeCbm: raw.actualVolumeCbm == null ? null : Number(raw.actualVolumeCbm),
-    pol: raw.pol ?? raw.departurePortName ?? null,
-    pod: raw.pod ?? raw.destinationPortName ?? null,
+    pol: raw.departurePortName?.trim() || raw.departurePortCode?.trim() || null,
+    pod: raw.destinationPortName?.trim() || raw.destinationPortCode?.trim() || null,
     carrierName: raw.carrierName ?? raw.shippingCompanyName ?? null,
     bookingAgent: raw.bookingAgent ?? raw.bookingAgentName ?? null,
     etd: raw.etd ?? raw.estimatedSailingAt ?? null,
@@ -98,6 +98,10 @@ export async function updateOceanBookingActualCargo(id: string, payload: OceanBo
   const response = await http.put<ApiEnvelope<OceanBookingDetail>, ApiEnvelope<OceanBookingDetail>>(`${basePath}/${encodeURIComponent(id)}/actual-cargo`, payload, { headers: { 'Idempotency-Key': idempotencyKey() } })
   return detail(unwrapApiResponse(response))
 }
+export async function updateOceanBookingEstimatedArrival(id: string, payload: { expectedVersion: number; estimatedArrivalAt: string }) {
+  const response = await http.put<ApiEnvelope<OceanBookingDetail>, ApiEnvelope<OceanBookingDetail>>(`${basePath}/${encodeURIComponent(id)}/estimated-arrival`, payload, { headers: { 'Idempotency-Key': idempotencyKey() } })
+  return detail(unwrapApiResponse(response))
+}
 export async function deleteOceanBookingDraft(id: string, expectedVersion: number) { await http.delete(`${basePath}/${encodeURIComponent(id)}`, { data: { expectedVersion }, headers: { 'Idempotency-Key': idempotencyKey() } }) }
 export async function releaseOceanBooking(id: string, request: OceanBookingReleaseRequest) { const response = await http.post<ApiEnvelope<OceanBookingDetail>, ApiEnvelope<OceanBookingDetail>>(`${basePath}/${encodeURIComponent(id)}/release`, request, { headers: { 'Idempotency-Key': idempotencyKey() } }); return detail(unwrapApiResponse(response)) }
 const printPaths: Record<OceanBookingPrintType, string> = {

src/modules/ocean-bookings/components/OceanBookingDocumentsPanel.test.ts

@@ -61,7 +61,7 @@ describe('OceanBookingDocumentsPanel contract', () => {
 
   it('makes released booking files permanently read-only and preserves traced errors', () => {
     expect(source).toContain("props.bookingStatus === 'DRAFT' && props.canManage")
-    expect(source).toContain('已放舱 · 永久只读')
+    expect(source).not.toContain('已放舱 · 永久只读')
     expect(source).toContain('manageReason')
     expect(source).toContain('<ApiErrorMeta :details="error" />')
     expect(source).toContain('订舱资料上传失败，请稍后重试')

src/modules/ocean-bookings/components/OceanBookingDocumentsPanel.vue

@@ -111,7 +111,7 @@ async function selectFile(event: Event, type: OceanBookingDocumentType) {
 
 <template>
   <section class="booking-documents workbench-panel is-compact admin-density admin-workbench" aria-label="订舱资料">
-    <div class="booking-documents__heading"><h2>订舱资料<InlineHelp title="订舱资料说明"><p>文件统一归属当前订舱；放舱要求至少一份有效的订舱确认文件或提单文件。</p></InlineHelp></h2><el-tag v-if="bookingStatus === 'RELEASED'" type="info">已放舱 · 永久只读</el-tag></div>
+    <div class="booking-documents__heading"><h2>订舱资料<InlineHelp title="订舱资料说明"><p>文件统一归属当前订舱；放舱要求至少一份有效的订舱确认文件或提单文件。</p></InlineHelp></h2></div>
     <el-alert v-if="bookingStatus === 'DRAFT' && !editable && manageReason" type="warning" :closable="false" show-icon :title="manageReason" />
     <el-alert v-if="error" type="error" :closable="true" show-icon @close="error = null"><template #title>{{ error.message }}</template><ApiErrorMeta :details="error" /></el-alert>
     <div class="booking-document-types">

src/modules/ocean-bookings/pages/OceanBookingDetailView.release.test.ts

@@ -1,8 +1,7 @@
 import { flushPromises, mount } from '@vue/test-utils'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
-import ElementPlus, { ElSelect } from 'element-plus'
+import ElementPlus, { ElDatePicker } from 'element-plus'
 import { ApiResponseError } from '@/shared/api/http'
-import { listPlatformTenants, type PlatformTenantResource } from '@/modules/iam'
 import { listPlatformPartners } from '@/modules/master-data'
 import { listPlatformWarehouses } from '@/modules/warehouses'
 import {
@@ -13,6 +12,7 @@ import {
   releaseOceanBooking,
   updateOceanBookingDraft,
   updateOceanBookingActualCargo,
+  updateOceanBookingEstimatedArrival,
 } from '../api/platformOceanBookings'
 import type { OceanBookingDetail, OceanBookingStatus } from '../types'
 import OceanBookingDetailView from './OceanBookingDetailView.vue'
@@ -28,14 +28,12 @@ vi.mock('vue-router', () => ({
 const deniedPermissions = vi.hoisted(() => new Set<string>())
 vi.mock('@/core/access/accessPreview', () => ({ useAccessPreviewStore: () => ({ can: (permission: string) => !deniedPermissions.has(permission) }) }))
 vi.mock('@/core/workspace-tabs/workspaceTabs', () => ({ useWorkspaceTabsStore: () => ({ removeByIds: vi.fn(), bumpCacheEpoch: vi.fn() }) }))
-vi.mock('@/modules/iam', async importOriginal => ({
-  ...await importOriginal<typeof import('@/modules/iam')>(), listPlatformTenants: vi.fn() }))
 vi.mock('@/modules/master-data', () => ({ listPlatformPartners: vi.fn() }))
 vi.mock('@/modules/warehouses', () => ({ listPlatformWarehouses: vi.fn() }))
 vi.mock('../api/platformOceanBookings', () => ({
   createOceanBooking: vi.fn(), deleteOceanBookingDraft: vi.fn(), getOceanBooking: vi.fn(),
   listOceanBookingAgents: vi.fn(), listWarehouseLogisticsChannels: vi.fn(),
-  releaseOceanBooking: vi.fn(), updateOceanBookingDraft: vi.fn(), updateOceanBookingActualCargo: vi.fn(),
+  releaseOceanBooking: vi.fn(), updateOceanBookingDraft: vi.fn(), updateOceanBookingActualCargo: vi.fn(), updateOceanBookingEstimatedArrival: vi.fn(),
 }))
 
 function booking(status: OceanBookingStatus = 'DRAFT', version = 3, billOfLadingNo = 'BL-001'): OceanBookingDetail {
@@ -68,6 +66,12 @@ function booking(status: OceanBookingStatus = 'DRAFT', version = 3, billOfLading
 }
 
 type ViewModel = {
+  arrivalValue: string | null
+  arrivalDialogOpen: boolean
+  arrivalSaving: boolean
+  arrivalError: { message: string; code?: string } | null
+  openArrivalDialog: () => void
+  saveEstimatedArrival: () => Promise<void>
   form: { data: import('../types').OceanBookingDraftData }
   saveActualCargo: () => Promise<void>
   actualReason: string
@@ -75,8 +79,6 @@ type ViewModel = {
   hasUnsavedActualChanges: boolean
   printDisabledReason: string
   save: () => Promise<void>
-  selectCustomer: (value: unknown) => void
-  canManageDocuments: boolean
   detail: OceanBookingDetail | null
   actionError: { code?: string; requestId?: string; traceId?: string; message: string } | null
   actionSaving: boolean
@@ -90,7 +92,7 @@ async function mountView() {
       stubs: {
         AdminPage: { template: '<main><slot /></main>' },
         DetailPageLayout: { template: '<section><slot name="header" /><slot /></section>' },
-        PageToolbar: { props: ['description'], template: '<header><p class="toolbar-description">{{ description }}</p><slot name="actions" /></header>' },
+        PageToolbar: { props: ['title', 'description'], template: '<header><h1>{{ title }}</h1><p v-if="description" class="toolbar-description">{{ description }}</p><slot name="actions" /></header>' },
         CarrierScheduleQueryPanel: true,
       },
     },
@@ -100,12 +102,68 @@ async function mountView() {
 }
 
 describe('OceanBookingDetailView one-click release', () => {
+  it('放舱后仅单独保存预计到港并立即回显，保留尚未提交的实货量', async () => {
+    vi.mocked(getOceanBooking).mockResolvedValue(booking('RELEASED'))
+    const saved = { ...booking('RELEASED', 4), estimatedArrivalAt: '2026-09-25T08:00:00' }
+    vi.mocked(updateOceanBookingEstimatedArrival).mockResolvedValue(saved)
+    const { wrapper, vm } = await mountView()
+    expect(wrapper.findAll('button').some(button => button.text() === '维护预计到港')).toBe(true)
+    vm.form.data.actualPackageCount = 499
+    vm.actualReason = '尚未提交'
+    vm.openArrivalDialog()
+    vm.arrivalValue = saved.estimatedArrivalAt
+    await vm.saveEstimatedArrival()
+    expect(updateOceanBookingEstimatedArrival).toHaveBeenCalledExactlyOnceWith('123', { expectedVersion: 3, estimatedArrivalAt: saved.estimatedArrivalAt })
+    expect(vm.detail?.estimatedArrivalAt).toBe(saved.estimatedArrivalAt)
+    expect(vm.detail?.version).toBe(4)
+    expect(vm.form.data.actualPackageCount).toBe(499)
+    expect(vm.actualReason).toBe('尚未提交')
+    expect(updateOceanBookingDraft).not.toHaveBeenCalled()
+    const coreForm = wrapper.findAllComponents({ name: 'ElForm' }).find(form => form.classes().includes('booking-groups'))!
+    expect(coreForm.props('disabled')).toBe(true)
+    wrapper.unmount()
+  })
+
+  it('无编辑权限不开放维护入口；版本冲突保留输入并恢复操作', async () => {
+    vi.mocked(getOceanBooking).mockResolvedValue(booking('RELEASED'))
+    deniedPermissions.add('platform:firstleg:ocean-booking:edit')
+    let rendered = await mountView()
+    expect(rendered.wrapper.findAll('button').some(button => button.text() === '维护预计到港')).toBe(false)
+    rendered.vm.openArrivalDialog()
+    await rendered.vm.saveEstimatedArrival()
+    expect(updateOceanBookingEstimatedArrival).not.toHaveBeenCalled()
+    rendered.wrapper.unmount()
+    deniedPermissions.clear()
+    rendered = await mountView()
+    rendered.vm.openArrivalDialog()
+    rendered.vm.arrivalValue = '2026-09-25T08:00:00'
+    vi.mocked(updateOceanBookingEstimatedArrival).mockRejectedValueOnce(new ApiResponseError('版本已变化，请刷新后重试', 'A0409'))
+    await rendered.vm.saveEstimatedArrival()
+    expect(rendered.vm.arrivalDialogOpen).toBe(true)
+    expect(rendered.vm.arrivalValue).toBe('2026-09-25T08:00:00')
+    expect(rendered.vm.arrivalSaving).toBe(false)
+    expect(rendered.vm.arrivalError?.code).toBe('A0409')
+    rendered.wrapper.unmount()
+  })
+
+  it('放舱后预计到港不得清空或早于预计开船', async () => {
+    vi.mocked(getOceanBooking).mockResolvedValue(booking('RELEASED'))
+    const { wrapper, vm } = await mountView()
+    vm.openArrivalDialog()
+    for (const value of [null, '2026-08-01T08:00:00']) {
+      vm.arrivalValue = value
+      await vm.saveEstimatedArrival()
+      expect(vm.arrivalError?.message).toBeTruthy()
+    }
+    expect(updateOceanBookingEstimatedArrival).not.toHaveBeenCalled()
+    wrapper.unmount()
+  })
+
   beforeEach(() => {
     routeState.name = 'ocean-booking-detail'; routeState.params.bookingId = '123'
     vi.clearAllMocks()
     deniedPermissions.clear()
     vi.mocked(getOceanBooking).mockResolvedValue(booking())
-    vi.mocked(listPlatformTenants).mockResolvedValue({ records: [], page: 1, size: 200, total: 0, pages: 0 })
     vi.mocked(listPlatformPartners).mockResolvedValue({ records: [], page: 1, size: 200, total: 0, pages: 0 })
     vi.mocked(listPlatformWarehouses).mockResolvedValue({ records: [], page: 1, size: 200, total: 0, pages: 0 })
     vi.mocked(listWarehouseLogisticsChannels).mockResolvedValue([{ channelCode: 'MATSON_CLX_TRUCK', channelName: '美森正班海卡' }])
@@ -129,25 +187,22 @@ describe('OceanBookingDetailView one-click release', () => {
     wrapper.unmount()
   })
 
-  it('finds a customer outside the initial page and saves its actual ID and name in a new booking', async () => {
+  it('starts new bookings with the agreed declared defaults and no removed inputs', async () => {
     routeState.name = 'ocean-booking-create'; routeState.params.bookingId = 'new'
-    const customer = { id: '9007199254740999', tenantName: '柏悦物流', status: 'ACTIVE' } as PlatformTenantResource
-    vi.mocked(listPlatformTenants).mockImplementation(async query => ({
-      records: query.keyword ? [customer] : [], page: 1, size: 50, total: query.keyword ? 1 : 350, pages: query.keyword ? 1 : 7,
-    }))
-    vi.mocked(createOceanBooking).mockResolvedValue({ ...booking(), customerId: String(customer.id), customerName: customer.tenantName })
+    vi.mocked(createOceanBooking).mockResolvedValue(booking())
     const { wrapper, vm } = await mountView()
-    const selector = wrapper.findAllComponents(ElSelect).find(item => item.props('placeholder') === '单客户可选择，多客户可留空')!
-    expect(selector.props('remote')).toBe(true)
-    selector.vm.$emit('end-reached', 'bottom'); await flushPromises()
-    expect(listPlatformTenants).toHaveBeenLastCalledWith({ page: 2, size: 50, status: 'ACTIVE' })
-    await selector.props('remoteMethod')?.('柏悦'); await flushPromises()
-    expect(listPlatformTenants).toHaveBeenLastCalledWith({ page: 1, size: 50, status: 'ACTIVE', keyword: '柏悦' })
-    selector.vm.$emit('update:modelValue', customer.id); await flushPromises()
-    expect(vm.form.data.customerId).toBe(customer.id)
-    expect(vm.form.data.customerName).toBe('柏悦物流')
+    expect(vm.form.data).toMatchObject({ freightTerm: 'FREIGHT PREPAID', serviceTerm: 'CY-CY', packageUnit: 'CARTONS', declaredPackageCount: 500, declaredGrossWeightKg: 15000, declaredVolumeCbm: 68, actualPackageCount: null, actualGrossWeightKg: null, actualVolumeCbm: null })
+    expect(wrapper.get('[aria-label="预报件数"]').element).toHaveProperty('value', '500')
+    expect(wrapper.get('[aria-label="预报毛重"]').element).toHaveProperty('value', '15000.000')
+    expect(wrapper.get('[aria-label="预报体积"]').element).toHaveProperty('value', '68.000')
+    const labels = wrapper.findAll('.el-form-item__label').map(item => item.text())
+    for (const removed of ['客户（选填）', '包装单位', '备注']) expect(labels).not.toContain(removed)
+    expect(labels).toContain('预计到港')
+    expect(wrapper.find('[aria-label="起运港名称"]').exists()).toBe(false)
+    expect(wrapper.find('[aria-label="目的港名称"]').exists()).toBe(false)
+    expect(wrapper.findAll('.container-table th').map(item => item.text())).toEqual(['操作', '柜型', '数量'])
     await vm.save()
-    expect(createOceanBooking).toHaveBeenCalledWith(expect.objectContaining({ data: expect.objectContaining({ customerId: customer.id, customerName: '柏悦物流' }) }))
+    expect(createOceanBooking).toHaveBeenCalledWith(expect.objectContaining({ data: expect.objectContaining({ declaredPackageCount: 500, declaredGrossWeightKg: 15000, declaredVolumeCbm: 68, actualPackageCount: null }) }))
     wrapper.unmount()
   })
 
@@ -170,8 +225,13 @@ describe('OceanBookingDetailView one-click release', () => {
     wrapper.unmount()
   })
 
-  it('shows the matching fixed logistics group instead of the underlying price-book channel', async () => {
-    const { wrapper } = await mountView()
+  it('keeps warehouse and channel in a collapsed operation section with their saved bindings', async () => {
+    const { wrapper, vm } = await mountView()
+    const header = wrapper.get('.booking-operation-config .el-collapse-item__header')
+    expect(header.attributes('aria-expanded')).toBe('false')
+    await header.trigger('click')
+    expect(header.attributes('aria-expanded')).toBe('true')
+    expect(vm.form.data).toMatchObject({ warehouseId: '8', channelCode: 'MATSON_CLX' })
     expect(wrapper.text()).toContain('美森正班')
     expect(wrapper.text()).not.toContain('美森正班海卡')
     wrapper.unmount()
@@ -192,19 +252,21 @@ describe('OceanBookingDetailView one-click release', () => {
     wrapper.unmount()
   })
 
-  it('shows the route alone in the heading without a single customer and keeps an actual customer name', async () => {
+  it('keeps the booking number without a subtitle for empty and populated route data', async () => {
     const value = booking()
     value.customerId = null; value.customerName = null
     value.oceanBooking.customerId = null; value.oceanBooking.customerName = null
+    value.pol = null; value.pod = null
     vi.mocked(getOceanBooking).mockResolvedValue(value)
     const { wrapper } = await mountView()
-    expect(wrapper.get('.toolbar-description').text()).toBe('上海 → 洛杉矶')
+    expect(wrapper.get('.booking-page-toolbar h1').text()).toBe(value.bookingNo)
+    expect(wrapper.find('.toolbar-description').exists()).toBe(false)
     expect(wrapper.text()).not.toContain('未关联客户')
     wrapper.unmount()
 
     vi.mocked(getOceanBooking).mockResolvedValue(booking())
     const { wrapper: customerWrapper } = await mountView()
-    expect(customerWrapper.get('.toolbar-description').text()).toBe('测试客户 · 上海 → 洛杉矶')
+    expect(customerWrapper.find('.toolbar-description').exists()).toBe(false)
     customerWrapper.unmount()
   })
 
@@ -232,26 +294,67 @@ describe('OceanBookingDetailView one-click release', () => {
     wrapper.unmount()
   })
 
-  it('clears an existing customer before saving and releasing with the returned version', async () => {
-    const saved = booking('DRAFT', 4)
-    saved.customerId = null; saved.customerName = null; saved.oceanBooking.customerId = null; saved.oceanBooking.customerName = null
-    vi.mocked(updateOceanBookingDraft).mockResolvedValue(saved)
-    vi.mocked(releaseOceanBooking).mockResolvedValue({ ...saved, status: 'RELEASED', version: 5 })
+  it('blocks release without estimated arrival while still allowing a partial draft save', async () => {
+    const saved = booking()
+    saved.estimatedArrivalAt = null
+    saved.oceanBooking.estimatedArrivalAt = null
+    vi.mocked(getOceanBooking).mockResolvedValue(saved)
+    vi.mocked(updateOceanBookingDraft).mockResolvedValue({ ...saved, version: 4 })
     const { vm, wrapper } = await mountView()
-    vm.selectCustomer('')
     await vm.submitRelease()
-    expect(updateOceanBookingDraft).toHaveBeenCalledWith('123', expect.objectContaining({ data: expect.objectContaining({ customerId: null, customerName: null }) }))
-    expect(releaseOceanBooking).toHaveBeenCalledWith('123', { expectedVersion: 4 })
+    expect(vm.actionError?.message).toBe('放舱前请填写预计到港时间')
+    expect(releaseOceanBooking).not.toHaveBeenCalled()
+    await vm.save()
+    expect(updateOceanBookingDraft).toHaveBeenCalledWith('123', expect.objectContaining({ data: expect.objectContaining({ estimatedArrivalAt: null }) }))
     wrapper.unmount()
   })
 
-  it('allows documents and release for a saved booking with no single customer', async () => {
+  it('loads and saves estimated arrival from the date input and includes it in release confirmation', async () => {
+    const arrival = '2026-09-25T10:30:00'
+    vi.mocked(updateOceanBookingDraft).mockResolvedValue({ ...booking('DRAFT', 4), estimatedArrivalAt: arrival })
+    const { vm, wrapper } = await mountView()
+    const picker = wrapper.findAllComponents(ElDatePicker).find(item => item.props('placeholder') === '请选择预计到港时间')!
+    expect(picker.props('modelValue')).toBe('2026-09-20T08:00:00')
+    picker.vm.$emit('update:modelValue', arrival)
+    await flushPromises()
+    await vm.save()
+    expect(updateOceanBookingDraft).toHaveBeenCalledWith('123', expect.objectContaining({ data: expect.objectContaining({ estimatedArrivalAt: arrival }) }))
+    await wrapper.findAll('button').find(button => button.text() === '放舱')!.trigger('click')
+    await flushPromises()
+    expect(wrapper.get('.release-summary').text()).toContain(arrival)
+    wrapper.unmount()
+  })
+
+  it('blocks an arrival before the sailing date', async () => {
+    const { vm, wrapper } = await mountView()
+    vm.form.data.estimatedArrivalAt = '2026-08-31T08:00:00'
+    await vm.submitRelease()
+    expect(vm.actionError?.message).toBe('预计到港时间不能早于预计开船时间')
+    expect(releaseOceanBooking).not.toHaveBeenCalled()
+    wrapper.unmount()
+  })
+
+  it('opens operation configuration when release is missing a warehouse', async () => {
+    const saved = booking()
+    saved.warehouseId = null
+    vi.mocked(getOceanBooking).mockResolvedValue(saved)
+    const { vm, wrapper } = await mountView()
+    await vm.submitRelease()
+    await flushPromises()
+    expect(vm.actionError?.message).toBe('放舱前请填写装柜仓库')
+    expect(wrapper.get('.booking-operation-config .el-collapse-item__header').attributes('aria-expanded')).toBe('true')
+    expect(releaseOceanBooking).not.toHaveBeenCalled()
+    wrapper.unmount()
+  })
+
+  it('allows release without documents for a saved booking with no single customer', async () => {
     const empty = booking()
     empty.customerId = null; empty.customerName = null; empty.oceanBooking.customerId = null; empty.oceanBooking.customerName = null
+    empty.documents = []
     vi.mocked(getOceanBooking).mockResolvedValue(empty)
     vi.mocked(releaseOceanBooking).mockResolvedValue({ ...empty, status: 'RELEASED', version: 4 })
     const { vm, wrapper } = await mountView()
-    expect(vm.canManageDocuments).toBe(true)
+    expect(wrapper.text()).not.toContain('订舱资料')
     await vm.submitRelease()
     expect(releaseOceanBooking).toHaveBeenCalledWith('123', { expectedVersion: 3 })
     expect(updateOceanBookingDraft).not.toHaveBeenCalled()
@@ -331,11 +434,19 @@ describe('OceanBookingDetailView one-click release', () => {
     vi.mocked(updateOceanBookingActualCargo).mockResolvedValue({ ...booking('RELEASED', 4), declaredPackageCount: 500, actualPackageCount: 480, actualGrossWeightKg: 14320.125, actualVolumeCbm: 65.321 })
     const { vm, wrapper } = await mountView()
     expect(wrapper.find('input[placeholder="请输入船名"]').attributes('disabled')).toBeDefined()
-    const actualInput = wrapper.find('[aria-label="实际件数"]')
-    expect(actualInput.attributes('disabled')).toBeUndefined()
-    vm.form.data.actualPackageCount = 480
-    vm.form.data.actualGrossWeightKg = 14320.125
-    vm.form.data.actualVolumeCbm = 65.321
+    for (const label of ['实际件数', '实际毛重', '实际体积']) {
+      const actualInput = wrapper.get(`input[aria-label="${label}"]`)
+      expect(actualInput.attributes('disabled')).toBeUndefined()
+      expect(actualInput.attributes('aria-disabled')).toBe('false')
+    }
+    for (const label of ['预报件数', '预报毛重', '预报体积']) {
+      const declaredInput = wrapper.get(`input[aria-label="${label}"]`)
+      expect(declaredInput.attributes('disabled')).toBeDefined()
+      expect(declaredInput.attributes('aria-disabled')).toBe('true')
+    }
+    await wrapper.get('input[aria-label="实际件数"]').setValue('480')
+    await wrapper.get('input[aria-label="实际毛重"]').setValue('14320.125')
+    await wrapper.get('input[aria-label="实际体积"]').setValue('65.321')
     vm.actualReason = ' 实装后补录 '
     await flushPromises()
     expect(vm.printDisabledReason).toContain('请先保存')
@@ -346,6 +457,29 @@ describe('OceanBookingDetailView one-click release', () => {
     expect(vm.actualReason).toBe('')
     expect(vm.hasUnsavedActualChanges).toBe(false)
     expect(vm.form.data.declaredPackageCount).toBe(500)
+    expect((wrapper.get('input[aria-label="实际件数"]').element as HTMLInputElement).value).toBe('480')
+    expect((wrapper.get('input[aria-label="实际毛重"]').element as HTMLInputElement).value).toBe('14320.125')
+    expect((wrapper.get('input[aria-label="实际体积"]').element as HTMLInputElement).value).toBe('65.321')
+    wrapper.unmount()
+  })
+
+  it('shows the saved server values after input and blur without a change event', async () => {
+    vi.mocked(getOceanBooking).mockResolvedValue(booking('RELEASED'))
+    vi.mocked(updateOceanBookingActualCargo).mockResolvedValue({ ...booking('RELEASED', 4), actualPackageCount: 480, actualGrossWeightKg: 14320.125, actualVolumeCbm: 65.321 })
+    const { vm, wrapper } = await mountView()
+    for (const [label, value] of [['实际件数', '480'], ['实际毛重', '14320.125'], ['实际体积', '65.321']] as const) {
+      const input = wrapper.get(`input[aria-label="${label}"]`)
+      const element = input.element as HTMLInputElement
+      element.value = value
+      await input.trigger('input')
+      await input.trigger('blur')
+    }
+    vm.actualReason = '补录'
+    await vm.saveActualCargo()
+    await flushPromises()
+    for (const [label, value] of [['实际件数', '480'], ['实际毛重', '14320.125'], ['实际体积', '65.321']] as const) {
+      expect((wrapper.get(`input[aria-label="${label}"]`).element as HTMLInputElement).value).toBe(value)
+    }
     wrapper.unmount()
   })
 

src/modules/ocean-bookings/pages/OceanBookingDetailView.test.ts

@@ -70,12 +70,11 @@ describe('OceanBookingDetailView draft and release contract', () => {
     expect(source).toContain('if (!saved) return')
     expect(source).toContain("{{ form.data.billOfLadingNo || '—' }}")
     expect(source).not.toContain("{{ detail?.billOfLadingNo || '—' }}")
-    expect(source).toContain('const workflowBusy = computed(() => saving.value || actionSaving.value || actualSaving.value)')
+    expect(source).toContain('const workflowBusy = computed(() => saving.value || actionSaving.value || actualSaving.value || arrivalSaving.value)')
     expect(source).toContain(':disabled="workflowBusy" @click="openReleaseDialog"')
     expect(source).not.toContain('releaseReason')
-    expect(source).toContain('放舱前请上传有效的订舱确认文件或提单文件')
-    expect(source).toContain('OceanBookingDocumentsPanel')
-    expect(source).toContain('@updated="updateDocuments"')
+    expect(source).not.toContain('放舱前请上传有效的订舱确认文件或提单文件')
+    expect(source).not.toContain('OceanBookingDocumentsPanel')
   })
 
   it('freezes the selected carrier standard code into the booking draft', () => {

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

@@ -17,7 +17,6 @@ import AppDialog from '@/shared/components/AppDialog.vue'
 import DetailPageLayout from '@/shared/components/DetailPageLayout.vue'
 import PageToolbar from '@/shared/components/PageToolbar.vue'
 import { CONTAINER_SPECIFICATIONS } from '@/shared/domain/containerSpecifications'
-import { listPlatformTenants, useActiveCustomerOptions } from '@/modules/iam'
 import { listPlatformPartners, type PlatformPartnerResource } from '@/modules/master-data'
 import { listPlatformWarehouses, type PlatformWarehouseResource } from '@/modules/warehouses'
 import { CarrierScheduleQueryPanel } from '@/modules/port-schedules'
@@ -31,6 +30,7 @@ import {
   listWarehouseLogisticsChannels,
   updateOceanBookingDraft,
   updateOceanBookingActualCargo,
+  updateOceanBookingEstimatedArrival,
   type OceanLogisticsChannel,
 } from '../api/platformOceanBookings'
 import type {
@@ -38,7 +38,6 @@ import type {
   OceanBookingAgentOption,
   OceanBookingCarrierCode,
   OceanBookingDraftData,
-  OceanBookingDocument,
   OceanBookingParty,
   OceanBookingSaveRequest,
   OceanBookingStatus,
@@ -49,7 +48,6 @@ import { containerRequirementError, createBlankContainerRequirement, selectConta
 import { shouldClearBookingAgent } from '../bookingAgents'
 import { oceanBookingPrintSignature, oceanBookingWorkflow, type OceanBookingPreviewSignatures } from '../workflow'
 import OceanBookingPrintDialog from '../components/OceanBookingPrintDialog.vue'
-import OceanBookingDocumentsPanel from '../components/OceanBookingDocumentsPanel.vue'
 
 const partyTypes = [
   { value: 'SHIPPER', label: '发货人' },
@@ -57,10 +55,6 @@ const partyTypes = [
   { value: 'NOTIFY_PARTY', label: '通知人' },
 ] as const
 const containerTypeOptions = CONTAINER_SPECIFICATIONS
-const containerKindOptions = [
-  { value: 'FCL', label: '整箱 FCL' },
-  { value: 'LCL', label: '拼箱 LCL' },
-]
 const route = useRoute()
 const router = useRouter()
 const access = useAccessPreviewStore()
@@ -87,9 +81,6 @@ const channelsError = ref('')
 const selectedChannelName = ref('')
 let channelRequestSerial = 0
 let bookingAgentRequestSerial = 0
-const selectableCustomers = computed(() => customers.value.filter((customer) => (
-  customer.status === 'ACTIVE' || String(customer.id) === String(form.data.customerId)
-)))
 const shippingCompanies = computed(() => partners.value.filter((partner) => partner.types.includes('CARRIER')))
 const channelGroups = computed(() => {
   const activeCodes = new Set(channels.value.map((channel) => channel.channelCode))
@@ -103,7 +94,7 @@ function blankParties(): OceanBookingParty[] {
 function blankData(): OceanBookingDraftData {
   return {
     freightTerm: 'FREIGHT PREPAID', serviceTerm: 'CY-CY', packageUnit: 'CARTONS',
-    cargoDescription: '', marksAndNos: '', declaredPackageCount: null, declaredGrossWeightKg: null, declaredVolumeCbm: null,
+    cargoDescription: '', marksAndNos: '', declaredPackageCount: 500, declaredGrossWeightKg: 15000, declaredVolumeCbm: 68,
     actualPackageCount: null, actualGrossWeightKg: null, actualVolumeCbm: null,
     customerId: null, customerName: null, channelCode: '', warehouseId: '', parties: blankParties(),
     billOfLadingNo: '', vesselName: '', voyageNo: '', estimatedSailingAt: null, estimatedArrivalAt: null,
@@ -112,7 +103,6 @@ function blankData(): OceanBookingDraftData {
   }
 }
 const form = reactive<OceanBookingSaveRequest>({ expectedVersion: 0, data: blankData() })
-const { customers, loading: customersLoading, error: customersError, search: loadCustomers, endReached: customerEndReached, retry: retryCustomers } = useActiveCustomerOptions(() => form.data.customerId, listPlatformTenants)
 const savedDraftSignature = ref('')
 const rules: FormRules = {}
 const editable = computed(() => isNew.value || detail.value?.status === 'DRAFT')
@@ -121,13 +111,17 @@ const formWritable = computed(() => canSave.value)
 const canDelete = computed(() => detail.value?.status === 'DRAFT' && access.can('platform:firstleg:ocean-booking:delete'))
 const canRelease = computed(() => detail.value?.status === 'DRAFT' && access.can('platform:firstleg:ocean-booking:release'))
 const canPrint = computed(() => !!detail.value && access.can('platform:firstleg:ocean-booking:list'))
-const canManageDocuments = computed(() => detail.value?.status === 'DRAFT' && access.can('platform:firstleg:ocean-booking:edit'))
-const documentManageReason = computed(() => !access.can('platform:firstleg:ocean-booking:edit') ? '暂无订舱资料维护权限' : '')
 const actualSaving = ref(false)
+const arrivalDialogOpen = ref(false)
+const arrivalSaving = ref(false)
+const arrivalValue = ref<string | null>(null)
+const arrivalError = ref<ApiErrorDetails | null>(null)
+const canMaintainArrival = computed(() => detail.value?.status === 'RELEASED' && access.can('platform:firstleg:ocean-booking:edit'))
 const actualReason = ref('')
 const cargoWritable = computed(() => formWritable.value || (detail.value?.status === 'RELEASED' && access.can('platform:firstleg:ocean-booking:edit')))
-const workflowBusy = computed(() => saving.value || actionSaving.value || actualSaving.value)
+const workflowBusy = computed(() => saving.value || actionSaving.value || actualSaving.value || arrivalSaving.value)
 const releaseDialogOpen = ref(false)
+const operationSections = ref<string[]>([])
 const printOpen = ref(false)
 const printType = ref<OceanBookingPrintType>('SHIPPING_INSTRUCTION')
 const previewSignatures = ref<OceanBookingPreviewSignatures>({})
@@ -136,15 +130,14 @@ function statusLabel(status: OceanBookingStatus | string | null | undefined) {
   return oceanBookingStatusLabel(status)
 }
 function historyActionLabel(action: string) {
-  const labels: Record<string, string> = { CREATE: '创建草稿', UPDATE_DRAFT: '编辑草稿', RELEASE: '确认放舱', UPDATE_ACTUAL_CARGO: '实货量补录/修正', UPLOAD_DOCUMENT: '上传文件', ATTACH_DOCUMENT: '关联文件', INVALIDATE_DOCUMENT: '作废文件' }
+  const labels: Record<string, string> = { CREATE: '创建草稿', UPDATE_DRAFT: '编辑草稿', RELEASE: '确认放舱', UPDATE_ESTIMATED_ARRIVAL: '维护预计到港', UPDATE_ACTUAL_CARGO: '实货量补录/修正', UPLOAD_DOCUMENT: '上传文件', ATTACH_DOCUMENT: '关联文件', INVALIDATE_DOCUMENT: '作废文件' }
   return labels[action] || '资料维护'
 }
 async function loadOptions() {
   optionsLoading.value = true
   optionsError.value = ''
   try {
-    const [, partnerResult, warehouseResult] = await Promise.all([
-      loadCustomers(),
+    const [partnerResult, warehouseResult] = await Promise.all([
       listPlatformPartners({ page: 1, size: 200, status: 'ACTIVE' }),
       listPlatformWarehouses({ page: 1, size: 200, warehouseType: 'DOMESTIC', status: 'ACTIVE' }),
     ])
@@ -161,12 +154,6 @@ async function loadOptions() {
     optionsLoading.value = false
   }
 }
-function selectCustomer(value: unknown) {
-  const customerId = value == null || value === '' ? null : String(value)
-  form.data.customerId = customerId
-  const customer = customerId == null ? null : customers.value.find((item) => String(item.id) === customerId)
-  form.data.customerName = customer?.tenantName || null
-}
 function draftPayload(): OceanBookingDraftData {
   const customerId = form.data.customerId || null
   return {
@@ -200,6 +187,35 @@ function openPrint(type: OceanBookingPrintType) {
   printType.value = type
   printOpen.value = true
 }
+function openArrivalDialog() {
+  if (!canMaintainArrival.value || workflowBusy.value) return
+  arrivalValue.value = detail.value?.estimatedArrivalAt || null
+  arrivalError.value = null
+  arrivalDialogOpen.value = true
+}
+async function saveEstimatedArrival() {
+  const current = detail.value
+  if (!current || !canMaintainArrival.value || workflowBusy.value) return
+  if (!arrivalValue.value || (current.estimatedSailingAt && arrivalValue.value < current.estimatedSailingAt)) {
+    arrivalError.value = { message: !arrivalValue.value ? '请选择预计到港时间' : '预计到港时间不能早于预计开船时间' }
+    return
+  }
+  arrivalSaving.value = true
+  arrivalError.value = null
+  try {
+    const saved = await updateOceanBookingEstimatedArrival(current.id, { expectedVersion: current.version, estimatedArrivalAt: arrivalValue.value })
+    // 单独保存预计到港不丢弃客服尚未提交的实际货量。
+    const pendingCargo = { actualPackageCount: form.data.actualPackageCount, actualGrossWeightKg: form.data.actualGrossWeightKg, actualVolumeCbm: form.data.actualVolumeCbm }
+    const pendingReason = actualReason.value
+    applyDetail(saved)
+    Object.assign(form.data, pendingCargo)
+    actualReason.value = pendingReason
+    workspace.bumpCacheEpoch('ocean-bookings')
+    arrivalDialogOpen.value = false
+    ElMessage.success('预计到港已保存')
+  } catch (cause) { arrivalError.value = getApiErrorDetails(cause, '预计到港保存失败') }
+  finally { arrivalSaving.value = false }
+}
 async function saveActualCargo() {
   if (detail.value?.status !== 'RELEASED' || !cargoWritable.value || workflowBusy.value) return
   const validationError = cargoValidationError()
@@ -393,19 +409,14 @@ function releaseValidationError() {
     [form.data.shippingCompanyId, '船公司'], [form.data.bookingAgentId, '订舱代理'],
   ]
   const missing = requiredFields.find(([value]) => !String(value || '').trim())
-  if (missing) return `放舱前请填写${missing[1]}`
-  if (form.data.estimatedArrivalAt! < form.data.estimatedSailingAt!) return '预计到港时间不能早于预计开船时间'
+  if (missing) {
+    if (missing[1] === '装柜仓库' || missing[1] === '物流渠道') operationSections.value = ['operation']
+    return `放舱前请填写${missing[1]}`
+  }
+  if (form.data.estimatedArrivalAt && form.data.estimatedSailingAt && form.data.estimatedArrivalAt < form.data.estimatedSailingAt) return '预计到港时间不能早于预计开船时间'
   if (form.data.parties.some((party) => !party.partyName.trim())) return '放舱前请填写发货人、收货人和通知人名称'
-  if (!detail.value?.documents.some((document) => document.valid && ['BOOKING_CONFIRMATION', 'BILL_OF_LADING'].includes(document.documentType))) return '放舱前请上传有效的订舱确认文件或提单文件'
   return containerRequirementError(form.data.containerRequirements)
 }
-function updateDocuments(documents: OceanBookingDocument[], bookingVersion: number) {
-  if (!detail.value) return
-  detail.value.documents = documents
-  detail.value.version = bookingVersion
-  detail.value.oceanBooking.version = bookingVersion
-  form.expectedVersion = bookingVersion
-}
 async function submitRelease() {
   if (!detail.value || workflowBusy.value) return
   actionSaving.value = true
@@ -457,12 +468,13 @@ onMounted(() => { void load(); void loadOptions() })
         <div class="detail-heading">
           <el-button link class="density-back" @click="router.push('/ocean-bookings')"><ArrowLeft :size="16" />返回列表</el-button>
           <span class="booking-brand" aria-hidden="true"><Ship :size="22" /></span>
-          <PageToolbar class="booking-page-toolbar" as="section" :title="detail?.bookingNo || '订舱信息管理'" :description="detail ? `${detail.customerName ? `${detail.customerName} · ` : ''}${detail.pol || '—'} → ${detail.pod || '—'}` : '出口订舱作业'">
+          <PageToolbar class="booking-page-toolbar" as="section" :title="detail?.bookingNo || '订舱信息管理'">
             <template #actions>
               <div class="actions booking-page-actions">
                 <StatusBadge v-if="detail" :status="statusLabel(detail.status)" />
                 <el-button v-if="canDelete" type="danger" plain :loading="actionSaving" :disabled="workflowBusy" @click="removeDraft"><Trash2 :size="16" />删除草稿</el-button>
                 <el-button v-if="canSave" plain :loading="saving" :disabled="workflowBusy" @click="save"><Save :size="16" />保存草稿</el-button>
+                <el-button v-if="canMaintainArrival" plain :disabled="workflowBusy" @click="openArrivalDialog">维护预计到港</el-button>
               </div>
             </template>
           </PageToolbar>
@@ -492,16 +504,13 @@ onMounted(() => { void load(); void loadOptions() })
             <el-form-item label="订舱号"><el-input :model-value="detail?.bookingNo || '保存后生成'" disabled /></el-form-item>
             <el-form-item label="船公司"><el-select :model-value="form.data.shippingCompanyId" filterable clearable placeholder="请选择船公司" :loading="optionsLoading" style="width:100%" @update:model-value="selectShippingCompany(String($event || ''))"><el-option v-if="form.data.shippingCompanyId && !shippingCompanies.some((partner) => String(partner.id) === String(form.data.shippingCompanyId))" :label="form.data.shippingCompanyName || '船公司名称缺失'" :value="String(form.data.shippingCompanyId)" /><el-option v-for="partner in shippingCompanies" :key="String(partner.id)" :label="partner.partnerName" :value="String(partner.id)" /></el-select></el-form-item>
             <el-form-item label="订舱代理"><el-select :model-value="form.data.bookingAgentId" filterable clearable :disabled="!editable || !form.data.carrierCode || bookingAgentsLoading || !!bookingAgentsError" :placeholder="form.data.carrierCode ? '请选择订舱代理' : '请先选择船公司'" :loading="bookingAgentsLoading" no-data-text="当前船公司暂无可用订舱代理" style="width:100%" @update:model-value="selectBookingAgent(String($event || ''))"><el-option v-if="!editable && form.data.bookingAgentId && !bookingAgents.some((supplier) => supplier.supplierId === String(form.data.bookingAgentId))" :label="form.data.bookingAgentName || '订舱代理名称缺失'" :value="String(form.data.bookingAgentId)" /><el-option v-for="supplier in bookingAgents" :key="supplier.supplierId" :label="supplier.name" :value="supplier.supplierId" /></el-select><div v-if="bookingAgentsError" class="field-error"><ApiErrorMeta :details="bookingAgentsError" /><el-button link type="primary" :loading="bookingAgentsLoading" @click="form.data.carrierCode && loadBookingAgents(form.data.carrierCode)">重新加载</el-button></div></el-form-item>
-            <el-form-item label="客户（选填）"><el-select :model-value="form.data.customerId" filterable clearable placeholder="单客户可选择，多客户可留空" no-data-text="暂无可选客户" :loading="customersLoading" remote :remote-method="loadCustomers" @end-reached="customerEndReached" style="width:100%" @update:model-value="selectCustomer"><el-option v-if="form.data.customerId && !selectableCustomers.some((customer) => String(customer.id) === String(form.data.customerId))" :label="form.data.customerName || '客户名称缺失'" :value="String(form.data.customerId)" /><el-option v-for="customer in selectableCustomers" :key="String(customer.id)" :label="customer.tenantName" :value="String(customer.id)" /></el-select><LoadErrorState v-if="customersError" title="客户选项加载失败" :message="customersError.message" :loading="customersLoading" compact @retry="retryCustomers"><template #details><ApiErrorMeta :details="customersError" /></template></LoadErrorState></el-form-item>
-            <el-form-item label="装柜仓库" prop="warehouseId"><el-select :model-value="form.data.warehouseId" filterable placeholder="请选择装柜仓库" :loading="optionsLoading" style="width:100%" @update:model-value="selectWarehouse"><el-option v-for="warehouse in warehouses" :key="String(warehouse.id)" :label="warehouse.warehouseName" :value="String(warehouse.id)" /></el-select></el-form-item>
-            <el-form-item label="物流渠道" prop="channelCode"><el-select :model-value="form.data.channelCode" filterable :disabled="!formWritable || !form.data.warehouseId || channelsLoading || !!channelsError || channelUnavailable" :loading="channelsLoading" :placeholder="form.data.warehouseId ? '请选择物流渠道' : '请先选择装柜仓库'" no-data-text="该仓库暂无有效物流渠道" style="width:100%" @update:model-value="selectChannel(String($event || ''))"><el-option v-if="form.data.channelCode && !channelGroups.some((channel) => channel.code === form.data.channelCode)" :label="selectedChannelName || form.data.channelCode" :value="form.data.channelCode" /><el-option v-for="channel in channelGroups" :key="channel.code" :label="channel.name" :value="channel.code" /></el-select><div v-if="channelsError" class="field-error"><span>{{ channelsError }}</span><el-button link type="primary" :loading="channelsLoading" @click="form.data.warehouseId && loadChannels(form.data.warehouseId)">重新加载</el-button></div><div v-else-if="channelUnavailable" class="field-hint">该仓库暂无有效物流渠道，请更换仓库或联系管理员。</div></el-form-item>
             </div>
           </section>
           <section class="booking-group" aria-label="航线船期">
             <h3 class="booking-group__title"><span>港口航线</span></h3>
             <div class="booking-group__body booking-group__body--fields">
-              <el-form-item label="起运港"><div class="booking-port-fields"><el-input v-model="form.data.departurePortCode" placeholder="港代码" aria-label="起运港代码" /><el-input v-model="form.data.departurePortName" placeholder="港口名称" aria-label="起运港名称" /></div></el-form-item>
-              <el-form-item label="目的港"><div class="booking-port-fields"><el-input v-model="form.data.destinationPortCode" placeholder="港代码" aria-label="目的港代码" /><el-input v-model="form.data.destinationPortName" placeholder="港口名称" aria-label="目的港名称" /></div></el-form-item>
+              <el-form-item label="起运港"><el-input v-model="form.data.departurePortCode" placeholder="港代码" aria-label="起运港代码" /></el-form-item>
+              <el-form-item label="目的港"><el-input v-model="form.data.destinationPortCode" placeholder="港代码" aria-label="目的港代码" /></el-form-item>
             <el-form-item label="预计开船" prop="estimatedSailingAt"><el-date-picker v-model="form.data.estimatedSailingAt" type="datetime" value-format="YYYY-MM-DDTHH:mm:ss" placeholder="请选择预计开船时间" style="width:100%" /></el-form-item>
             <el-form-item label="预计到港" prop="estimatedArrivalAt"><el-date-picker v-model="form.data.estimatedArrivalAt" type="datetime" value-format="YYYY-MM-DDTHH:mm:ss" placeholder="请选择预计到港时间" style="width:100%" /></el-form-item>
             <el-form-item class="booking-field--wide" label="交货地点"><el-input v-model="form.data.placeOfDelivery" placeholder="请输入最终交货地点" /></el-form-item>
@@ -514,36 +523,36 @@ onMounted(() => { void load(); void loadOptions() })
             <h3 class="booking-group__title"><span>货物信息</span></h3>
             <el-form label-position="top" class="density-form booking-group__body">
               <div class="cargo-metrics" role="group" aria-label="货物预报与实际数量">
+                <!-- 数字组件仅挂载时写入禁用标记，且可能保留输入缓存；资格切换及实值保存成功后按权威版本重建。 -->
                 <div class="cargo-metric">
                   <span class="cargo-metric__label">件数（委 / 实）</span>
                   <div class="cargo-metric__inputs">
-                    <el-input-number v-model="form.data.declaredPackageCount" :disabled="!formWritable" :min="1" :max="999999999" :precision="0" :controls="false" placeholder="预报量" aria-label="预报件数" />
+                    <el-input-number :key="'declared-count-' + formWritable" v-model="form.data.declaredPackageCount" :disabled="!formWritable" :min="1" :max="999999999" :precision="0" :controls="false" placeholder="预报量" aria-label="预报件数" />
                     <span class="cargo-metric__separator" aria-hidden="true">/</span>
-                    <el-input-number v-model="form.data.actualPackageCount" :disabled="!cargoWritable" :min="1" :max="999999999" :precision="0" :controls="false" placeholder="待录实值" aria-label="实际件数" />
+                    <el-input-number :key="'actual-count-' + cargoWritable + '-' + (detail?.version ?? 'new')" v-model="form.data.actualPackageCount" :disabled="!cargoWritable" :min="1" :max="999999999" :precision="0" :controls="false" placeholder="待录实值" aria-label="实际件数" />
                     <span class="cargo-metric__unit">{{ form.data.packageUnit || '—' }}</span>
                   </div>
                 </div>
                 <div class="cargo-metric">
                   <span class="cargo-metric__label">毛重（委 / 实）</span>
                   <div class="cargo-metric__inputs">
-                    <el-input-number v-model="form.data.declaredGrossWeightKg" :disabled="!formWritable" :min="0.001" :max="999999999999.999" :precision="3" :controls="false" placeholder="预报量" aria-label="预报毛重" />
+                    <el-input-number :key="'declared-weight-' + formWritable" v-model="form.data.declaredGrossWeightKg" :disabled="!formWritable" :min="0.001" :max="999999999999.999" :precision="3" :controls="false" placeholder="预报量" aria-label="预报毛重" />
                     <span class="cargo-metric__separator" aria-hidden="true">/</span>
-                    <el-input-number v-model="form.data.actualGrossWeightKg" :disabled="!cargoWritable" :min="0.001" :max="999999999999.999" :precision="3" :controls="false" placeholder="待录实值" aria-label="实际毛重" />
+                    <el-input-number :key="'actual-weight-' + cargoWritable + '-' + (detail?.version ?? 'new')" v-model="form.data.actualGrossWeightKg" :disabled="!cargoWritable" :min="0.001" :max="999999999999.999" :precision="3" :controls="false" placeholder="待录实值" aria-label="实际毛重" />
                     <span class="cargo-metric__unit">KGS</span>
                   </div>
                 </div>
                 <div class="cargo-metric">
                   <span class="cargo-metric__label">体积（委 / 实）</span>
                   <div class="cargo-metric__inputs">
-                    <el-input-number v-model="form.data.declaredVolumeCbm" :disabled="!formWritable" :min="0.001" :max="999999999999.999" :precision="3" :controls="false" placeholder="预报量" aria-label="预报体积" />
+                    <el-input-number :key="'declared-volume-' + formWritable" v-model="form.data.declaredVolumeCbm" :disabled="!formWritable" :min="0.001" :max="999999999999.999" :precision="3" :controls="false" placeholder="预报量" aria-label="预报体积" />
                     <span class="cargo-metric__separator" aria-hidden="true">/</span>
-                    <el-input-number v-model="form.data.actualVolumeCbm" :disabled="!cargoWritable" :min="0.001" :max="999999999999.999" :precision="3" :controls="false" placeholder="待录实值" aria-label="实际体积" />
+                    <el-input-number :key="'actual-volume-' + cargoWritable + '-' + (detail?.version ?? 'new')" v-model="form.data.actualVolumeCbm" :disabled="!cargoWritable" :min="0.001" :max="999999999999.999" :precision="3" :controls="false" placeholder="待录实值" aria-label="实际体积" />
                     <span class="cargo-metric__unit">CBM</span>
                   </div>
                 </div>
               </div>
               <div class="booking-group__body--fields">
-                <el-form-item label="包装单位"><el-select v-model="form.data.packageUnit" :disabled="!formWritable" placeholder="请选择包装单位"><el-option label="箱 CARTONS" value="CARTONS" /><el-option label="件 PCS" value="PCS" /><el-option label="托 PALLETS" value="PALLETS" /></el-select></el-form-item>
                 <el-form-item label="唛头和号码"><el-input v-model="form.data.marksAndNos" :disabled="!formWritable" maxlength="1000" /></el-form-item>
                 <el-form-item class="booking-field--wide" label="品名及托运要求"><el-input v-model="form.data.cargoDescription" :disabled="!formWritable" type="textarea" :rows="2" maxlength="1000" placeholder="填写实际品名及免用箱等托运要求" /></el-form-item>
               </div>
@@ -571,10 +580,10 @@ onMounted(() => { void load(); void loadOptions() })
 
         <el-form :model="form.data" label-position="top" :disabled="!formWritable" class="density-form booking-requirements">
           <section class="booking-group" aria-label="柜型需求">
-            <h3 class="booking-group__title"><span>柜型需求与备注</span></h3><div class="booking-group__body">
+            <h3 class="booking-group__title"><span>柜型需求</span></h3><div class="booking-group__body">
             <div class="container-table-wrap" aria-label="柜型需求">
               <div class="workbench-evidence"><table class="container-table density-table">
-                <thead><tr><th scope="col">操作</th><th scope="col">柜型</th><th scope="col">箱种</th><th scope="col">数量</th><th scope="col">容量</th><th scope="col">限重</th><th v-if="detail?.status === 'RELEASED'" scope="col">剩余可关联</th></tr></thead>
+                <thead><tr><th scope="col">操作</th><th scope="col">柜型</th><th scope="col">数量</th><th v-if="detail?.status === 'RELEASED'" scope="col">剩余可关联</th></tr></thead>
                 <tbody>
                   <tr v-for="(requirement, index) in form.data.containerRequirements" :key="requirement.requirementId || index">
                     <td class="container-table__action">
@@ -584,20 +593,24 @@ onMounted(() => { void load(); void loadOptions() })
                       <span v-else aria-hidden="true">—</span>
                     </td>
                     <td><el-select :model-value="requirement.containerType" :disabled="!formWritable" placeholder="请选择柜型" @update:model-value="selectContainerRequirementType(requirement, String($event || ''))"><el-option v-for="item in containerTypeOptions" :key="item.type" :label="item.type" :value="item.type" /></el-select></td>
-                    <td><el-select v-model="requirement.containerKind" :disabled="!formWritable" placeholder="请选择箱种"><el-option v-for="item in containerKindOptions" :key="item.value" :label="item.label" :value="item.value" /></el-select></td>
                     <td><el-input-number v-model="requirement.quantity" :disabled="!formWritable" :min="1" :max="99" controls-position="right" placeholder="请输入柜量" /></td>
-                    <td class="container-table__specification"><span>{{ requirement.capacityCbm }} m³</span></td>
-                    <td class="container-table__specification"><span>{{ requirement.maxWeightKg }} kg</span></td>
                     <td v-if="detail?.status === 'RELEASED'"><span>{{ requirement.remainingQuantity ?? requirement.quantity }}</span></td>
                   </tr>
                 </tbody>
               </table></div>
             </div>
             <div v-if="formWritable" class="container-actions"><el-button class="add-container density-action" size="small" :disabled="form.data.containerRequirements.length >= 20" @click="addRequirement">新增柜型需求</el-button><span>{{ form.data.containerRequirements.length }} / 20 项</span></div>
-            <el-form-item label="备注"><el-input v-model="form.data.remark" type="textarea" :rows="3" /></el-form-item>
             </div>
           </section>
         </el-form>
+        <el-collapse v-model="operationSections" class="booking-operation-config">
+          <el-collapse-item title="作业配置" name="operation">
+            <el-form :model="form.data" label-position="top" :disabled="!formWritable" class="density-form booking-group__body--fields">
+            <el-form-item label="装柜仓库" prop="warehouseId"><el-select :model-value="form.data.warehouseId" filterable placeholder="请选择装柜仓库" :loading="optionsLoading" style="width:100%" @update:model-value="selectWarehouse"><el-option v-for="warehouse in warehouses" :key="String(warehouse.id)" :label="warehouse.warehouseName" :value="String(warehouse.id)" /></el-select></el-form-item>
+            <el-form-item label="物流渠道" prop="channelCode"><el-select :model-value="form.data.channelCode" filterable :disabled="!formWritable || !form.data.warehouseId || channelsLoading || !!channelsError || channelUnavailable" :loading="channelsLoading" :placeholder="form.data.warehouseId ? '请选择物流渠道' : '请先选择装柜仓库'" no-data-text="该仓库暂无有效物流渠道" style="width:100%" @update:model-value="selectChannel(String($event || ''))"><el-option v-if="form.data.channelCode && !channelGroups.some((channel) => channel.code === form.data.channelCode)" :label="selectedChannelName || form.data.channelCode" :value="form.data.channelCode" /><el-option v-for="channel in channelGroups" :key="channel.code" :label="channel.name" :value="channel.code" /></el-select><div v-if="channelsError" class="field-error"><span>{{ channelsError }}</span><el-button link type="primary" :loading="channelsLoading" @click="form.data.warehouseId && loadChannels(form.data.warehouseId)">重新加载</el-button></div><div v-else-if="channelUnavailable" class="field-hint">该仓库暂无有效物流渠道，请更换仓库或联系管理员。</div></el-form-item>
+            </el-form>
+          </el-collapse-item>
+        </el-collapse>
         <footer class="booking-section__footer">
         <el-tooltip :content="printDisabledReason || '按已保存预报货量打印托运单'" placement="top"><span><el-button type="primary" :disabled="!!printDisabledReason || workflowBusy" @click="openPrint('SHIPPING_INSTRUCTION')"><Printer :size="16" />打印托运单</el-button></span></el-tooltip>
         </footer>
@@ -615,7 +628,6 @@ onMounted(() => { void load(); void loadOptions() })
         </footer>
       </section>
 
-      <OceanBookingDocumentsPanel v-if="detail" :booking-id="detail.id" :booking-no="detail.bookingNo" :booking-version="detail.version" :booking-status="detail.status" :documents="detail.documents" :can-manage="canManageDocuments" :manage-reason="documentManageReason" @updated="updateDocuments" />
 
       <div v-if="detail" class="workbench-panel is-compact"><CarrierScheduleQueryPanel dense :ocean-booking-id="detail.id" /></div>
 
@@ -625,6 +637,10 @@ onMounted(() => { void load(); void loadOptions() })
       </section>
       </template>
     </DetailPageLayout>
+    <AppDialog v-if="detail?.status === 'RELEASED'" v-model="arrivalDialogOpen" class="admin-density-dialog admin-workbench is-dialog" :title="bookingDialogTitle('维护预计到港')" width="560px" :confirm-loading="arrivalSaving" :confirm-disabled="!canMaintainArrival" confirm-text="保存" @confirm="saveEstimatedArrival">
+      <el-form class="density-form" label-position="top"><el-form-item label="预计到港" required><el-date-picker v-model="arrivalValue" type="datetime" value-format="YYYY-MM-DDTHH:mm:ss" placeholder="请选择预计到港时间" style="width:100%" /></el-form-item></el-form>
+      <LoadErrorState v-if="arrivalError" compact title="预计到港保存失败" :message="arrivalError.message" :show-retry="false"><template #details><ApiErrorMeta :details="arrivalError" /></template></LoadErrorState>
+    </AppDialog>
     <OceanBookingPrintDialog v-if="detail" v-model="printOpen" :booking-id="detail.id" :booking-no="detail.bookingNo" :allowed="canPrint" :initial-type="printType" @previewed="onPrintPreviewed" />
 
     <AppDialog class="admin-density-dialog admin-workbench is-dialog" v-model="releaseDialogOpen" :title="bookingDialogTitle('确认放舱')" width="min(560px, 94vw)" :confirm-loading="actionSaving" :confirm-disabled="workflowBusy" confirm-text="确认放舱" cancel-text="取消" @confirm="submitRelease">
@@ -666,7 +682,6 @@ onMounted(() => { void load(); void loadOptions() })
 }
 .booking-page-toolbar { min-width: 0; flex: 1; }
 .booking-page-toolbar :deep(h1) { font-size: var(--admin-font-title); }
-.booking-page-toolbar :deep(.page-toolbar__description) { margin-top: var(--admin-space-1); font-size: var(--admin-font-caption); color: var(--workbench-muted); }
 .booking-page-actions { align-items: center; }
 .actions { display: flex; flex-wrap: wrap; gap: var(--admin-space-3); }
 .booking-workflow {
@@ -758,7 +773,6 @@ onMounted(() => { void load(); void loadOptions() })
 .booking-group__title::after { flex: 1; height: 1px; background: var(--workbench-border); content: ''; }
 .booking-group__body--fields { display: grid; grid-template-columns: repeat(2, minmax(0, 1fr)); column-gap: var(--admin-space-5); row-gap: var(--admin-space-3); }
 .booking-field--wide { grid-column: 1 / -1; }
-.booking-port-fields { display: grid; grid-template-columns: minmax(76px, .65fr) minmax(0, 1fr); gap: var(--admin-space-2); width: 100%; }
 .booking-core__main > .booking-group { margin-top: var(--admin-space-6); }
 .booking-parties { padding-left: var(--admin-space-7); border-left: 1px solid var(--workbench-border); }
 .party-grid { display: grid; grid-template-columns: repeat(3, minmax(0, 1fr)); gap: var(--admin-space-4); align-items: start; }
@@ -798,17 +812,16 @@ onMounted(() => { void load(); void loadOptions() })
 .cargo-metric__separator { color: var(--workbench-muted); text-align: center; }
 .cargo-metric__unit { color: var(--workbench-muted); font-size: var(--admin-font-caption); }
 .cargo-metric__inputs :deep(.el-input__inner) { text-align: left; }
+.booking-operation-config { margin-top: var(--admin-space-4); }
 .booking-requirements { margin-top: var(--admin-space-6); }
 .container-table-wrap { max-width: 100%; overflow-x: auto; margin-bottom: var(--admin-space-4); }
-.container-table { width: 100%; min-width: 780px; table-layout: fixed; }
+.container-table { width: 100%; min-width: 420px; table-layout: fixed; }
 .container-table th:first-child, .container-table td:first-child { width: 80px; }
 .container-table th:nth-child(2), .container-table td:nth-child(2) { width: 180px; }
 .container-table th:nth-child(3), .container-table td:nth-child(3) { width: 90px; }
 .container-table th:nth-child(4), .container-table td:nth-child(4) { width: 110px; }
-.container-table th:nth-child(5), .container-table td:nth-child(5), .container-table th:nth-child(6), .container-table td:nth-child(6) { width: 100px; }
 .container-table td :deep(.el-select), .container-table td :deep(.el-input) { width: 100%; min-width: 0; }
 .container-table__action { text-align: center !important; }
-.container-table__specification { color: var(--workbench-muted); white-space: nowrap; }
 .container-actions { display: flex; align-items: center; gap: var(--admin-space-4); margin-bottom: var(--admin-space-5); color: var(--workbench-muted); font-size: var(--admin-font-caption); }
 .add-container { margin: 0; }
 .booking-section__footer { display: flex; align-items: center; justify-content: flex-end; flex-wrap: wrap; gap: var(--admin-space-3); margin-top: var(--admin-space-6); padding-top: var(--admin-space-5); border-top: 1px dashed var(--workbench-border); }

src/modules/ocean-bookings/workflow.test.ts

@@ -45,6 +45,8 @@ describe('ocean booking workflow milestones', () => {
     const saved = detail()
     saved.status = 'RELEASED'
     let steps = oceanBookingWorkflow(saved, false, false, {})
+    expect(steps.map(step => step.state)).toEqual(['complete', 'complete', 'complete', 'current'])
+    expect(steps[1]).toMatchObject({ state: 'complete', status: '可重新预览 / 打印' })
     expect(steps[2]).toMatchObject({ state: 'complete', status: '已放舱' })
     expect(steps[3]).toMatchObject({ state: 'current', status: '待补齐实值' })
     saved.actualPackageCount = 480
@@ -72,6 +74,14 @@ describe('ocean booking workflow milestones', () => {
     expect(steps[3]).toMatchObject({ state: 'current', status: '可预览 / 打印' })
     saved.declaredPackageCount = 510
     steps = oceanBookingWorkflow(saved, false, false, previews)
-    expect(steps[1]?.state).toBe('pending')
+    expect(steps[1]).toMatchObject({ state: 'complete', status: '可重新预览 / 打印' })
+  })
+
+  it('requires a fresh preview when draft print data changes before release', () => {
+    const saved = detail()
+    const previews = { SHIPPING_INSTRUCTION: oceanBookingPrintSignature(saved, 'SHIPPING_INSTRUCTION') }
+    saved.declaredPackageCount = 510
+    expect(oceanBookingWorkflow(saved, false, false, previews).map(step => step.state))
+      .toEqual(['complete', 'current', 'pending', 'pending'])
   })
 })

src/modules/ocean-bookings/workflow.ts

@@ -36,6 +36,9 @@ export function oceanBookingWorkflow(
     .every(value => value != null && Number(value) > 0))
   const previewed = (type: OceanBookingPrintType) => Boolean(detail && previews[type] === oceanBookingPrintSignature(detail, type))
   const instructionPreviewed = saved && previewed('SHIPPING_INSTRUCTION')
+  // 已放舱代表已进入后续作业；刷新清除预览标记时，不让先前阶段倒退。
+  // 阶段通过不代表有打印记录，仍用状态文案区分本次是否预览。
+  const instructionPassed = released || instructionPreviewed
   const confirmationPreviewed = saved && released && actualComplete && !actualDirty && previewed('BILL_OF_LADING_CONFIRMATION')
   const current = !saved ? 0 : !released ? instructionPreviewed ? 2 : 1 : confirmationPreviewed ? -1 : 3
   const step = (index: number, label: string, complete: boolean, status: string): OceanBookingWorkflowStep => ({
@@ -43,7 +46,7 @@ export function oceanBookingWorkflow(
   })
   return [
     step(0, '填写并保存订舱信息', saved, saved ? '已保存' : detail ? '修改待保存' : '待填写并保存'),
-    step(1, '托运单预览 / 打印', instructionPreviewed, instructionPreviewed ? '已预览' : saved ? '可预览 / 打印' : '待保存资料'),
+    step(1, '托运单预览 / 打印', instructionPassed, instructionPreviewed ? '已预览' : released ? '可重新预览 / 打印' : saved ? '可预览 / 打印' : '待保存资料'),
     step(2, '补齐资料并确认放舱', released, released ? '已放舱' : saved ? '待确认放舱' : '待补齐资料'),
     step(3, '补实并预览提单确认件', confirmationPreviewed, !released ? '待放舱' : actualDirty ? '实值待保存' : !actualComplete ? '待补齐实值' : confirmationPreviewed ? '已预览' : '可预览 / 打印'),
   ]

src/modules/overseas-business/components/ProcurementNodeActions.test.ts

@@ -9,7 +9,6 @@ import AppDialog from '@/shared/components/AppDialog.vue'
 import ProcurementNodeActions from './ProcurementNodeActions.vue'
 import { listOverseasPurchaseWarehouseOptions } from '../api/platformOverseasBusiness'
 import { submitProcurementCommand, uploadProcurementFile } from '../api/procurementCommands'
-import { readPendingProcurement } from '../procurementPending'
 import type { PlatformProcurement } from '../procurementTypes'
 vi.mock('../api/platformOverseasBusiness', () => ({ listOverseasPurchaseWarehouseOptions: vi.fn() }))
 vi.mock('../api/procurementCommands', () => ({ submitProcurementCommand: vi.fn(), uploadProcurementFile: vi.fn() }))
@@ -74,7 +73,7 @@ describe('procurement purchase node operations', () => {
     expect(dialog.props('confirmDisabled')).toBe(false)
     expect(submitProcurementCommand).not.toHaveBeenCalled()
   })
-  it('saves and restores a separate correction while the immutable original request is pending, scoped to operator/customer/order', async () => {
+  it('keeps ordinary correction drafts scoped to operator/customer/order while ignoring old requests', async () => {
     const value = fixture('FINANCE_ADJUST', false)
     value.fees = [{ id: '11', feeNo: 'PF-11', purpose: 'SAMPLE_PAYMENT', confirmationOrigin: 'BUSINESS', feeItemCode: 'SAMPLE_PAYMENT', feeItemName: '样品货款', feeVersion: 1, active: true, determination: 'POSITIVE', amount: '70.00', currency: 'CNY', originalAmount: '10.00', originalCurrency: 'USD', exchangeRate: '7', exchangeRateMonth: '2020-01', businessDate: '2020-01-01', parentFeeId: null, sourceFeeId: null, voucherFileId: '501', voucherFileName: 'invoice.pdf', walletStatus: 'PENDING', walletLedgerId: null, walletErrorCode: null, walletErrorMessage: null, remark: null }]
     const original = JSON.stringify({ command: 'fees/correct-target', payload: { version: 3, idempotencyKey: 'original-request', feeId: '11', targetOriginalAmount: '11.00', reason: '原请求', voucherFileId: '501' } })
@@ -90,12 +89,11 @@ describe('procurement purchase node operations', () => {
     expect(submitProcurementCommand).not.toHaveBeenCalled()
     expect(sessionStorage.getItem(storageKey)).toBe(original)
     expect(JSON.parse(sessionStorage.getItem(`${storageKey}:correction-draft`)!)).toMatchObject({ targetOriginalAmount: '12.00', feeId: '11', reason: '准备下一版本' })
-    expect(wrapper.findAll('button').find(button => button.text() === '核对并继续确认')!.attributes('disabled')).toBeDefined()
+    expect(wrapper.findAll('button').find(button => button.text() === '核对并继续确认')!.attributes('disabled')).toBeUndefined()
     wrapper.unmount(); wrapper = render(value)
     await click('恢复费用更正草稿')
     expect((wrapper.findComponent(AppDialog).find('input[placeholder="填写原费用链正确总额，最多两位小数"]').element as HTMLInputElement).value).toBe('12.00')
-    await click('确认上次提交结果')
-    expect(submitProcurementCommand).toHaveBeenCalledWith('OP-100', '10001', 'fees/correct-target', JSON.parse(original).payload)
+    expect(submitProcurementCommand).not.toHaveBeenCalled()
     expect(sessionStorage.getItem(`${storageKey}:correction-draft`)).not.toBeNull()
     const latest = structuredClone(value)
     latest.actions[0].allowed = true; latest.customerView.order.version = 9
@@ -104,7 +102,7 @@ describe('procurement purchase node operations', () => {
     await click('恢复费用更正草稿'); await click('核对并继续确认')
     wrapper.findComponent(AppDialog).findAllComponents({ name: 'ElFormItem' }).find(row => row.props('label') === '本单凭证')!.findComponent({ name: 'ElSelect' }).vm.$emit('update:modelValue', '501')
     await confirm(wrapper)
-    expect(submitProcurementCommand).toHaveBeenCalledTimes(1)
+    expect(submitProcurementCommand).not.toHaveBeenCalled()
     expect(wrapper.findComponent(AppDialog).text()).toContain('原实际费用及来源关联尚未完成')
     latest.fees[0].walletStatus = 'SETTLED'; latest.fees[0].walletLedgerId = 'LEDGER-1'
     latest.customerView.fees = [{ feeNo: 'PF-11', purpose: 'SAMPLE_PAYMENT', name: '样品货款', version: 1, active: true, determination: 'POSITIVE', amount: '70.00', currency: 'CNY', originalAmount: '10.00', originalCurrency: 'USD', exchangeRate: '7', exchangeRateMonth: '2020-01', businessDate: '2020-01-01', parentFeeNo: null, walletStatus: 'SETTLED', sourceLinked: true }]
@@ -251,22 +249,20 @@ describe('procurement purchase node operations', () => {
     await confirm(wrapper)
     expect(submitProcurementCommand).toHaveBeenCalledWith('OP-100', '10001', 'purchase', expect.objectContaining({ productName: '样品商品', specification: '黑色', quantity: 2, amount: '0.00', currency: 'USD', voucherFileId: '101', purchasedAt: '2026-10-08T10:00:00' }))
   })
-  it('recovers an uncertain request after reload without changing its body or key', async () => {
+  it('unknown request leaves inputs editable and a later click submits current input', async () => {
     vi.mocked(submitProcurementCommand).mockRejectedValueOnce(new Error('timeout'))
-    let wrapper = render(fixture('CANCEL')); await open(wrapper); await explain(wrapper, '客户取消'); await confirm(wrapper)
-    const original = vi.mocked(submitProcurementCommand).mock.calls[0][3]; expect(sessionStorage.getItem(storageKey)).not.toBeNull(); wrapper.unmount()
-    wrapper = render(fixture('CANCEL')); await flushPromises()
-    const retry = wrapper.findAll('button').find(button => button.text() === '确认上次提交结果')!; await retry.trigger('click'); await flushPromises()
-    expect(vi.mocked(submitProcurementCommand).mock.calls[1][3]).toEqual(original); expect(sessionStorage.getItem(storageKey)).toBeNull()
+    const wrapper = render(fixture('CANCEL')); await open(wrapper); await explain(wrapper, '客户取消'); await confirm(wrapper)
+    const original = vi.mocked(submitProcurementCommand).mock.calls[0]![3]
+    expect(sessionStorage.getItem(storageKey)).toBeNull(); await explain(wrapper, '修改后的原因'); await confirm(wrapper)
+    const next = vi.mocked(submitProcurementCommand).mock.calls[1]![3]
+    expect(next.idempotencyKey).not.toBe(original.idempotencyKey); expect(next.reason).toBe('修改后的原因')
   })
-  it('preserves an earlier uncertain financial or physical command when replay is rejected', async () => {
+  it('consecutive failures never retain a request or block another click', async () => {
     vi.mocked(submitProcurementCommand).mockRejectedValueOnce(new Error('timeout')).mockRejectedValueOnce(new ApiResponseError('资源正在处理中', 'A0409'))
-    const wrapper = render(fixture('CANCEL')); await open(wrapper); await explain(wrapper); await confirm(wrapper)
-    const saved = sessionStorage.getItem(storageKey); expect(saved).not.toBeNull()
-    await confirm(wrapper)
-    expect(sessionStorage.getItem(storageKey)).toBe(saved)
-    expect(vi.mocked(submitProcurementCommand).mock.calls[1][3]).toEqual(vi.mocked(submitProcurementCommand).mock.calls[0][3])
-    expect(wrapper.emitted('changed')).toBeUndefined()
+    const wrapper = render(fixture('CANCEL')); await open(wrapper); await explain(wrapper); await confirm(wrapper); await confirm(wrapper)
+    const calls = vi.mocked(submitProcurementCommand).mock.calls
+    expect(calls).toHaveLength(2); expect(calls[1]![3].idempotencyKey).not.toBe(calls[0]![3].idempotencyKey)
+    expect(sessionStorage.getItem(storageKey)).toBeNull(); expect(wrapper.emitted('changed')).toBeUndefined()
   })
   it('keeps a version conflict visible, releases the failed command and does not report success', async () => {
     vi.mocked(submitProcurementCommand).mockRejectedValue(new ApiResponseError('订单版本冲突，请刷新', 'A0409'))
@@ -300,9 +296,9 @@ describe('procurement purchase node operations', () => {
     wrapper.findComponent(AppDialog).vm.$emit('confirm'); wrapper.findComponent(AppDialog).vm.$emit('confirm'); await flushPromises()
     expect(submitProcurementCommand).toHaveBeenCalledTimes(1); complete(); await flushPromises()
   })
-  it('rejects malformed recovery records instead of allowing a fresh competing operation', async () => {
+  it('old malformed request storage does not disable current actions', async () => {
     sessionStorage.setItem(storageKey, '{bad')
-    const wrapper = render(); expect(wrapper.text()).toContain('上次操作记录无法读取'); expect(wrapper.find('.purchase-actions button').attributes('disabled')).toBeDefined()
-    expect(() => readPendingProcurement(JSON.stringify({ command: 'purchase', payload: { version: 3, idempotencyKey: 'a', amount: '-2' } }))).toThrow()
+    const wrapper = render(); expect(wrapper.text()).not.toContain('上次操作记录无法读取')
+    expect(wrapper.find('.purchase-actions button').attributes('disabled')).toBeUndefined()
   })
 })

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

@@ -11,7 +11,7 @@ import { getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
 import { useUnsavedWorkRegistration } from '@/core/unsaved-work/useUnsavedWorkRegistration'
 import { listOverseasPurchaseWarehouseOptions } from '../api/platformOverseasBusiness'
 import { submitProcurementCommand, uploadProcurementFile, type ProcurementCommand, type ProcurementCommandBody } from '../api/procurementCommands'
-import { commandKey, definitelyRejected, readPendingProcurement, type PendingProcurement } from '../procurementPending'
+import { commandKey, type PendingProcurement } from '../procurementPending'
 import { readCorrectionDraft, type ProcurementCorrectionDraft } from '../procurementCorrectionDraft'
 import type { PlatformProcurement, ProcurementAction, ProcurementFile } from '../procurementTypes'
 import type { OverseasPurchaseWarehouseOption } from '../types'
@@ -75,8 +75,6 @@ const { captureBaseline } = useUnsavedWorkRegistration({ key: 'procurement-purch
 watch(key, () => {
   opened.value = false; pending.value = null; storageError.value = ''; extraFiles.value = []; active.value = null; editingDraft.value = false; correctionDraft.value = null; draftError.value = ''
   if (!key.value) return
-  try { pending.value = readPendingProcurement(sessionStorage.getItem(key.value)) }
-  catch { storageError.value = '上次操作记录无法读取，请先联系管理员核对该订单的处理结果。' }
   try { correctionDraft.value = readCorrectionDraft(sessionStorage.getItem(draftKey.value)) }
   catch { draftError.value = '本浏览器的费用更正草稿无法读取，请核对后重新填写。' }
 }, { immediate: true })
@@ -123,11 +121,6 @@ function useCorrectionDraft() {
   const fee = props.detail.fees.find(row => row.id === finance.value.feeId)
   active.value = action; financialCommand.value = fee && !fee.active && ['TERMINATED', 'RELEASED'].includes(fee.walletStatus) ? 'fees/replace-failed' : 'fees/correct-target'; editingDraft.value = false
 }
-async function retryPending() {
-  if (editingDraft.value) { saveCorrectionDraft(); if (draftError.value) return }
-  editingDraft.value = false; opened.value = false
-  await submit()
-}
 watch(financialCommand, () => { if (editingDraft.value) return; finance.value.feeId = ''; finance.value.targetOriginalAmount = ''; finance.value.refundAmount = ''; form.voucherFileId = ''; error.value = null }, { flush: 'sync' })
 watch(needsWarehouse, value => { if (value && opened.value) void loadWarehouses() })
 function build(): ProcurementCommandBody {
@@ -157,33 +150,29 @@ function build(): ProcurementCommandBody {
 async function submit() {
   if (editingDraft.value) { saveCorrectionDraft(); return }
   if (saving.value || uploading.value || storageError.value || !key.value) return
-  const resuming = !!pending.value
   const scope = key.value; const orderNo = props.detail.customerView.order.orderNo; const customer = props.customerId
   if (!pending.value) {
     if (!active.value?.allowed || !access.can(active.value.permission) || !command.value) return
     try {
       if (managementBlock.value) throw new Error(managementBlock.value)
       const request = { command: command.value, payload: build() }
-      const serialized = JSON.stringify(request); readPendingProcurement(serialized)
-      sessionStorage.setItem(scope, serialized); pending.value = request
+      pending.value = request
     } catch (issue) { error.value = { message: issue instanceof Error ? issue.message : '提交信息保存失败，请重试' }; return }
   }
   const retryFee = pending.value.command === 'fees/retry' ? props.detail.fees.find(fee => fee.id === pending.value?.payload.feeId) : null
   const requiredPermission = pending.value.command === 'fees/retry' ? (retryFee ? feeRetryPermission(retryFee) : '') : `platform:overseas-business:purchase:${commandPermissions[pending.value.command]}`
-  if (!requiredPermission || !access.can(requiredPermission)) { error.value = { message: '当前账号无此节点操作权限' }; return }
+  if (!requiredPermission || !access.can(requiredPermission)) { pending.value = null; error.value = { message: '当前账号无此节点操作权限' }; return }
   saving.value = true; error.value = null
-  const confirmsCorrection = !resuming && ['fees/correct-target', 'fees/replace-failed'].includes(pending.value.command)
+  const confirmsCorrection = ['fees/correct-target', 'fees/replace-failed'].includes(pending.value.command)
   try {
     await submitProcurementCommand(orderNo, customer, pending.value.command, pending.value.payload)
-    sessionStorage.removeItem(scope)
     if (key.value !== scope) return
     if (confirmsCorrection) { sessionStorage.removeItem(draftKey.value); correctionDraft.value = null }
     pending.value = null; opened.value = false; captureBaseline(); ElMessage.success('操作已保存，请核对最新业务及资金结果'); emit('changed')
   } catch (issue) {
     if (key.value !== scope) return
-    if (!resuming && definitelyRejected(issue)) { sessionStorage.removeItem(scope); pending.value = null }
-    error.value = getApiErrorDetails(issue, '结果尚未确认，请使用原请求重试')
-  } finally { saving.value = false }
+    error.value = getApiErrorDetails(issue, '操作失败，请重新提交')
+  } finally { pending.value = null; saving.value = false }
 }
 async function upload(event: Event) {
   const input = event.target as HTMLInputElement; const file = input.files?.[0]; input.value = ''
@@ -212,10 +201,9 @@ async function upload(event: Event) {
       <dl><template v-for="action in unavailableActions" :key="action.key"><dt>{{ action.label }}</dt><dd>{{ action.reason || '当前不可操作' }}</dd></template></dl>
     </details>
     <el-alert v-if="draftError" :title="draftError" type="error" :closable="false" /><el-alert v-if="storageError" :title="storageError" type="error" :closable="false" />
-    <el-alert v-if="pending" title="上次提交结果尚未确认，重试将使用原始内容与原请求编号。" type="warning" :closable="false"><p>原操作：{{ pending.command === 'review' ? (pending.payload.decision === 'APPROVE' ? '审核通过' : '审核拒绝') : actions.find(action => routes[action.key] === pending?.command)?.label || '采购节点操作' }} · {{ pending.payload.remark || pending.payload.reason }}</p><p v-if="pending.payload.amount !== undefined">原提交金额：{{ pending.payload.amount }} {{ pending.payload.currency || (['international-estimate', 'fees/refund'].includes(pending.command) ? 'CNY' : '') }}</p><el-button :loading="saving" @click="retryPending">确认上次提交结果</el-button></el-alert>
     <ApiErrorMeta v-if="error && !opened" :details="error" />
-    <AppDialog class="admin-density-dialog admin-workbench is-dialog" v-model="opened" :title="active?.label || '采购节点操作'" :width="['packing', 'labels', 'charges/confirm', 'exception-close'].includes(command || '') ? 'min(1120px, calc(100vw - 28px))' : 'min(760px, calc(100vw - 28px))'" :confirm-loading="saving || uploading" :confirm-disabled="!!managementBlock || uploading || warehouseLoading || (!editingDraft && !!storageError) || !key" :confirm-text="editingDraft ? '保存本地草稿' : pending ? '重试原请求' : '确认提交'" @confirm="submit">
-      <template #default><el-alert v-if="editingDraft" title="草稿仅保存在当前浏览器标签页，关闭标签页后可能丢失；不代表已确认费用。原请求未决时只能保存，结果明确后请刷新订单再核对确认。" type="info" :closable="false" /><el-alert v-if="command === 'purchase'" title="记录已实际购买的商品和供应商实付总额。资金未完成时，真实购买事实仍保留。" type="info" :closable="false" />
+    <AppDialog class="admin-density-dialog admin-workbench is-dialog" v-model="opened" :title="active?.label || '采购节点操作'" :width="['packing', 'labels', 'charges/confirm', 'exception-close'].includes(command || '') ? 'min(1120px, calc(100vw - 28px))' : 'min(760px, calc(100vw - 28px))'" :confirm-loading="saving || uploading" :confirm-disabled="!!managementBlock || uploading || warehouseLoading || (!editingDraft && !!storageError) || !key" :confirm-text="editingDraft ? '保存本地草稿' : '确认提交'" @confirm="submit">
+      <template #default><el-alert v-if="editingDraft" title="草稿仅保存在当前浏览器标签页，关闭标签页后可能丢失；不代表已确认费用。" type="info" :closable="false" /><el-alert v-if="command === 'purchase'" title="记录已实际购买的商品和供应商实付总额。资金未完成时，真实购买事实仍保留。" type="info" :closable="false" />
         <el-alert v-if="managementBlock" :title="managementBlock" type="warning" :closable="false" />
         <el-form class="density-form" label-position="top" :disabled="saving || uploading || (!!pending && !editingDraft)">
           <el-form-item v-if="active?.key === 'MANAGE'" label="实物更正操作"><el-select v-model="manageCommand" placeholder="选择处置或更正操作"><el-option v-for="option in manageOptions" :key="option.value" :value="option.value" :disabled="!!option.reason" :label="option.reason ? `${option.label}（${option.reason}）` : option.label" /></el-select></el-form-item>
@@ -235,7 +223,7 @@ async function upload(event: Event) {
           <el-form-item v-if="needsAmount || needsEvidence" label="本单凭证" required><el-select v-model="form.voucherFileId" placeholder="选择已上传凭证"><el-option v-for="file in files" :key="file.fileId" :value="file.fileId" :label="file.fileName" /></el-select><input aria-label="上传本单凭证" type="file" accept="application/pdf,image/jpeg,image/png" :disabled="uploading || (!!pending && !editingDraft) || saving" @change="upload" /></el-form-item>
           <el-form-item label="操作说明" required><el-input v-model="form.reason" type="textarea" :rows="3" maxlength="1000" show-word-limit /></el-form-item>
         </el-form><el-alert v-if="error" :title="error.message" type="error" :closable="false" /><ApiErrorMeta v-if="error" :details="error" /></template>
-      <template #footer><div class="density-actions density-actions--footer"><el-button :disabled="saving || uploading" @click="opened = false">关闭</el-button><el-button v-if="editingDraft" :disabled="!!pending || !!storageError || saving || uploading" @click="useCorrectionDraft">核对并继续确认</el-button><el-button type="primary" :loading="saving" :disabled="uploading || warehouseLoading || (!editingDraft && !!storageError) || !key" @click="submit">{{ editingDraft ? '保存本地草稿' : pending ? '重试原请求' : '确认提交' }}</el-button></div></template>
+      <template #footer><div class="density-actions density-actions--footer"><el-button :disabled="saving || uploading" @click="opened = false">关闭</el-button><el-button v-if="editingDraft" :disabled="!!pending || !!storageError || saving || uploading" @click="useCorrectionDraft">核对并继续确认</el-button><el-button type="primary" :loading="saving" :disabled="uploading || warehouseLoading || (!editingDraft && !!storageError) || !key" @click="submit">{{ editingDraft ? '保存本地草稿' : '确认提交' }}</el-button></div></template>
     </AppDialog>
   </section>
 </template>

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

@@ -19,7 +19,6 @@ const commands = computed(() => access.can(overseasBusinessPermissions.truckStat
 const open = ref(false), saving = ref(false)
 const active = ref<TruckCommand | null>(null)
 const error = ref<ApiErrorDetails | null>(null), validationError = ref('')
-// 响应丢失时保留原命令、版本和幂等键，重试不得变更请求内容。
 const pending = ref<TruckOperation | null>(null)
 const form = reactive({ decision: 'APPROVE' as 'APPROVE' | 'REJECT', actualPalletCount: 1, packageCount: undefined as number | undefined, palletIds: [] as string[], remark: '' })
 const selectablePallets = computed(() => props.detail.pallets.filter(pallet => pallet.status === 'RECEIVED'))
@@ -71,7 +70,7 @@ function buildOperation(): TruckOperation | null {
 async function submit() {
   if (saving.value || !active.value || !commands.value.includes(active.value)) return
   validationError.value = ''; error.value = null
-  const operation = pending.value ?? buildOperation()
+  const operation = buildOperation()
   if (!operation) return
   pending.value = operation; saving.value = true
   const customerId = props.detail.customerId, orderNo = props.detail.orderNo
@@ -83,20 +82,20 @@ async function submit() {
     emit('updated', updated)
   } catch (cause) {
     if (props.detail.customerId === customerId && props.detail.orderNo === orderNo) error.value = getApiErrorDetails(cause, '操作未确认成功，请重试或刷新订单核对最新记录')
-  } finally { saving.value = false }
+  } finally { pending.value = null; saving.value = false }
 }
 </script>
 
 <template>
   <div v-if="commands.length" class="truck-order-actions">
     <el-button v-for="command in commands" :key="command" :type="command === 'cancel' ? 'danger' : 'primary'" :plain="command === 'cancel'" :disabled="saving" @click="start(command)">{{ truckCommandLabels[command] }}</el-button>
-    <p v-if="pending && !open" role="status">上次操作尚未确认结果，请重新打开重试，或刷新订单核对最新记录。</p>
+
   </div>
-  <AppDialog v-model="open" class="admin-density-dialog admin-workbench is-dialog" :title="active ? truckCommandLabels[active] : '单据操作'" width="680px" :confirm-text="pending ? '重试原操作' : '确认提交'" :confirm-type="active === 'cancel' || (review && form.decision === 'REJECT') ? 'danger' : 'primary'" :confirm-loading="saving" :confirm-disabled="!active || !commands.includes(active)" @confirm="submit">
+  <AppDialog v-model="open" class="admin-density-dialog admin-workbench is-dialog" :title="active ? truckCommandLabels[active] : '单据操作'" width="680px" :confirm-text="'确认提交'" :confirm-type="active === 'cancel' || (review && form.decision === 'REJECT') ? 'danger' : 'primary'" :confirm-loading="saving" :confirm-disabled="!active || !commands.includes(active)" @confirm="submit">
     <template v-if="active">
       <p>{{ detail.orderNo }} · {{ truckCommandHints[active] }}</p>
       <el-alert v-if="validationError" :title="validationError" type="warning" :closable="false" role="alert" />
-      <div v-if="error" role="alert"><el-alert :title="error.message" type="error" :closable="false" /><ApiErrorMeta :details="error" /><p>可重试原操作；如提示版本冲突，请关闭弹框并刷新订单，核对最新状态及操作记录。</p></div>
+      <div v-if="error" role="alert"><el-alert :title="error.message" type="error" :closable="false" /><ApiErrorMeta :details="error" /><p>可修改后重新提交；如提示版本冲突，请关闭弹框并刷新订单，核对最新状态及操作记录。</p></div>
       <el-form :model="form" label-width="130px" :disabled="saving || !!pending" @submit.prevent="submit">
         <el-form-item v-if="review" label="审核结果"><el-radio-group v-model="form.decision"><el-radio value="APPROVE">通过</el-radio><el-radio value="REJECT">拒绝</el-radio></el-radio-group></el-form-item>
         <template v-if="active === 'receive-pallets'">

src/modules/overseas-business/procurementPending.ts

@@ -1,5 +1,3 @@
-import { isAxiosError } from 'axios'
-import { ApiResponseError } from '@/shared/api/http'
 import type { ProcurementCommand, ProcurementCommandBody } from './api/procurementCommands'
 export interface PendingProcurement { command: ProcurementCommand; payload: ProcurementCommandBody }
 const commands = new Set(['review', 'purchase', 'purchase/confirm', 'budget-authorizations', 'planned-warehouse', 'cancel', 'overseas-receipts', 'domestic-receipts', 'overseas-receipts/complete', 'domestic-receipts/complete', 'packing', 'packing/confirm', 'packing/withdraw', 'dispositions', 'receipts/correct', 'dispositions/revoke', 'labels', 'international-estimate', 'labels/apply', 'domestic-repack', 'overseas-shipment', 'customer-shipment', 'charges/confirm', 'fees/retry', 'fees/terminate', 'fees/release-estimate', 'fees/correct-target', 'fees/refund', 'fees/replace-failed', 'fees/additional', 'control-notes', 'control-notes/resolve', 'actual-warehouse/correct', 'exception-close'])
@@ -7,126 +5,3 @@ export function commandKey() {
   const bytes = new Uint8Array(16); globalThis.crypto.getRandomValues(bytes)
   return Array.from(bytes, byte => byte.toString(16).padStart(2, '0')).join('')
 }
-export function readPendingProcurement(raw: string | null): PendingProcurement | null {
-  if (raw === null) return null
-  const value: unknown = JSON.parse(raw)
-  if (!value || typeof value !== 'object' || !('command' in value) || !('payload' in value) || !commands.has(String(value.command))) throw new Error('invalid pending command')
-  const payload = value.payload
-  if (!payload || typeof payload !== 'object' || !('version' in payload) || !Number.isSafeInteger(payload.version) || Number(payload.version) < 0 || !('idempotencyKey' in payload) || typeof payload.idempotencyKey !== 'string' || !payload.idempotencyKey) throw new Error('invalid pending payload')
-  const fields = new Set(['version', 'idempotencyKey', 'reason', 'decision', 'remark', 'purchaseWarehouseId', 'warehouseId', 'productName', 'specification', 'quantity', 'amount', 'currency', 'purchasedAt', 'estimatedArrivalAt', 'voucherFileId', 'leg', 'sourceCartonId', 'receiptId', 'dispositionId', 'goodQuantity', 'damagedQuantity', 'extraQuantity', 'receivedAt', 'kind', 'packingVersion', 'cartons', 'labelVersion', 'receiver', 'addressVoucherFileId', 'labels', 'cartonIds', 'businessDate', 'appliedAt', 'shippedAt', 'cartonId', 'lengthCm', 'widthCm', 'heightCm', 'grossWeightKg', 'feeId', 'targetOriginalAmount', 'internationalFreight', 'duty', 'domesticFreight', 'otherDetermination', 'otherFees', 'targetType', 'targetId', 'blocking', 'clientSummary', 'noteId', 'resolutions', 'customerVoucherFileId', 'financialConclusion', 'name'])
-  const body = payload as Record<string, unknown>
-  if (Object.keys(body).some(field => !fields.has(field))) throw new Error('unexpected pending field')
-  const nonempty = (field: string) => typeof body[field] === 'string' && !!body[field].trim()
-  const positiveId = (field: string) => nonempty(field) && /^[1-9]\d*$/.test(String(body[field]))
-  if (value.command === 'review') {
-    if (!['APPROVE', 'REJECT'].includes(String(body.decision)) || (body.decision === 'APPROVE' && !positiveId('purchaseWarehouseId'))) throw new Error('invalid pending review')
-  } else if (!nonempty('reason')) throw new Error('missing pending reason')
-  if (value.command === 'planned-warehouse' && !positiveId('warehouseId')) throw new Error('invalid pending warehouse')
-  if (['purchase', 'budget-authorizations'].includes(String(value.command))) {
-    if (!/^\d{1,16}(?:\.\d{1,2})?$/.test(String(body.amount)) || !['CNY', 'USD'].includes(String(body.currency)) || !positiveId('voucherFileId')) throw new Error('invalid pending amount')
-  }
-  if (value.command === 'purchase' && (!nonempty('productName') || !Number.isSafeInteger(body.quantity) || Number(body.quantity) < 1 || !nonempty('purchasedAt') || !nonempty('estimatedArrivalAt'))) throw new Error('invalid pending purchase')
-  const count = (field: string, minimum: number) => Number.isSafeInteger(body[field]) && Number(body[field]) >= minimum
-  if (['overseas-receipts', 'domestic-receipts', 'overseas-receipts/complete', 'domestic-receipts/complete', 'receipts/correct', 'dispositions'].includes(String(value.command))) {
-    if (!['OVERSEAS', 'DOMESTIC'].includes(String(body.leg))) throw new Error('invalid receipt leg')
-    if ((String(value.command).startsWith('overseas') && body.leg !== 'OVERSEAS') || (String(value.command).startsWith('domestic') && body.leg !== 'DOMESTIC')) throw new Error('wrong receipt endpoint')
-  }
-  if (['overseas-receipts', 'domestic-receipts', 'receipts/correct'].includes(String(value.command))) {
-    if (!['goodQuantity', 'damagedQuantity', 'extraQuantity'].every(field => count(field, 0)) || Number(body.goodQuantity) + Number(body.damagedQuantity) + Number(body.extraQuantity) <= 0 || !nonempty('receivedAt')) throw new Error('invalid pending receipt')
-    if (body.leg === 'OVERSEAS' ? !positiveId('warehouseId') || body.sourceCartonId != null : !positiveId('sourceCartonId') || body.warehouseId != null) throw new Error('invalid receipt source')
-  }
-  if (['receipts/correct', 'dispositions', 'dispositions/revoke'].includes(String(value.command)) && !positiveId('voucherFileId')) throw new Error('missing correction evidence')
-  if (value.command === 'receipts/correct' && !positiveId('receiptId')) throw new Error('missing original receipt')
-  if (value.command === 'dispositions/revoke' && !positiveId('dispositionId')) throw new Error('missing original disposition')
-  if (value.command === 'dispositions') {
-    const decisions: Record<string, string> = { SHORTAGE: 'ACCEPT_SHORTAGE', DAMAGED: 'DISPOSE_DAMAGED', EXTRA: 'RETURN_EXTRA' }
-    if (!count('quantity', 1) || !decisions[String(body.kind)] || decisions[String(body.kind)] !== body.decision || (body.kind !== 'SHORTAGE' && !positiveId('receiptId')) || (body.kind === 'SHORTAGE' && body.receiptId != null) || (body.leg === 'DOMESTIC' && !positiveId('sourceCartonId'))) throw new Error('invalid pending disposition')
-  }
-  if (value.command === 'packing/confirm' && !count('packingVersion', 1)) throw new Error('invalid packing version')
-  if (value.command === 'packing') {
-    if (!Array.isArray(body.cartons) || !body.cartons.length) throw new Error('missing packing list')
-    const names = new Set<string>()
-    for (const item of body.cartons) {
-      if (!item || typeof item !== 'object' || typeof item.cartonNo !== 'string' || !item.cartonNo.trim() || names.has(item.cartonNo) || Object.keys(item).some(key => !['cartonNo', 'lengthCm', 'widthCm', 'heightCm', 'grossWeightKg', 'sources'].includes(key))) throw new Error('invalid packing carton')
-      names.add(item.cartonNo)
-      for (const field of ['lengthCm', 'widthCm', 'heightCm', 'grossWeightKg']) {
-        const pattern = field === 'grossWeightKg' ? /^\d{1,9}(?:\.\d{1,3})?$/ : /^\d{1,10}(?:\.\d{1,2})?$/
-        if (typeof item[field] !== 'string' || !pattern.test(item[field]) || Number(item[field]) <= 0) throw new Error('invalid packing measurement')
-      }
-      if (!Array.isArray(item.sources) || !item.sources.length || item.sources.some((source: unknown) => {
-        if (!source || typeof source !== 'object') return true
-        const row = source as Record<string, unknown>
-        return Object.keys(row).some(key => !['receiptId', 'quantity'].includes(key)) || typeof row.receiptId !== 'string' || !/^[1-9]\d*$/.test(row.receiptId) || !Number.isSafeInteger(row.quantity) || Number(row.quantity) < 1
-      })) throw new Error('invalid packing source')
-    }
-  }
-  if (value.command === 'labels') {
-    const receiver = body.receiver
-    if (!count('packingVersion', 1) || !['OVERSEAS', 'DOMESTIC'].includes(String(body.leg)) || !receiver || typeof receiver !== 'object' || !['name', 'phone', 'address'].every(key => typeof (receiver as Record<string, unknown>)[key] === 'string' && String((receiver as Record<string, unknown>)[key]).trim())) throw new Error('invalid label address')
-    if (!Array.isArray(body.labels) || !body.labels.length) throw new Error('missing labels')
-    const cartonIds = new Set<string>()
-    for (const row of body.labels) {
-      if (!row || typeof row !== 'object' || typeof row.cartonId !== 'string' || !/^[1-9]\d*$/.test(row.cartonId) || typeof row.fileId !== 'string' || !/^[1-9]\d*$/.test(row.fileId) || !Number.isSafeInteger(row.page) || row.page < 1 || !row.carrier?.trim() || !row.trackingNo?.trim() || cartonIds.has(row.cartonId)) throw new Error('invalid label association')
-      cartonIds.add(row.cartonId)
-    }
-  }
-  if (value.command === 'international-estimate' && (!count('labelVersion', 1) || !/^\d{1,16}(?:\.\d{1,2})?$/.test(String(body.amount)) || !nonempty('businessDate'))) throw new Error('invalid pending estimate')
-  if (['labels/apply', 'overseas-shipment', 'customer-shipment'].includes(String(value.command))) {
-    if (!count('labelVersion', 1) || !Array.isArray(body.cartonIds) || !body.cartonIds.length || body.cartonIds.some(id => typeof id !== 'string' || !/^[1-9]\d*$/.test(id)) || new Set(body.cartonIds).size !== body.cartonIds.length) throw new Error('invalid transport cartons')
-    if (!nonempty(value.command === 'labels/apply' ? 'appliedAt' : 'shippedAt')) throw new Error('missing actual transport time')
-    if ((value.command === 'overseas-shipment' && body.leg !== 'OVERSEAS') || (value.command === 'customer-shipment' && body.leg !== 'DOMESTIC')) throw new Error('wrong shipment leg')
-  }
-  if (value.command === 'domestic-repack') {
-    if (!positiveId('cartonId') || !positiveId('voucherFileId')) throw new Error('invalid repack reference')
-    for (const field of ['lengthCm', 'widthCm', 'heightCm', 'grossWeightKg']) {
-      const pattern = field === 'grossWeightKg' ? /^\d{1,9}(?:\.\d{1,3})?$/ : /^\d{1,10}(?:\.\d{1,2})?$/
-      if (typeof body[field] !== 'string' || !pattern.test(String(body[field])) || Number(body[field]) <= 0) throw new Error('invalid repack measurement')
-    }
-  }
-  if (String(value.command).startsWith('fees/') && value.command !== 'fees/additional') {
-    if (!positiveId('feeId')) throw new Error('invalid original fee')
-    if (['fees/correct-target', 'fees/refund', 'fees/replace-failed'].includes(String(value.command)) && !positiveId('voucherFileId')) throw new Error('missing finance evidence')
-    if (['fees/correct-target', 'fees/replace-failed'].includes(String(value.command)) && !/^\d{1,16}(?:\.\d{1,2})?$/.test(String(body.targetOriginalAmount))) throw new Error('invalid correction target')
-    if (value.command === 'fees/refund' && (!/^\d{1,16}(?:\.\d{1,2})?$/.test(String(body.amount)) || Number(body.amount) <= 0)) throw new Error('invalid refund amount')
-  }
-  if (value.command === 'charges/confirm') {
-    const selection = (input: unknown) => {
-      if (!input || typeof input !== 'object') throw new Error('missing fee determination')
-      const item = input as Record<string, unknown>
-      if ((item.feeId == null) === (item.value == null) || Object.keys(item).some(key => !['feeId', 'value'].includes(key))) throw new Error('ambiguous fee determination')
-      if (item.feeId != null) { if (typeof item.feeId !== 'string' || !/^[1-9]\d*$/.test(item.feeId)) throw new Error('invalid fee reference'); return }
-      if (!item.value || typeof item.value !== 'object') throw new Error('invalid fee amount')
-      const value = item.value as Record<string, unknown>
-      if (Object.keys(value).some(key => !['determination', 'amount', 'currency', 'businessDate', 'voucherFileId', 'reason'].includes(key))) throw new Error('unexpected fee amount field')
-      if (!['POSITIVE', 'ZERO', 'NOT_APPLICABLE'].includes(String(value.determination)) || typeof value.amount !== 'string' || !/^\d{1,16}(?:\.\d{1,2})?$/.test(value.amount) || (value.determination === 'POSITIVE' ? Number(value.amount) <= 0 : Number(value.amount) !== 0) || !['CNY', 'USD'].includes(String(value.currency)) || typeof value.businessDate !== 'string' || !/^\d{4}-\d{2}-\d{2}$/.test(value.businessDate) || typeof value.reason !== 'string' || !value.reason.trim()) throw new Error('invalid fee determination value')
-      if (value.determination === 'POSITIVE' && (typeof value.voucherFileId !== 'string' || !/^[1-9]\d*$/.test(value.voucherFileId))) throw new Error('missing fee voucher')
-    }
-    for (const key of ['internationalFreight', 'duty', 'domesticFreight']) selection(body[key])
-    if (!['NOT_APPLICABLE', 'ITEMIZED'].includes(String(body.otherDetermination)) || !Array.isArray(body.otherFees) || (body.otherDetermination === 'NOT_APPLICABLE') !== (body.otherFees.length === 0)) throw new Error('invalid other fee determination')
-    const codes = new Set<string>()
-    for (const row of body.otherFees) {
-      if (!row || typeof row !== 'object' || typeof row.code !== 'string' || !/^[A-Z][A-Z0-9_]{0,31}$/.test(row.code) || codes.has(row.code) || typeof row.name !== 'string' || !row.name.trim()) throw new Error('invalid other fee')
-      codes.add(row.code); selection(row.selection)
-    }
-  }
-  if (['control-notes', 'control-notes/resolve', 'actual-warehouse/correct'].includes(String(value.command)) && !positiveId('voucherFileId')) throw new Error('missing control evidence')
-  if (value.command === 'control-notes' && (!['PURCHASE', 'WAREHOUSE', 'RECEIPT', 'SHIPMENT'].includes(String(body.targetType)) || typeof body.blocking !== 'boolean' || (body.targetType === 'PURCHASE' ? body.targetId != null : !positiveId('targetId')))) throw new Error('invalid control target')
-  if (value.command === 'control-notes/resolve' && !positiveId('noteId')) throw new Error('missing original blocker')
-  if (value.command === 'actual-warehouse/correct' && !positiveId('warehouseId')) throw new Error('invalid actual warehouse')
-  if (value.command === 'exception-close') {
-    if (!positiveId('customerVoucherFileId') || !nonempty('financialConclusion') || !nonempty('clientSummary') || !Array.isArray(body.resolutions)) throw new Error('incomplete closure facts')
-    const decisions: Record<string, string[]> = { PURCHASE_REMAINDER: ['SUPPLIER_RETAINED', 'RETURNED_TO_SUPPLIER', 'LOSS_CONFIRMED'], TRANSIT_REMAINDER: ['LOSS_CONFIRMED', 'RETURNED_TO_SENDER'], GOOD: ['RETURNED_TO_SUPPLIER', 'CUSTOMER_AUTHORIZED_RETENTION', 'DISPOSED'], DAMAGED: ['DISPOSED', 'RETURNED_TO_SUPPLIER'], EXTRA: ['RETURNED_TO_SUPPLIER'] }
-    const sources = new Set<string>()
-    for (const row of body.resolutions) {
-      if (!row || typeof row !== 'object' || !decisions[row.kind]?.includes(row.decision) || !Number.isSafeInteger(row.quantity) || row.quantity < 1 || typeof row.destination !== 'string' || !row.destination.trim() || typeof row.voucherFileId !== 'string' || !/^[1-9]\d*$/.test(row.voucherFileId) || (row.kind === 'PURCHASE_REMAINDER' ? row.sourceId != null : typeof row.sourceId !== 'string' || !/^[1-9]\d*$/.test(row.sourceId))) throw new Error('invalid closure resolution')
-      const key = `${row.kind}:${row.sourceId ?? ''}`; if (sources.has(key)) throw new Error('duplicate closure source'); sources.add(key)
-    }
-  }
-  if (value.command === 'fees/additional' && (!nonempty('name') || !nonempty('businessDate') || !['CNY', 'USD'].includes(String(body.currency)) || !/^\d{1,16}(?:\.\d{1,2})?$/.test(String(body.amount)) || Number(body.amount) <= 0 || !positiveId('voucherFileId'))) throw new Error('invalid independent financial fee')
-  return value as PendingProcurement
-}
-export function definitelyRejected(error: unknown) {
-  const status = error instanceof ApiResponseError ? error.status : isAxiosError(error) ? error.response?.status : undefined
-  const code = error instanceof ApiResponseError ? error.code : ''
-  return [400, 401, 403, 404, 409, 422].includes(status ?? 0) || ['A0400', 'A0401', 'A0403', 'A0404', 'A0409', 'A0422'].includes(code)
-}

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

@@ -5,7 +5,7 @@
 
 - 运输路线地图：`components/TransportRouteDialog.vue`经`index.ts`公开导出，排车装车后、本土散板列表、本土卡车表单共用；来源字段、缺值规则和原型映射唯一见`PROTOTYPE_MATRIX.md`“运输路线地图”。仓库引用经`routeLocations.ts`复用Warehouse列表/详情解析完整地址（warehouse:list）；解析失败不加载地图。仅规划路线，不接GPS、不用固定样例，不在车辆主档顶部重复放入口。
 
-- 当前散板需求：正式列表使用`pages/DispatchCapacityDemandsView.vue`、`api/dispatchCapacityDemands.ts`，只读消费日常派送排车的`/dispatches/capacity-demands`摘要；发布选项在排车新建/维护车辆中默认勾选，规则见拼车主契约当前页面范围。不得以实托数推算标准托位，未知余位明确待确认，不读取客户或司机私人资料。原登记和旧车次入口代码保留隐藏。
+- 当前散板需求：正式列表使用`pages/DispatchCapacityDemandsView.vue`、`api/dispatchCapacityDemands.ts`，只读消费日常派送排车的`/dispatches/capacity-demands`摘要；发布选项仅在智能排车建单时选择，默认不勾选；维护车辆不提供发布修改，预约日历建单不自动发布，重发先取消原排车再重新创建，规则见拼车主契约当前页面范围。不得以实托数推算标准托位，未知余位明确待确认，不读取客户或司机私人资料。原登记和旧车次入口代码保留隐藏。
 
 - 保留的内部拼车实现：`pages/CapacityOffersView.vue`、`pages/CapacityOfferDetailView.vue`、`api/capacityOffers.ts`，车次详情显式打开 `components/CapacityOfferSettingsDialog.vue` 发布余位；独立 `capacity-offer:list/manage/inquiry-*` 权限，销售只操作本人意向。流程与交互唯一契约见 `../../../../../docs/海外仓业务/内部拼车需求池首版开发契约.md`，服务端沿 `fleet-capacity-offers-v1.yaml`；首版所有货到我仓上车，未确认意向不占位，列表不逐行请求详情。
 
@@ -15,7 +15,7 @@
 
 - 车队报价`pages/FleetQuotesView.vue`、`api/fleetQuotes.ts`沿`fleet-quotes-v1.yaml`区分采购/销售；原型通用菜单，编辑780px、CSV导入1040px，未知价格与零价分开。出车记录`pages/TripOperationsView.vue`、`api/tripOperations.ts`沿`fleet-operations-v1.yaml`按实际DEPART查询，列表/图表同筛选，缺少成本或财务事实不推为零；分别使用fleet:quote:list与fleet:operations:list，写入/导出独立权限。
 
-- 车次“直接成本”页签：`components/TripCostPanel.vue`、`api/tripCosts.ts`，选择页签才读取一次分页及整趟汇总；登记/更正分别使用trip:cost-create/cost-edit，历史沿trip:list。编辑先取最新历史快照版本；不修改内容不写入，未知新增结果保留原键及内容重试。按原币种展示，不将未登记或未分摊当零，不推定财务付款；费用表操作列在左，分摊表只读。后端合同为`fleet-trip-costs-v1.yaml`。
+- 车次“直接成本”页签：`components/TripCostPanel.vue`、`api/tripCosts.ts`，选择页签才读取一次分页及整趟汇总；登记/更正分别使用trip:cost-create/cost-edit，历史沿trip:list。编辑先取最新历史快照版本；不修改内容不写入，请求失败即释放提交态并保留表单，下一次点击按当前输入发起新请求，不保存失败请求用于重放。按原币种展示，不将未登记或未分摊当零，不推定财务付款；费用表操作列在左，分摊表只读。后端合同为`fleet-trip-costs-v1.yaml`。
 
 - 车辆概览中的派送与更换记录由`components/VehicleFulfillmentTable.vue`、`api/vehicleFulfillment.ts`读取，替代原提示文字。派送要求vehicle:list与delivery:list，更换要求vehicle:list与trip:list；无对应权限不请求接口。两个可见分区各一次分页请求，不逐行加载；换车/换页忽略旧响应，错误保留重试及诊断。更换显示原/新车辆与司机、历史车次及排车业务号；现有快照没有操作人姓名时显示“—”，不用内部操作者ID回退。
 
@@ -24,7 +24,7 @@
 - 共享车次接口在 `api/trips.ts`，类型在 `tripTypes.ts`，后端合同为 `fleet-trips-v1.yaml`；覆盖计划/分配、客户排车关联、实际装载、货物结案和分别结束车辆/司机任务。接口保留稳定幂等键、版本与货物hash，长ID按字符串透传；数量和容量展示服务端结果，不在浏览器推算整车可发或可结案。新页面承载按 `PROTOTYPE_MATRIX.md` 确定，不因API存在推导页面能力。
 - 当前日常作业统一从排车列表进入，侧栏`fleet-trips`为hidden；“出车记录”保留实际发车后的运营查询。原`pages/TripsView.vue`、`pages/TripDetailView.vue`及附加能力代码保留，不能作为新排车的前置步骤。旧详情仍按页签按需读取，资源候选聚焦或搜索时查询，不逐行读取。新整车审核、PDA真实拣货、双端装车确认及实际发车规则以`../../../../../docs/海外仓业务/排车列表统一作业改造契约.md`为准；详情只有已确认四页签，不把旧八项附加功能自动迁入或以派送完成自动释放资源。
 - 车辆实际托位/载重kg/容积m³分别由服务端返回，三项同填正数或全空待确认；不按车型名称推算。占用期间主档关键变更由服务端拒绝，下载中心 XLSX 导出使用车牌业务标识并包含容量字段。
-- 车辆运维在 `VehicleDetailView.vue` 的页签内，表格与编辑框为 `components/VehicleCareTable.vue`、`VehicleCareEditor.vue`；`api/vehicleCare.ts` 对接 `fleet-vehicle-records-v1.yaml`。保养/加油680px，维修/故障/救援/异常620px居中弹框，行操作按 `PROTOTYPE_MATRIX.md` 的逐类型入口执行。进入页签才分页查询，保养加油图片点击才鉴权读取并在新标签页预览；卸载释放Blob。车辆list包含记录只读，record-create/edit/upload独立；未知保存结果保留原请求键，照片重试不重复建记录。处理状态与付款状态独立，费用未填和零值区分；无财务关联时只显示服务端UNLINKED，不自动修改车辆公里码、状态或财务。
+- 车辆运维在 `VehicleDetailView.vue` 的页签内，表格与编辑框为 `components/VehicleCareTable.vue`、`VehicleCareEditor.vue`；`api/vehicleCare.ts` 对接 `fleet-vehicle-records-v1.yaml`。保养/加油680px，维修/故障/救援/异常620px居中弹框，行操作按 `PROTOTYPE_MATRIX.md` 的逐类型入口执行。进入页签才分页查询，保养加油图片点击才鉴权读取并在新标签页预览；卸载释放Blob。车辆list包含记录只读，record-create/edit/upload独立；保存失败即恢复编辑、关闭及重新提交，不保存失败请求；已确认创建成功的记录和附件继续使用返回的业务身份。处理状态与付款状态独立，费用未填和零值区分；无财务关联时只显示服务端UNLINKED，不自动修改车辆公里码、状态或财务。
 - 维修/故障/救援的“更新处理”已获用户确认，复用原620px弹框及record-edit权限；更正说明选填，空值由页面填标准动作说明，不移除服务端不可变历史。
 - 司机列表 `pages/DriversView.vue`、详情 `pages/DriverDetailView.vue`，编辑和证照预览在 `components/DriverEditorDialog.vue`、`DriverLicensePreview.vue`。详情独立路由；编辑居中1080px三列表单；预览居中620px。
 - 列表与统计使用同一次服务端响应；统计范围与列表筛选一致，30天提醒按证照时区计算。页面不能用当前分页行数替代总统计，也不能在浏览器重算派车资格。
@@ -37,10 +37,12 @@
 
 - 车次详情“计划容量”页签按需读写`/capacity-plan`，复用`TripLoadingPanel`的计划模式，预计重量/体积与实际装载分别保存；只在该页签展示逐段计划余位。`planValid=false`时不展示旧余位，货物变化后重新核对；保存计划只更新车次版本，不把理货审核变成通过或写入实载。
 
-- `TripBookingPanel.vue`在车次详情“外接预订”页签按需读取列表；1080px居中弹框登记/编辑或只读详情，客户聚焦搜索才读取`/fleet/trips/customer-options`。询价只要求客户、既有卸货站和箱数，载荷/价格/联系信息可后补；确认承运由服务端校验余位及完整报价。create/edit/confirm/cancel分别使用独立`trip:booking-*`权限，读操作沿trip:list。未知创建及确认结果保留原请求重试，成功用命令结果更新列表和车次版本；计划容量表展示availableSegments（已扣除外接占位），不使用旧自有货余位覆盖。
+- `TripBookingPanel.vue`在车次详情“外接预订”页签按需读取列表；1080px居中弹框登记/编辑或只读详情，客户聚焦搜索才读取`/fleet/trips/customer-options`。询价只要求客户、既有卸货站和箱数，载荷/价格/联系信息可后补；确认承运由服务端校验余位及完整报价。create/edit/confirm/cancel分别使用独立`trip:booking-*`权限，读操作沿trip:list。创建及确认失败即释放提交态，下一次点击使用当前输入及新请求键，成功用命令结果更新列表和车次版本；计划容量表展示availableSegments（已扣除外接占位），不使用旧自有货余位覆盖。
 
 - 外接履约弹框`TripBookingFulfillmentDialog.vue`为1080px居中：登记来货、按服务器实托/receiptHash核对实收与约定价格、输入客户排车单号关联；来货详情只读。只有显式打开来货/实收弹框才查询来源，不逐行请求。关联后刷新外接列表及车次详情，更新全部排车成员和理货审核状态；预订取消不删除来货或库存。
 
 - 报价、汇率、车辆、车队报价与出车记录导出统一使用 `../downloads/` 的 `useExportTask`，按当前筛选创建 XLSX 任务；按钮要求原业务导出权限和 `platform:download:list`。出车成本可见性由 File 根据账号权限冻结，不接受页面声明。CSV 仅用于车队报价导入模板。
 
 - 拼车接货简化沿 `FleetCapacityOfferModels.Inquiry.progress` 展示缺项、是否保位、负责人及主要动作，`appointmentCoverage`只消费预约侧真实投影，不以承运成功冒充预约。`CapacityInquiryFulfillment.vue`从原登记按需读取本票履约，不授予销售整车读取权限；来货、核量、排入本车分别保持原写权限。`TripPreparationDialog.vue`和`TripDispatchSelector.vue`通过`index.ts`公开给排车/预约使用；前者提交原子`/fleet/trips/prepare`并衔接容量发布，后者只读取本仓合格候选。新版合同见`fleet-preparation-v1.yaml`及拼车唯一主契约。
+
+- 车辆详情与司机详情通过 `ResourcePhotoPanel.vue` 维护常用照片，接口 `api/resourcePhotos.ts`／`fleet-resource-photos-v1.yaml`；车辆沿vehicle:edit、司机沿driver:upload，读取沿各自list。照片版本独立于档案字段版本，替换保留历史且不改变驾驶证审核；排车缺照片时由服务端复制为当趟证据。只在详情加载元数据、点击预览读取图片，不逐行请求。

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

@@ -1,5 +1,9 @@
 # 海外通用资料原型核对矩阵
 
+## 档案照片复用（2026-10-26）
+
+依据用户确认优化重复上传：车辆概览和司机详情增加常用照片维护，沿既有详情分区与620px居中预览；元数据按详情加载，原图点击才读。车辆编辑权限与司机上传权限分别控制替换。排车选档案后自动带入并保存当趟副本；沿用Admin详情、提示及表单规范。自动行为验证与类型检查单独报告，1920×1080、100%截图待人工确认。
+
 ## 散板需求只读展示（2026-10-21）
 
 依据本轮用户确认：仅保留内部余位需求池，人工联系下单；登记与后续拼车直接隐藏，不增加开关，不删除代码。当前范围唯一见[拼车主契约](../../../../../docs/海外仓业务/内部拼车需求池首版开发契约.md#当前页面范围2026-10-21)，覆盖下文此前开放登记的页面结论。
@@ -367,3 +371,9 @@ S05补充源码核对：实际自有/外配API均经公共解包检查业务码
 | OwnedBusinessOperationsEditor、OutsourcedBusinessOperationsEditor | 自有/外配业务详情的居中运营登记弹框 | 表单补齐公共密度控件宽度；目的仓及预约号允许换行，实际到达时间列以受约束宽度占位，防止长业务编号撑宽 | 定向回归通过；待人工1920×1080、100%截图确认 |
 
 依据本轮可用性反馈与本文件原操作矩阵；金额、日期时区、版本及未知结果重试逻辑均未修改。司机、车辆和运维编辑表单已有多列布局与公共底部确认入口，源码复查未据此扩大修改；真实可用性仍需截图确认。
+
+## 装车资料多图（2026-10-26）
+
+依据用户PDA截图标注，五类统一为司机驾驶证、车牌照片、装车完成、封车照片、BOL司机签字。PDA每类最多5张，可多选追加、逐张更换；Admin排车资料仍沿五行表格展示，每类逐图预览/更换，自有和外配照片弹框展示全部当前图片，油耗保持单张。五类各至少1张与装车确认共同控制自动派送。PDA相关75项、后端47项、Admin照片编辑17项及照片弹框4项通过，定向类型检查通过；扩大到运营布局时另有2项既存关闭行为断言失败，未改动该运营代码。未部署，PDA真机及Admin人工截图待确认。
+
+- 同日双端复核：Admin装车资料补齐多选上传；PDA/Admin保存响应异常时重读服务端当前照片，核对失败保留刷新入口，停止本批后续上传。旧图替换不影响同类其他图，批次已成功部分保留。Admin 6文件32项、PDA 3文件38项及定向类型检查通过；此前2项运营弹框过期断言已按仅busy期间锁定的现行规则修正并通过。后端本轮未改，沿用47项验证结果；未部署、未做真机/人工截图验收。

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

@@ -57,7 +57,7 @@ export async function createExchangeRate(payload: { month: string; usdToCnyAvera
 export async function updateExchangeRate(month: string, payload: { recordVersion: number; usdToCnyAverage: number; remark: string | null }) { return normalizeExchangeRate(unwrapApiResponse(await http.put<ApiEnvelope<ExchangeRateWire>, ApiEnvelope<ExchangeRateWire>>(`${base}/exchange-rates/${encodeURIComponent(month)}`, payload))) }
 export async function changeExchangeRateStatus(month: string, status: MasterDataStatus, recordVersion: number, remark: string | null) { return normalizeExchangeRate(unwrapApiResponse(await http.patch<ApiEnvelope<ExchangeRateWire>, ApiEnvelope<ExchangeRateWire>>(`${base}/exchange-rates/${encodeURIComponent(month)}/status`, { status, recordVersion, remark }))) }
 
-export interface VehicleQuery { page: number; size: number; keyword?: string; ownership?: VehicleOwnership; region?: VehicleRegion; status?: VehicleStatus }
+export interface VehicleQuery { page: number; size: number; keyword?: string; ownership?: VehicleOwnership; region?: VehicleRegion; status?: VehicleStatus; dispatchNo?: string }
 type VehicleEditableFields = Omit<VehicleDetail, 'id' | 'recordVersion' | 'updatedBy' | 'updatedAt' | 'status'>
 export type VehicleCreate = VehicleEditableFields & Pick<VehicleDetail, 'status'>
 export type VehicleUpdate = VehicleEditableFields & Pick<VehicleDetail, 'recordVersion'>

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

@@ -0,0 +1,15 @@
+import { expect, it, vi } from 'vitest'
+import { http } from '@/shared/api/http'
+import { getResourcePhoto, uploadResourcePhoto, downloadResourcePhoto } from './resourcePhotos'
+vi.mock('@/shared/api/http', async original => ({ ...(await original<typeof import('@/shared/api/http')>()), http: { get: vi.fn(), post: vi.fn() } }))
+it('preserves long identifiers and versions and submits the correct resource scope', async () => {
+  const id = '9223372036854775701', fileId = '9223372036854775702', version = '9007199254740993'
+  const wire = { code: '200', data: { recordVersion: version, photo: { fileId, fileName: 'photo.png', contentType: 'image/png', sizeBytes: '3' } } }
+  vi.mocked(http.get).mockResolvedValue(wire); vi.mocked(http.post).mockResolvedValue(wire)
+  expect(await getResourcePhoto('VEHICLE', id)).toMatchObject({ recordVersion: version, photo: { fileId, sizeBytes: 3 } })
+  await uploadResourcePhoto('VEHICLE', id, version, new File(['png'], 'photo.png', { type: 'image/png' }))
+  expect(http.post).toHaveBeenCalledWith(`/platform/v1/last-leg/fleet/resource-photos/VEHICLE/${id}`, expect.any(FormData))
+  expect((vi.mocked(http.post).mock.calls[0]![1] as FormData).get('recordVersion')).toBe(version)
+  vi.mocked(http.get).mockResolvedValue(new Blob(['{"code":"A0403"}'], { type: 'application/json' }))
+  await expect(downloadResourcePhoto('VEHICLE', id, fileId)).rejects.toThrow('读取失败')
+})

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

@@ -0,0 +1,22 @@
+import { http, unwrapApiResponse, type ApiEnvelope } from '@/shared/api/http'
+
+export type ResourcePhotoKind = 'VEHICLE' | 'DRIVER'
+export interface ResourcePhoto { fileId: string; fileName: string; contentType: string; sizeBytes: number }
+export interface ResourcePhotoDetail { recordVersion: string; photo: ResourcePhoto | null }
+const path = (kind: ResourcePhotoKind, id: string) => `/platform/v1/last-leg/fleet/resource-photos/${kind}/${encodeURIComponent(id)}`
+type Wire = { recordVersion: string | number; photo: (Omit<ResourcePhoto, 'sizeBytes'> & { sizeBytes: number | string }) | null }
+function normalize(value: Wire): ResourcePhotoDetail {
+  return { recordVersion: String(value.recordVersion), photo: value.photo ? { ...value.photo, sizeBytes: Number(value.photo.sizeBytes) } : null }
+}
+export async function getResourcePhoto(kind: ResourcePhotoKind, id: string) {
+  return normalize(unwrapApiResponse(await http.get<ApiEnvelope<Wire>, ApiEnvelope<Wire>>(path(kind, id))))
+}
+export async function uploadResourcePhoto(kind: ResourcePhotoKind, id: string, version: string, file: File) {
+  const body = new FormData(); body.append('recordVersion', version); body.append('file', file)
+  return normalize(unwrapApiResponse(await http.post<ApiEnvelope<Wire>, ApiEnvelope<Wire>>(path(kind, id), body)))
+}
+export async function downloadResourcePhoto(kind: ResourcePhotoKind, id: string, fileId: string) {
+  const blob = await http.get<Blob, Blob>(`${path(kind, id)}/${encodeURIComponent(fileId)}/content`, { responseType: 'blob' })
+  if (!(blob instanceof Blob) || !['image/jpeg', 'image/png'].includes(blob.type) || !blob.size || blob.size > 10 * 1024 * 1024) throw new Error('档案照片读取失败，请重新核对')
+  return blob
+}

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

@@ -64,7 +64,7 @@ export async function listVehicleCareFinance(vehicleId: string, recordNos: strin
 export async function submitVehicleCareFinance(vehicleId: string, recordNo: string, request: VehicleCareFinanceSubmit): Promise<VehicleCareFinanceSubmitted> {
   type Wire = Omit<VehicleCareFinanceSubmitted, 'sourceVersion' | 'submittedRecordVersion'> & { sourceVersion: Numeric; submittedRecordVersion: Numeric }
   const response = unwrapApiResponse(await http.post<ApiEnvelope<Wire>, ApiEnvelope<Wire>>(`${path(vehicleId, recordNo)}/finance`, request))
-  if (response.recordNo !== recordNo || response.status !== 'PENDING_FINANCE') throw new Error('财务提交响应不匹配，请使用原请求重试')
+  if (response.recordNo !== recordNo || response.status !== 'PENDING_FINANCE') throw new Error('财务提交响应不匹配，请刷新当前记录')
   return { ...response, sourceVersion: financeVersion(response.sourceVersion), submittedRecordVersion: financeVersion(response.submittedRecordVersion) }
 }
 export async function listVehicleCareSuppliers(keyword = ''): Promise<Array<{ id: string; name: string }>> {

src/modules/overseas-master-data/components/CapacityInquiryDialog.test.ts

@@ -93,7 +93,7 @@ it('locks the destination in readonly follow-up even without offer detail, while
   expect(saveCapacityInquiry).not.toHaveBeenCalled()
 })
 
-it('matches an existing looseboard order without inventing space, arrival or agreed price and retries the same source', async () => {
+it('matches an existing looseboard order without inventing space, arrival or agreed price and submits a fresh command after failure', async () => {
   permissions.values = new Set(['platform:fleet:capacity-offer:manage'])
   const source = { orderNo: 'LB-ORIGINAL', customerId: '19', version: 4, origin: 'LA', destination: 'ONT8', productName: '家居用品', estimatedPalletCount: 3, packageCount: 12, totalWeightKg: 100, totalVolumeCbm: 2.5, currency: 'USD', originContactName: 'Alice', originContactPhone: '555', remark: '原单备注' }
   vi.mocked(saveCapacityInquiry).mockRejectedValue(new Error('network'))
@@ -107,6 +107,6 @@ it('matches an existing looseboard order without inventing space, arrival or agr
   const body = vi.mocked(saveCapacityInquiry).mock.calls[0]![2]
   expect(body).toMatchObject({ sourceOrderNo: 'LB-ORIGINAL', sourceOrderVersion: 4, customerId: '19', businessType: 'LOCAL_LOOSEBOARD', estimatedArrivalAt: null, expectedPalletCount: 3, cargo: { packageCount: 12, palletSpaces: null, unitPrice: null, weightKg: 100, volumeCbm: 2.5 } })
   dialog.vm.$emit('confirm'); await flushPromises()
-  expect(saveCapacityInquiry).toHaveBeenNthCalledWith(2, offer.offerNo, null, body)
+  expect(saveCapacityInquiry).toHaveBeenNthCalledWith(2, offer.offerNo, null, { ...body, idempotencyKey: expect.any(String) }); expect(vi.mocked(saveCapacityInquiry).mock.calls[1]![2].idempotencyKey).not.toBe(body.idempotencyKey)
   expect(listOfferCustomers).not.toHaveBeenCalled()
 })

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

@@ -54,7 +54,7 @@ const lock = computed(() => !writable.value || busy.value || !!pending.value)
 const cargoLabel = computed(() => inquiryCargoLabel(props.inquiry?.status))
 const selectedCapacity = computed(() => props.offer?.capacityKnown ? props.offer.destinations.find(stop => stop.destinationKey === form.cargo.destinationKey)?.remaining : null)
 const quoteReady = computed(() => !!form.customerId && form.cargo.destinationKey.startsWith('FBA:') && ['CNY', 'USD'].includes(form.cargo.currency || ''))
-const guard = useFleetDraftGuard('capacity-inquiry-editor', open, form, busy, computed(() => !!pending.value))
+const guard = useFleetDraftGuard('capacity-inquiry-editor', open, form, busy)
 let generation = 0, customerSequence = 0, quoteSequence = 0
 let timer: ReturnType<typeof setTimeout> | undefined
 function resetQuotes() { quoteSequence++; quoteRows.value = []; quoteSearched.value = false; quoteError.value = null; quoteLoading.value = false; quotePage.value = 1; quotePages.value = 0 }
@@ -108,12 +108,12 @@ async function save() {
     const result = pending.value.confirm && props.inquiry ? await saveAndConfirmInquiry(props.inquiry.bookingNo, pending.value.body) : await saveCapacityInquiry(props.offer.offerNo, props.inquiry?.bookingNo || null, pending.value.body)
     if (current === generation) { pending.value = null; guard.capture(); emit('saved', result); open.value = false; ElMessage.success(result.inquiry.status === 'CONFIRMED' ? '已保留货位并关联本土订单，尚未安排来货' : '登记已保存，调度可见，尚未保留货位') }
   } catch (cause) { if (current === generation) { error.value = getApiErrorDetails(cause, '意向保存未完成'); if (cause instanceof ApiResponseError) pending.value = null } }
-  finally { if (current === generation) busy.value = false }
+  finally { pending.value = null;  if (current === generation) busy.value = false }
 }
 onBeforeUnmount(() => { generation++; customerSequence++; quoteSequence++; clearTimeout(timer) })
 </script>
 <template>
-  <AppDialog v-model="open" :before-close="guard.beforeClose" class="admin-density-dialog admin-workbench is-dialog" destroy-on-close :title="readonly ? '客户货物跟进' : inquiry ? '补充客户货物资料' : '登记客户货物'" width="1080px" :show-confirm="writable" :confirm-text="pending ? '重试原请求' : confirmMode ? '确认承运并保位' : '保存登记'" :confirm-loading="busy" @confirm="save">
+  <AppDialog v-model="open" :before-close="guard.beforeClose" class="admin-density-dialog admin-workbench is-dialog" destroy-on-close :title="readonly ? '客户货物跟进' : inquiry ? '补充客户货物资料' : '登记客户货物'" width="1080px" :show-confirm="writable" :confirm-text="confirmMode ? '确认承运并保位' : '保存登记'" :confirm-loading="busy" @confirm="save">
     <LoadErrorState v-if="error" title="意向未能保存" :message="error.message" @retry="pending ? save() : emit('refresh')"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState>
     <p v-if="sourceDemand">散板原单：{{ sourceDemand.orderNo }} · {{ sourceDemand.origin }} → {{ sourceDemand.destination }}。请核对卸货站、标准托位和预计到仓时间。</p>
     <p v-if="confirmMode">核对本票货量、价格与交货资料后确认承运。成功将保留货位并关联本土订单，不自动安排仓库收货。</p>
@@ -123,7 +123,7 @@ onBeforeUnmount(() => { generation++; customerSequence++; quoteSequence++; clear
       <p v-else>待调度核对，当前没有可靠的可接余位。</p>
 
     </section>
-    <p v-if="pending" role="status">上次提交结果尚未确定，请保留原内容重试或核对。</p>
+
     <p v-if="offer">{{ offer.offerNo }} · {{ offer.warehouseName }} · {{ offer.blockReason || '询价不占位，调度确认承运后占位。' }}</p>
     <section v-if="inquiry" aria-label="本票处理进度"><strong>{{ inquiry.customerName }} · {{ inquiry.destinationLabel }}</strong><p>车次：{{ inquiry.tripNo }} · 登记：{{ inquiry.bookingNo }}</p><strong>{{ inquiry.progress.label }} · {{ inquiry.progress.reservation }}</strong><p>下一步负责人：{{ inquiry.progress.owner }} · {{ inquiry.progress.message }}</p></section>
 

src/modules/overseas-master-data/components/CapacityOfferSettingsDialog.test.ts

@@ -49,15 +49,15 @@ it('does not publish if capacity validation is incomplete', async () => {
  wrapper.findComponent({ name: 'AppDialog' }).vm.$emit('confirm'); await flushPromises()
  expect(offers.saveCapacityOffer).not.toHaveBeenCalled(); expect(offers.commandCapacityOffer).not.toHaveBeenCalled()
 })
-it('retries only the uncertain publish command with the original key', async () => {
+it('releases a failed publish and submits current settings with a new key', async () => {
  vi.mocked(offers.commandCapacityOffer).mockRejectedValueOnce(new Error('network'))
  const wrapper = mount(); await flushPromises()
  wrapper.findComponent({ name: 'AppDialog' }).vm.$emit('confirm'); await flushPromises()
  const first = vi.mocked(offers.commandCapacityOffer).mock.calls[0]!
- expect(wrapper.findComponent({ name: 'AppDialog' }).props('confirmText')).toBe('重试原请求')
+ expect(wrapper.findComponent({ name: 'AppDialog' }).props('confirmText')).toBe('确认发布')
  wrapper.findComponent({ name: 'AppDialog' }).vm.$emit('confirm'); await flushPromises()
- expect(offers.commandCapacityOffer).toHaveBeenNthCalledWith(2, ...first)
- expect(state.plan).toHaveBeenCalledOnce(); expect(offers.saveCapacityOffer).toHaveBeenCalledOnce()
+ expect(offers.commandCapacityOffer).toHaveBeenNthCalledWith(2, first[0], first[1], { ...first[2], idempotencyKey: expect.any(String) }); expect(vi.mocked(offers.commandCapacityOffer).mock.calls[1]![2].idempotencyKey).not.toBe(first[2].idempotencyKey)
+ expect(state.plan).toHaveBeenCalledTimes(2); expect(offers.saveCapacityOffer).toHaveBeenCalledTimes(2)
 })
 
 it('submits measurements from the embedded panel before saving and publishing', async () => {

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

@@ -30,7 +30,7 @@ const form = reactive({ cutoffAt: '', contactName: '', contactPhone: '', remark:
 const pending = ref<{ action: 'save'; offerNo: string | null; body: OfferWrite } | { action: 'publish' | 'pause' | 'resume' | 'close'; offerNo: string; body: OfferCommand } | null>(null)
 let generation = 0
 const writable = computed(() => access.can('platform:fleet:capacity-offer:manage'))
-const guard = useFleetDraftGuard('capacity-offer-settings', open, reactive({ form, planState }), busy, computed(() => !!pending.value))
+const guard = useFleetDraftGuard('capacity-offer-settings', open, reactive({ form, planState }), busy)
 async function load() {
   if (!writable.value || !open.value || pending.value) return
   const current = ++generation; loading.value = true; error.value = null; loaded.value = false
@@ -69,7 +69,7 @@ async function execute() {
     else ElMessage.success('发布设置已更新')
   }
   catch (cause) { if (current === generation) { error.value = getApiErrorDetails(cause, '发布操作未完成'); if (cause instanceof ApiResponseError) pending.value = null } }
-  finally { if (current === generation) busy.value = false }
+  finally { pending.value = null;  if (current === generation) busy.value = false }
 }
 async function matchExistingStops() {
   if (busy.value || !canPlan.value || pending.value) return
@@ -86,7 +86,7 @@ async function matchExistingStops() {
     currentTrip.value = result.trip; emit('tripUpdated', result.trip); emit('saved', result.trip.recordVersion)
     if (offer.value) offer.value = { ...offer.value, tripRecordVersion: result.trip.recordVersion }
   } catch (cause) { error.value = getApiErrorDetails(cause, '卸货站匹配未完成') }
-  finally { busy.value = false }
+  finally { pending.value = null;  busy.value = false }
 }
 function planChanged(value: string) {
   planState.value = value
@@ -100,7 +100,7 @@ async function save() {
   if (new Date(form.cutoffAt).getTime() <= Date.now() || new Date(form.cutoffAt).getTime() > new Date(currentTrip.value.plannedDepartureAt).getTime()) { ElMessage.warning('交货截止须晚于现在且不晚于计划发车'); return }
   busy.value = true
   let plan
-  try { plan = await planner.value?.save() } finally { busy.value = false }
+  try { plan = await planner.value?.save() } finally { pending.value = null;  busy.value = false }
   if (!plan) return
   currentTrip.value = { ...currentTrip.value, recordVersion: plan.recordVersion }
   emit('saved', plan.recordVersion)
@@ -118,9 +118,9 @@ async function command(action: 'publish' | 'pause' | 'resume' | 'close') {
 }
 onBeforeUnmount(() => { generation++ })
 </script>
-<template><AppDialog v-model="open" :before-close="guard.beforeClose" class="admin-density-dialog admin-workbench is-dialog" title="发布拼车余位" width="1080px" :show-confirm="writable && (!offer || offer.actions.canEdit || !!pending)" :confirm-text="pending ? '重试原请求' : '确认发布'" :confirm-loading="busy" :confirm-disabled="loading || !loaded" @confirm="save">
+<template><AppDialog v-model="open" :before-close="guard.beforeClose" class="admin-density-dialog admin-workbench is-dialog" title="发布拼车余位" width="1080px" :show-confirm="writable && (!offer || offer.actions.canEdit || !!pending)" :confirm-text="'确认发布'" :confirm-loading="busy" :confirm-disabled="loading || !loaded" @confirm="save">
   <LoadErrorState v-if="error" title="发布操作未完成" :message="error.message" @retry="pending ? execute() : load()"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState>
-  <p>{{ trip.tripNo }} · {{ offer ? `${offer.offerNo} · ${offerStatusLabels[offer.status]}` : '尚未建立发布' }}</p><p v-if="offer?.blockReason && offer.status !== 'DRAFT'">{{ offer.blockReason }}</p><p v-if="pending">上次结果尚未确定，原请求已保留，请重试核对。</p>
+  <p>{{ trip.tripNo }} · {{ offer ? `${offer.offerNo} · ${offerStatusLabels[offer.status]}` : '尚未建立发布' }}</p><p v-if="offer?.blockReason && offer.status !== 'DRAFT'">{{ offer.blockReason }}</p>
   <template v-if="loaded && open && (!offer || offer.actions.canEdit)">
     <h3>本车货物与余位<InlineHelp title="容量发布说明"><p>卸货站已按货物匹配。核对下方数据，确认发布时一并保存容量；多个目的地的先后顺序请在车次计划中确认。</p></InlineHelp></h3>
 

src/modules/overseas-master-data/components/FleetQuoteEditor.test.ts

@@ -33,12 +33,12 @@ it('HTTP 200/A0409 unlocks the form so corrected content receives a new key', as
   const corrected = vi.mocked(api.createFleetQuote).mock.calls[1]!
   expect(corrected[0]).not.toBe(original[0]); expect(corrected[1].originCity).toBe('QA-Another-Origin'); expect(corrected[1].fullDeliveryPrice).toBe(0)
 })
-it('unknown creation retains its exact key after viewing another quote', async () => {
+it('unknown creation unlocks the current form and sends edited values with a fresh key', async () => {
   const wrapper = await mount(); vi.mocked(api.createFleetQuote).mockRejectedValueOnce(new Error('Network unavailable'))
   await clickSave(wrapper); const original = vi.mocked(api.createFleetQuote).mock.calls[0]!
-  const other: api.FleetQuote = { quoteNo: 'FQ-OTHER', details: { ...original[1], originCity: 'OTHER' }, recordVersion: '2', partyName: '测试客户', status: 'ACTIVE', updatedAt: '' }
-  await wrapper.setProps({ modelValue: false }); await wrapper.setProps({ quote: other, readonly: true, modelValue: true }); await flushPromises()
-  await wrapper.setProps({ modelValue: false }); await wrapper.setProps({ quote: null, readonly: false, modelValue: true }); await flushPromises()
-  expect(wrapper.text()).toContain('按原请求重试'); vi.mocked(api.createFleetQuote).mockResolvedValue({ ...other, quoteNo: 'FQ-NEW', details: original[1] })
-  await clickSave(wrapper); expect(vi.mocked(api.createFleetQuote).mock.calls[1]).toEqual(original)
+  expect(wrapper.findComponent({ name: 'ElForm' }).props('disabled')).toBe(false)
+  wrapper.findAllComponents({ name: 'ElInput' }).find(input => input.attributes('placeholder') === '请输入发货城市')!.vm.$emit('update:modelValue', 'CHANGED')
+  await clickSave(wrapper)
+  const next = vi.mocked(api.createFleetQuote).mock.calls[1]!
+  expect(next[0]).not.toBe(original[0]); expect(next[1].originCity).toBe('CHANGED')
 })

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

@@ -6,15 +6,13 @@ import AppDialog from '@/shared/components/AppDialog.vue'
 import ApiErrorMeta from '@/shared/components/ApiErrorMeta.vue'
 import { getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
 import FleetQuotePartySelect from './FleetQuotePartySelect.vue'
-import { createFleetQuote, updateFleetQuote, isFleetCommandRejected, type FleetQuote, type FleetQuoteDraft, type FleetQuoteKind } from '../api/fleetQuotes'
+import { createFleetQuote, updateFleetQuote, type FleetQuote, type FleetQuoteDraft, type FleetQuoteKind } from '../api/fleetQuotes'
 const open = defineModel<boolean>({ default: false })
 const props = defineProps<{ quote: FleetQuote | null; readonly?: boolean; kind: FleetQuoteKind }>()
 const emit = defineEmits<{ saved: [] }>()
 type QuoteForm = Omit<FleetQuoteDraft, 'distanceMiles'> & { distanceMiles: number | null }
 const empty = (): QuoteForm => ({ kind: props.kind, partyId: '', originCity: '', destinationCode: '', distanceMiles: null, currency: 'USD', selfPickupPrice: null, fullDeliveryPrice: null, looseDeliveryPrice: null, validFrom: new Date().toISOString().slice(0, 10), validTo: '', remark: null })
 const form = reactive<QuoteForm>(empty()), saving = ref(false), error = ref<ApiErrorDetails | null>(null)
-let pending: { idempotencyKey: string; details: FleetQuoteDraft } | null = null
-const uncertain = ref(false)
 const title = computed(() => {
   const action = props.readonly ? '报价详情' : props.quote ? '编辑报价' : form.kind === 'PURCHASE' ? '新增车队采购报价' : '新增外接销售报价'
   return props.quote?.quoteNo?.trim() ? `${action} · ${props.quote.quoteNo.trim()}` : action
@@ -30,8 +28,7 @@ const facts = computed(() => [
 ])
 watch([open, () => props.quote?.quoteNo], () => {
   if (!open.value) return
-  uncertain.value = !props.quote && pending !== null
-  Object.assign(form, props.quote?.details || pending?.details || empty()); error.value = null
+  Object.assign(form, props.quote?.details || empty()); error.value = null
 })
 async function save() {
   if (props.readonly || saving.value) return
@@ -43,25 +40,24 @@ async function save() {
     if (form.selfPickupPrice == null && form.fullDeliveryPrice == null && form.looseDeliveryPrice == null) throw new Error('至少填写一种价格，零表示明确零价')
     const details: FleetQuoteDraft = { ...form, distanceMiles: form.distanceMiles }
     if (editing) await updateFleetQuote(editing, details)
-    else { pending ??= { idempotencyKey: crypto.randomUUID(), details }; await createFleetQuote(pending.idempotencyKey, pending.details) }
-    if (!editing) pending = null
-    uncertain.value = false; open.value = false; emit('saved')
-  } catch (e) { error.value = getApiErrorDetails(e, '报价保存失败'); if (!editing && isFleetCommandRejected(e)) pending = null; uncertain.value = !editing && pending !== null }
+    else await createFleetQuote(crypto.randomUUID(), details)
+    open.value = false; emit('saved')
+  } catch (e) { error.value = getApiErrorDetails(e, '报价保存失败') }
   finally { saving.value = false }
 }
 </script>
 <template><AppDialog v-model="open" :title="title" width="780px" class="admin-density-dialog admin-workbench is-dialog" fullscreenable :confirm-loading="saving" :show-confirm="false" :close-on-click-modal="false">
   <el-alert v-if="error" :title="error.message" type="error" :closable="false"><ApiErrorMeta :details="error" /></el-alert>
-  <p v-if="uncertain" role="status" class="density-dialog-note">保存结果尚未确认，重试将发送原请求和原内容。</p>
+
   <section v-if="readonly" class="density-dialog-section" data-tone="source" aria-label="车队报价资料">
     <h3 class="density-dialog-section__title">报价资料</h3>
     <dl class="density-fields fleet-quote-facts"><div v-for="(fact,index) in facts" :key="index"><dt>{{fact[0]}}</dt><dd>{{fact[1]}}</dd></div></dl>
   </section>
-  <el-form v-else label-position="left" label-width="130px" class="density-form density-dialog-sections" :disabled="saving || uncertain">
+  <el-form v-else label-position="left" label-width="130px" class="density-form density-dialog-sections" :disabled="saving">
     <section class="density-dialog-section" data-tone="work" aria-label="报价路线与归属">
       <h3 class="density-dialog-section__title">基础信息</h3>
       <table class="density-table density-table--editable fleet-quote-form"><tbody>
-        <tr><td><el-form-item label="用途"><span>{{form.kind === 'PURCHASE' ? '车队采购报价' : '外接销售报价'}}</span></el-form-item></td><td><el-form-item :label="form.kind === 'PURCHASE' ? '海外车队供应商' : '委托客户'" required><FleetQuotePartySelect v-model="form.partyId" :kind="form.kind" :party-name="quote?.partyName" :disabled="saving || uncertain" /></el-form-item></td></tr>
+        <tr><td><el-form-item label="用途"><span>{{form.kind === 'PURCHASE' ? '车队采购报价' : '外接销售报价'}}</span></el-form-item></td><td><el-form-item :label="form.kind === 'PURCHASE' ? '海外车队供应商' : '委托客户'" required><FleetQuotePartySelect v-model="form.partyId" :kind="form.kind" :party-name="quote?.partyName" :disabled="saving" /></el-form-item></td></tr>
         <tr><td><el-form-item label="发货城市" required><el-input v-model="form.originCity" maxlength="128" placeholder="请输入发货城市" /></el-form-item></td><td><el-form-item label="目的仓码" required><el-input v-model="form.destinationCode" maxlength="64" placeholder="请输入目的仓码，如 ONT8" /></el-form-item></td></tr>
         <tr><td><el-form-item label="预估距离(mile)" required><el-input-number :model-value="form.distanceMiles" @update:model-value="form.distanceMiles = $event ?? null" :min="0" :precision="1" placeholder="请输入预估英里数" /></el-form-item></td><td><el-form-item label="币种"><el-select v-model="form.currency"><el-option label="USD" value="USD" /><el-option label="CNY" value="CNY" /></el-select></el-form-item></td></tr>
       </tbody></table>
@@ -82,7 +78,7 @@ async function save() {
     </section>
   </el-form>
 
-  <template #footer="{close}"><div class="density-actions density-actions--footer"><el-button :disabled="saving" @click="close">关闭</el-button><el-button v-if="!readonly" type="primary" :loading="saving" @click="save">{{ uncertain ? '按原请求重试' : '保存报价' }}</el-button></div></template>
+  <template #footer="{close}"><div class="density-actions density-actions--footer"><el-button :disabled="saving" @click="close">关闭</el-button><el-button v-if="!readonly" type="primary" :loading="saving" @click="save">保存报价</el-button></div></template>
 </AppDialog></template>
 <style scoped>
 .fleet-quote-form { table-layout: fixed; }

src/modules/overseas-master-data/components/FleetQuoteImport.test.ts

@@ -30,16 +30,16 @@ it('definite import rejection unlocks file selection and corrected rows use a ne
   const second = vi.mocked(api.importFleetQuotes).mock.calls[1]!
   expect(second[0]).not.toBe(first[0]); expect(second[1][0]?.originCity).toBe('QA-CORRECTED')
 })
-it('unknown result preserves original purpose, key and rows across closing and category changes', async () => {
+it('failed import allows a different category and corrected file on the next click', async () => {
   const wrapper = await mount(); await pick(wrapper)
   vi.mocked(api.importFleetQuotes).mockRejectedValueOnce(new Error('network')); await save(wrapper)
   const call = vi.mocked(api.importFleetQuotes).mock.calls[0]!
-  const first = [call[0], call[1].map(row => ({ ...row }))]
+  const firstKey = call[0]
   await wrapper.setProps({ modelValue: false, kind: 'PURCHASE' }); await wrapper.setProps({ modelValue: true }); await flushPromises()
-  expect(wrapper.findComponent({ name: 'FleetQuotePartySelect' }).props('kind')).toBe('SALE')
-  expect(wrapper.find('input[type="file"]').attributes('disabled')).toBeDefined()
+  expect(wrapper.findComponent({ name: 'FleetQuotePartySelect' }).props('kind')).toBe('PURCHASE')
+  expect(wrapper.find('input[type="file"]').attributes('disabled')).toBeUndefined(); wrapper.findComponent({ name: 'FleetQuotePartySelect' }).vm.$emit('update:modelValue', '101'); await pick(wrapper, 'QA-NEW')
   vi.mocked(api.importFleetQuotes).mockResolvedValue({ importedRows: 1 }); await save(wrapper)
-  expect(vi.mocked(api.importFleetQuotes).mock.calls[1]).toEqual(first)
+  expect(vi.mocked(api.importFleetQuotes).mock.calls[1]![0]).not.toBe(firstKey); expect(vi.mocked(api.importFleetQuotes).mock.calls[1]![1][0]).toMatchObject({ kind: 'PURCHASE', originCity: 'QA-NEW' })
 })
 it('selecting an oversized replacement file cannot accidentally submit the previous valid file', async () => {
   const wrapper = await mount(); await pick(wrapper); await pick(wrapper, 'TOO-LARGE', 500001)

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

@@ -23,13 +23,13 @@ async function pick(event: Event) {
   catch (e) { if (current === fileSequence) error.value = getApiErrorDetails(e, 'CSV读取失败，请重新选择文件') }
 }
 function template() { saveFleetCsv(new Blob(['\uFEFF' + fleetQuoteCsvHeader.join(',') + '\r\n'], { type: 'text/csv;charset=utf-8' }), '车队报价模板.csv') }
-async function save() { if (saving.value || (!pending.value && (!rows.value.length || !partyId.value))) return; fileSequence++; saving.value = true; error.value = null; try { pending.value ??= { key: crypto.randomUUID(), rows: rows.value.map(r => ({ ...r })) }; await importFleetQuotes(pending.value.key, pending.value.rows); pending.value = null; rows.value = []; source.value = ''; open.value = false; emit('saved') } catch (e) { error.value = getApiErrorDetails(e, '整批导入失败，请核对报价库与目录后重试'); if (isFleetCommandRejected(e)) pending.value = null } finally { saving.value = false } }
+async function save() { if (saving.value || (!pending.value && (!rows.value.length || !partyId.value))) return; fileSequence++; saving.value = true; error.value = null; try { pending.value ??= { key: crypto.randomUUID(), rows: rows.value.map(r => ({ ...r })) }; await importFleetQuotes(pending.value.key, pending.value.rows); pending.value = null; rows.value = []; source.value = ''; open.value = false; emit('saved') } catch (e) { error.value = getApiErrorDetails(e, '整批导入失败，请核对报价库与目录后重试'); if (isFleetCommandRejected(e)) pending.value = null } finally { pending.value = null;  saving.value = false } }
 onBeforeUnmount(() => { fileSequence++ })
 </script>
 <template><AppDialog v-model="open" title="批量导入车队报价" width="1040px" class="admin-density-dialog admin-workbench is-dialog" fullscreenable :confirm-loading="saving" :show-confirm="false" :close-on-click-modal="false">
   <p class="density-dialog-note">本批{{ activeKind === 'PURCHASE' ? '采购' : '销售' }}报价使用同一往来单位；每批最多200条，服务端整批校验，任一失败全部不写入。</p>
   <el-alert v-if="error" type="error" :title="error.message" :closable="false"><ApiErrorMeta :details="error" /></el-alert>
-  <p v-if="pending" role="status" class="density-dialog-note">已保留原批次和原内容。结果未确认时请按原请求重试，避免重复导入。</p>
+
   <div class="density-dialog-sections">
     <section class="density-dialog-section" data-tone="work" aria-label="导入报价文件与归属">
       <h3 class="density-dialog-section__title">导入资料</h3>
@@ -48,7 +48,7 @@ onBeforeUnmount(() => { fileSequence++ })
       <div class="fleet-import-scroll"><table class="density-table fleet-import-table"><thead><tr><th scope="col">发货城市</th><th scope="col">目的仓码</th><th scope="col">距离(mile)</th><th scope="col">币种</th><th scope="col">整车自提</th><th scope="col">整车派送</th><th scope="col">散板派送</th><th scope="col">有效期</th></tr></thead><tbody><tr v-for="(row, index) in rows.slice(0,10)" :key="index"><td>{{ row.originCity }}</td><td>{{ row.destinationCode }}</td><td>{{ row.distanceMiles }}</td><td>{{ row.currency }}</td><td>{{ row.selfPickupPrice ?? '—' }}</td><td>{{ row.fullDeliveryPrice ?? '—' }}</td><td>{{ row.looseDeliveryPrice ?? '—' }}</td><td>{{ row.validFrom }} — {{ row.validTo }}</td></tr><tr v-if="!rows.length"><td colspan="8">请选择往来单位并上传有效CSV文件</td></tr></tbody></table></div>
     </section>
   </div>
-  <template #footer="{close}"><div class="density-actions density-actions--footer"><el-button :disabled="saving" @click="close">关闭</el-button><el-button type="primary" :disabled="!rows.length || !partyId" :loading="saving" @click="save">{{ pending ? '按原请求重试' : '确认导入' }}</el-button></div></template>
+  <template #footer="{close}"><div class="density-actions density-actions--footer"><el-button :disabled="saving" @click="close">关闭</el-button><el-button type="primary" :disabled="!rows.length || !partyId" :loading="saving" @click="save">{{ '确认导入' }}</el-button></div></template>
 </AppDialog></template>
 <style scoped>
 .fleet-import-scroll { overflow-x: auto; }

src/modules/overseas-master-data/components/OutsourcedBusinessCommandRecovery.test.ts

@@ -1,72 +0,0 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-import { ApiResponseError } from '@/shared/api/http'
-import * as api from '../api/outsourcedBusiness'
-import { outsourcedBusinessFixture, outsourcedBusinessCommandFixture } from './OutsourcedBusinessFixtures'
-import { acceptOutsourcedBusinessCommand, newOutsourcedBusinessPending, persistOutsourcedBusinessPending, restoreOutsourcedBusinessPending, recoverOutsourcedBusinessCommand, outsourcedBusinessPendingKey } from './OutsourcedBusinessCommandRecovery'
-import type { OutsourcedBusinessPhoto, OutsourcedBusinessSave } from '../outsourcedBusinessTypes'
-
-beforeEach(() => sessionStorage.clear())
-const no = 'DS-OUT-1'
-function operation() : OutsourcedBusinessSave { return { recordVersion: '0', idempotencyKey: 'original-key', operations: { ...outsourcedBusinessFixture().row.operations, money: { currency: 'USD', amount: '9999999999999999.99' } }, reason: null } }
-function client() {
-  const current = outsourcedBusinessFixture(); current.row.recordVersion = '1'
-  const photo: OutsourcedBusinessPhoto = { slot:'LOADING_SCENE',category:'LOADING',fileId:'9007199254740993',fileName:'loading.png',contentType:'image/png',sizeBytes:'5',uploadedAt:'2026-10-20T10:00:00Z',savedAt:null }
-  return { ...api, getOutsourcedBusiness: vi.fn(async () => current), getOutsourcedBusinessCommand: vi.fn(async () => outsourcedBusinessCommandFixture()), saveOutsourcedBusinessOperations: vi.fn(async () => current), bindOutsourcedBusinessPhoto: vi.fn(async () => current), uploadOutsourcedBusinessPhoto: vi.fn(async () => photo) }
-}
-describe('outsourced business exact command recovery', () => {
-  it('persists the complete original payload, actor and zero auxiliary version', () => {
-    const pending = newOutsourcedBusinessPending('actor', no, 'SAVE_OPERATIONS', operation())
-    persistOutsourcedBusinessPending('actor', no, 'operations', pending)
-    expect(restoreOutsourcedBusinessPending('actor', no, 'operations')).toEqual(pending)
-    expect(restoreOutsourcedBusinessPending('another', no, 'operations')).toBeNull()
-    const raw = JSON.parse(sessionStorage.getItem(outsourcedBusinessPendingKey('actor',no,'operations'))!)
-    raw.actor = 'another'; sessionStorage.setItem(outsourcedBusinessPendingKey('actor',no,'operations'),JSON.stringify(raw))
-    expect(() => restoreOutsourcedBusinessPending('actor',no,'operations')).toThrow('损坏')
-  })
-  it('looks up an unknown write first and retries only the unchanged original body on explicit not-found', async () => {
-    const pending = newOutsourcedBusinessPending('actor', no, 'SAVE_OPERATIONS', operation()); pending.attempted = true
-    const service = client(), persist = vi.fn()
-    service.getOutsourcedBusinessCommand.mockRejectedValue(new ApiResponseError('not found','A0404',404))
-    await recoverOutsourcedBusinessCommand(pending,persist,() => {},service)
-    expect(service.getOutsourcedBusinessCommand).toHaveBeenCalledWith(no,'original-key')
-    expect(service.saveOutsourcedBusinessOperations).toHaveBeenCalledExactlyOnceWith(no,operation())
-    expect(pending.body).toEqual(operation()); expect(pending.body?.recordVersion).toBe('0')
-  })
-  it('retains a proven success through failed fresh reads without writing it a second time', async () => {
-    const pending = newOutsourcedBusinessPending('actor', no, 'SAVE_OPERATIONS', operation()), service = client()
-    service.getOutsourcedBusiness.mockRejectedValueOnce(new Error('read offline'))
-    await expect(recoverOutsourcedBusinessCommand(pending,() => {},() => {},service)).rejects.toThrow('read offline')
-    expect(pending.confirmed?.recordVersion).toBe('1')
-    await recoverOutsourcedBusinessCommand(pending,() => {},() => {},service)
-    expect(service.saveOutsourcedBusinessOperations).toHaveBeenCalledTimes(1); expect(service.getOutsourcedBusinessCommand).not.toHaveBeenCalled()
-  })
-  it('never retransmits a file for an unknown upload, including command not-found', async () => {
-    const pending = newOutsourcedBusinessPending('actor',no,'UPLOAD_PHOTO',null,'LOADING_SCENE'); pending.attempted = true
-    const service = client(); service.getOutsourcedBusinessCommand.mockRejectedValue(new ApiResponseError('not found','A0404',404))
-    await expect(recoverOutsourcedBusinessCommand(pending,() => {},() => {},service)).rejects.toThrow('禁止重复上传')
-    expect(service.uploadOutsourcedBusinessPhoto).not.toHaveBeenCalled(); expect(service.bindOutsourcedBusinessPhoto).not.toHaveBeenCalled(); expect(pending.key).toBeTruthy()
-  })
-  it('keeps the prepared file and exact binding key through unknown binding and later replacement', async () => {
-    const photo: OutsourcedBusinessPhoto = { slot:'LOADING_SCENE',category:'LOADING',fileId:'9007199254740993',fileName:'loading.png',contentType:'image/png',sizeBytes:'5',uploadedAt:'2026-10-20T10:00:00Z',savedAt:'2026-10-20T10:01:00Z' }
-    const pending = newOutsourcedBusinessPending('actor',no,'BIND_PHOTO',{recordVersion:'0',idempotencyKey:'bind-key',fileId:photo.fileId},photo.slot)
-    pending.attempted = true
-    const service = client(); const bound = outsourcedBusinessFixture(); bound.row.recordVersion='1'; bound.photos=[photo]
-    const original = outsourcedBusinessCommandFixture({action:'BIND_PHOTO',idempotencyKey:'bind-key',result:bound})
-    service.getOutsourcedBusinessCommand.mockResolvedValue(original)
-    const current = outsourcedBusinessFixture();current.row.recordVersion='2';current.photos=[{...photo,fileId:'9007199254740994'}]
-    service.getOutsourcedBusiness.mockResolvedValue(current)
-    const result = await recoverOutsourcedBusinessCommand(pending,() => {},() => {},service)
-    expect(result.detail?.photos[0]?.fileId).toBe('9007199254740994')
-    expect(pending.body).toEqual({recordVersion:'0',idempotencyKey:'bind-key',fileId:photo.fileId})
-    expect(service.uploadOutsourcedBusinessPhoto).not.toHaveBeenCalled();expect(service.bindOutsourcedBusinessPhoto).not.toHaveBeenCalled()
-  })
-  it('refuses wrong command identities, stale reads, definite rejection retries and scope changes', async () => {
-    const pending = newOutsourcedBusinessPending('actor',no,'SAVE_OPERATIONS',operation()), service=client()
-    expect(() => acceptOutsourcedBusinessCommand(pending,outsourcedBusinessCommandFixture({dispatchNo:'another'}))).toThrow('不一致')
-    pending.command=outsourcedBusinessCommandFixture({recordVersion:'9007199254740993'})
-    await expect(recoverOutsourcedBusinessCommand(pending,() => {},() => {},service)).rejects.toThrow('早于')
-    pending.rejected=true;await expect(recoverOutsourcedBusinessCommand(pending,() => {},() => {},service)).rejects.toThrow('明确拒绝')
-    pending.rejected=false;await expect(recoverOutsourcedBusinessCommand(pending,() => {},() => {throw new Error('scope changed')},service)).rejects.toThrow('scope changed')
-    expect(service.saveOutsourcedBusinessOperations).not.toHaveBeenCalled()
-  })
-})

src/modules/overseas-master-data/components/OutsourcedBusinessCommandRecovery.ts

@@ -1,89 +0,0 @@
-import { ApiResponseError } from '@/shared/api/http'
-import * as api from '../api/outsourcedBusiness'
-import { outsourcedBusinessPhotoRoles, outsourcedBusinessVersion, type OutsourcedBusinessAction, type OutsourcedBusinessBind, type OutsourcedBusinessCommand, type OutsourcedBusinessDetail, type OutsourcedBusinessPhoto, type OutsourcedBusinessPhotoSlot, type OutsourcedBusinessSave } from '../outsourcedBusinessTypes'
-
-export interface OutsourcedBusinessPending {
-  actor: string; dispatchNo: string; action: OutsourcedBusinessAction; key: string; slot?: OutsourcedBusinessPhotoSlot
-  body: OutsourcedBusinessSave | OutsourcedBusinessBind | null; attempted: boolean; command: OutsourcedBusinessCommand | null; confirmed: { recordVersion: string | null; result: OutsourcedBusinessDetail | OutsourcedBusinessPhoto } | null; rejected: boolean
-}
-export const outsourcedBusinessPendingKey = (actor: string, no: string, area: string) => `outsourced-business:${encodeURIComponent(actor)}:${encodeURIComponent(no)}:${area}`
-export function restoreOutsourcedBusinessPending(actor: string, no: string, area: string): OutsourcedBusinessPending | null {
-  const raw = sessionStorage.getItem(outsourcedBusinessPendingKey(actor, no, area))
-  if (!raw) return null
-  const pending = JSON.parse(raw) as OutsourcedBusinessPending
-  if (pending.actor !== actor || pending.dispatchNo !== no || !pending.key || !['SAVE_OPERATIONS','UPLOAD_PHOTO','BIND_PHOTO'].includes(pending.action)) throw new Error('原运营请求记录损坏，请保留现场核对')
-  if (pending.action !== 'SAVE_OPERATIONS' && !outsourcedBusinessPhotoRoles.some(role => role.slot === pending.slot) || pending.action !== 'UPLOAD_PHOTO' && (!pending.body || pending.body.idempotencyKey !== pending.key)) throw new Error('原运营请求内容不完整，请保留现场核对')
-  return pending
-}
-export function persistOutsourcedBusinessPending(actor: string, no: string, area: string, pending: OutsourcedBusinessPending | null) {
-  if (!actor || !no || pending && (pending.actor !== actor || pending.dispatchNo !== no)) throw new Error('运营请求身份已变化')
-  const key = outsourcedBusinessPendingKey(actor, no, area)
-  if (pending) sessionStorage.setItem(key, JSON.stringify(pending)); else sessionStorage.removeItem(key)
-}
-export function newOutsourcedBusinessPending(actor: string, no: string, action: OutsourcedBusinessAction, body: OutsourcedBusinessPending['body'], slot?: OutsourcedBusinessPhotoSlot): OutsourcedBusinessPending {
-  if (!actor || !no) throw new Error('当前运营作业身份缺失')
-  const key = body?.idempotencyKey || crypto.randomUUID()
-  return { actor, dispatchNo: no, action, key, slot, body: body ? structuredClone(body) : null, attempted: false, command: null, confirmed: null, rejected: false }
-}
-export function acceptOutsourcedBusinessResult(pending: OutsourcedBusinessPending, result: OutsourcedBusinessDetail | OutsourcedBusinessPhoto) {
-  if (pending.action === 'UPLOAD_PHOTO') {
-    if (!('fileId' in result) || result.slot !== pending.slot || result.category !== 'LOADING' || typeof result.fileId !== 'string' || !/^[1-9]\d*$/.test(result.fileId) || !['image/jpeg','image/png'].includes(result.contentType)) throw new Error('原上传尚未返回本分类的真实文件')
-    pending.confirmed = { recordVersion: null, result }
-  } else {
-    if (!('row' in result) || result.row.dispatchNo !== pending.dispatchNo) throw new Error('运营保存结果与原排车单不一致')
-    pending.confirmed = { recordVersion: outsourcedBusinessVersion(result.row.recordVersion), result }
-  }
-}
-export function acceptOutsourcedBusinessCommand(pending: OutsourcedBusinessPending, command: OutsourcedBusinessCommand) {
-  if (command.dispatchNo !== pending.dispatchNo || command.action !== pending.action || command.idempotencyKey !== pending.key) throw new Error('返回结果与原运营请求不一致，请保留原请求核对')
-  pending.command = command
-  if (command.state === 'REJECTED') pending.rejected = true
-  if (command.state !== 'SUCCEEDED') throw new Error(command.state === 'REJECTED' ? '原请求已明确拒绝，请核对原因后重新登记' : '原请求结果尚未确定，请保留原请求继续核对')
-  if (!command.result) throw new Error('原运营命令的成功结果不完整，请继续核对')
-  acceptOutsourcedBusinessResult(pending, command.result)
-  if (pending.action !== 'UPLOAD_PHOTO' && (command.recordVersion == null || command.recordVersion !== pending.confirmed!.recordVersion)) throw new Error('原运营命令版本与结果不一致')
-}
-export async function recoverOutsourcedBusinessCommand(pending: OutsourcedBusinessPending, persist: () => void, ensureScope: () => void, client = api): Promise<{ detail?: OutsourcedBusinessDetail; photo?: OutsourcedBusinessPhoto }> {
-  ensureScope()
-  if (pending.rejected) throw new Error('原请求已明确拒绝，请先按明确拒绝结果重新核对')
-  if (pending.command?.state === 'SUCCEEDED') acceptOutsourcedBusinessCommand(pending, pending.command)
-  const previous = pending.attempted
-  if (!pending.confirmed) {
-    let original: OutsourcedBusinessCommand | null = null
-    if (previous) {
-      try { original = await client.getOutsourcedBusinessCommand(pending.dispatchNo, pending.key) }
-      catch (cause) { if (!(cause instanceof ApiResponseError) || !['404','A0404','HTTP_404'].includes(cause.code)) throw cause }
-      ensureScope()
-    }
-    if (original) { try { acceptOutsourcedBusinessCommand(pending, original) } finally { persist() } }
-    else {
-      if (pending.action === 'UPLOAD_PHOTO') throw new Error('图片上传结果未知，禁止重复上传；请继续核对原上传请求')
-      pending.attempted = true; persist()
-      try {
-        const result = pending.action === 'SAVE_OPERATIONS'
-          ? await client.saveOutsourcedBusinessOperations(pending.dispatchNo, pending.body as OutsourcedBusinessSave)
-          : await client.bindOutsourcedBusinessPhoto(pending.dispatchNo, pending.slot!, pending.body as OutsourcedBusinessBind)
-        ensureScope(); acceptOutsourcedBusinessResult(pending, result); persist()
-      } catch (cause) {
-        ensureScope()
-        if (!previous && cause instanceof ApiResponseError && ['A0400','A0403','A0404','A0409','400','403','404','409','422'].includes(cause.code)) { pending.rejected = true; persist() }
-        throw cause
-      }
-    }
-  }
-  const confirmed = pending.confirmed!
-  if (pending.action === 'UPLOAD_PHOTO') {
-    const photo = confirmed.result as OutsourcedBusinessPhoto | null
-    if (!photo || photo.slot !== pending.slot || photo.category !== 'LOADING' || typeof photo.fileId !== 'string' || !/^[1-9]\d*$/.test(photo.fileId) || !['image/jpeg','image/png'].includes(photo.contentType)) throw new Error('原上传尚未返回本分类的真实文件')
-    return { photo }
-  }
-  const current = await client.getOutsourcedBusiness(pending.dispatchNo); ensureScope()
-  if (current.row.dispatchNo !== pending.dispatchNo || confirmed.recordVersion == null || BigInt(outsourcedBusinessVersion(current.row.recordVersion)) < BigInt(outsourcedBusinessVersion(confirmed.recordVersion))) throw new Error('当前运营版本早于原操作结果，请继续核对')
-  if (pending.action === 'BIND_PHOTO') {
-    const matches = (photo: OutsourcedBusinessPhoto) => photo.slot === pending.slot && photo.fileId === (pending.body as OutsourcedBusinessBind).fileId && Boolean(photo.savedAt)
-    const original = confirmed.result
-    const originalPhotos = original && 'row' in original ? original.photos : original && 'fileId' in original ? [original] : []
-    if (!current.photos.some(matches) && !originalPhotos.some(matches)) throw new Error('图片绑定结果尚未确认，请保留原文件和请求')
-  }
-  return { detail: current }
-}

src/modules/overseas-master-data/components/OutsourcedBusinessLayouts.test.ts

@@ -24,7 +24,7 @@ describe('OutsourcedBusiness presentation boundaries', () => {
     const wrapper = mount(OutsourcedBusinessPhotosDialog, { global, props: { modelValue: true } })
     expect(wrapper.findComponent(Dialog).props('width')).toBe('760px')
     expect(wrapper.findComponent(Dialog).props('showConfirm')).toBe(false)
-    expect(wrapper.findAll('section[aria-label]').map(section => section.attributes('aria-label'))).toEqual(['装车现场', '装车清单', '出车前检查', '驾驶证附件', '签收凭证'])
+    expect(wrapper.findAll('section[aria-label]').map(section => section.attributes('aria-label'))).toEqual(['司机驾驶证', '车牌照片', '装车完成', '封车照片', 'BOL司机签字'])
     expect(wrapper.findAll('img')).toHaveLength(0); expect(wrapper.text()).not.toContain('已上传')
   })
 
@@ -37,12 +37,15 @@ describe('OutsourcedBusiness presentation boundaries', () => {
     expect(guard).toHaveBeenCalledWith(done); expect(done).not.toHaveBeenCalled()
   })
 
-  it('keeps an unknown operations request until its owner explicitly handles closing', async () => {
+  it('unlocks operations closing when the request ends and still respects the owner guard', async () => {
     const done = vi.fn(), guard = vi.fn()
-    const wrapper = mount(OutsourcedBusinessOperationsDialog, { global, props: { modelValue: true, pending: true } })
+    const wrapper = mount(OutsourcedBusinessOperationsDialog, { global, props: { modelValue: true, busy: true } })
     const close = wrapper.findComponent(Dialog).props('beforeClose') as (done: () => void) => void
     close(done); expect(done).not.toHaveBeenCalled()
+    await wrapper.setProps({ busy: false }); close(done)
+    expect(done).toHaveBeenCalledTimes(1)
     await wrapper.setProps({ beforeClose: guard }); close(done)
-    expect(guard).toHaveBeenCalledWith(done); expect(done).not.toHaveBeenCalled()
+    expect(guard).toHaveBeenCalledWith(done); expect(done).toHaveBeenCalledTimes(1)
+    wrapper.unmount()
   })
 })

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

@@ -7,7 +7,6 @@ const props = defineProps<{
   dispatchNo?: string
   busy?: boolean
   saveDisabled?: boolean
-  pending?: boolean
   beforeClose?: (done: () => void) => void | Promise<void>
 }>()
 const open = defineModel<boolean>({ default: false })
@@ -15,12 +14,12 @@ const emit = defineEmits<{ save: [] }>()
 function close(done: () => void) {
   if (props.busy) return
   if (props.beforeClose) return props.beforeClose(done)
-  if (!props.pending) done()
+  done()
 }
 </script>
 
 <template>
-  <AppDialog v-model="open" class="admin-density-dialog admin-density admin-workbench is-dialog" title="登记运营信息" width="1080px" :confirm-loading="busy" :confirm-disabled="saveDisabled" :confirm-text="pending ? '核对并重试原请求' : '保存登记'" :before-close="close" :close-on-press-escape="!busy" @confirm="emit('save')">
+  <AppDialog v-model="open" class="admin-density-dialog admin-density admin-workbench is-dialog" title="登记运营信息" width="1080px" :confirm-loading="busy" :confirm-disabled="saveDisabled" confirm-text="保存登记" :before-close="close" :close-on-press-escape="!busy" @confirm="emit('save')">
     <p class="outsourced-business-operation-reference">排车单号 {{ dispatchNo || '—' }}</p>
     <slot name="state" />
     <fieldset class="outsourced-business-operation-section density-dialog-section" data-tone="work"><legend>整车承运金额<InlineHelp title="承运金额口径">整车只登记一次；单价采用系统返回的承运金额与实际物理托数计算结果。</InlineHelp></legend><slot name="amount" /></fieldset>

src/modules/overseas-master-data/components/OutsourcedBusinessOperationsEditor.test.ts

@@ -36,7 +36,7 @@ describe('outsourced operations registration', () => {
     expect(calls.save).toHaveBeenCalledTimes(1); expect(wrapper.emitted('saved')).toHaveLength(1)
     expect(wrapper.text()).not.toContain('油耗'); expect(wrapper.text()).not.toContain('里程'); wrapper.unmount()
   })
-  it('clears money as null and retains exactly the original request after an unknown save', async () => {
+  it('clears money as null and unlocks the form after an unknown save', async () => {
     const detail = outsourcedBusinessFixture(); detail.row.operations.money = {currency:'CNY',amount:'123.45'}
     calls.save.mockRejectedValueOnce(new TypeError('network interrupted'))
     const wrapper = mount(OutsourcedBusinessOperationsEditor,{global,props:{modelValue:true,detail}}); await flushPromises()
@@ -46,8 +46,8 @@ describe('outsourced operations registration', () => {
     const original = JSON.parse(JSON.stringify(calls.save.mock.calls[0]![1]))
     expect(original.operations.money).toBeNull(); expect(wrapper.emitted('saved')).toBeUndefined()
     await wrapper.find('[data-save]').trigger('click'); await flushPromises()
-    expect(calls.command).toHaveBeenCalledExactlyOnceWith('DS-OUT-1',original.idempotencyKey)
-    expect(calls.save).toHaveBeenNthCalledWith(2,'DS-OUT-1',original); expect(wrapper.emitted('saved')).toHaveLength(1); wrapper.unmount()
+    expect(calls.command).not.toHaveBeenCalled()
+    expect(calls.save.mock.calls[1]![1]).toEqual({...original,idempotencyKey:expect.any(String)});expect(calls.save.mock.calls[1]![1].idempotencyKey).not.toBe(original.idempotencyKey); expect(wrapper.emitted('saved')).toHaveLength(1); wrapper.unmount()
   })
   it('does not write for an unchanged form or a user without edit permission', async () => {
     const first = mount(OutsourcedBusinessOperationsEditor,{global,props:{modelValue:true,detail:outsourcedBusinessFixture()}}); await flushPromises()

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

@@ -9,33 +9,28 @@ import { getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
 import ApiErrorMeta from '@/shared/components/ApiErrorMeta.vue'
 import LoadErrorState from '@/shared/components/LoadErrorState.vue'
 import OutsourcedBusinessOperationsDialog from './OutsourcedBusinessOperationsDialog.vue'
-import { newOutsourcedBusinessPending, persistOutsourcedBusinessPending, restoreOutsourcedBusinessPending, recoverOutsourcedBusinessCommand, type OutsourcedBusinessPending } from './OutsourcedBusinessCommandRecovery'
 import { outsourcedBusinessDecimal, outsourcedBusinessVersion, type OutsourcedBusinessDetail, type OutsourcedBusinessMoney, type OutsourcedBusinessSave } from '../outsourcedBusinessTypes'
 import { overseasMasterDataPermissions as permission } from '../permissions'
-import { getOutsourcedBusiness } from '../api/outsourcedBusiness'
+import { saveOutsourcedBusinessOperations } from '../api/outsourcedBusiness'
 
 const open = defineModel<boolean>({ default: false })
 const props = defineProps<{ detail: OutsourcedBusinessDetail | null }>()
 const emit = defineEmits<{ saved: [value: OutsourcedBusinessDetail]; busy: [value: boolean] }>()
-const auth = useAuthStore(), access = useAccessPreviewStore(), busy = ref(false), pending = ref<OutsourcedBusinessPending | null>(null), error = ref<ApiErrorDetails | null>(null), corrupted = ref(false)
+const auth = useAuthStore(), access = useAccessPreviewStore(), busy = ref(false), error = ref<ApiErrorDetails | null>(null)
 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 active = computed(() => open.value)
+const registration = useUnsavedWorkRegistration({ key: `outsourced-business-operations:${getCurrentInstance()?.uid}`, label: computed(() => '外配任务运营登记'), isOpen: active, model: reactive({ form }), 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))
-function persist() { persistOutsourcedBusinessPending(actor, number, 'operations', pending.value) }
+const writable = computed(() => access.can(permission.outsourcedBusinessEdit) && props.detail?.row.actions.edit.allowed === true)
+const locked = computed(() => busy.value)
 function ensureScope() { if (auth.user?.id !== actor || props.detail?.row.dispatchNo !== number) throw new Error('操作身份或排车单已变化，请重新打开') }
 watch(busy, value => emit('busy', value))
 watch(open, async value => {
   if (!value || !props.detail) return
-  actor = auth.user?.id || ''; number = props.detail.row.dispatchNo; error.value = null; corrupted.value = false
-  try {
-    pending.value = restoreOutsourcedBusinessPending(actor, number, 'operations')
-    const operations = pending.value?.action === 'SAVE_OPERATIONS' ? (pending.value.body as OutsourcedBusinessSave).operations : props.detail.row.operations
-    Object.assign(form, { currency: operations.money?.currency || '', amount: operations.money?.amount ?? '', reason: pending.value ? (pending.value.body as OutsourcedBusinessSave).reason || '' : '', arrivals: Object.fromEntries(props.detail.row.destinations.map(destination => [destination.destinationKey, operations.arrivals.find(arrival => arrival.destinationKey === destination.destinationKey)?.actualArrivedAt || ''])) })
-    baseline = JSON.stringify(form); await nextTick(); if (!pending.value) registration.captureBaseline()
-  } catch (cause) { corrupted.value = true; error.value = getApiErrorDetails(cause, '运营资料恢复失败') }
+  actor = auth.user?.id || ''; number = props.detail.row.dispatchNo; error.value = null
+  const operations = props.detail.row.operations
+    Object.assign(form, { currency: operations.money?.currency || '', amount: operations.money?.amount ?? '', reason: '', arrivals: Object.fromEntries(props.detail.row.destinations.map(destination => [destination.destinationKey, operations.arrivals.find(arrival => arrival.destinationKey === destination.destinationKey)?.actualArrivedAt || ''])) })
+  baseline = JSON.stringify(form); await nextTick(); registration.captureBaseline()
 }, { immediate: true })
 function payload(): OutsourcedBusinessSave {
   const amount = outsourcedBusinessDecimal(form.amount, 2, 18)
@@ -54,32 +49,25 @@ async function save() {
   busy.value = true; error.value = null
   try {
     ensureScope()
-    if (!pending.value) { if (JSON.stringify(form) === baseline) { open.value = false; return }; pending.value = newOutsourcedBusinessPending(actor, number, 'SAVE_OPERATIONS', payload()); persist() }
-    const result = await recoverOutsourcedBusinessCommand(pending.value, persist, ensureScope)
-    if (!result.detail) throw new Error('运营登记结果未确认')
-    pending.value = null; persist(); registration.captureBaseline(); emit('saved', result.detail); open.value = false; ElMessage.success('运营信息已保存')
-  } catch (cause) { error.value = getApiErrorDetails(cause, cause instanceof Error ? cause.message : '运营登记结果尚未确认') }
+    if (JSON.stringify(form) === baseline) { open.value = false; return }
+    const request = payload()
+    const result = await saveOutsourcedBusinessOperations(number, request); ensureScope()
+    registration.captureBaseline(); emit('saved', result); open.value = false; ElMessage.success('运营信息已保存')
+  } catch (cause) { error.value = getApiErrorDetails(cause, '运营登记失败，请重新操作') }
   finally { busy.value = false }
 }
 async function beforeClose(done: () => void) {
   if (busy.value) return
-  if (pending.value || JSON.stringify(form) !== baseline) {
-    try { await ElMessageBox.confirm(pending.value ? '原请求将保留，重新打开后可核对原结果。是否关闭？' : '放弃尚未保存的运营信息？', '关闭运营登记', { customClass: 'admin-density-confirm admin-workbench is-dialog', confirmButtonText: pending.value ? '保留请求并关闭' : '放弃修改', cancelButtonText: '继续编辑' }) } catch { return }
+  if (JSON.stringify(form) !== baseline) {
+    try { await ElMessageBox.confirm('放弃尚未保存的运营信息？', '关闭运营登记', { customClass: 'admin-density-confirm admin-workbench is-dialog', confirmButtonText: '放弃修改', cancelButtonText: '继续编辑' }) } catch { return }
   }
   done()
 }
-async function discardRejected() {
-  if (!pending.value?.rejected || busy.value) return
-  busy.value = true
-  try { const current = await getOutsourcedBusiness(number); ensureScope(); pending.value = null; persist(); emit('saved', current); error.value = null }
-  catch (cause) { error.value = getApiErrorDetails(cause, '当前运营版本核对失败') }
-  finally { busy.value = false }
-}
 </script>
 
 <template>
-  <OutsourcedBusinessOperationsDialog v-model="open" :dispatch-no="detail?.row.dispatchNo" :busy="busy" :pending="Boolean(pending)" :save-disabled="!writable" :before-close="beforeClose" @save="save">
-    <template #state><LoadErrorState v-if="error" title="运营登记未完成" :message="error.message" :show-retry="false"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState><p v-if="pending">原请求已保留，字段锁定；核对结果前不会建立新请求。</p><el-button v-if="pending?.rejected" :disabled="busy" @click="discardRejected">按明确拒绝结果重新编辑</el-button><p v-if="!writable">{{ detail?.row.actions.edit.blockReason || '没有运营登记权限' }}</p></template>
+  <OutsourcedBusinessOperationsDialog v-model="open" :dispatch-no="detail?.row.dispatchNo" :busy="busy" :save-disabled="!writable" :before-close="beforeClose" @save="save">
+    <template #state><LoadErrorState v-if="error" title="运营登记未完成" :message="error.message" :show-retry="false"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState><p v-if="!writable">{{ detail?.row.actions.edit.blockReason || '没有运营登记权限' }}</p></template>
     <template #amount><el-form label-position="top" class="density-form outsourced-business-form"><el-form-item label="币种"><el-select v-model="form.currency" clearable :disabled="locked"><el-option label="CNY" value="CNY" /><el-option label="USD" value="USD" /></el-select></el-form-item><el-form-item label="整车承运金额"><el-input v-model="form.amount" :disabled="locked" placeholder="未登记；允许明确填写0" /></el-form-item><el-form-item label="更正说明"><el-input v-model="form.reason" :disabled="locked" maxlength="1000" /></el-form-item></el-form></template>
     <template #arrivals><div v-for="destination in detail?.row.destinations || []" :key="destination.destinationKey" class="outsourced-business-arrival"><span>{{ destination.warehouseCode || destination.warehouseName || destination.address || '目的地资料缺失' }}<small v-for="appointment in destination.appointments" :key="appointment.appointmentNo">{{ appointment.appointmentNo }}</small></span><el-date-picker v-model="form.arrivals[destination.destinationKey]" type="datetime" value-format="YYYY-MM-DDTHH:mm:ssZ" :disabled="locked" placeholder="实际到达时间，未登记留空" /></div><p>时间按浏览器本地时区输入，提交时保留时区。</p></template>
   </OutsourcedBusinessOperationsDialog>

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

@@ -19,7 +19,7 @@ function close(done: () => void) {
 
 <template>
   <AppDialog v-model="open" class="admin-density-dialog admin-density admin-workbench is-dialog" title="上传照片" width="760px" :show-confirm="false" cancel-text="关闭" :confirm-loading="busy" :close-on-press-escape="!busy" :before-close="close">
-    <p class="outsourced-business-photo-reference">排车单号 {{ dispatchNo || '—' }}<InlineHelp title="照片说明">每个附件方框单独处理，支持 JPG、PNG；上传照片不改变装车状态。</InlineHelp></p>
+    <p class="outsourced-business-photo-reference">排车单号 {{ dispatchNo || '—' }}<InlineHelp title="照片说明">装车资料每类最多5张，支持 JPG、PNG，可逐张替换。此处补充照片不改变装车状态。</InlineHelp></p>
     <slot name="state" />
 
     <div class="outsourced-business-photo-grid">

src/modules/overseas-master-data/components/OutsourcedBusinessPhotosEditor.test.ts

@@ -25,23 +25,23 @@ beforeEach(()=>{
 })
 afterEach(() => vi.unstubAllGlobals())
 describe('outsourced business per-slot photo save',()=>{
-  it('retains prepared file and original binding request through a failed bind without retransmitting the image',async()=>{
+  it('unlocks after binding failure and accepts a fresh photo submission',async()=>{
     calls.bind.mockRejectedValueOnce(new TypeError('network interrupted'))
     const wrapper=mount(OutsourcedBusinessPhotosEditor,{global,props:{modelValue:true,detail:outsourcedBusinessFixture()}});await choose(wrapper)
     expect(calls.upload).toHaveBeenCalledTimes(1);expect(calls.bind).toHaveBeenCalledTimes(1)
-    expect(wrapper.text()).toContain('尚未确认绑定保存');expect(wrapper.emitted('saved')).toBeUndefined()
+    expect(wrapper.find('input[type="file"]').attributes('disabled')).toBeUndefined();expect(wrapper.emitted('saved')).toBeUndefined()
     const original={...calls.bind.mock.calls[0]![2]}
-    await wrapper.findAll('button').find(button=>button.text()==='核对原结果并继续绑定')!.trigger('click');await flushPromises()
-    expect(calls.upload).toHaveBeenCalledTimes(1);expect(calls.bind).toHaveBeenCalledTimes(2)
-    expect(calls.bind.mock.calls[1]![2]).toEqual(original);expect(original.fileId).toBe(photo.fileId);expect(original.recordVersion).toBe('0')
+    await choose(wrapper)
+    expect(calls.upload).toHaveBeenCalledTimes(2);expect(calls.bind).toHaveBeenCalledTimes(2)
+    expect(calls.bind.mock.calls[1]![2].idempotencyKey).not.toBe(original.idempotencyKey);expect(original.fileId).toBe(photo.fileId);expect(original.recordVersion).toBe('1')
     expect(wrapper.emitted('saved')).toHaveLength(1);wrapper.unmount()
   })
-  it('does not offer a new upload after unknown upload or fabricate a saved photo',async()=>{
+  it('allows another upload after an unknown failure without fabricating a saved photo',async()=>{
     calls.upload.mockRejectedValue(new TypeError('network interrupted'))
     const wrapper=mount(OutsourcedBusinessPhotosEditor,{global,props:{modelValue:true,detail:outsourcedBusinessFixture()}});await choose(wrapper)
-    await wrapper.findAll('button').find(button=>button.text()==='核对原结果并继续绑定')!.trigger('click');await flushPromises()
-    expect(calls.upload).toHaveBeenCalledTimes(1);expect(calls.bind).not.toHaveBeenCalled();expect(wrapper.emitted('saved')).toBeUndefined()
-    expect(wrapper.find('input[type="file"]').attributes('disabled')).toBeDefined();expect(wrapper.text()).toContain('禁止重复上传');wrapper.unmount()
+    await choose(wrapper)
+    expect(calls.upload).toHaveBeenCalledTimes(2);expect(calls.bind).not.toHaveBeenCalled();expect(wrapper.emitted('saved')).toBeUndefined()
+    expect(wrapper.find('input[type="file"]').attributes('disabled')).toBeUndefined();expect(sessionStorage.length).toBe(0);wrapper.unmount()
   })
   it('keeps saved metadata readable without upload permission and fetches image bytes only on explicit preview',async()=>{
     calls.canUpload=false
@@ -62,3 +62,16 @@ describe('outsourced business per-slot photo save',()=>{
     await wrapper.setProps({modelValue:false});expect(revoke).toHaveBeenCalledWith('blob:outsourced-loading');wrapper.unmount()
   })
 })
+
+it('renders all saved images and replaces only the chosen file', async () => {
+  const detail=outsourcedBusinessFixture()
+  detail.photos=[{...photo,savedAt:'2026-10-26T00:00:00Z'},{...photo,fileId:'222',fileName:'second.png',savedAt:'2026-10-26T00:00:00Z'}]
+  const wrapper=mount(OutsourcedBusinessPhotosEditor,{global,props:{modelValue:true,detail}})
+  await flushPromises()
+  expect(wrapper.text()).toContain('loading.png');expect(wrapper.text()).toContain('second.png')
+  const input=wrapper.findAll('input[type="file"]')[1]!
+  Object.defineProperty(input.element,'files',{configurable:true,value:[new File(['new'],'new.png',{type:'image/png'})]})
+  await input.trigger('change');await flushPromises()
+  expect(calls.bind).toHaveBeenLastCalledWith(expect.any(String),'LOADING_SCENE',expect.objectContaining({replaceFileId:'222'}))
+  wrapper.unmount()
+})

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

@@ -1,122 +1,73 @@
 <script setup lang="ts">
 import '@/styles/adminWorkbench.css'
-import { computed, getCurrentInstance, onBeforeUnmount, reactive, ref, watch } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+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 { useUnsavedWorkRegistration } from '@/core/unsaved-work/useUnsavedWorkRegistration'
-import { ApiResponseError, getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
+import { getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
 import ApiErrorMeta from '@/shared/components/ApiErrorMeta.vue'
 import LoadErrorState from '@/shared/components/LoadErrorState.vue'
 import OutsourcedBusinessPhotosDialog from './OutsourcedBusinessPhotosDialog.vue'
-import { outsourcedBusinessPhotoRoles, outsourcedBusinessVersion, type OutsourcedBusinessDetail, type OutsourcedBusinessPhoto, type OutsourcedBusinessPhotoSlot } from '../outsourcedBusinessTypes'
-import { getOutsourcedBusiness, getOutsourcedBusinessPhotoContent, uploadOutsourcedBusinessPhoto } from '../api/outsourcedBusiness'
+import { outsourcedBusinessPhotoRoles, outsourcedBusinessVersion, type OutsourcedBusinessDetail, type OutsourcedBusinessPhotoSlot } from '../outsourcedBusinessTypes'
+import { getOutsourcedBusiness, getOutsourcedBusinessPhotoContent, uploadOutsourcedBusinessPhoto, bindOutsourcedBusinessPhoto } from '../api/outsourcedBusiness'
 import { overseasMasterDataPermissions as permission } from '../permissions'
-import { acceptOutsourcedBusinessResult, newOutsourcedBusinessPending, outsourcedBusinessPendingKey, persistOutsourcedBusinessPending, restoreOutsourcedBusinessPending, recoverOutsourcedBusinessCommand, type OutsourcedBusinessPending } from './OutsourcedBusinessCommandRecovery'
 
 const open = defineModel<boolean>({ default: false })
 const props = defineProps<{ detail: OutsourcedBusinessDetail | null }>()
 const emit = defineEmits<{ saved: [value: OutsourcedBusinessDetail]; busy: [value: boolean] }>()
-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) })
+const auth = useAuthStore(), access = useAccessPreviewStore(), busy = ref(false), error = ref<ApiErrorDetails | null>(null)
+const urls = ref<Record<string,string>>({}), reading = ref<string | null>(null)
+const uploadable = computed(() => access.can(permission.outsourcedBusinessUpload) && props.detail?.row.actions.upload.allowed === true)
 let actor = '', number = '', generation = 0
-function savedPhoto(slot: OutsourcedBusinessPhotoSlot) { return props.detail?.photos.find(photo => photo.slot === slot && photo.savedAt) }
+function savedPhotos(slot: OutsourcedBusinessPhotoSlot) { return props.detail?.photos.filter(photo => photo.slot === slot && photo.savedAt) || [] }
 function release() { Object.values(urls.value).forEach(url => { if (url) URL.revokeObjectURL(url) }); urls.value = {} }
 function ensureScope() { if (auth.user?.id !== actor || props.detail?.row.dispatchNo !== number) throw new Error('图片作业身份或排车单已变化，请重新打开') }
-function persist() { persistOutsourcedBusinessPending(actor, number, 'photos', pending.value) }
-function persistPrepared() {
-  const key = outsourcedBusinessPendingKey(actor, number, 'prepared-photo')
-  if (prepared.value) sessionStorage.setItem(key, JSON.stringify(prepared.value)); else sessionStorage.removeItem(key)
-}
 watch(busy, value => emit('busy', value))
 watch(open, value => {
-  generation++; release(); reading.value = null; error.value = null; corrupted.value = false
+  generation++; release(); reading.value = null; error.value = null
   if (!value || !props.detail) return
   actor = auth.user?.id || ''; number = props.detail.row.dispatchNo
-  try {
-    pending.value = restoreOutsourcedBusinessPending(actor, number, 'photos')
-    const raw = sessionStorage.getItem(outsourcedBusinessPendingKey(actor, number, 'prepared-photo'))
-    prepared.value = raw ? JSON.parse(raw) as OutsourcedBusinessPhoto : null
-    if (prepared.value && (!prepared.value.fileId || !outsourcedBusinessPhotoRoles.some(role => role.slot === prepared.value!.slot))) throw new Error('原上传文件资料损坏，请保留现场核对')
-  } catch (cause) { corrupted.value = true; error.value = getApiErrorDetails(cause, '照片作业恢复失败') }
 }, { immediate: true })
 watch(() => props.detail?.photos, () => { generation++; release(); reading.value = null })
 onBeforeUnmount(() => { generation++; release() })
-async function preview(slot: OutsourcedBusinessPhotoSlot) {
-  const photo = savedPhoto(slot), current = generation
+async function preview(slot: OutsourcedBusinessPhotoSlot, fileId: string) {
+  const photo = savedPhotos(slot).find(item => item.fileId === fileId), current = generation
   if (!photo || reading.value) return
-  reading.value = slot; error.value = null
-  try { const blob = await getOutsourcedBusinessPhotoContent(number, photo); if (current !== generation || !open.value) return; urls.value[slot] = URL.createObjectURL(blob) }
+  reading.value = fileId; error.value = null
+  try { const blob = await getOutsourcedBusinessPhotoContent(number, photo); if (current !== generation || !open.value) return; urls.value[fileId] = URL.createObjectURL(blob) }
   catch (cause) { if (current === generation) error.value = getApiErrorDetails(cause, '图片读取失败') }
   finally { if (current === generation) reading.value = null }
 }
-async function bindPrepared() {
-  if ((!prepared.value && !pending.value) || !props.detail || !uploadable.value) return
-  if (!pending.value) {
-    const body = { recordVersion: outsourcedBusinessVersion(props.detail.row.recordVersion), idempotencyKey: crypto.randomUUID(), fileId: prepared.value!.fileId }
-    pending.value = newOutsourcedBusinessPending(actor, number, 'BIND_PHOTO', body, prepared.value!.slot); persist()
-  }
-  const result = await recoverOutsourcedBusinessCommand(pending.value, persist, ensureScope)
-  if (!result.detail) throw new Error('照片绑定尚未确认')
-  pending.value = null; persist(); prepared.value = null; persistPrepared(); emit('saved', result.detail); ElMessage.success('照片已绑定保存')
-}
-async function recover() {
-  if (busy.value || !uploadable.value) return
+async function upload(slot: OutsourcedBusinessPhotoSlot, event: Event, replaceFileId?: string) {
+  const input = event.target as HTMLInputElement, file = input.files?.[0]; input.value = ''
+  if (!file || busy.value || !uploadable.value) return
+  if (!replaceFileId && savedPhotos(slot).length >= (slot.startsWith('FUEL_') ? 1 : 5)) return
+  if (!['image/jpeg','image/png'].includes(file.type) || !file.size) { error.value = { message: '请选择有效的JPG或PNG图片' }; return }
   busy.value = true; error.value = null
   try {
     ensureScope()
-    if (pending.value?.action === 'UPLOAD_PHOTO') {
-      const result = await recoverOutsourcedBusinessCommand(pending.value, persist, ensureScope)
-      if (!result.photo) throw new Error('原上传文件未确认')
-      prepared.value = result.photo; persistPrepared(); pending.value = null; persist()
-    }
-    await bindPrepared()
-  } catch (cause) { error.value = getApiErrorDetails(cause, cause instanceof Error ? cause.message : '照片结果尚未确认') }
+    const photo = await uploadOutsourcedBusinessPhoto(number, slot, file, crypto.randomUUID()); ensureScope()
+    const latest = await getOutsourcedBusiness(number); ensureScope()
+    if (!latest.row.actions.upload.allowed) throw new Error(latest.row.actions.upload.blockReason || '当前不允许上传照片')
+    const result = await bindOutsourcedBusinessPhoto(number, slot, { recordVersion: outsourcedBusinessVersion(latest.row.recordVersion), idempotencyKey: crypto.randomUUID(), fileId: photo.fileId, ...(replaceFileId ? { replaceFileId } : {}) }); ensureScope()
+    emit('saved', result); ElMessage.success('照片已保存')
+  } catch (cause) { error.value = getApiErrorDetails(cause, '图片上传或保存失败，请重新选择图片') }
   finally { busy.value = false }
 }
-async function upload(slot: OutsourcedBusinessPhotoSlot, event: Event) {
-  const input = event.target as HTMLInputElement, file = input.files?.[0]; input.value = ''
-  if (!file || busy.value || pending.value || prepared.value || !uploadable.value) return
-  if (!['image/jpeg','image/png'].includes(file.type) || file.size <= 0) { error.value = { message: '请选择有效的JPG或PNG图片' }; return }
-  busy.value = true; error.value = null
-  try {
-    ensureScope(); pending.value = newOutsourcedBusinessPending(actor, number, 'UPLOAD_PHOTO', null, slot); pending.value.attempted = true; persist()
-    const uploaded = await uploadOutsourcedBusinessPhoto(number, slot, file, pending.value.key)
-    ensureScope(); acceptOutsourcedBusinessResult(pending.value, uploaded); persist()
-    const result = await recoverOutsourcedBusinessCommand(pending.value, persist, ensureScope)
-    if (!result.photo) throw new Error('真实上传文件未确认')
-    prepared.value = result.photo; persistPrepared(); pending.value = null; persist(); await bindPrepared()
-  } catch (cause) {
-    if (pending.value?.action === 'UPLOAD_PHOTO' && cause instanceof ApiResponseError && ['A0400','A0403','A0404','400','403','404','422'].includes(cause.code)) { pending.value.rejected = true; persist() }
-    error.value = getApiErrorDetails(cause, cause instanceof Error ? cause.message : '图片上传或绑定结果尚未确认')
-  } finally { busy.value = false }
-}
-async function discardRejected() {
-  if (busy.value || !pending.value?.rejected) return
-  busy.value = true
-  try { const latest = await getOutsourcedBusiness(number); ensureScope(); pending.value = null; persist(); emit('saved', latest); error.value = null }
-  catch (cause) { error.value = getApiErrorDetails(cause, '当前照片版本读取失败') }
-  finally { busy.value = false }
-}
-async function beforeClose(done: () => void) {
-  if (busy.value) return
-  if (pending.value || prepared.value) {
-    try { await ElMessageBox.confirm('未完成的原上传或绑定记录将保留，重新打开后继续核对；关闭不会保存尚未绑定的照片。是否关闭？', '关闭照片窗口', { customClass: 'admin-density-confirm admin-workbench is-dialog', confirmButtonText: '保留记录并关闭', cancelButtonText: '继续核对' }) } catch { return }
-  }
-  done()
-}
+function beforeClose(done: () => void) { if (!busy.value) done() }
 </script>
 
 <template>
   <OutsourcedBusinessPhotosDialog v-model="open" :dispatch-no="detail?.row.dispatchNo" :busy="busy" :before-close="beforeClose">
-    <template #state><LoadErrorState v-if="error" title="照片作业未完成" :message="error.message" :show-retry="false"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState><p v-if="pending">原{{ pending.action === 'UPLOAD_PHOTO' ? '上传' : '绑定' }}请求已保留，不会重新上传文件。</p><p v-if="prepared">{{ prepared.fileName }} 已上传，尚未确认绑定保存。</p><el-button v-if="pending || prepared" :loading="busy" :disabled="!uploadable" @click="recover">核对原结果并继续绑定</el-button><el-button v-if="pending?.rejected" :disabled="busy" @click="discardRejected">按明确拒绝重新核对，保留已上传文件</el-button><p v-if="!uploadable">{{ detail?.row.actions.upload.blockReason || '当前仅可查看照片' }}</p></template>
+    <template #state><LoadErrorState v-if="error" title="照片作业未完成" :message="error.message" :show-retry="false"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState><p v-if="!uploadable">{{ detail?.row.actions.upload.blockReason || '当前仅可查看照片' }}</p></template>
     <template v-for="role in outsourcedBusinessPhotoRoles" :key="role.slot" #[role.viewSlot]>
-      <img v-if="urls[role.slot]" :src="urls[role.slot]" :alt="role.label" class="outsourced-business-photo" />
-      <template v-if="savedPhoto(role.slot)"><p>{{ savedPhoto(role.slot)?.fileName }} · 已保存</p><el-button :loading="reading === role.slot" :disabled="Boolean(reading)" @click="preview(role.slot)">查看图片</el-button></template>
-      <p v-else>暂无已保存照片</p>
-      <label v-if="uploadable" class="outsourced-business-upload">{{ savedPhoto(role.slot) ? '替换图片' : '上传图片' }}<input type="file" accept="image/jpeg,image/png" :disabled="busy || Boolean(pending) || Boolean(prepared)" @change="upload(role.slot, $event)" /></label>
+      <div v-for="photo in savedPhotos(role.slot)" :key="photo.fileId">
+        <img v-if="urls[photo.fileId]" :src="urls[photo.fileId]" :alt="role.label" class="outsourced-business-photo" />
+        <p>{{ photo.fileName }} · 已保存</p><el-button :loading="reading === photo.fileId" :disabled="Boolean(reading)" @click="preview(role.slot, photo.fileId)">查看图片</el-button>
+        <label v-if="uploadable" class="outsourced-business-upload">替换图片<input type="file" accept="image/jpeg,image/png" :disabled="busy" @change="upload(role.slot, $event, photo.fileId)" /></label>
+      </div>
+      <p v-if="!savedPhotos(role.slot).length">暂无已保存照片</p>
+      <label v-if="uploadable && savedPhotos(role.slot).length < (role.slot.startsWith('FUEL_') ? 1 : 5)" class="outsourced-business-upload">上传图片<input type="file" accept="image/jpeg,image/png" :disabled="busy" @change="upload(role.slot, $event)" /></label>
     </template>
   </OutsourcedBusinessPhotosDialog>
 </template>

src/modules/overseas-master-data/components/OwnedBusinessCommandRecovery.test.ts

@@ -1,72 +0,0 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-import { ApiResponseError } from '@/shared/api/http'
-import * as api from '../api/ownedBusiness'
-import { ownedBusinessFixture, ownedBusinessCommandFixture } from './OwnedBusinessFixtures'
-import { acceptOwnedBusinessCommand, newOwnedBusinessPending, persistOwnedBusinessPending, restoreOwnedBusinessPending, recoverOwnedBusinessCommand, ownedBusinessPendingKey } from './OwnedBusinessCommandRecovery'
-import type { OwnedBusinessPhoto, OwnedBusinessSave } from '../ownedBusinessTypes'
-
-beforeEach(() => sessionStorage.clear())
-const no = 'DS-OWN-1'
-function operation() : OwnedBusinessSave { return { recordVersion: '0', idempotencyKey: 'original-key', operations: { ...ownedBusinessFixture().row.operations, money: { currency: 'USD', amount: '9999999999999999.99' } }, reason: null } }
-function client() {
-  const current = ownedBusinessFixture(); current.row.recordVersion = '1'
-  const photo: OwnedBusinessPhoto = { slot:'FUEL_START',category:'FUEL',fileId:'9007199254740993',fileName:'fuel.png',contentType:'image/png',sizeBytes:'5',uploadedAt:'2026-10-20T10:00:00Z',savedAt:null }
-  return { ...api, getOwnedBusiness: vi.fn(async () => current), getOwnedBusinessCommand: vi.fn(async () => ownedBusinessCommandFixture()), saveOwnedBusinessOperations: vi.fn(async () => current), bindOwnedBusinessPhoto: vi.fn(async () => current), uploadOwnedBusinessPhoto: vi.fn(async () => photo) }
-}
-describe('owned business exact command recovery', () => {
-  it('persists the complete original payload, actor and zero auxiliary version', () => {
-    const pending = newOwnedBusinessPending('actor', no, 'SAVE_OPERATIONS', operation())
-    persistOwnedBusinessPending('actor', no, 'operations', pending)
-    expect(restoreOwnedBusinessPending('actor', no, 'operations')).toEqual(pending)
-    expect(restoreOwnedBusinessPending('another', no, 'operations')).toBeNull()
-    const raw = JSON.parse(sessionStorage.getItem(ownedBusinessPendingKey('actor',no,'operations'))!)
-    raw.actor = 'another'; sessionStorage.setItem(ownedBusinessPendingKey('actor',no,'operations'),JSON.stringify(raw))
-    expect(() => restoreOwnedBusinessPending('actor',no,'operations')).toThrow('损坏')
-  })
-  it('looks up an unknown write first and retries only the unchanged original body on explicit not-found', async () => {
-    const pending = newOwnedBusinessPending('actor', no, 'SAVE_OPERATIONS', operation()); pending.attempted = true
-    const service = client(), persist = vi.fn()
-    service.getOwnedBusinessCommand.mockRejectedValue(new ApiResponseError('not found','A0404',404))
-    await recoverOwnedBusinessCommand(pending,persist,() => {},service)
-    expect(service.getOwnedBusinessCommand).toHaveBeenCalledWith(no,'original-key')
-    expect(service.saveOwnedBusinessOperations).toHaveBeenCalledExactlyOnceWith(no,operation())
-    expect(pending.body).toEqual(operation()); expect(pending.body?.recordVersion).toBe('0')
-  })
-  it('retains a proven success through failed fresh reads without writing it a second time', async () => {
-    const pending = newOwnedBusinessPending('actor', no, 'SAVE_OPERATIONS', operation()), service = client()
-    service.getOwnedBusiness.mockRejectedValueOnce(new Error('read offline'))
-    await expect(recoverOwnedBusinessCommand(pending,() => {},() => {},service)).rejects.toThrow('read offline')
-    expect(pending.confirmed?.recordVersion).toBe('1')
-    await recoverOwnedBusinessCommand(pending,() => {},() => {},service)
-    expect(service.saveOwnedBusinessOperations).toHaveBeenCalledTimes(1); expect(service.getOwnedBusinessCommand).not.toHaveBeenCalled()
-  })
-  it('never retransmits a file for an unknown upload, including command not-found', async () => {
-    const pending = newOwnedBusinessPending('actor',no,'UPLOAD_PHOTO',null,'FUEL_START'); pending.attempted = true
-    const service = client(); service.getOwnedBusinessCommand.mockRejectedValue(new ApiResponseError('not found','A0404',404))
-    await expect(recoverOwnedBusinessCommand(pending,() => {},() => {},service)).rejects.toThrow('禁止重复上传')
-    expect(service.uploadOwnedBusinessPhoto).not.toHaveBeenCalled(); expect(service.bindOwnedBusinessPhoto).not.toHaveBeenCalled(); expect(pending.key).toBeTruthy()
-  })
-  it('keeps the prepared file and exact binding key through unknown binding and later replacement', async () => {
-    const photo: OwnedBusinessPhoto = { slot:'FUEL_START',category:'FUEL',fileId:'9007199254740993',fileName:'fuel.png',contentType:'image/png',sizeBytes:'5',uploadedAt:'2026-10-20T10:00:00Z',savedAt:'2026-10-20T10:01:00Z' }
-    const pending = newOwnedBusinessPending('actor',no,'BIND_PHOTO',{recordVersion:'0',idempotencyKey:'bind-key',fileId:photo.fileId},photo.slot)
-    pending.attempted = true
-    const service = client(); const bound = ownedBusinessFixture(); bound.row.recordVersion='1'; bound.photos=[photo]
-    const original = ownedBusinessCommandFixture({action:'BIND_PHOTO',idempotencyKey:'bind-key',result:bound})
-    service.getOwnedBusinessCommand.mockResolvedValue(original)
-    const current = ownedBusinessFixture();current.row.recordVersion='2';current.photos=[{...photo,fileId:'9007199254740994'}]
-    service.getOwnedBusiness.mockResolvedValue(current)
-    const result = await recoverOwnedBusinessCommand(pending,() => {},() => {},service)
-    expect(result.detail?.photos[0]?.fileId).toBe('9007199254740994')
-    expect(pending.body).toEqual({recordVersion:'0',idempotencyKey:'bind-key',fileId:photo.fileId})
-    expect(service.uploadOwnedBusinessPhoto).not.toHaveBeenCalled();expect(service.bindOwnedBusinessPhoto).not.toHaveBeenCalled()
-  })
-  it('refuses wrong command identities, stale reads, definite rejection retries and scope changes', async () => {
-    const pending = newOwnedBusinessPending('actor',no,'SAVE_OPERATIONS',operation()), service=client()
-    expect(() => acceptOwnedBusinessCommand(pending,ownedBusinessCommandFixture({dispatchNo:'another'}))).toThrow('不一致')
-    pending.command=ownedBusinessCommandFixture({recordVersion:'9007199254740993'})
-    await expect(recoverOwnedBusinessCommand(pending,() => {},() => {},service)).rejects.toThrow('早于')
-    pending.rejected=true;await expect(recoverOwnedBusinessCommand(pending,() => {},() => {},service)).rejects.toThrow('明确拒绝')
-    pending.rejected=false;await expect(recoverOwnedBusinessCommand(pending,() => {},() => {throw new Error('scope changed')},service)).rejects.toThrow('scope changed')
-    expect(service.saveOwnedBusinessOperations).not.toHaveBeenCalled()
-  })
-})

src/modules/overseas-master-data/components/OwnedBusinessCommandRecovery.ts

@@ -1,89 +0,0 @@
-import { ApiResponseError } from '@/shared/api/http'
-import * as api from '../api/ownedBusiness'
-import { ownedBusinessPhotoRoles, ownedBusinessVersion, type OwnedBusinessAction, type OwnedBusinessBind, type OwnedBusinessCommand, type OwnedBusinessDetail, type OwnedBusinessPhoto, type OwnedBusinessPhotoSlot, type OwnedBusinessSave } from '../ownedBusinessTypes'
-
-export interface OwnedBusinessPending {
-  actor: string; dispatchNo: string; action: OwnedBusinessAction; key: string; slot?: OwnedBusinessPhotoSlot
-  body: OwnedBusinessSave | OwnedBusinessBind | null; attempted: boolean; command: OwnedBusinessCommand | null; confirmed: { recordVersion: string | null; result: OwnedBusinessDetail | OwnedBusinessPhoto } | null; rejected: boolean
-}
-export const ownedBusinessPendingKey = (actor: string, no: string, area: string) => `owned-business:${encodeURIComponent(actor)}:${encodeURIComponent(no)}:${area}`
-export function restoreOwnedBusinessPending(actor: string, no: string, area: string): OwnedBusinessPending | null {
-  const raw = sessionStorage.getItem(ownedBusinessPendingKey(actor, no, area))
-  if (!raw) return null
-  const pending = JSON.parse(raw) as OwnedBusinessPending
-  if (pending.actor !== actor || pending.dispatchNo !== no || !pending.key || !['SAVE_OPERATIONS','UPLOAD_PHOTO','BIND_PHOTO'].includes(pending.action)) throw new Error('原运营请求记录损坏，请保留现场核对')
-  if (pending.action !== 'SAVE_OPERATIONS' && !ownedBusinessPhotoRoles.some(role => role.slot === pending.slot) || pending.action !== 'UPLOAD_PHOTO' && (!pending.body || pending.body.idempotencyKey !== pending.key)) throw new Error('原运营请求内容不完整，请保留现场核对')
-  return pending
-}
-export function persistOwnedBusinessPending(actor: string, no: string, area: string, pending: OwnedBusinessPending | null) {
-  if (!actor || !no || pending && (pending.actor !== actor || pending.dispatchNo !== no)) throw new Error('运营请求身份已变化')
-  const key = ownedBusinessPendingKey(actor, no, area)
-  if (pending) sessionStorage.setItem(key, JSON.stringify(pending)); else sessionStorage.removeItem(key)
-}
-export function newOwnedBusinessPending(actor: string, no: string, action: OwnedBusinessAction, body: OwnedBusinessPending['body'], slot?: OwnedBusinessPhotoSlot): OwnedBusinessPending {
-  if (!actor || !no) throw new Error('当前运营作业身份缺失')
-  const key = body?.idempotencyKey || crypto.randomUUID()
-  return { actor, dispatchNo: no, action, key, slot, body: body ? structuredClone(body) : null, attempted: false, command: null, confirmed: null, rejected: false }
-}
-export function acceptOwnedBusinessResult(pending: OwnedBusinessPending, result: OwnedBusinessDetail | OwnedBusinessPhoto) {
-  if (pending.action === 'UPLOAD_PHOTO') {
-    if (!('fileId' in result) || result.slot !== pending.slot || typeof result.fileId !== 'string' || !/^[1-9]\d*$/.test(result.fileId) || !['image/jpeg','image/png'].includes(result.contentType)) throw new Error('原上传尚未返回本分类的真实文件')
-    pending.confirmed = { recordVersion: null, result }
-  } else {
-    if (!('row' in result) || result.row.dispatchNo !== pending.dispatchNo) throw new Error('运营保存结果与原排车单不一致')
-    pending.confirmed = { recordVersion: ownedBusinessVersion(result.row.recordVersion), result }
-  }
-}
-export function acceptOwnedBusinessCommand(pending: OwnedBusinessPending, command: OwnedBusinessCommand) {
-  if (command.dispatchNo !== pending.dispatchNo || command.action !== pending.action || command.idempotencyKey !== pending.key) throw new Error('返回结果与原运营请求不一致，请保留原请求核对')
-  pending.command = command
-  if (command.state === 'REJECTED') pending.rejected = true
-  if (command.state !== 'SUCCEEDED') throw new Error(command.state === 'REJECTED' ? '原请求已明确拒绝，请核对原因后重新登记' : '原请求结果尚未确定，请保留原请求继续核对')
-  if (!command.result) throw new Error('原运营命令的成功结果不完整，请继续核对')
-  acceptOwnedBusinessResult(pending, command.result)
-  if (pending.action !== 'UPLOAD_PHOTO' && (command.recordVersion == null || command.recordVersion !== pending.confirmed!.recordVersion)) throw new Error('原运营命令版本与结果不一致')
-}
-export async function recoverOwnedBusinessCommand(pending: OwnedBusinessPending, persist: () => void, ensureScope: () => void, client = api): Promise<{ detail?: OwnedBusinessDetail; photo?: OwnedBusinessPhoto }> {
-  ensureScope()
-  if (pending.rejected) throw new Error('原请求已明确拒绝，请先按明确拒绝结果重新核对')
-  if (pending.command?.state === 'SUCCEEDED') acceptOwnedBusinessCommand(pending, pending.command)
-  const previous = pending.attempted
-  if (!pending.confirmed) {
-    let original: OwnedBusinessCommand | null = null
-    if (previous) {
-      try { original = await client.getOwnedBusinessCommand(pending.dispatchNo, pending.key) }
-      catch (cause) { if (!(cause instanceof ApiResponseError) || !['404','A0404','HTTP_404'].includes(cause.code)) throw cause }
-      ensureScope()
-    }
-    if (original) { try { acceptOwnedBusinessCommand(pending, original) } finally { persist() } }
-    else {
-      if (pending.action === 'UPLOAD_PHOTO') throw new Error('图片上传结果未知，禁止重复上传；请继续核对原上传请求')
-      pending.attempted = true; persist()
-      try {
-        const result = pending.action === 'SAVE_OPERATIONS'
-          ? await client.saveOwnedBusinessOperations(pending.dispatchNo, pending.body as OwnedBusinessSave)
-          : await client.bindOwnedBusinessPhoto(pending.dispatchNo, pending.slot!, pending.body as OwnedBusinessBind)
-        ensureScope(); acceptOwnedBusinessResult(pending, result); persist()
-      } catch (cause) {
-        ensureScope()
-        if (!previous && cause instanceof ApiResponseError && ['A0400','A0403','A0404','A0409','400','403','404','409','422'].includes(cause.code)) { pending.rejected = true; persist() }
-        throw cause
-      }
-    }
-  }
-  const confirmed = pending.confirmed!
-  if (pending.action === 'UPLOAD_PHOTO') {
-    const photo = confirmed.result as OwnedBusinessPhoto | null
-    if (!photo || photo.slot !== pending.slot || typeof photo.fileId !== 'string' || !/^[1-9]\d*$/.test(photo.fileId) || !['image/jpeg','image/png'].includes(photo.contentType)) throw new Error('原上传尚未返回本分类的真实文件')
-    return { photo }
-  }
-  const current = await client.getOwnedBusiness(pending.dispatchNo); ensureScope()
-  if (current.row.dispatchNo !== pending.dispatchNo || confirmed.recordVersion == null || BigInt(ownedBusinessVersion(current.row.recordVersion)) < BigInt(ownedBusinessVersion(confirmed.recordVersion))) throw new Error('当前运营版本早于原操作结果，请继续核对')
-  if (pending.action === 'BIND_PHOTO') {
-    const matches = (photo: OwnedBusinessPhoto) => photo.slot === pending.slot && photo.fileId === (pending.body as OwnedBusinessBind).fileId && Boolean(photo.savedAt)
-    const original = confirmed.result
-    const originalPhotos = original && 'row' in original ? original.photos : original && 'fileId' in original ? [original] : []
-    if (!current.photos.some(matches) && !originalPhotos.some(matches)) throw new Error('图片绑定结果尚未确认，请保留原文件和请求')
-  }
-  return { detail: current }
-}

src/modules/overseas-master-data/components/OwnedBusinessLayouts.test.ts

@@ -24,7 +24,7 @@ describe('OwnedBusiness presentation boundaries', () => {
     const wrapper = mount(OwnedBusinessPhotosDialog, { global, props: { modelValue: true } })
     expect(wrapper.findComponent(Dialog).props('width')).toBe('760px')
     expect(wrapper.findComponent(Dialog).props('showConfirm')).toBe(false)
-    expect(wrapper.findAll('section[aria-label]').map(section => section.attributes('aria-label'))).toEqual(['装车现场', '装车清单', '出车前检查', '驾驶证附件', '签收凭证', '起始油耗表盘', '结束油耗表盘'])
+    expect(wrapper.findAll('section[aria-label]').map(section => section.attributes('aria-label'))).toEqual(['司机驾驶证', '车牌照片', '装车完成', '封车照片', 'BOL司机签字', '起始油耗表盘', '结束油耗表盘'])
     expect(wrapper.findAll('img')).toHaveLength(0); expect(wrapper.text()).not.toContain('已上传')
   })
 
@@ -37,12 +37,15 @@ describe('OwnedBusiness presentation boundaries', () => {
     expect(guard).toHaveBeenCalledWith(done); expect(done).not.toHaveBeenCalled()
   })
 
-  it('keeps an unknown operations request until its owner explicitly handles closing', async () => {
+  it('unlocks operations closing when the request ends and still respects the owner guard', async () => {
     const done = vi.fn(), guard = vi.fn()
-    const wrapper = mount(OwnedBusinessOperationsDialog, { global, props: { modelValue: true, pending: true } })
+    const wrapper = mount(OwnedBusinessOperationsDialog, { global, props: { modelValue: true, busy: true } })
     const close = wrapper.findComponent(Dialog).props('beforeClose') as (done: () => void) => void
     close(done); expect(done).not.toHaveBeenCalled()
+    await wrapper.setProps({ busy: false }); close(done)
+    expect(done).toHaveBeenCalledTimes(1)
     await wrapper.setProps({ beforeClose: guard }); close(done)
-    expect(guard).toHaveBeenCalledWith(done); expect(done).not.toHaveBeenCalled()
+    expect(guard).toHaveBeenCalledWith(done); expect(done).toHaveBeenCalledTimes(1)
+    wrapper.unmount()
   })
 })

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

@@ -7,7 +7,6 @@ const props = defineProps<{
   dispatchNo?: string
   busy?: boolean
   saveDisabled?: boolean
-  pending?: boolean
   beforeClose?: (done: () => void) => void | Promise<void>
 }>()
 const open = defineModel<boolean>({ default: false })
@@ -15,12 +14,12 @@ const emit = defineEmits<{ save: [] }>()
 function close(done: () => void) {
   if (props.busy) return
   if (props.beforeClose) return props.beforeClose(done)
-  if (!props.pending) done()
+  done()
 }
 </script>
 
 <template>
-  <AppDialog v-model="open" class="admin-density-dialog admin-density admin-workbench is-dialog" title="登记运营信息" width="1080px" :confirm-loading="busy" :confirm-disabled="saveDisabled" :confirm-text="pending ? '核对并重试原请求' : '保存登记'" :before-close="close" :close-on-press-escape="!busy" @confirm="emit('save')">
+  <AppDialog v-model="open" class="admin-density-dialog admin-density admin-workbench is-dialog" title="登记运营信息" width="1080px" :confirm-loading="busy" :confirm-disabled="saveDisabled" confirm-text="保存登记" :before-close="close" :close-on-press-escape="!busy" @confirm="emit('save')">
     <p class="owned-business-operation-reference">排车单号 {{ dispatchNo || '—' }}</p>
     <slot name="state" />
     <fieldset class="owned-business-operation-section density-dialog-section" data-tone="work"><legend>整车金额<InlineHelp title="金额口径">整车只登记一次；单价采用系统返回的总金额与实际物理托数计算结果。</InlineHelp></legend><slot name="amount" /></fieldset>

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

@@ -9,33 +9,28 @@ import { getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
 import ApiErrorMeta from '@/shared/components/ApiErrorMeta.vue'
 import LoadErrorState from '@/shared/components/LoadErrorState.vue'
 import OwnedBusinessOperationsDialog from './OwnedBusinessOperationsDialog.vue'
-import { newOwnedBusinessPending, persistOwnedBusinessPending, restoreOwnedBusinessPending, recoverOwnedBusinessCommand, type OwnedBusinessPending } from './OwnedBusinessCommandRecovery'
 import { ownedBusinessDecimal, ownedBusinessVersion, type OwnedBusinessDetail, type OwnedBusinessMoney, type OwnedBusinessSave } from '../ownedBusinessTypes'
 import { overseasMasterDataPermissions as permission } from '../permissions'
-import { getOwnedBusiness } from '../api/ownedBusiness'
+import { saveOwnedBusinessOperations } from '../api/ownedBusiness'
 
 const open = defineModel<boolean>({ default: false })
 const props = defineProps<{ detail: OwnedBusinessDetail | null }>()
 const emit = defineEmits<{ saved: [value: OwnedBusinessDetail]; busy: [value: boolean] }>()
-const auth = useAuthStore(), access = useAccessPreviewStore(), busy = ref(false), pending = ref<OwnedBusinessPending | null>(null), error = ref<ApiErrorDetails | null>(null), corrupted = ref(false)
+const auth = useAuthStore(), access = useAccessPreviewStore(), busy = ref(false), error = ref<ApiErrorDetails | null>(null)
 const form = reactive({ currency: '', amount: '', actualDistanceMiles: '', fuelConsumptionLitresPer100Km: '', reason: '', arrivals: {} as Record<string,string> })
-const active = computed(() => open.value || Boolean(pending.value))
-const registration = useUnsavedWorkRegistration({ key: `owned-business-operations:${getCurrentInstance()?.uid}`, label: computed(() => '自有业务运营登记'), isOpen: active, model: reactive({ form, pending }), requiredPermission: computed(() => permission.ownedBusinessEdit) })
+const active = computed(() => open.value)
+const registration = useUnsavedWorkRegistration({ key: `owned-business-operations:${getCurrentInstance()?.uid}`, label: computed(() => '自有业务运营登记'), isOpen: active, model: reactive({ form }), requiredPermission: computed(() => permission.ownedBusinessEdit) })
 let actor = '', number = '', baseline = ''
-const writable = computed(() => !corrupted.value && access.can(permission.ownedBusinessEdit) && props.detail?.row.actions.edit.allowed === true)
-const locked = computed(() => busy.value || Boolean(pending.value))
-function persist() { persistOwnedBusinessPending(actor, number, 'operations', pending.value) }
+const writable = computed(() => access.can(permission.ownedBusinessEdit) && props.detail?.row.actions.edit.allowed === true)
+const locked = computed(() => busy.value)
 function ensureScope() { if (auth.user?.id !== actor || props.detail?.row.dispatchNo !== number) throw new Error('操作身份或排车单已变化，请重新打开') }
 watch(busy, value => emit('busy', value))
 watch(open, async value => {
   if (!value || !props.detail) return
-  actor = auth.user?.id || ''; number = props.detail.row.dispatchNo; error.value = null; corrupted.value = false
-  try {
-    pending.value = restoreOwnedBusinessPending(actor, number, 'operations')
-    const operations = pending.value?.action === 'SAVE_OPERATIONS' ? (pending.value.body as OwnedBusinessSave).operations : props.detail.row.operations
-    Object.assign(form, { currency: operations.money?.currency || '', amount: operations.money?.amount ?? '', actualDistanceMiles: operations.actualDistanceMiles ?? '', fuelConsumptionLitresPer100Km: operations.fuelConsumptionLitresPer100Km ?? '', reason: pending.value ? (pending.value.body as OwnedBusinessSave).reason || '' : '', arrivals: Object.fromEntries(props.detail.row.destinations.map(destination => [destination.destinationKey, operations.arrivals.find(arrival => arrival.destinationKey === destination.destinationKey)?.actualArrivedAt || ''])) })
-    baseline = JSON.stringify(form); await nextTick(); if (!pending.value) registration.captureBaseline()
-  } catch (cause) { corrupted.value = true; error.value = getApiErrorDetails(cause, '运营资料恢复失败') }
+  actor = auth.user?.id || ''; number = props.detail.row.dispatchNo; error.value = null
+  const operations = props.detail.row.operations
+    Object.assign(form, { currency: operations.money?.currency || '', amount: operations.money?.amount ?? '', actualDistanceMiles: operations.actualDistanceMiles ?? '', fuelConsumptionLitresPer100Km: operations.fuelConsumptionLitresPer100Km ?? '', reason: '', arrivals: Object.fromEntries(props.detail.row.destinations.map(destination => [destination.destinationKey, operations.arrivals.find(arrival => arrival.destinationKey === destination.destinationKey)?.actualArrivedAt || ''])) })
+  baseline = JSON.stringify(form); await nextTick(); registration.captureBaseline()
 }, { immediate: true })
 function payload(): OwnedBusinessSave {
   const amount = ownedBusinessDecimal(form.amount, 2, 18)
@@ -54,32 +49,25 @@ async function save() {
   busy.value = true; error.value = null
   try {
     ensureScope()
-    if (!pending.value) { if (JSON.stringify(form) === baseline) { open.value = false; return }; pending.value = newOwnedBusinessPending(actor, number, 'SAVE_OPERATIONS', payload()); persist() }
-    const result = await recoverOwnedBusinessCommand(pending.value, persist, ensureScope)
-    if (!result.detail) throw new Error('运营登记结果未确认')
-    pending.value = null; persist(); registration.captureBaseline(); emit('saved', result.detail); open.value = false; ElMessage.success('运营信息已保存')
-  } catch (cause) { error.value = getApiErrorDetails(cause, cause instanceof Error ? cause.message : '运营登记结果尚未确认') }
+    if (JSON.stringify(form) === baseline) { open.value = false; return }
+    const request = payload()
+    const result = await saveOwnedBusinessOperations(number, request); ensureScope()
+    registration.captureBaseline(); emit('saved', result); open.value = false; ElMessage.success('运营信息已保存')
+  } catch (cause) { error.value = getApiErrorDetails(cause, '运营登记失败，请重新操作') }
   finally { busy.value = false }
 }
 async function beforeClose(done: () => void) {
   if (busy.value) return
-  if (pending.value || JSON.stringify(form) !== baseline) {
-    try { await ElMessageBox.confirm(pending.value ? '原请求将保留，重新打开后可核对原结果。是否关闭？' : '放弃尚未保存的运营信息？', '关闭运营登记', { customClass: 'admin-density-confirm admin-workbench is-dialog', confirmButtonText: pending.value ? '保留请求并关闭' : '放弃修改', cancelButtonText: '继续编辑' }) } catch { return }
+  if (JSON.stringify(form) !== baseline) {
+    try { await ElMessageBox.confirm('放弃尚未保存的运营信息？', '关闭运营登记', { customClass: 'admin-density-confirm admin-workbench is-dialog', confirmButtonText: '放弃修改', cancelButtonText: '继续编辑' }) } catch { return }
   }
   done()
 }
-async function discardRejected() {
-  if (!pending.value?.rejected || busy.value) return
-  busy.value = true
-  try { const current = await getOwnedBusiness(number); ensureScope(); pending.value = null; persist(); emit('saved', current); error.value = null }
-  catch (cause) { error.value = getApiErrorDetails(cause, '当前运营版本核对失败') }
-  finally { busy.value = false }
-}
 </script>
 
 <template>
-  <OwnedBusinessOperationsDialog v-model="open" :dispatch-no="detail?.row.dispatchNo" :busy="busy" :pending="Boolean(pending)" :save-disabled="!writable" :before-close="beforeClose" @save="save">
-    <template #state><LoadErrorState v-if="error" title="运营登记未完成" :message="error.message" :show-retry="false"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState><p v-if="pending">原请求已保留，字段锁定；核对结果前不会建立新请求。</p><el-button v-if="pending?.rejected" :disabled="busy" @click="discardRejected">按明确拒绝结果重新编辑</el-button><p v-if="!writable">{{ detail?.row.actions.edit.blockReason || '没有运营登记权限' }}</p></template>
+  <OwnedBusinessOperationsDialog v-model="open" :dispatch-no="detail?.row.dispatchNo" :busy="busy" :save-disabled="!writable" :before-close="beforeClose" @save="save">
+    <template #state><LoadErrorState v-if="error" title="运营登记未完成" :message="error.message" :show-retry="false"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState><p v-if="!writable">{{ detail?.row.actions.edit.blockReason || '没有运营登记权限' }}</p></template>
     <template #amount><el-form label-position="top" class="density-form owned-business-form"><el-form-item label="币种"><el-select v-model="form.currency" clearable :disabled="locked"><el-option label="CNY" value="CNY" /><el-option label="USD" value="USD" /></el-select></el-form-item><el-form-item label="整车总金额"><el-input v-model="form.amount" :disabled="locked" placeholder="未登记；允许明确填写0" /></el-form-item><el-form-item label="更正说明"><el-input v-model="form.reason" :disabled="locked" maxlength="1000" /></el-form-item></el-form></template>
     <template #arrivals><div v-for="destination in detail?.row.destinations || []" :key="destination.destinationKey" class="owned-business-arrival"><span>{{ destination.warehouseCode || destination.warehouseName || destination.address || '目的地资料缺失' }}<small v-for="appointment in destination.appointments" :key="appointment.appointmentNo">{{ appointment.appointmentNo }}</small></span><el-date-picker v-model="form.arrivals[destination.destinationKey]" type="datetime" value-format="YYYY-MM-DDTHH:mm:ssZ" :disabled="locked" placeholder="实际到达时间，未登记留空" /></div><p>时间按浏览器本地时区输入，提交时保留时区。</p></template>
     <template #measurements><el-form label-position="top" class="density-form owned-business-form"><el-form-item label="实际里程（mile）"><el-input v-model="form.actualDistanceMiles" :disabled="locked" placeholder="未登记" /></el-form-item><el-form-item label="油耗（L/100km）"><el-input v-model="form.fuelConsumptionLitresPer100Km" :disabled="locked" placeholder="手填耗油率，未登记留空" /></el-form-item></el-form></template>

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

@@ -10,13 +10,13 @@ const props = defineProps<{
 }>()
 const open = defineModel<boolean>({ default: false })
 const activeTab = defineModel<'loading' | 'fuel'>('activeTab', { default: 'loading' })
-// These are prototype presentation slots; the public file categories are not yet frozen.
+// 展示槽位沿用既有引用，标签与排车装车资料一致。
 const loadingPhotos = [
-  { slot: 'loading-scene', label: '装车现场' },
-  { slot: 'loading-list', label: '装车清单' },
-  { slot: 'pre-departure-check', label: '出车前检查' },
-  { slot: 'driver-license', label: '驾驶证附件' },
-  { slot: 'delivery-receipt', label: '签收凭证' },
+  { slot: 'loading-scene', label: '司机驾驶证' },
+  { slot: 'loading-list', label: '车牌照片' },
+  { slot: 'pre-departure-check', label: '装车完成' },
+  { slot: 'driver-license', label: '封车照片' },
+  { slot: 'delivery-receipt', label: 'BOL司机签字' },
 ]
 const fuelPhotos = [{ slot: 'fuel-start', label: '起始油耗表盘' }, { slot: 'fuel-end', label: '结束油耗表盘' }]
 function close(done: () => void) {
@@ -28,7 +28,7 @@ function close(done: () => void) {
 
 <template>
   <AppDialog v-model="open" class="admin-density-dialog admin-density admin-workbench is-dialog" title="上传照片" width="760px" :show-confirm="false" cancel-text="关闭" :confirm-loading="busy" :close-on-press-escape="!busy" :before-close="close">
-    <p class="owned-business-photo-reference">排车单号 {{ dispatchNo || '—' }}<InlineHelp title="照片说明">每个附件方框单独处理，支持 JPG、PNG；上传照片不改变装车状态。</InlineHelp></p>
+    <p class="owned-business-photo-reference">排车单号 {{ dispatchNo || '—' }}<InlineHelp title="照片说明">装车资料每类最多5张，油耗每类1张；支持 JPG、PNG，可逐张替换。此处补充照片不改变装车状态。</InlineHelp></p>
     <slot name="state" />
 
     <el-tabs v-model="activeTab" class="density-element-tabs density-contained-tabs">

src/modules/overseas-master-data/components/OwnedBusinessPhotosEditor.test.ts

@@ -24,23 +24,23 @@ beforeEach(()=>{
   calls.bind.mockResolvedValue(current);calls.detail.mockResolvedValue(current)
 })
 describe('owned business per-slot photo save',()=>{
-  it('retains prepared file and original binding request through a failed bind without retransmitting the image',async()=>{
+  it('unlocks after binding failure and accepts a fresh photo submission',async()=>{
     calls.bind.mockRejectedValueOnce(new TypeError('network interrupted'))
     const wrapper=mount(OwnedBusinessPhotosEditor,{global,props:{modelValue:true,detail:ownedBusinessFixture()}});await choose(wrapper)
     expect(calls.upload).toHaveBeenCalledTimes(1);expect(calls.bind).toHaveBeenCalledTimes(1)
-    expect(wrapper.text()).toContain('尚未确认绑定保存');expect(wrapper.emitted('saved')).toBeUndefined()
+    expect(wrapper.find('input[type="file"]').attributes('disabled')).toBeUndefined();expect(wrapper.emitted('saved')).toBeUndefined()
     const original={...calls.bind.mock.calls[0]![2]}
-    await wrapper.findAll('button').find(button=>button.text()==='核对原结果并继续绑定')!.trigger('click');await flushPromises()
-    expect(calls.upload).toHaveBeenCalledTimes(1);expect(calls.bind).toHaveBeenCalledTimes(2)
-    expect(calls.bind.mock.calls[1]![2]).toEqual(original);expect(original.fileId).toBe(photo.fileId);expect(original.recordVersion).toBe('0')
+    await choose(wrapper)
+    expect(calls.upload).toHaveBeenCalledTimes(2);expect(calls.bind).toHaveBeenCalledTimes(2)
+    expect(calls.bind.mock.calls[1]![2].idempotencyKey).not.toBe(original.idempotencyKey);expect(original.fileId).toBe(photo.fileId);expect(original.recordVersion).toBe('1')
     expect(wrapper.emitted('saved')).toHaveLength(1);wrapper.unmount()
   })
-  it('does not offer a new upload after unknown upload or fabricate a saved photo',async()=>{
+  it('allows another upload after an unknown failure without fabricating a saved photo',async()=>{
     calls.upload.mockRejectedValue(new TypeError('network interrupted'))
     const wrapper=mount(OwnedBusinessPhotosEditor,{global,props:{modelValue:true,detail:ownedBusinessFixture()}});await choose(wrapper)
-    await wrapper.findAll('button').find(button=>button.text()==='核对原结果并继续绑定')!.trigger('click');await flushPromises()
-    expect(calls.upload).toHaveBeenCalledTimes(1);expect(calls.bind).not.toHaveBeenCalled();expect(wrapper.emitted('saved')).toBeUndefined()
-    expect(wrapper.find('input[type="file"]').attributes('disabled')).toBeDefined();expect(wrapper.text()).toContain('禁止重复上传');wrapper.unmount()
+    await choose(wrapper)
+    expect(calls.upload).toHaveBeenCalledTimes(2);expect(calls.bind).not.toHaveBeenCalled();expect(wrapper.emitted('saved')).toBeUndefined()
+    expect(wrapper.find('input[type="file"]').attributes('disabled')).toBeUndefined();expect(sessionStorage.length).toBe(0);wrapper.unmount()
   })
   it('keeps saved metadata readable without upload permission and fetches image bytes only on explicit preview',async()=>{
     calls.canUpload=false
@@ -50,3 +50,16 @@ describe('owned business per-slot photo save',()=>{
     wrapper.unmount()
   })
 })
+
+it('renders all saved images and replaces only the chosen file', async () => {
+  const detail=ownedBusinessFixture()
+  detail.photos=[{...photo,savedAt:'2026-10-26T00:00:00Z'},{...photo,fileId:'222',fileName:'second.png',savedAt:'2026-10-26T00:00:00Z'}]
+  const wrapper=mount(OwnedBusinessPhotosEditor,{global,props:{modelValue:true,detail}})
+  await flushPromises()
+  expect(wrapper.text()).toContain('loading.png');expect(wrapper.text()).toContain('second.png')
+  const input=wrapper.findAll('input[type="file"]')[1]!
+  Object.defineProperty(input.element,'files',{configurable:true,value:[new File(['new'],'new.png',{type:'image/png'})]})
+  await input.trigger('change');await flushPromises()
+  expect(calls.bind).toHaveBeenLastCalledWith(expect.any(String),'LOADING_SCENE',expect.objectContaining({replaceFileId:'222'}))
+  wrapper.unmount()
+})

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

@@ -1,122 +1,73 @@
 <script setup lang="ts">
 import '@/styles/adminWorkbench.css'
-import { computed, getCurrentInstance, onBeforeUnmount, reactive, ref, watch } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
+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 { useUnsavedWorkRegistration } from '@/core/unsaved-work/useUnsavedWorkRegistration'
-import { ApiResponseError, getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
+import { getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
 import ApiErrorMeta from '@/shared/components/ApiErrorMeta.vue'
 import LoadErrorState from '@/shared/components/LoadErrorState.vue'
 import OwnedBusinessPhotosDialog from './OwnedBusinessPhotosDialog.vue'
-import { ownedBusinessPhotoRoles, ownedBusinessVersion, type OwnedBusinessDetail, type OwnedBusinessPhoto, type OwnedBusinessPhotoSlot } from '../ownedBusinessTypes'
-import { getOwnedBusiness, getOwnedBusinessPhotoContent, uploadOwnedBusinessPhoto } from '../api/ownedBusiness'
+import { ownedBusinessPhotoRoles, ownedBusinessVersion, type OwnedBusinessDetail, type OwnedBusinessPhotoSlot } from '../ownedBusinessTypes'
+import { getOwnedBusiness, getOwnedBusinessPhotoContent, uploadOwnedBusinessPhoto, bindOwnedBusinessPhoto } from '../api/ownedBusiness'
 import { overseasMasterDataPermissions as permission } from '../permissions'
-import { acceptOwnedBusinessResult, newOwnedBusinessPending, ownedBusinessPendingKey, persistOwnedBusinessPending, restoreOwnedBusinessPending, recoverOwnedBusinessCommand, type OwnedBusinessPending } from './OwnedBusinessCommandRecovery'
 
 const open = defineModel<boolean>({ default: false })
 const props = defineProps<{ detail: OwnedBusinessDetail | null }>()
 const emit = defineEmits<{ saved: [value: OwnedBusinessDetail]; busy: [value: boolean] }>()
-const auth = useAuthStore(), access = useAccessPreviewStore(), busy = ref(false), error = ref<ApiErrorDetails | null>(null), pending = ref<OwnedBusinessPending | null>(null), prepared = ref<OwnedBusinessPhoto | null>(null), corrupted = ref(false)
-const urls = ref<Partial<Record<OwnedBusinessPhotoSlot,string>>>({}), reading = ref<OwnedBusinessPhotoSlot | null>(null)
-const uploadable = computed(() => !corrupted.value && access.can(permission.ownedBusinessUpload) && props.detail?.row.actions.upload.allowed === true)
-useUnsavedWorkRegistration({ key: `owned-business-photos:${getCurrentInstance()?.uid}`, label: computed(() => '自有业务照片作业'), isOpen: computed(() => open.value || Boolean(pending.value) || Boolean(prepared.value)), model: reactive({ pending, prepared }), requiredPermission: computed(() => permission.ownedBusinessUpload) })
+const auth = useAuthStore(), access = useAccessPreviewStore(), busy = ref(false), error = ref<ApiErrorDetails | null>(null)
+const urls = ref<Record<string,string>>({}), reading = ref<string | null>(null)
+const uploadable = computed(() => access.can(permission.ownedBusinessUpload) && props.detail?.row.actions.upload.allowed === true)
 let actor = '', number = '', generation = 0
-function savedPhoto(slot: OwnedBusinessPhotoSlot) { return props.detail?.photos.find(photo => photo.slot === slot && photo.savedAt) }
+function savedPhotos(slot: OwnedBusinessPhotoSlot) { return props.detail?.photos.filter(photo => photo.slot === slot && photo.savedAt) || [] }
 function release() { Object.values(urls.value).forEach(url => { if (url) URL.revokeObjectURL(url) }); urls.value = {} }
 function ensureScope() { if (auth.user?.id !== actor || props.detail?.row.dispatchNo !== number) throw new Error('图片作业身份或排车单已变化，请重新打开') }
-function persist() { persistOwnedBusinessPending(actor, number, 'photos', pending.value) }
-function persistPrepared() {
-  const key = ownedBusinessPendingKey(actor, number, 'prepared-photo')
-  if (prepared.value) sessionStorage.setItem(key, JSON.stringify(prepared.value)); else sessionStorage.removeItem(key)
-}
 watch(busy, value => emit('busy', value))
 watch(open, value => {
-  generation++; release(); reading.value = null; error.value = null; corrupted.value = false
+  generation++; release(); reading.value = null; error.value = null
   if (!value || !props.detail) return
   actor = auth.user?.id || ''; number = props.detail.row.dispatchNo
-  try {
-    pending.value = restoreOwnedBusinessPending(actor, number, 'photos')
-    const raw = sessionStorage.getItem(ownedBusinessPendingKey(actor, number, 'prepared-photo'))
-    prepared.value = raw ? JSON.parse(raw) as OwnedBusinessPhoto : null
-    if (prepared.value && (!prepared.value.fileId || !ownedBusinessPhotoRoles.some(role => role.slot === prepared.value!.slot))) throw new Error('原上传文件资料损坏，请保留现场核对')
-  } catch (cause) { corrupted.value = true; error.value = getApiErrorDetails(cause, '照片作业恢复失败') }
 }, { immediate: true })
 watch(() => props.detail?.photos, () => { generation++; release(); reading.value = null })
 onBeforeUnmount(() => { generation++; release() })
-async function preview(slot: OwnedBusinessPhotoSlot) {
-  const photo = savedPhoto(slot), current = generation
+async function preview(slot: OwnedBusinessPhotoSlot, fileId: string) {
+  const photo = savedPhotos(slot).find(item => item.fileId === fileId), current = generation
   if (!photo || reading.value) return
-  reading.value = slot; error.value = null
-  try { const blob = await getOwnedBusinessPhotoContent(number, photo); if (current !== generation || !open.value) return; urls.value[slot] = URL.createObjectURL(blob) }
+  reading.value = fileId; error.value = null
+  try { const blob = await getOwnedBusinessPhotoContent(number, photo); if (current !== generation || !open.value) return; urls.value[fileId] = URL.createObjectURL(blob) }
   catch (cause) { if (current === generation) error.value = getApiErrorDetails(cause, '图片读取失败') }
   finally { if (current === generation) reading.value = null }
 }
-async function bindPrepared() {
-  if ((!prepared.value && !pending.value) || !props.detail || !uploadable.value) return
-  if (!pending.value) {
-    const body = { recordVersion: ownedBusinessVersion(props.detail.row.recordVersion), idempotencyKey: crypto.randomUUID(), fileId: prepared.value!.fileId }
-    pending.value = newOwnedBusinessPending(actor, number, 'BIND_PHOTO', body, prepared.value!.slot); persist()
-  }
-  const result = await recoverOwnedBusinessCommand(pending.value, persist, ensureScope)
-  if (!result.detail) throw new Error('照片绑定尚未确认')
-  pending.value = null; persist(); prepared.value = null; persistPrepared(); emit('saved', result.detail); ElMessage.success('照片已绑定保存')
-}
-async function recover() {
-  if (busy.value || !uploadable.value) return
+async function upload(slot: OwnedBusinessPhotoSlot, event: Event, replaceFileId?: string) {
+  const input = event.target as HTMLInputElement, file = input.files?.[0]; input.value = ''
+  if (!file || busy.value || !uploadable.value) return
+  if (!replaceFileId && savedPhotos(slot).length >= (slot.startsWith('FUEL_') ? 1 : 5)) return
+  if (!['image/jpeg','image/png'].includes(file.type) || !file.size) { error.value = { message: '请选择有效的JPG或PNG图片' }; return }
   busy.value = true; error.value = null
   try {
     ensureScope()
-    if (pending.value?.action === 'UPLOAD_PHOTO') {
-      const result = await recoverOwnedBusinessCommand(pending.value, persist, ensureScope)
-      if (!result.photo) throw new Error('原上传文件未确认')
-      prepared.value = result.photo; persistPrepared(); pending.value = null; persist()
-    }
-    await bindPrepared()
-  } catch (cause) { error.value = getApiErrorDetails(cause, cause instanceof Error ? cause.message : '照片结果尚未确认') }
+    const photo = await uploadOwnedBusinessPhoto(number, slot, file, crypto.randomUUID()); ensureScope()
+    const latest = await getOwnedBusiness(number); ensureScope()
+    if (!latest.row.actions.upload.allowed) throw new Error(latest.row.actions.upload.blockReason || '当前不允许上传照片')
+    const result = await bindOwnedBusinessPhoto(number, slot, { recordVersion: ownedBusinessVersion(latest.row.recordVersion), idempotencyKey: crypto.randomUUID(), fileId: photo.fileId, ...(replaceFileId ? { replaceFileId } : {}) }); ensureScope()
+    emit('saved', result); ElMessage.success('照片已保存')
+  } catch (cause) { error.value = getApiErrorDetails(cause, '图片上传或保存失败，请重新选择图片') }
   finally { busy.value = false }
 }
-async function upload(slot: OwnedBusinessPhotoSlot, event: Event) {
-  const input = event.target as HTMLInputElement, file = input.files?.[0]; input.value = ''
-  if (!file || busy.value || pending.value || prepared.value || !uploadable.value) return
-  if (!['image/jpeg','image/png'].includes(file.type) || file.size <= 0) { error.value = { message: '请选择有效的JPG或PNG图片' }; return }
-  busy.value = true; error.value = null
-  try {
-    ensureScope(); pending.value = newOwnedBusinessPending(actor, number, 'UPLOAD_PHOTO', null, slot); pending.value.attempted = true; persist()
-    const uploaded = await uploadOwnedBusinessPhoto(number, slot, file, pending.value.key)
-    ensureScope(); acceptOwnedBusinessResult(pending.value, uploaded); persist()
-    const result = await recoverOwnedBusinessCommand(pending.value, persist, ensureScope)
-    if (!result.photo) throw new Error('真实上传文件未确认')
-    prepared.value = result.photo; persistPrepared(); pending.value = null; persist(); await bindPrepared()
-  } catch (cause) {
-    if (pending.value?.action === 'UPLOAD_PHOTO' && cause instanceof ApiResponseError && ['A0400','A0403','A0404','400','403','404','422'].includes(cause.code)) { pending.value.rejected = true; persist() }
-    error.value = getApiErrorDetails(cause, cause instanceof Error ? cause.message : '图片上传或绑定结果尚未确认')
-  } finally { busy.value = false }
-}
-async function discardRejected() {
-  if (busy.value || !pending.value?.rejected) return
-  busy.value = true
-  try { const latest = await getOwnedBusiness(number); ensureScope(); pending.value = null; persist(); emit('saved', latest); error.value = null }
-  catch (cause) { error.value = getApiErrorDetails(cause, '当前照片版本读取失败') }
-  finally { busy.value = false }
-}
-async function beforeClose(done: () => void) {
-  if (busy.value) return
-  if (pending.value || prepared.value) {
-    try { await ElMessageBox.confirm('未完成的原上传或绑定记录将保留，重新打开后继续核对；关闭不会保存尚未绑定的照片。是否关闭？', '关闭照片窗口', { customClass: 'admin-density-confirm admin-workbench is-dialog', confirmButtonText: '保留记录并关闭', cancelButtonText: '继续核对' }) } catch { return }
-  }
-  done()
-}
+function beforeClose(done: () => void) { if (!busy.value) done() }
 </script>
 
 <template>
   <OwnedBusinessPhotosDialog v-model="open" :dispatch-no="detail?.row.dispatchNo" :busy="busy" :before-close="beforeClose">
-    <template #state><LoadErrorState v-if="error" title="照片作业未完成" :message="error.message" :show-retry="false"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState><p v-if="pending">原{{ pending.action === 'UPLOAD_PHOTO' ? '上传' : '绑定' }}请求已保留，不会重新上传文件。</p><p v-if="prepared">{{ prepared.fileName }} 已上传，尚未确认绑定保存。</p><el-button v-if="pending || prepared" :loading="busy" :disabled="!uploadable" @click="recover">核对原结果并继续绑定</el-button><el-button v-if="pending?.rejected" :disabled="busy" @click="discardRejected">按明确拒绝重新核对，保留已上传文件</el-button><p v-if="!uploadable">{{ detail?.row.actions.upload.blockReason || '当前仅可查看照片' }}</p></template>
+    <template #state><LoadErrorState v-if="error" title="照片作业未完成" :message="error.message" :show-retry="false"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState><p v-if="!uploadable">{{ detail?.row.actions.upload.blockReason || '当前仅可查看照片' }}</p></template>
     <template v-for="role in ownedBusinessPhotoRoles" :key="role.slot" #[role.viewSlot]>
-      <img v-if="urls[role.slot]" :src="urls[role.slot]" :alt="role.label" class="owned-business-photo" />
-      <template v-if="savedPhoto(role.slot)"><p>{{ savedPhoto(role.slot)?.fileName }} · 已保存</p><el-button :loading="reading === role.slot" :disabled="Boolean(reading)" @click="preview(role.slot)">查看图片</el-button></template>
-      <p v-else>暂无已保存照片</p>
-      <label v-if="uploadable" class="owned-business-upload">{{ savedPhoto(role.slot) ? '替换图片' : '上传图片' }}<input type="file" accept="image/jpeg,image/png" :disabled="busy || Boolean(pending) || Boolean(prepared)" @change="upload(role.slot, $event)" /></label>
+      <div v-for="photo in savedPhotos(role.slot)" :key="photo.fileId">
+        <img v-if="urls[photo.fileId]" :src="urls[photo.fileId]" :alt="role.label" class="owned-business-photo" />
+        <p>{{ photo.fileName }} · 已保存</p><el-button :loading="reading === photo.fileId" :disabled="Boolean(reading)" @click="preview(role.slot, photo.fileId)">查看图片</el-button>
+        <label v-if="uploadable" class="owned-business-upload">替换图片<input type="file" accept="image/jpeg,image/png" :disabled="busy" @change="upload(role.slot, $event, photo.fileId)" /></label>
+      </div>
+      <p v-if="!savedPhotos(role.slot).length">暂无已保存照片</p>
+      <label v-if="uploadable && savedPhotos(role.slot).length < (role.slot.startsWith('FUEL_') ? 1 : 5)" class="owned-business-upload">上传图片<input type="file" accept="image/jpeg,image/png" :disabled="busy" @change="upload(role.slot, $event)" /></label>
     </template>
   </OwnedBusinessPhotosDialog>
 </template>

src/modules/overseas-master-data/components/PickupDemandPanel.test.ts

@@ -30,7 +30,7 @@ it('uses server total and rejects combining different destination warehouses', a
   expect(wrapper.findComponent({ name: 'AppDialog' }).props('modelValue')).toBe(false)
   expect(createPickupTrip).not.toHaveBeenCalled()
 })
-it('keeps exact source identities and the same create request after an unknown network result', async () => {
+it('keeps source identities and submits a new request after network failure', async () => {
   const wrapper = mount(); await flushPromises()
   wrapper.findComponent({ name: 'DataTable' }).vm.$emit('selection-change', rows); await flushPromises(); await wrapper.find('button').trigger('click')
   const dates = wrapper.findAllComponents({ name: 'ElDatePicker' })
@@ -40,7 +40,7 @@ it('keeps exact source identities and the same create request after an unknown n
   const request = vi.mocked(createPickupTrip).mock.calls[0]![0]
   expect(request.sources).toEqual(rows.map(({ customerId, transferNo }) => ({ customerId, transferNo })))
   dialog.vm.$emit('confirm'); await flushPromises()
-  expect(vi.mocked(createPickupTrip).mock.calls[1]![0]).toBe(request)
+  expect(vi.mocked(createPickupTrip).mock.calls[1]![0]).toEqual({ ...request, idempotencyKey: expect.any(String) }); expect(vi.mocked(createPickupTrip).mock.calls[1]![0].idempotencyKey).not.toBe(request.idempotencyKey)
   expect(state.push).toHaveBeenCalledWith({ name: 'overseas-master-data-trip-detail', params: { tripNo: 'TR-TEST' } })
 })
 it('does not show scheduling to read-only users', async () => {

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

@@ -40,7 +40,6 @@ function arrange() {
   if (new Set(selected.value.map(row => row.warehouseId)).size !== 1) { ElMessage.warning('同车取货必须送往同一海外仓'); return }
   snapshot.value = [...selected.value]; pending.value = null; departure.value = ''; end.value = ''; remark.value = ''; error.value = ''; open.value = true
 }
-/** 网络结果未知时沿原键原内容重试，业务错误后允许修正输入。 */
 async function save() {
   if (busy.value) return
   if (!pending.value && (!departure.value || !end.value)) { ElMessage.warning('请填写取货发车时间和预计任务结束时间'); return }
@@ -48,10 +47,9 @@ async function save() {
   busy.value = true
   try { const value = await createPickupTrip(pending.value); open.value = false; pending.value = null; await router.push({ name: 'overseas-master-data-trip-detail', params: { tripNo: value.trip.tripNo } }) }
   catch (cause) { error.value = getApiErrorDetails(cause, '安排取货未完成').message; if (cause instanceof ApiResponseError) pending.value = null }
-  finally { busy.value = false }
+  finally { pending.value = null;  busy.value = false }
 }
-/** 未知提交结果必须保留原请求，避免关闭后重复建车次。 */
-function close(done: () => void) { if (busy.value || pending.value) { ElMessage.warning('请先重试原安排请求，确认结果后再关闭'); return }; done() }
+function close(done: () => void) { if (busy.value || pending.value) { ElMessage.warning('操作正在提交，请稍候'); return }; done() }
 onBeforeRouteLeave(() => { if (busy.value || pending.value) { ElMessage.warning('请先确认本次安排结果'); return false }; return true })
 watch(page, load); onMounted(load); onBeforeUnmount(() => { sequence++ })
 </script>
@@ -62,7 +60,7 @@ watch(page, load); onMounted(load); onBeforeUnmount(() => { sequence++ })
     <template #notices><LoadErrorState v-if="error && !open" title="待取货需求加载失败" :message="error" @retry="load" /></template>
     <template #warehouse="{ row }">{{ row.warehouseName || '海外仓' }} · {{ row.warehouseCode || row.warehouseId }}</template>
   </DataTable></div>
-  <AppDialog v-model="open" class="admin-density-dialog admin-workbench is-dialog" :before-close="close" title="安排仓储转运取货" width="780px" :confirm-text="pending ? '重试原安排请求' : '创建取货车次'" :confirm-loading="busy" @confirm="save">
+  <AppDialog v-model="open" class="admin-density-dialog admin-workbench is-dialog" :before-close="close" title="安排仓储转运取货" width="780px" :confirm-text="'创建取货车次'" :confirm-loading="busy" @confirm="save">
     <p>已选 {{ snapshot.length }} 单：{{ snapshot.map(row => row.transferNo).join('、') }}</p>
     <el-form label-position="top" class="pickup-plan-form" :disabled="busy || !!pending">
       <el-form-item label="计划取货发车时间" required><el-date-picker v-model="departure" type="datetime" value-format="YYYY-MM-DDTHH:mm:ssZ" /></el-form-item>

src/modules/overseas-master-data/components/ResourcePhotoPanel.test.ts

@@ -0,0 +1,54 @@
+import { flushPromises, mount } from '@vue/test-utils'
+import { beforeEach, expect, it, vi } from 'vitest'
+import { ApiResponseError } from '@/shared/api/http'
+import ResourcePhotoPanel from './ResourcePhotoPanel.vue'
+import * as api from '../api/resourcePhotos'
+const security = vi.hoisted(() => ({ writable: true }))
+vi.mock('@/core/access/accessPreview', () => ({ useAccessPreviewStore: () => ({ can: () => security.writable }) }))
+vi.mock('../api/resourcePhotos', () => ({ getResourcePhoto: vi.fn(), uploadResourcePhoto: vi.fn(), downloadResourcePhoto: vi.fn() }))
+const photo = { fileId: '81', fileName: 'driver.png', contentType: 'image/png', sizeBytes: 3 }
+const options = { props: { kind: 'DRIVER' as const, resourceId: '7' }, global: { directives: { loading: () => undefined }, stubs: {
+  ElButton: { props: ['disabled'], template: '<button :disabled="disabled"><slot /></button>' },
+  AppDialog: { props: ['modelValue'], template: '<div v-if="modelValue"><slot /></div>' },
+} } }
+beforeEach(() => {
+  vi.resetAllMocks(); security.writable = true
+  vi.mocked(api.getResourcePhoto).mockResolvedValue({ recordVersion: '2', photo })
+  URL.createObjectURL = vi.fn().mockReturnValue('blob:photo'); URL.revokeObjectURL = vi.fn()
+})
+it('keeps reading independent from upload permission and downloads only on preview', async () => {
+  security.writable = false
+  vi.mocked(api.downloadResourcePhoto).mockResolvedValue(new Blob(['png'], { type: 'image/png' }))
+  const wrapper = mount(ResourcePhotoPanel, options); await flushPromises()
+  expect(wrapper.text()).not.toContain('上传 / 替换')
+  expect(api.downloadResourcePhoto).not.toHaveBeenCalled()
+  await wrapper.get('button').trigger('click'); await flushPromises()
+  expect(api.downloadResourcePhoto).toHaveBeenCalledWith('DRIVER', '7', '81')
+  wrapper.unmount(); expect(URL.revokeObjectURL).toHaveBeenCalledWith('blob:photo')
+})
+it('submits the independent photo version and releases busy state after failure', async () => {
+  vi.mocked(api.uploadResourcePhoto).mockRejectedValueOnce(new ApiResponseError('版本冲突', 'A0409'))
+    .mockResolvedValueOnce({ recordVersion: '3', photo })
+  const wrapper = mount(ResourcePhotoPanel, options); await flushPromises()
+  const input = wrapper.get('input[type="file"]'), file = new File(['png'], 'driver.png', { type: 'image/png' })
+  Object.defineProperty(input.element, 'files', { configurable: true, value: [file] })
+  await input.trigger('change'); await flushPromises()
+  expect(api.uploadResourcePhoto).toHaveBeenCalledWith('DRIVER', '7', '2', file)
+  expect(wrapper.text()).toContain('版本冲突')
+  await input.trigger('change'); await flushPromises()
+  expect(api.uploadResourcePhoto).toHaveBeenCalledTimes(2)
+  wrapper.unmount()
+})
+it('does not apply an upload result to a different resource', async () => {
+  let finish!: (value: api.ResourcePhotoDetail) => void
+  vi.mocked(api.uploadResourcePhoto).mockImplementation(() => new Promise(resolve => { finish = resolve }))
+  const wrapper = mount(ResourcePhotoPanel, options); await flushPromises()
+  const input = wrapper.get('input[type="file"]')
+  Object.defineProperty(input.element, 'files', { value: [new File(['png'], 'driver.png', { type: 'image/png' })] })
+  await input.trigger('change')
+  vi.mocked(api.getResourcePhoto).mockResolvedValue({ recordVersion: '0', photo: null })
+  await wrapper.setProps({ resourceId: '8' }); await flushPromises()
+  finish({ recordVersion: '3', photo }); await flushPromises()
+  expect(wrapper.text()).toContain('尚未上传司机照片')
+  wrapper.unmount()
+})

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

@@ -0,0 +1,62 @@
+<script setup lang="ts">
+import { computed, onBeforeUnmount, ref, watch } from 'vue'
+import { ElMessage } from 'element-plus'
+import { useAccessPreviewStore } from '@/core/access/accessPreview'
+import AppDialog from '@/shared/components/AppDialog.vue'
+import LoadErrorState from '@/shared/components/LoadErrorState.vue'
+import ApiErrorMeta from '@/shared/components/ApiErrorMeta.vue'
+import { getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
+import { getResourcePhoto, uploadResourcePhoto, downloadResourcePhoto, type ResourcePhotoKind, type ResourcePhotoDetail } from '../api/resourcePhotos'
+import { overseasMasterDataPermissions as permission } from '../permissions'
+
+const props = defineProps<{ kind: ResourcePhotoKind; resourceId: string }>()
+const access = useAccessPreviewStore(), detail = ref<ResourcePhotoDetail | null>(null), loading = ref(false), busy = ref(false)
+const error = ref<ApiErrorDetails | null>(null), input = ref<HTMLInputElement | null>(null), previewOpen = ref(false), url = ref('')
+const label = computed(() => props.kind === 'VEHICLE' ? '车辆图片' : '司机照片')
+const editable = computed(() => access.can(props.kind === 'VEHICLE' ? permission.vehicleEdit : permission.driverUpload))
+let generation = 0
+function closePreview() { previewOpen.value = false; if (url.value) URL.revokeObjectURL(url.value); url.value = '' }
+async function load() {
+  const current = ++generation; closePreview(); detail.value = null; loading.value = true; error.value = null; busy.value = false
+  try { const result = await getResourcePhoto(props.kind, props.resourceId); if (current === generation) detail.value = result }
+  catch (cause) { if (current === generation) error.value = getApiErrorDetails(cause, '档案照片加载失败') }
+  finally { if (current === generation) loading.value = false }
+}
+async function upload(event: Event) {
+  const element = event.target as HTMLInputElement, file = element.files?.[0]; element.value = ''
+  if (!file || !detail.value || busy.value || !editable.value) return
+  if (!['image/jpeg', 'image/png'].includes(file.type) || !file.size || file.size > 10 * 1024 * 1024) { ElMessage.warning('请选择非空 JPG 或 PNG，最大 10MiB'); return }
+  const current = generation; busy.value = true; error.value = null
+  try {
+    const saved = await uploadResourcePhoto(props.kind, props.resourceId, detail.value.recordVersion, file)
+    if (current !== generation) return
+    detail.value = saved; closePreview(); ElMessage.success(`${label.value}已保存，新排车会自动带入`)
+  } catch (cause) { if (current === generation) error.value = getApiErrorDetails(cause, '照片保存未完成，请重新读取后重试') }
+  finally { if (current === generation) busy.value = false }
+}
+async function preview() {
+  if (!detail.value?.photo || busy.value) return
+  const current = generation; busy.value = true; error.value = null
+  try {
+    const blob = await downloadResourcePhoto(props.kind, props.resourceId, detail.value.photo.fileId)
+    if (current !== generation) return
+    closePreview(); url.value = URL.createObjectURL(blob); previewOpen.value = true
+  } catch (cause) { if (current === generation) error.value = getApiErrorDetails(cause, '照片预览失败') }
+  finally { if (current === generation) busy.value = false }
+}
+watch(() => [props.kind, props.resourceId], load, { immediate: true })
+onBeforeUnmount(() => { generation++; closePreview() })
+</script>
+<template>
+  <section v-loading="loading" :aria-label="label">
+    <LoadErrorState v-if="error" title="档案照片操作未完成" :message="error.message" compact @retry="load"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState>
+    <div class="density-actions">
+      <el-button v-if="detail?.photo" :disabled="busy" @click="preview">查看{{ label }}</el-button><span v-else-if="detail">尚未上传{{ label }}</span>
+      <el-button v-if="editable" :disabled="!detail || busy" :loading="busy" @click="input?.click()">上传 / 替换{{ label }}</el-button>
+      <input ref="input" hidden type="file" accept="image/jpeg,image/png" :aria-label="'上传' + label" @change="upload">
+    </div>
+    <p class="density-dialog-note">排车选择此档案后自动带入照片；替换不影响已保存的排车资料。JPG、PNG，最大 10MiB。</p>
+    <AppDialog :model-value="previewOpen" class="admin-density-dialog" :title="label" width="620px" :show-confirm="false" cancel-text="关闭" @update:model-value="closePreview"><img v-if="url" class="resource-photo-preview" :src="url" :alt="label"></AppDialog>
+  </section>
+</template>
+<style scoped>.resource-photo-preview { display: block; width: 100%; max-height: 60vh; object-fit: contain; }</style>

src/modules/overseas-master-data/components/TripBookingFulfillmentDialog.test.ts

@@ -46,15 +46,15 @@ it('does not accept a receipt while the warehouse is still waiting for actual go
   const wrapper = mount('receipt'); await flushPromises(); wrapper.findComponent({ name: 'AppDialog' }).vm.$emit('confirm'); await flushPromises()
   expect(api.acceptTripIncoming).not.toHaveBeenCalled(); expect(wrapper.findComponent({ name: 'AppDialog' }).props('confirmDisabled')).toBe(true)
 })
-it('retries the same incoming registration after an uncertain result without creating a new command', async () => {
+it('submits a fresh incoming registration after failure', async () => {
   vi.mocked(api.startTripIncoming).mockRejectedValueOnce(new Error('network')).mockResolvedValueOnce({ tripRecordVersion: 5, booking, replayed: true })
   const wrapper = mount('incoming'); await flushPromises(); wrapper.findComponent({ name: 'AppDialog' }).vm.$emit('confirm'); await flushPromises()
   const first = vi.mocked(api.startTripIncoming).mock.calls[0]![2]
   wrapper.findComponent({ name: 'AppDialog' }).vm.$emit('confirm'); await flushPromises()
-  expect(api.startTripIncoming).toHaveBeenNthCalledWith(2, 'TR-1', 'FB-1', first); expect(api.getTripIncoming).not.toHaveBeenCalled()
+  expect(api.startTripIncoming).toHaveBeenNthCalledWith(2, 'TR-1', 'FB-1', { ...first, idempotencyKey: expect.any(String) }); expect(vi.mocked(api.startTripIncoming).mock.calls[1]![2].idempotencyKey).not.toBe(first.idempotencyKey); expect(api.getTripIncoming).not.toHaveBeenCalled()
 })
 
-it('keeps an uncertain receipt command retryable after closing and reopening without reloading or changing its hash', async () => {
+it('reloads current receipt on reopening and submits a fresh command', async () => {
   vi.mocked(api.acceptTripIncoming).mockRejectedValueOnce(new Error('network')).mockResolvedValueOnce({ tripRecordVersion: 6, booking: { ...booking, status: 'RECEIVED' }, replayed: true })
   const wrapper=mount('receipt'); await flushPromises()
   wrapper.findComponent({ name: 'AppDialog' }).vm.$emit('confirm'); await flushPromises()
@@ -62,8 +62,8 @@ it('keeps an uncertain receipt command retryable after closing and reopening wit
   await wrapper.setProps({ modelValue: false }); await wrapper.setProps({ modelValue: true }); await flushPromises()
   expect(wrapper.findComponent({ name: 'AppDialog' }).props('confirmDisabled')).toBe(false)
   wrapper.findComponent({ name: 'AppDialog' }).vm.$emit('confirm'); await flushPromises()
-  expect(api.acceptTripIncoming).toHaveBeenNthCalledWith(2, 'TR-1', 'FB-1', original)
-  expect(api.getTripIncoming).toHaveBeenCalledOnce()
+  expect(api.acceptTripIncoming).toHaveBeenNthCalledWith(2, 'TR-1', 'FB-1', { ...original, idempotencyKey: expect.any(String) }); expect(vi.mocked(api.acceptTripIncoming).mock.calls[1]![2].idempotencyKey).not.toBe(original.idempotencyKey)
+  expect(api.getTripIncoming).toHaveBeenCalledTimes(2)
 })
 
 it.each([
@@ -136,7 +136,7 @@ it('requires explicit acceptance of a changed received snapshot and submits the
   expect(api.acceptTripIncoming).toHaveBeenCalledExactlyOnceWith('TR-1', 'FB-1', { tripRecordVersion: 11, recordVersion: 8, idempotencyKey: expect.any(String), receiptHash: 'merged-hash', unitPrice: 50, pallets: [{ warehousePalletId: '903', palletSpaces: 1 }] })
 })
 
-it('uses a new key after a completed confirmation while preserving the original key for unknown retries', async () => {
+it('uses a new key after a completed confirmation and after failed requests', async () => {
   vi.mocked(api.acceptTripIncoming).mockResolvedValue({ tripRecordVersion: 6, booking: { ...booking, status: 'RECEIVED' }, replayed: false })
   const wrapper = mount('receipt'); await flushPromises()
   wrapper.findComponent({ name: 'AppDialog' }).vm.$emit('confirm'); await flushPromises()
@@ -174,7 +174,7 @@ it.each(['bound', 'departed', 'permission'] as const)('rejects a receipt write i
   expect(wrapper.findComponent({ name: 'AppDialog' }).props('confirmDisabled')).toBe(true)
 })
 
-it('requires new measurements for changed pallet composition and keeps them in the exact unknown-result retry', async () => {
+it('requires measurements for changed pallet composition and submits them with a new key after failure', async () => {
   const merged = { ...preview, incoming: { ...preview.incoming!, status: 'READY_FOR_DISPATCH', receiptHash: 'merged-null-measurement', pallets: [{ warehousePalletId: '903', palletNo: 'MERGED-1', packages: 22, weightKg: null, volumeCbm: null }] } }
   vi.mocked(api.getTripIncoming).mockResolvedValue(merged)
   vi.mocked(api.acceptTripIncoming).mockRejectedValueOnce(new Error('network')).mockResolvedValueOnce({ tripRecordVersion: 6, booking: { ...booking, status: 'RECEIVED' }, replayed: true })
@@ -190,7 +190,7 @@ it('requires new measurements for changed pallet composition and keeps them in t
   const original = vi.mocked(api.acceptTripIncoming).mock.calls[0]![2]
   expect(original).toMatchObject({ receiptHash: 'merged-null-measurement', pallets: [{ warehousePalletId: '903', palletSpaces: 1, weightKg: 123.456, volumeCbm: 1.234 }] })
   confirm(); await flushPromises()
-  expect(api.acceptTripIncoming).toHaveBeenNthCalledWith(2, 'TR-1', 'FB-1', original)
+  expect(api.acceptTripIncoming).toHaveBeenNthCalledWith(2, 'TR-1', 'FB-1', { ...original, idempotencyKey: expect.any(String) }); expect(vi.mocked(api.acceptTripIncoming).mock.calls[1]![2].idempotencyKey).not.toBe(original.idempotencyKey)
 })
 
 it('does not offer measurement overrides for unchanged source pallets', async () => {

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

@@ -23,7 +23,7 @@ const spaces = reactive<Record<string, number>>({}), unitPrice = ref<number | nu
 const measurements = reactive({ weightKg: {} as Record<string, number | undefined>, volumeCbm: {} as Record<string, number | undefined> })
 const form = reactive({ estimatedArrivalAt: '', deliveryInstructions: '', privateAddress: '', postalCode: '', recipientName: '', recipientPhone: '' })
 const pending = ref<{ target: string; body: TripIncomingStart | TripIncomingAccept | TripBookingBind } | null>(null)
-const guard = useFleetDraftGuard('booking-fulfillment', open, reactive({ form, spaces, measurements, unitPrice, dispatchNo }), busy, computed(() => !!pending.value))
+const guard = useFleetDraftGuard('booking-fulfillment', open, reactive({ form, spaces, measurements, unitPrice, dispatchNo }), busy)
 defineExpose({ hasPending: computed(() => !!pending.value) })
 let generation = 0
 const target = computed(() => `${props.trip.tripNo}:${props.booking?.bookingNo}:${props.mode}`)
@@ -113,7 +113,7 @@ async function save() {
         busy.value = true
         try { await ElMessageBox.confirm(`当前实托、货量、托位或约定价格存在变化，确认按当前完整实收和 ${amount.value?.toFixed(2)} ${booking.cargo.currency || ''} 核实？容量仍由服务端复核，超容量不会保存。`, '确认实收差异', { customClass: 'admin-density-confirm admin-workbench is-dialog', confirmButtonText: '确认当前实收与运费', cancelButtonText: '返回核对', type: 'warning' }) }
         catch { return }
-        finally { busy.value = false }
+        finally { pending.value = null;  busy.value = false }
         if (current !== generation || !receiptAllowed.value) return
       }
       pending.value = { target: target.value, body: { ...versions, receiptHash: preview.value.incoming.receiptHash, unitPrice: unitPrice.value,
@@ -128,15 +128,15 @@ async function save() {
         : await acceptTripIncoming(props.trip.tripNo, booking.bookingNo, body as TripIncomingAccept)
     if (current === generation) { pending.value = null; guard.capture(); emit('saved', value); open.value = false; ElMessage.success(value.booking.status === 'BOUND' ? '已排入本车，尚未装车或发车' : value.booking.status === 'RECEIVED' ? '实收货量及约定运费已核实' : value.booking.incomingNo ? '已安排来货，等待仓库实际收货' : '履约命令已完成，请查看最新进度') }
   } catch (cause) { if (current === generation) { error.value = getApiErrorDetails(cause, '外接履约操作未完成'); if (cause instanceof ApiResponseError && /^A04/.test(cause.code)) pending.value = null } }
-  finally { busy.value = false }
+  finally { pending.value = null;  busy.value = false }
 }
 onBeforeUnmount(() => { generation++ })
 </script>
 <template>
-  <AppDialog v-model="open" :before-close="guard.beforeClose" class="admin-density-dialog admin-workbench is-dialog" :title="titles[mode]" width="1080px" :show-confirm="mode !== 'view'" :confirm-text="pending ? '重试原请求' : mode === 'receipt' ? '确认实收与运费' : mode === 'bind' ? '确认排入本车' : '生成来货单'" :confirm-disabled="loading || (mode === 'receipt' && (!receiptAllowed || (!pending && !ready)))" :confirm-loading="busy" @confirm="save">
+  <AppDialog v-model="open" :before-close="guard.beforeClose" class="admin-density-dialog admin-workbench is-dialog" :title="titles[mode]" width="1080px" :show-confirm="mode !== 'view'" :confirm-text="mode === 'receipt' ? '确认实收与运费' : mode === 'bind' ? '确认排入本车' : '生成来货单'" :confirm-disabled="loading || (mode === 'receipt' && (!receiptAllowed || (!pending && !ready)))" :confirm-loading="busy" @confirm="save">
     <LoadErrorState v-if="error" title="操作未完成" :message="error.message" @retry="load"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState>
     <div v-if="booking" v-loading="loading">
-      <p>{{ booking.bookingNo }} · {{ booking.customerName }} · {{ booking.destinationLabel }}</p><p v-if="pending" role="status">本票上次提交结果尚未确定，保留原内容与请求键重试；不会改为处理另一票货物。</p>
+      <p>{{ booking.bookingNo }} · {{ booking.customerName }} · {{ booking.destinationLabel }}</p>
       <el-form v-if="mode === 'incoming'" label-position="top" class="density-form incoming-form" :disabled="busy || !!pending">
         <el-form-item label="预计到仓时间"><el-date-picker v-model="form.estimatedArrivalAt" type="datetime" value-format="YYYY-MM-DDTHH:mm:ssZ" /></el-form-item>
         <el-form-item label="交货说明"><el-input v-model="form.deliveryInstructions" placeholder="选填，默认客户自送至本起运仓" /></el-form-item>

src/modules/overseas-master-data/components/TripBookingPanel.test.ts

@@ -63,7 +63,7 @@ it('reopens saved negotiated price in a fresh numeric control while retaining it
   expect(wrapper.text()).toContain('来源单价：16.00 USD')
   expect(wrapper.text()).toContain('约定运费：18.00 USD')
 })
-it('keeps inquiry estimates and contacts optional and retries the same uncertain create command', async () => {
+it('keeps inquiry estimates and contacts optional and submits a fresh create command after failure', async () => {
   vi.mocked(api.createTripBooking).mockRejectedValueOnce(new Error('network')).mockResolvedValueOnce({ tripRecordVersion: 5, booking: row, replayed: true })
   const wrapper = mount(); await flushPromises(); await button(wrapper, '登记外接询价').trigger('click'); await flushPromises()
   const selects = wrapper.findAllComponents({ name: 'ElSelect' }); selects[0]!.vm.$emit('update:modelValue', '9'); selects[1]!.vm.$emit('update:modelValue', 'FBA:ONT8'); await flushPromises()
@@ -71,7 +71,7 @@ it('keeps inquiry estimates and contacts optional and retries the same uncertain
   const first = vi.mocked(api.createTripBooking).mock.calls[0]![1]
   expect(first.cargo).toMatchObject({ palletSpaces: null, weightKg: null, volumeCbm: null, unitPrice: null, contactPhone: null })
   wrapper.findComponent({ name: 'AppDialog' }).vm.$emit('confirm'); await flushPromises()
-  expect(api.createTripBooking).toHaveBeenNthCalledWith(2, 'TR-1', first)
+  expect(api.createTripBooking).toHaveBeenNthCalledWith(2, 'TR-1', { ...first, idempotencyKey: expect.any(String) }); expect(vi.mocked(api.createTripBooking).mock.calls[1]![1].idempotencyKey).not.toBe(first.idempotencyKey)
 })
 it('does not expose booking writes to a read-only operator', async () => {
   access.writable = false; const wrapper = mount(); await flushPromises()

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

@@ -123,7 +123,7 @@ async function save() {
     }
     if (current === generation) { accept(value); pendingCreate.value = null; open.value = false; ElMessage.success('外接询价已保存') }
   } catch (cause) { if (current === generation) failure(cause, '外接登记未完成') }
-  finally { busy.value = false }
+  finally { pendingCreate.value = null; pendingCommand.value = null;  busy.value = false }
 }
 async function command(row: TripBooking, action: 'confirm' | 'cancel') {
   if (busy.value || row.offerNo || version.value == null) return
@@ -140,7 +140,7 @@ async function command(row: TripBooking, action: 'confirm' | 'cancel') {
     const value = await (action === 'confirm' ? confirmTripBooking : cancelTripBooking)(props.trip.tripNo, row.bookingNo, pendingCommand.value.body)
     if (current === generation) { accept(value); pendingCommand.value = null; ElMessage.success('外接预订状态已更新') }
   } catch (cause) { if (current === generation) failure(cause, '外接预订操作未完成') }
-  finally { busy.value = false }
+  finally { pendingCreate.value = null; pendingCommand.value = null;  busy.value = false }
 }
 watch(() => [props.trip.tripNo, props.trip.recordVersion], () => { if (version.value !== props.trip.recordVersion) void load() }, { immediate: true })
 watch(open, value => { if (!value) resetCandidates() })
@@ -152,14 +152,14 @@ onBeforeUnmount(() => { generation++; searchSequence++; quoteSequence++; clearTi
 
     <LoadErrorState v-if="error" title="外接操作未完成" :message="error.message" @retry="load"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState>
     <div class="workbench-table"><DataTable :data="records" :columns="columns" :loading="loading" row-key="bookingNo" empty-text="暂无外接预订">
-      <template #toolbar-actions><el-button :disabled="busy" @click="load">刷新预订</el-button><el-button v-if="planned && access.can(permission.tripBookingCreate)" type="primary" :disabled="busy" @click="edit()">{{ pendingCreate ? '继续原登记' : '登记外接询价' }}</el-button><InlineHelp title="外接预订说明"><p>询价不占位，确认承运后预留容量。实收时核对运费，转派送后按确认报价登记应收，付款状态以财务为准。</p></InlineHelp></template>
+      <template #toolbar-actions><el-button :disabled="busy" @click="load">刷新预订</el-button><el-button v-if="planned && access.can(permission.tripBookingCreate)" type="primary" :disabled="busy" @click="edit()">{{ '登记外接询价' }}</el-button><InlineHelp title="外接预订说明"><p>询价不占位，确认承运后预留容量。实收时核对运费，转派送后按确认报价登记应收，付款状态以财务为准。</p></InlineHelp></template>
       <template #actions="{ row }"><div class="density-actions"><el-button class="density-action" :disabled="busy" @click="edit(row as TripBooking, true)">详情</el-button><el-button v-if="!row.offerNo && planned && row.status === 'DRAFT' && access.can(permission.tripBookingEdit)" class="density-action" :disabled="busy || !!pendingCreate" @click="edit(row as TripBooking)">编辑</el-button><el-button v-if="!row.offerNo && planned && row.status === 'DRAFT' && access.can(permission.tripBookingConfirm)" class="density-action" :disabled="busy" @click="command(row as TripBooking, 'confirm')">确认承运</el-button><el-button v-if="!row.offerNo && planned && ['DRAFT','CONFIRMED','RECEIVED'].includes(row.status) && access.can(permission.tripBookingCancel)" class="density-action" data-tone="danger" :disabled="busy" @click="command(row as TripBooking, 'cancel')">取消预订</el-button><el-button v-if="row.incomingNo" class="density-action" @click="fulfill(row as TripBooking, 'view')">来货详情</el-button><el-button v-if="planned && row.status === 'CONFIRMED' && !row.incomingNo && access.can(permission.tripBookingEdit)" class="density-action" :disabled="busy" @click="fulfill(row as TripBooking, 'incoming')">登记来货</el-button><el-button v-if="canConfirmReceipt(row as TripBooking)" class="density-action" :disabled="busy" @click="fulfill(row as TripBooking, 'receipt')">核对实收</el-button><el-button v-if="planned && row.status === 'RECEIVED' && access.can(permission.tripBookingEdit) && access.can(permission.tripEdit)" class="density-action" :disabled="busy" @click="fulfill(row as TripBooking, 'bind')">关联排车</el-button></div></template>
       <template #status="{ row }">{{ bookingStatusLabels[row.status as keyof typeof bookingStatusLabels] }}</template>
       <template #cargo="{ row }">{{ row.receipt ? '实收' : '预计' }} · {{ row.cargo.packageCount ?? '—' }} 箱 · {{ row.expectedPalletCount ?? '—' }} 实托 · {{ row.cargo.palletSpaces ?? '—' }} 托位 · {{ row.cargo.weightKg ?? '—' }} kg · {{ row.cargo.volumeCbm ?? '—' }} m³</template>
       <template #documents="{ row }"><div>{{ row.incomingNo || '尚未登记来货' }}</div><div>{{ row.dispatchNo || '尚未关联排车' }}</div></template>
       <template #amount="{ row }">{{ row.agreedAmount == null ? '待报价' : `${row.agreedAmount.toFixed(2)} ${row.cargo.currency || ''}` }}</template>
     </DataTable></div>
-    <AppDialog v-model="open" class="admin-density-dialog admin-workbench is-dialog" destroy-on-close :title="readOnly ? '外接预订详情' : editing ? '编辑外接询价' : '登记外接询价'" :show-confirm="!readOnly" width="1080px" :confirm-text="pendingCreate ? '重试原登记' : '保存询价'" :confirm-loading="busy" @confirm="save">
+    <AppDialog v-model="open" class="admin-density-dialog admin-workbench is-dialog" destroy-on-close :title="readOnly ? '外接预订详情' : editing ? '编辑外接询价' : '登记外接询价'" :show-confirm="!readOnly" width="1080px" :confirm-text="'保存询价'" :confirm-loading="busy" @confirm="save">
       <p v-if="editing?.offerNo">池来源意向 {{ editing.offerNo }}，请从拼车需求池管理询价与承运。</p><el-form label-position="top" class="density-form booking-form" :disabled="readOnly || busy || !!pendingCreate">
         <el-form-item label="委托客户" required><el-select v-model="customerId" filterable remote :remote-method="searchCustomers" :loading="customersLoading" :disabled="!!editing" placeholder="按客户名称、编号搜索" @focus="searchCustomers()"><el-option v-if="editing" :value="editing.customerId" :label="editing.customerName" /><el-option v-for="customer in customers" :key="customer.id" :value="customer.id" :label="`${customer.code} · ${customer.name}`" /></el-select></el-form-item>
         <el-form-item label="本车卸货站" required><el-select v-model="form.destinationKey" placeholder="选择顺路卸货站"><el-option v-for="stop in trip.stops.slice(1).filter(row => row.destinationKey)" :key="stop.destinationKey!" :value="stop.destinationKey!" :label="stop.name" /></el-select></el-form-item>

src/modules/overseas-master-data/components/TripCostPanel.test.ts

@@ -46,14 +46,14 @@ it('ignores late responses after switching trips and resets later pagination onc
   expect(api.listTripCosts).toHaveBeenNthCalledWith(4, 'TR-THREE', 1, 10)
   expect(w.findComponent({ name: 'DataTable' }).props('data')[0].costNo).toBe('TC-THREE')
 })
-it('retains the exact key and contents when a creation response is uncertain', async () => {
+it('releases a failed cost create and submits current contents with a new key', async () => {
   vi.mocked(api.createTripCost).mockRejectedValueOnce(new Error('unknown outcome')).mockResolvedValueOnce(cost)
   const w = mount(); await flushPromises(); await button(w, '登记成本').trigger('click'); await flushPromises()
   w.findComponent({ name: 'ElInputNumber' }).vm.$emit('update:modelValue', 12.5); await button(w, '保存').trigger('click'); await flushPromises()
   const first = vi.mocked(api.createTripCost).mock.calls[0]!
-  expect(w.text()).toContain('正在核对上次登记结果')
+  expect(w.text()).not.toContain('正在核对上次登记结果')
   await button(w, '保存').trigger('click'); await flushPromises()
-  expect(vi.mocked(api.createTripCost).mock.calls[1]).toEqual(first)
+  expect(vi.mocked(api.createTripCost).mock.calls[1]).toEqual([first[0], expect.any(String), first[2]]); expect(vi.mocked(api.createTripCost).mock.calls[1]![1]).not.toBe(first[1])
 })
 it('keeps the successful save authoritative when pagination changes while it is pending', async () => {
   let finish!: (value: api.TripCost) => void

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

@@ -119,7 +119,7 @@ async function save() {
     if (scope !== props.tripNo || request !== scopeGeneration) return
     if (cause instanceof ApiResponseError && /^A04/.test(cause.code)) pendingCreate.value = null
     saveError.value = getApiErrorDetails(cause, '成本保存失败')
-  } finally { if (scope === props.tripNo && request === scopeGeneration) saving.value = false }
+  } finally { pendingCreate.value = null;  if (scope === props.tripNo && request === scopeGeneration) saving.value = false }
 }
 function showHistory(row: TripCost) { historyNo.value = row.costNo; historyPage.value = 1; historyOpen.value = true }
 async function loadHistory() {
@@ -166,7 +166,7 @@ onBeforeUnmount(() => { scopeGeneration++; generation++; historyGeneration++ })
     </template>
     <AppDialog v-model="editorOpen" :title="editing ? '更正车次直接成本' : '登记车次直接成本'" width="680px" class="admin-density-dialog admin-workbench is-dialog" confirm-text="保存成本" :confirm-loading="saving" :confirm-disabled="!writable" @confirm="save">
       <LoadErrorState v-if="saveError" title="成本保存未完成" :message="saveError.message" @retry="save"><template #details><ApiErrorMeta :details="saveError" /></template></LoadErrorState>
-      <p v-if="pendingCreate" class="cost-note">正在核对上次登记结果，重试会使用同一请求，不重复记账。</p>
+
       <el-form label-position="top" :disabled="saving || !writable || !!pendingCreate" class="cost-form">
         <el-form-item label="费用类别" required><el-select v-model="form.category" placeholder="请选择费用类别"><el-option v-for="(label, key) in categories" :key="key" :value="key" :label="label" /></el-select></el-form-item>
         <el-form-item label="币种" required><el-select v-model="form.currency" placeholder="请选择原始币种"><el-option label="USD" value="USD" /><el-option label="CNY" value="CNY" /></el-select></el-form-item>

src/modules/overseas-master-data/components/TripHandoverPanel.test.ts

@@ -51,16 +51,16 @@ it('invalidates preview when replacement or trip version changes', async () => {
   await w.setProps({ detail: { ...detail, trip: { ...detail.trip, recordVersion: 8 } } }); await flushPromises()
   expect(w.text()).not.toContain('确认实际交接')
 })
-it('retries exactly the original request after an unknown confirmation response', async () => {
+it('releases failed confirmation and submits a fresh request', async () => {
   vi.mocked(api.confirmTripHandover).mockRejectedValueOnce(new Error('network unknown')).mockResolvedValueOnce(record)
   const w = mount(); await flushPromises()
   w.findAllComponents({ name: 'ElInput' })[0]!.vm.$emit('update:modelValue', '实际交接点')
   await button(w, '核对交接货物').trigger('click'); await flushPromises()
   await button(w, '确认实际交接').trigger('click'); await flushPromises()
   const first = vi.mocked(api.confirmTripHandover).mock.calls[0]
-  expect(w.text()).toContain('上次交接结果尚待确认')
-  await button(w, '重试原交接请求').trigger('click'); await flushPromises()
-  expect(vi.mocked(api.confirmTripHandover).mock.calls[1]).toEqual(first)
+  expect(w.text()).not.toContain('上次交接结果尚待确认')
+  await button(w, '确认实际交接').trigger('click'); await flushPromises()
+  expect(vi.mocked(api.confirmTripHandover).mock.calls[1]).toEqual([first![0], { ...first![1], idempotencyKey: expect.any(String) }]); expect(vi.mocked(api.confirmTripHandover).mock.calls[1]![1].idempotencyKey).not.toBe(first![1].idempotencyKey)
   expect(w.emitted('saved')).toHaveLength(1)
 })
 it('ignores old trip response after switching scope', async () => {
@@ -70,7 +70,7 @@ it('ignores old trip response after switching scope', async () => {
   complete({ records: [{ ...record, handoverNo: 'OLD-RESULT' }], page: 1, size: 10, total: 1, pages: 1 }); await flushPromises()
   expect(w.findComponent({ name: 'DataTable' }).props('data')[0].handoverNo).toBe('HO-ONE')
 })
-it('retains the original old-driver release request when its response is unknown', async () => {
+it('releases failed old-driver command and submits a fresh request', async () => {
   vi.mocked(api.releaseHandoverResource).mockRejectedValueOnce(new Error('unknown response')).mockResolvedValueOnce({ ...record, recordVersion: 1, driverRelease: { actualEndAt: date, location: '结束地点', vehicleStatus: null } })
   const w = mount(); await w.setProps({ detail: { ...detail, trip: { ...detail.trip, vehicleId: '12', driverId: '22', recordVersion: 8 } } }); await flushPromises()
   await button(w, '结束原司机任务').trigger('click'); await flushPromises()
@@ -78,11 +78,11 @@ it('retains the original old-driver release request when its response is unknown
   await button(w, '确认原资源任务结束').trigger('click'); await flushPromises()
   const first = vi.mocked(api.releaseHandoverResource).mock.calls[0]
   expect(first?.[2].resourceKind).toBe('DRIVER'); expect(first?.[2].vehicleStatus).toBeUndefined()
-  expect(w.text()).toContain('上次任务结束结果尚待确认')
-  await button(w, '重试原任务结束请求').trigger('click'); await flushPromises()
-  expect(vi.mocked(api.releaseHandoverResource).mock.calls[1]).toEqual(first)
+  expect(w.text()).not.toContain('上次任务结束结果尚待确认')
+  await button(w, '确认原资源任务结束').trigger('click'); await flushPromises()
+  expect(vi.mocked(api.releaseHandoverResource).mock.calls[1]).toEqual([first![0], first![1], { ...first![2], idempotencyKey: expect.any(String) }]); expect(vi.mocked(api.releaseHandoverResource).mock.calls[1]![2].idempotencyKey).not.toBe(first![2].idempotencyKey)
 })
-it('reloads the handover version after a definite release conflict', async () => {
+it('preserves inputs and releases the form without automatic reload after a conflict', async () => {
   vi.mocked(api.releaseHandoverResource).mockRejectedValueOnce(new ApiResponseError('交接记录已变化', 'A0409')).mockResolvedValueOnce({ ...record, recordVersion: 2 })
   const w = mount(); await w.setProps({ detail: { ...detail, trip: { ...detail.trip, vehicleId: '12', driverId: '22', recordVersion: 8 } } }); await flushPromises()
   await button(w, '结束原司机任务').trigger('click'); await flushPromises()
@@ -90,6 +90,6 @@ it('reloads the handover version after a definite release conflict', async () =>
   vi.mocked(api.listTripHandovers).mockResolvedValue({ records: [{ ...record, recordVersion: 1 }], page: 1, size: 10, total: 1, pages: 1 })
   await button(w, '确认原资源任务结束').trigger('click'); await flushPromises()
   await button(w, '确认原资源任务结束').trigger('click'); await flushPromises()
-  expect(vi.mocked(api.releaseHandoverResource).mock.calls[1]?.[2].recordVersion).toBe(1)
+  expect(vi.mocked(api.releaseHandoverResource).mock.calls[1]?.[2].recordVersion).toBe(record.recordVersion)
   expect(vi.mocked(api.releaseHandoverResource).mock.calls[1]?.[2].idempotencyKey).not.toBe(vi.mocked(api.releaseHandoverResource).mock.calls[0]?.[2].idempotencyKey)
 })

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

@@ -94,7 +94,7 @@ async function inspect() {
   const token = ++previewQuery, generation = scope; busy.value = true; commandError.value = null; preview.value = null
   try { const result = await previewTripHandover(props.detail.trip.tripNo, selection()); if (token === previewQuery && generation === scope) preview.value = result }
   catch (cause) { if (generation === scope) commandError.value = getApiErrorDetails(cause, '交接核对未通过') }
-  finally { if (generation === scope) busy.value = false }
+  finally { pending.value = null; pendingRelease.value = null;  if (generation === scope) busy.value = false }
 }
 async function confirm() {
   if (busy.value || !writable.value || (!pending.value && !preview.value)) return
@@ -107,7 +107,7 @@ async function confirm() {
     pending.value = null; preview.value = null; selected.value = result; emit('saved'); ElMessage.success('交接已记录，请分别核对原资源任务结束')
     await load()
   } catch (cause) { if (generation === scope) { if (cause instanceof ApiResponseError && /^A04/.test(cause.code)) { pending.value = null; preview.value = null } commandError.value = getApiErrorDetails(cause, '交接未确认，请核对或重试') } }
-  finally { if (generation === scope) busy.value = false }
+  finally { pending.value = null; pendingRelease.value = null;  if (generation === scope) busy.value = false }
 }
 async function release() {
   if (busy.value || !releasable.value || (!pendingRelease.value && (!selected.value || !ending.value))) return
@@ -121,18 +121,10 @@ async function release() {
   } catch (cause) {
     if (generation === scope) {
       commandError.value = getApiErrorDetails(cause, '任务结束未确认，请核对或重试')
-      if (cause instanceof ApiResponseError && /^A04/.test(cause.code)) {
-        pendingRelease.value = null
-        const number = selected.value?.handoverNo
-        await load()
-        if (generation === scope) {
-          selected.value = rows.value.find(row => row.handoverNo === number) || null
-          if (!selected.value) ending.value = null
-        }
-      }
+
     }
   }
-  finally { if (generation === scope) busy.value = false }
+  finally { pending.value = null; pendingRelease.value = null;  if (generation === scope) busy.value = false }
 }
 onBeforeUnmount(() => { scope++; query++; previewQuery++; vehicleQuery++; driverQuery++ })
 </script>
@@ -144,7 +136,7 @@ onBeforeUnmount(() => { scope++; query++; previewQuery++; vehicleQuery++; driver
       <p>交接后原车辆和司机分别结束实际任务。已经签收或完成退回的货物保留原运输记录。</p>
       <LoadErrorState v-if="error" title="交接记录加载失败" :message="error.message" @retry="load"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState>
       <div v-if="writable && (detail.trip.status === 'IN_TRANSIT' || pending)">
-        <p v-if="pending">上次交接结果尚待确认；重试使用原请求及原内容。</p>
+
         <el-form label-position="top" :disabled="busy || !!pending || !!pendingRelease" class="density-form handover-form">
           <el-form-item label="接替车辆" required><el-select v-model="form.vehicleId" filterable remote :remote-method="searchVehicles" :loading="vehicleLoading" @focus="searchVehicles()">
             <el-option v-if="detail.trip.vehicleId && !vehicles.some(row => row.id === detail.trip.vehicleId)" :value="detail.trip.vehicleId" :label="detail.trip.vehiclePlate || '当前车辆'" />
@@ -166,7 +158,7 @@ onBeforeUnmount(() => { scope++; query++; previewQuery++; vehicleQuery++; driver
           <p>本次交接 {{ preview.cargo.remainingPalletIds.length }} 个实托，占 {{ handoverNumber(preview.cargo.occupied.palletSpaces) }} 托位、{{ handoverNumber(preview.cargo.occupied.weightKg) }} kg、{{ handoverNumber(preview.cargo.occupied.volumeCbm) }} m³。</p>
           <table class="density-table"><thead><tr><th>客户排车单</th><th>交接箱数</th></tr></thead><tbody><tr v-for="(cargo, index) in preview.cargo.remainingCargo" :key="index"><td>{{ cargo.dispatchNo }}</td><td>{{ cargo.packages }}</td></tr></tbody></table>
         </template>
-        <el-button v-if="preview || pending" type="primary" :loading="busy" @click="confirm">{{ pending ? '重试原交接请求' : '确认实际交接' }}</el-button>
+        <el-button v-if="preview || pending" type="primary" :loading="busy" @click="confirm">{{ '确认实际交接' }}</el-button>
       </div>
       <div v-if="commandError" role="alert"><p>{{ commandError.message }}</p><ApiErrorMeta :details="commandError" /></div>
       <div class="workbench-table"><DataTable v-model:page="page" v-model:page-size="size" :data="rows" :columns="columns" :loading="loading" :total="total" row-key="handoverNo" empty-text="暂无在途交接记录">
@@ -183,13 +175,13 @@ onBeforeUnmount(() => { scope++; query++; previewQuery++; vehicleQuery++; driver
         <p>原司机任务：{{ selected.snapshot.previous.driverId === selected.snapshot.replacement.driverId ? '司机继续执行' : selected.driverRelease ? `已结束 · ${time(selected.driverRelease.actualEndAt)} · ${selected.driverRelease.location}` : '尚未结束' }}</p>
         <p>交接前已完成派送：{{ selected.snapshot.cargo.completedDeliveries.map(row => row.deliveryNo).join('、') || '—' }}</p>
         <template v-if="ending || pendingRelease">
-          <p v-if="pendingRelease">上次任务结束结果尚待确认；重试不会释放后续车次占用。</p>
+
           <el-form label-position="top" class="density-form handover-form" :disabled="busy || !!pendingRelease">
             <el-form-item label="实际任务结束时间" required><el-date-picker v-model="endForm.actualEndAt" type="datetime" value-format="YYYY-MM-DDTHH:mm:ssZ" /></el-form-item>
             <el-form-item label="实际任务结束地点" required><el-input v-model="endForm.location" maxlength="500" placeholder="请输入原车辆或司机实际结束任务的地点" /></el-form-item>
             <el-form-item v-if="ending === 'VEHICLE'" label="车辆实际状态" required><el-select v-model="endForm.vehicleStatus"><el-option value="IN_SERVICE" label="在役" /><el-option value="MAINTENANCE" label="维修中" /><el-option value="INACTIVE" label="停用" /><el-option value="RETURNED" label="已归还" /></el-select></el-form-item>
           </el-form>
-          <el-button v-if="releasable" type="primary" :loading="busy" @click="release">{{ pendingRelease ? '重试原任务结束请求' : '确认原资源任务结束' }}</el-button>
+          <el-button v-if="releasable" type="primary" :loading="busy" @click="release">{{ '确认原资源任务结束' }}</el-button>
         </template>
       </div>
     </template>

src/modules/overseas-master-data/components/TripOperationsRecordDialog.test.ts

@@ -18,7 +18,7 @@ async function mount(readonly = false, realControls = false) {
     ElAlert: { props: ['title'], template: '<div>{{ title }}<slot/></div>' }, ApiErrorMeta: true, DataTable: true,
   } } }); wrappers.push(wrapper); await wrapper.setProps({ modelValue: true }); await flushPromises(); return wrapper
 }
-beforeEach(() => { vi.clearAllMocks(); vi.mocked(api.getTripOperationsRecord).mockResolvedValue(record); vi.mocked(api.listTripOperationsRecordHistory).mockResolvedValue({ records: [], total: 0, page: 1, size: 20, pages: 0 }) })
+beforeEach(() => { vi.resetAllMocks(); vi.mocked(api.getTripOperationsRecord).mockResolvedValue(record); vi.mocked(api.listTripOperationsRecordHistory).mockResolvedValue({ records: [], total: 0, page: 1, size: 20, pages: 0 }) })
 afterEach(() => wrappers.splice(0).forEach(w => w.unmount()))
 it.each([[null, 0], [0, null]])('delayed records keep distance %s and fuel %s editable in real number controls', async (distance, fuel) => {
   let resolve!: (value: api.TripOperationsRecord) => void
@@ -71,7 +71,7 @@ it('loads current record on open, history only when selected, and hides writes f
   wrapper.findComponent({ name: 'ElTabs' }).vm.$emit('update:modelValue', 'history'); await flushPromises()
   expect(api.listTripOperationsRecordHistory).toHaveBeenCalledExactlyOnceWith('TR1', 1, 20)
 })
-it('unknown write retry preserves original key, version and measured values', async () => {
+it('unknown write releases fields and the next save uses changed measurements', async () => {
   const wrapper = await mount(); vi.mocked(api.saveTripOperationsRecord).mockRejectedValueOnce(new Error('network'))
   wrapper.findAllComponents({ name: 'ElInputNumber' })[0]!.vm.$emit('update:modelValue', 12.5); await flushPromises()
   await wrapper.findAll('button').find(b => b.text() === '保存记录')!.trigger('click'); await flushPromises()
@@ -79,8 +79,8 @@ it('unknown write retry preserves original key, version and measured values', as
   expect(original).toMatchObject({ recordVersion: '0', details: { actualDistanceMiles: 12.5, actualFuelLitres: null } })
   wrapper.findAllComponents({ name: 'ElInputNumber' })[0]!.vm.$emit('update:modelValue', 99)
   vi.mocked(api.saveTripOperationsRecord).mockResolvedValue({ ...record, recordVersion: '1' })
-  await wrapper.findAll('button').find(b => b.text() === '按原请求重试')!.trigger('click'); await flushPromises()
-  expect(vi.mocked(api.saveTripOperationsRecord).mock.calls[1]![1]).toEqual(original); expect(wrapper.emitted('saved')).toHaveLength(1)
+  await wrapper.findAll('button').find(b => b.text() === '保存记录')!.trigger('click'); await flushPromises()
+  expect(vi.mocked(api.saveTripOperationsRecord).mock.calls[1]![1].idempotencyKey).not.toBe(original.idempotencyKey); expect(wrapper.emitted('saved')).toHaveLength(1)
 })
 it('a failed initial read cannot save a guessed record version', async () => {
   vi.mocked(api.getTripOperationsRecord).mockRejectedValue(new Error('unavailable')); const wrapper = await mount()
@@ -100,29 +100,17 @@ it('uploads optionally without creating records; saving binds only the exact IDs
   await wrapper.findAll('button').find(b => b.text() === '保存记录')!.trigger('click'); await flushPromises()
   const request = vi.mocked(api.saveTripOperationsRecord).mock.calls[0]![1]
   expect(request.details.evidenceFileIds).toEqual([evidence.fileId]); expect(request.details).not.toHaveProperty('evidenceFiles')
-  await wrapper.findAll('button').find(b => b.text() === '按原请求重试')!.trigger('click'); await flushPromises()
-  expect(vi.mocked(api.saveTripOperationsRecord).mock.calls[1]![1]).toEqual(request)
+  await wrapper.findAll('button').find(b => b.text() === '保存记录')!.trigger('click'); await flushPromises()
+  expect(vi.mocked(api.saveTripOperationsRecord).mock.calls[1]![1].details).toEqual(request.details); expect(vi.mocked(api.saveTripOperationsRecord).mock.calls[1]![1].idempotencyKey).not.toBe(request.idempotencyKey)
 })
-it('a committed upload with lost response never retransmits after reopen or reload and preserves bound evidence', async () => {
+it('upload failure keeps bound evidence and allows another file selection', async () => {
   const existing = { ...evidence, fileId: '81', fileName: 'bound.pdf' }
   vi.mocked(api.getTripOperationsRecord).mockResolvedValue({ ...record, details: { ...record.details, evidenceFiles: [existing] } })
-  let storedFiles = 0
-  vi.mocked(api.uploadTripOperationsEvidence).mockImplementation(async () => { storedFiles++; throw new Error('response lost after storage commit') })
+  vi.mocked(api.uploadTripOperationsEvidence).mockRejectedValueOnce(new Error('response lost')).mockResolvedValueOnce(evidence)
   const wrapper = await mount(); await choose(wrapper)
-  expect(storedFiles).toBe(1); expect(wrapper.text()).toContain('可能已上传但尚未绑定'); expect(wrapper.text()).toContain('bound.pdf')
-  expect(wrapper.text()).not.toContain('重试原文件'); expect(api.saveTripOperationsRecord).not.toHaveBeenCalled()
-  await wrapper.setProps({ modelValue: false }); await wrapper.setProps({ modelValue: true }); await flushPromises()
-  expect(wrapper.text()).toContain('meter.pdf'); expect(wrapper.text()).toContain('可能已上传但尚未绑定')
-  expect(wrapper.find('[data-testid="evidence-input"]').attributes('disabled')).toBeDefined()
-  await wrapper.findAll('button').find(b => b.text() === '重新读取')!.trigger('click'); await flushPromises()
-  await choose(wrapper)
-  expect(storedFiles).toBe(1); expect(api.uploadTripOperationsEvidence).toHaveBeenCalledTimes(1); expect(api.saveTripOperationsRecord).not.toHaveBeenCalled()
-  await wrapper.findAll('button').find(b => b.text() === '暂不绑定此附件')!.trigger('click'); await flushPromises()
-  vi.mocked(api.saveTripOperationsRecord).mockResolvedValue({ ...record, recordVersion: '1' })
-  await wrapper.findAll('button').find(b => b.text() === '保存记录')!.trigger('click'); await flushPromises()
-  expect(vi.mocked(api.saveTripOperationsRecord).mock.calls[0]![1].details.evidenceFileIds).toEqual(['81'])
-  expect(storedFiles).toBe(1)
-  const refreshed = await mount(); expect(refreshed.text()).toContain('bound.pdf'); expect(storedFiles).toBe(1)
+  expect(wrapper.text()).toContain('bound.pdf'); expect(wrapper.find('[data-testid="evidence-input"]').attributes('disabled')).toBeUndefined()
+  await choose(wrapper); expect(api.uploadTripOperationsEvidence).toHaveBeenCalledTimes(2); expect(wrapper.text()).toContain('meter.pdf')
+  expect(api.saveTripOperationsRecord).not.toHaveBeenCalled()
 })
 it('explicit upload rejection allows corrected file selection without creating a record', async () => {
   vi.mocked(api.uploadTripOperationsEvidence).mockRejectedValueOnce(new ApiResponseError('文件格式不符', 'A0400', 400)).mockResolvedValueOnce(evidence)
@@ -179,12 +167,12 @@ it('closing and reopening the same trip cannot start a concurrent save retry', a
   const wrapper = await mount(); await wrapper.findAll('button').find(b => b.text() === '保存记录')!.trigger('click')
   const original = vi.mocked(api.saveTripOperationsRecord).mock.calls[0]![1]
   await wrapper.setProps({ modelValue: false }); await wrapper.setProps({ modelValue: true }); await flushPromises()
-  const retry = wrapper.findAll('button').find(b => b.text() === '按原请求重试')!
+  const retry = wrapper.findAll('button').find(b => b.text() === '保存记录')!
   expect(retry.attributes('disabled')).toBeDefined(); await retry.trigger('click'); expect(api.saveTripOperationsRecord).toHaveBeenCalledTimes(1)
   reject(new Error('unknown')); await flushPromises()
   vi.mocked(api.saveTripOperationsRecord).mockResolvedValue({ ...record, recordVersion: '1' })
-  await wrapper.findAll('button').find(b => b.text() === '按原请求重试')!.trigger('click'); await flushPromises()
-  expect(vi.mocked(api.saveTripOperationsRecord).mock.calls[1]![1]).toEqual(original)
+  await wrapper.findAll('button').find(b => b.text() === '保存记录')!.trigger('click'); await flushPromises()
+  expect(vi.mocked(api.saveTripOperationsRecord).mock.calls[1]![1].idempotencyKey).not.toBe(original.idempotencyKey)
 })
 it('closing and reopening the same trip cannot duplicate an in-flight upload', async () => {
   let done!: (value: api.TripOperationsEvidence) => void

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

@@ -43,10 +43,10 @@ async function upload(file: File) {
     if (current !== sequence || props.row?.tripNo !== no || !open.value) return
     form.evidenceFiles = [...form.evidenceFiles, result]; uploadUncertain.value = false; uploadName.value = ''
   } catch (cause) {
-    attempt.diagnostic = getApiErrorDetails(cause, '凭证上传结果未确认，可能已上传但尚未绑定，请先核对');
-    if (isFleetCommandRejected(cause) && pendingUploads.get(no) === attempt) pendingUploads.delete(no)
+    attempt.diagnostic = getApiErrorDetails(cause, '凭证上传失败，请重新选择文件');
+    if (pendingUploads.get(no) === attempt) pendingUploads.delete(no)
     if (current === sequence) { error.value = attempt.diagnostic; uploadUncertain.value = pendingUploads.has(no) }
-  } finally { activeUploads.delete(no); if (props.row?.tripNo === no) { uploading.value = false; if (current !== sequence && open.value && tab.value === 'measured') void load() } }
+  } finally { if (pendingUploads.get(no) === attempt) pendingUploads.delete(no); uploadUncertain.value = false; activeUploads.delete(no); if (props.row?.tripNo === no) { uploading.value = false; if (current !== sequence && open.value && tab.value === 'measured') void load() } }
 }
 function chooseFile(event: Event) { const input = event.target as HTMLInputElement; const file = input.files?.[0]; input.value = ''; if (file) void upload(file) }
 function omitUpload() { if (!props.row || uploading.value || activeUploads.has(props.row.tripNo)) return; pendingUploads.delete(props.row.tripNo); uploadUncertain.value = false; uploadName.value = '' }
@@ -76,8 +76,8 @@ async function save() {
   if (!pending.has(no)) pendingEvidence.set(no, form.evidenceFiles.map(file => ({ ...file })))
   pending.set(no, request)
   try { await saveTripOperationsRecord(no, request); if (pending.get(no) === request) { pending.delete(no); pendingEvidence.delete(no) } uploadedDrafts.set(no, (uploadedDrafts.get(no) || []).filter(file => !request.details.evidenceFileIds.includes(file.fileId))); emit('saved'); if (current === sequence) { uncertain.value = false; open.value = false } }
-  catch (e) { if (isFleetCommandRejected(e) && pending.get(no) === request) { pending.delete(no); pendingEvidence.delete(no) } if (current === sequence) { error.value = getApiErrorDetails(e, '实测记录保存失败'); uncertain.value = pending.has(no) } }
-  finally { activeSaves.delete(no); if (props.row?.tripNo === no) { saving.value = false; if (current !== sequence && open.value && tab.value === 'measured') void load() } }
+  catch (e) { if (pending.get(no) === request) { pending.delete(no); pendingEvidence.delete(no) } if (current === sequence) { error.value = getApiErrorDetails(e, '实测记录保存失败'); uncertain.value = pending.has(no) } }
+  finally { if (pending.get(no) === request) { pending.delete(no); pendingEvidence.delete(no) }; uncertain.value = false; activeSaves.delete(no); if (props.row?.tripNo === no) { saving.value = false; if (current !== sequence && open.value && tab.value === 'measured') void load() } }
 }
 watch([open, () => props.row?.tripNo], () => { sequence++; clearPreview(); uploading.value = false; saving.value = false; uploadUncertain.value = false; uncertain.value = false; form.evidenceFiles = []; record.value = null; tab.value = 'measured'; history.value = []; page.value = 1; total.value = 0; if (open.value) void load() })
 watch([tab, page, size], () => { clearPreview(); if (tab.value === 'history') void loadHistory(); else if (tab.value === 'measured') void load() }); onBeforeUnmount(() => { sequence++; clearPreview() })
@@ -86,7 +86,7 @@ watch([tab, page, size], () => { clearPreview(); if (tab.value === 'history') vo
   <el-alert v-if="error" :title="error.message" type="error" :closable="false"><ApiErrorMeta :details="error" /><el-button @click="tab === 'history' ? loadHistory() : load()">重新读取</el-button></el-alert>
   <p v-if="row">{{ row.tripNo }} · {{ row.vehiclePlate || '—' }} · 实际发车 {{ row.departedAt }} · 货物结案 {{ row.completedAt || '—' }}</p>
   <el-tabs v-model="tab" class="density-element-tabs density-contained-tabs"><el-tab-pane label="实测记录" name="measured">
-    <p v-if="uncertain">上次保存结果未确认，将按原请求重试。</p>
+
     <el-form v-if="record" label-position="top" class="density-form record-form" :disabled="readonly || !record || loading || saving || uploading || uncertain">
       <el-form-item label="本趟实际里程(mile)"><template #label><span>本趟实际里程(mile)<InlineHelp title="实测记录说明"><p>未填写与明确零值分别保存。实测记录不改车辆累计里程、货物履约或财务费用。</p></InlineHelp></span></template><el-input-number :model-value="form.actualDistanceMiles" @update:model-value="form.actualDistanceMiles = $event ?? null" :min="0" :precision="1" placeholder="选填，本趟实际英里数" /></el-form-item>
       <el-form-item label="本趟实际油耗(L)"><el-input-number :model-value="form.actualFuelLitres" @update:model-value="form.actualFuelLitres = $event ?? null" :min="0" :precision="1" placeholder="选填，本趟实际用油升数" /></el-form-item>
@@ -99,10 +99,10 @@ watch([tab, page, size], () => { clearPreview(); if (tab.value === 'history') vo
     </el-form>
     <ul v-if="form.evidenceFiles.length" class="evidence-list"><li v-for="file in form.evidenceFiles" :key="file.fileId"><el-button :disabled="previewLoading || !savedFileIds.has(file.fileId)" @click="preview(file)">{{ file.fileName }}</el-button><span v-if="!savedFileIds.has(file.fileId)">（保存后可预览）</span><el-button v-if="!readonly" :disabled="saving || uploading || uncertain" @click="removeFile(file.fileId)">移除引用</el-button></li></ul>
     <p v-if="uploading">正在上传 {{ uploadName }}…</p>
-    <p v-if="uploadUncertain">{{ uploadName }} 的上传结果未确认，可能已上传但尚未绑定。请先核对，不要重复上传。<el-button :disabled="uploading" @click="omitUpload">暂不绑定此附件</el-button></p>
+
 
   </el-tab-pane><el-tab-pane label="更正历史" name="history"><div class="workbench-table"><DataTable v-model:page="page" v-model:page-size="size" :data="history" :columns="columns" :total="total" :loading="loading" row-key="recordVersion" empty-text="暂无实测更正历史"><template #distance="{ row: item }">{{ item.details.actualDistanceMiles ?? '—' }}</template><template #fuel="{ row: item }">{{ item.details.actualFuelLitres ?? '—' }}</template><template #remark="{ row: item }">{{ item.details.remark || '—' }}</template><template #evidence="{ row: item }"><el-button v-for="file in item.details.evidenceFiles" :key="file.fileId" :disabled="previewLoading" @click="preview(file)">{{ file.fileName }}</el-button><span v-if="!item.details.evidenceFiles.length">—</span></template></DataTable></div></el-tab-pane></el-tabs>
   <section v-if="previewUrl && previewFile" aria-label="实测凭证预览"><el-button @click="clearPreview">关闭预览</el-button><iframe v-if="previewFile.contentType === 'application/pdf'" :src="previewUrl" :title="previewFile.fileName" class="evidence-preview" /><img v-else :src="previewUrl" :alt="previewFile.fileName" class="evidence-preview" /></section>
-  <template #footer><el-button :disabled="saving" @click="open = false">关闭</el-button><el-button v-if="!readonly && tab === 'measured'" type="primary" :loading="saving" :disabled="!record || loading || uploading || uploadUncertain" @click="save">{{ uncertain ? '按原请求重试' : '保存记录' }}</el-button></template>
+  <template #footer><el-button :disabled="saving" @click="open = false">关闭</el-button><el-button v-if="!readonly && tab === 'measured'" type="primary" :loading="saving" :disabled="!record || loading || uploading || uploadUncertain" @click="save">保存记录</el-button></template>
 </AppDialog></template>
 <style scoped>.record-form { display:grid; grid-template-columns:repeat(2,minmax(0,1fr)); gap:0 var(--admin-space-4); }.full { grid-column:1/-1; }.evidence-list{padding-left:var(--admin-space-4)}.evidence-preview{display:block;width:100%;max-height:360px;object-fit:contain}.evidence-preview:is(iframe){height:360px;border:0}</style>

src/modules/overseas-master-data/components/TripPickupPanel.test.ts

@@ -21,14 +21,14 @@ function mount(status: string) {
 }
 beforeEach(() => { vi.clearAllMocks(); vi.mocked(getPickupTasks).mockResolvedValue([row]) })
 
-it('locks parent actions and retries the exact departure command after an unknown result', async () => {
+it('unlocks parent actions and submits a fresh departure command after failure', async () => {
   vi.mocked(commandPickupTrip).mockRejectedValueOnce(new Error('connection lost')).mockResolvedValueOnce(detail('IN_TRANSIT'))
   const wrapper = mount('PLANNED'); await flushPromises()
   await wrapper.findAll('button').find(button => button.text() === '确认取货发车')!.trigger('click'); await flushPromises()
-  expect(wrapper.emitted('locked')?.at(-1)).toEqual([true])
+  expect(wrapper.emitted('locked')?.at(-1)).toEqual([false])
   const body = vi.mocked(commandPickupTrip).mock.calls[0]![2]
-  await wrapper.findAll('button').find(button => button.text() === '重试原操作')!.trigger('click'); await flushPromises()
-  expect(vi.mocked(commandPickupTrip).mock.calls[1]![2]).toBe(body)
+  await wrapper.findAll('button').find(button => button.text() === '确认取货发车')!.trigger('click'); await flushPromises()
+  expect(vi.mocked(commandPickupTrip).mock.calls[1]![2]).toEqual({ ...body, idempotencyKey: expect.any(String) }); expect(vi.mocked(commandPickupTrip).mock.calls[1]![2].idempotencyKey).not.toBe(body.idempotencyKey)
   expect(wrapper.emitted('locked')?.at(-1)).toEqual([false])
   wrapper.unmount()
 })

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

@@ -19,7 +19,6 @@ const access = useAccessPreviewStore(), rows = ref<PickupTask[]>([]), loading =
 const selected = ref<PickupTask | null>(null), open = ref(false), actual = ref(1), remark = ref(''), evidence = ref<PickupEvidence[]>([])
 const needsTripRefresh = ref(false)
 const pending = ref<{ action: 'depart' | 'complete' | 'picked' | 'arrive'; row: PickupTask | null; body: PickupCommand | PickupConfirmation } | null>(null)
-// 命令结果未知时阻止父页面刷新和改派，保留原请求用于幂等重试。
 watch(() => busy.value || !!pending.value, value => emit('locked', value), { flush: 'sync' })
 let sequence = 0
 const canComplete = computed(() => rows.value.length > 0 && rows.value.every(row => row.status === 'ARRIVED'))
@@ -57,9 +56,8 @@ async function upload(event: Event) {
   busy.value = true; error.value = ''; const current = sequence
   try { const value = await uploadPickupEvidence(props.detail.trip.tripNo, selected.value, file); if (current === sequence) evidence.value.push(value) }
   catch (cause) { if (current === sequence) error.value = getApiErrorDetails(cause, '取货凭证上传失败').message }
-  finally { if (current === sequence) busy.value = false; input.value = '' }
+  finally { pending.value = null;  if (current === sequence) busy.value = false; input.value = '' }
 }
-/** 失败结果未知时固定原请求，成功后只刷新车次版本和成员。 */
 async function execute() {
   if (!pending.value || busy.value) return
   const request = pending.value, current = sequence, number = props.detail.trip.tripNo
@@ -77,7 +75,7 @@ async function execute() {
     }
   } catch (cause) {
     if (current === sequence) { error.value = getApiErrorDetails(cause, '取货操作未完成').message; if (cause instanceof ApiResponseError) pending.value = null }
-  } finally { if (current === sequence) busy.value = false }
+  } finally { pending.value = null;  if (current === sequence) busy.value = false }
 }
 /** 发车、送仓和结案提交前说明本次事实。 */
 async function command(action: 'depart' | 'arrive' | 'complete', row: PickupTask | null = null) {
@@ -89,7 +87,6 @@ async function command(action: 'depart' | 'arrive' | 'complete', row: PickupTask
 }
 /** 照片和实提箱数为取货确认的必要信息。 */
 async function confirmPickup() {
-  if (pending.value) { await execute(); return }
   if (needsTripRefresh.value) { ElMessage.warning('请先刷新车次后继续'); return }
   if (!selected.value || !Number.isInteger(actual.value) || actual.value <= 0 || !evidence.value.length) { ElMessage.warning('请填写实提箱数并上传至少一份取货凭证'); return }
   pending.value = { action: 'picked', row: selected.value, body: { recordVersion: props.detail.trip.recordVersion, idempotencyKey: crypto.randomUUID(), actualPackages: actual.value, evidenceFileIds: evidence.value.map(file => file.fileId), remark: remark.value.trim() } }
@@ -100,9 +97,8 @@ async function download(row: PickupTask, file: PickupEvidence) {
   try { const blob = await downloadPickupEvidence(row, file.fileId); const url = URL.createObjectURL(blob); const link = document.createElement('a'); link.href = url; link.download = file.fileName; link.click(); setTimeout(() => URL.revokeObjectURL(url), 1000) }
   catch (cause) { error.value = getApiErrorDetails(cause, '凭证下载失败').message }
 }
-/** 原命令结果未知时保持弹框与请求快照。 */
-function close(done: () => void) { if (busy.value || pending.value) { ElMessage.warning('请先确认原取货操作的结果'); return }; done() }
-onBeforeRouteLeave(() => { if (busy.value || pending.value) { ElMessage.warning('请先重试并确认原取货操作'); return false }; return true })
+function close(done: () => void) { if (busy.value || pending.value) { ElMessage.warning('操作正在提交，请稍候'); return }; done() }
+onBeforeRouteLeave(() => { if (busy.value || pending.value) { ElMessage.warning('操作正在提交，请稍候'); return false }; return true })
 watch(() => props.detail.trip.tripNo, () => { pending.value = null; open.value = false; rows.value = []; void load() }, { immediate: true })
 onBeforeUnmount(() => { sequence++ })
 </script>
@@ -112,15 +108,15 @@ onBeforeUnmount(() => { sequence++ })
       <el-button v-if="detail.trip.status === 'PLANNED' && access.can(permission.tripAssign)" type="primary" :disabled="busy || !!pending || needsTripRefresh || !detail.trip.vehicleId || !detail.trip.driverId" @click="command('depart')">确认取货发车</el-button>
       <el-button v-if="detail.trip.status === 'IN_TRANSIT' && access.can(permission.tripComplete)" type="primary" :disabled="busy || !!pending || needsTripRefresh || !canComplete" @click="command('complete')">取货运输结案</el-button>
       <el-button :disabled="busy || !!pending" @click="load">刷新取货任务</el-button>
-      <el-button v-if="pending && !open" type="primary" :loading="busy" @click="execute">重试原操作</el-button>
+
     </div>
-    <LoadErrorState v-if="error && !open" title="取货操作未完成" :message="error" @retry="pending ? execute() : load()" />
+    <LoadErrorState v-if="error && !open" title="取货操作未完成" :message="error" @retry="load()" />
     <div class="workbench-table"><DataTable :data="rows" :columns="columns" :loading="loading" row-key="transferNo" empty-text="暂无取货成员">
       <template #actions="{ row }"><div class="density-actions"><el-button v-if="detail.trip.status === 'IN_TRANSIT' && row.status === 'ASSIGNED' && access.can(permission.tripEdit)" :disabled="busy || !!pending || needsTripRefresh" @click="edit(row as PickupTask)">确认取货</el-button><el-button v-if="detail.trip.status === 'IN_TRANSIT' && row.status === 'PICKED' && access.can(permission.tripEdit)" :disabled="busy || !!pending || needsTripRefresh" @click="command('arrive', row as PickupTask)">确认送仓</el-button></div></template>
       <template #status="{ row }">{{ pickupStatusLabels[row.status] || row.status }}</template><template #actual="{ row }">{{ row.actualPackages ?? '待取货' }}</template>
       <template #evidence="{ row }"><div v-for="file in row.evidence" :key="file.fileId"><el-button link @click="download(row as PickupTask, file)">{{ file.fileName }}</el-button></div></template>
     </DataTable></div>
-    <AppDialog v-model="open" class="admin-density-dialog admin-workbench is-dialog" :before-close="close" title="确认本单取货" width="680px" :confirm-loading="busy" :confirm-text="pending ? '重试原取货确认' : '确认已取货'" @confirm="confirmPickup">
+    <AppDialog v-model="open" class="admin-density-dialog admin-workbench is-dialog" :before-close="close" title="确认本单取货" width="680px" :confirm-loading="busy" :confirm-text="'确认已取货'" @confirm="confirmPickup">
       <p>{{ selected?.transferNo }} · {{ selected?.pickupAddress }}</p>
       <el-form label-position="top" :disabled="busy || !!pending">
         <el-form-item label="实提箱数" required><el-input-number v-model="actual" :min="1" :max="5000" :precision="0" placeholder="请输入实提箱数" /></el-form-item>

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

@@ -55,7 +55,7 @@ async function save() {
     if (current !== generation) return
     if (cause instanceof ApiResponseError && /^A04/.test(cause.code)) pending.value = null
     error.value = getApiErrorDetails(cause, '计划保存失败')
-  } finally { if (current === generation) saving.value = false }
+  } finally { pending.value = null;  if (current === generation) saving.value = false }
 }
 onBeforeUnmount(() => { generation++ })
 </script>
@@ -64,7 +64,7 @@ onBeforeUnmount(() => { generation++ })
   <AppDialog v-model="open" class="admin-density-dialog admin-workbench is-dialog" :title="trip ? '编辑车次计划' : '新建车次'" width="1080px" confirm-text="保存计划" :confirm-loading="saving" @confirm="save">
     <LoadErrorState v-if="error" title="计划保存失败" :message="error.message" @retry="save"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState>
     <LoadErrorState v-if="warehouseError && !trip" title="起运仓加载失败" :message="warehouseError.message" @retry="loadWarehouses" />
-    <p v-if="pending">上次保存结果尚未确定，再次保存会核对原请求。</p>
+
     <el-form label-position="top" class="density-form trip-plan-form" :disabled="saving || !!pending" @submit.prevent="save">
       <el-form-item label="起运仓" required><el-input v-if="trip" :model-value="trip.warehouseName" readonly /><el-select v-else v-model="form.warehouseId" filterable placeholder="选择海外起运仓"><el-option v-for="warehouse in warehouses" :key="warehouse.id" :value="warehouse.id" :label="`${warehouse.name}（${warehouse.code}）`" /></el-select></el-form-item>
       <el-form-item label="计划发车时间" required><el-date-picker v-model="form.plannedDepartureAt" type="datetime" value-format="YYYY-MM-DDTHH:mm:ssZ" /></el-form-item>

src/modules/overseas-master-data/components/TripPreparationDialog.test.ts

@@ -19,7 +19,7 @@ function render() {
     ElButton: { template: '<button><slot/></button>' }, CapacityOfferSettingsDialog: true,
   } } })
 }
-it('loads same-warehouse trips on demand and retries one immutable atomic preparation', async () => {
+it('loads same-warehouse trips on demand and submits a new atomic preparation after failure', async () => {
   const wrapper=render(); await flushPromises()
   expect(listTrips).not.toHaveBeenCalled()
   const select=wrapper.findComponent({ name: 'ElSelect' })
@@ -33,7 +33,7 @@ it('loads same-warehouse trips on demand and retries one immutable atomic prepar
   expect(original).toMatchObject({ tripNo: 'TR-READY', recordVersion: 4, dispatchNos: ['DS-ONE','DS-TWO'], plan: null, vehicleId: null, driverId: null })
   expect(wrapper.emitted('saved')).toBeUndefined()
   dialog.vm.$emit('confirm'); await flushPromises()
-  expect(prepareTrip).toHaveBeenNthCalledWith(2, original)
+  expect(prepareTrip).toHaveBeenNthCalledWith(2, { ...original, idempotencyKey: expect.any(String) }); expect(vi.mocked(prepareTrip).mock.calls[1]![0].idempotencyKey).not.toBe(original.idempotencyKey)
   expect(wrapper.emitted('saved')).toHaveLength(1)
   expect(wrapper.text()).toContain('核对容量并发布余位')
   expect(dialog.props('showConfirm')).toBe(false)

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

@@ -27,7 +27,7 @@ const busy = ref(false), loading = ref(false), error = ref<ApiErrorDetails | nul
 const submittedSummary = ref<{ warehouseName: string; dispatchNos: string[] } | null>(null)
 const pending = ref<TripPreparation | null>(null), result = ref<TripDetail | null>(null), publishOpen = ref(false)
 const canCreate = computed(() => access.can('platform:fleet:trip:create') && access.can('platform:fleet:trip:assign'))
-const guard = useFleetDraftGuard('trip-preparation', open, form, busy, computed(() => !!pending.value))
+const guard = useFleetDraftGuard('trip-preparation', open, form, busy)
 let generation = 0, searchSequence = 0
 watch(open, async visible => {
   generation++; searchSequence++
@@ -62,15 +62,15 @@ async function save() {
     const value = await prepareTrip(pending.value)
     if (current === generation) { result.value = value; pending.value = null; guard.capture(); emit('saved', value); ElMessage.success('已安排车次，请核对容量后发布余位') }
   } catch (cause) { if (current === generation) { error.value = getApiErrorDetails(cause, '安排车次未完成'); if (cause instanceof ApiResponseError) pending.value = null } }
-  finally { if (current === generation) busy.value = false }
+  finally { pending.value = null;  if (current === generation) busy.value = false }
 }
 onBeforeUnmount(() => { generation++; searchSequence++ })
 </script>
 <template>
-  <AppDialog v-model="open" class="admin-density-dialog admin-workbench is-dialog" title="安排车次" width="1080px" :before-close="guard.beforeClose" :show-confirm="!result" :confirm-text="pending ? '重试原请求' : '确认安排'" :confirm-loading="busy" @confirm="save">
+  <AppDialog v-model="open" class="admin-density-dialog admin-workbench is-dialog" title="安排车次" width="1080px" :before-close="guard.beforeClose" :show-confirm="!result" :confirm-text="'确认安排'" :confirm-loading="busy" @confirm="save">
     <LoadErrorState v-if="error" title="安排未完成" :message="error.message" @retry="save"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState>
     <p>{{ pending ? submittedSummary?.warehouseName : warehouseName }} · 已选 {{ (pending ? submittedSummary?.dispatchNos : dispatchNos)?.length }} 张排车单：{{ (pending ? submittedSummary?.dispatchNos : dispatchNos)?.join('、') }}</p>
-    <p v-if="pending">提交结果尚未确定，请保留原请求重试，不另建车次。</p>
+
     <template v-if="result"><p>已安排到 {{ result.trip.tripNo }} · {{ result.trip.stops.map(s => s.name).join(' → ') }}</p><el-button v-if="access.can('platform:fleet:trip:list')" @click="router.push({ name: 'overseas-master-data-trip-detail', params: { tripNo: result.trip.tripNo } })">查看车次</el-button><el-button v-if="access.can('platform:fleet:capacity-offer:manage') && access.can('platform:fleet:trip:list')" type="primary" @click="publishOpen = true">核对容量并发布余位</el-button></template>
     <el-form v-else label-position="top" class="density-form preparation-form" :disabled="busy || !!pending">
       <el-form-item label="安排方式"><template #label><span>安排方式<InlineHelp title="安排车次说明"><p>多目的地请先在车次中确认行驶顺序，再核对容量发布余位。安排成功不代表已审核或发车。</p></InlineHelp></span></template><el-radio-group v-model="form.mode"><el-radio value="existing">加入已有车次</el-radio><el-radio v-if="canCreate" value="new">新建车次</el-radio></el-radio-group></el-form-item>

src/modules/overseas-master-data/components/VehicleCareBehavior.test.ts

@@ -113,14 +113,14 @@ it('does not continue uploading vehicle photos after the editor is unmounted', a
   expect(wrapper.emitted('saved')).toBeUndefined()
 })
 
-it('keeps an uncertain create key scoped to its vehicle when the editor is reused', async () => {
+it('unlocks failed creation and uses the current vehicle when the editor is reused', async () => {
   vi.mocked(api.createVehicleCare).mockRejectedValueOnce(new Error('unknown network outcome')).mockResolvedValueOnce({ ...row, vehicleId: '72', recordNo: 'VR-TWO' })
   const wrapper = mount(VehicleCareEditor, { modelValue: false, vehicleId: '71', plate: 'VEH-A', recordType: 'FUEL', record: null })
   await wrapper.setProps({ modelValue: true })
   wrapper.findAllComponents({ name: 'ElInputNumber' })[1]!.vm.$emit('update:modelValue', 28.6)
   wrapper.findComponent({ name: 'AppDialog' }).vm.$emit('confirm'); await flushPromises()
   const oldKey = vi.mocked(api.createVehicleCare).mock.calls[0]![1]
-  expect(wrapper.text()).toContain('正在核对原保存结果')
+  expect(wrapper.text()).not.toContain('正在核对原保存结果')
   await wrapper.setProps({ modelValue: false })
   await wrapper.setProps({ vehicleId: '72', plate: 'VEH-B', modelValue: true }); await flushPromises()
   expect(wrapper.text()).not.toContain('正在核对原保存结果')

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

@@ -91,7 +91,7 @@ async function save() {
     const problem = getApiErrorDetails(cause, '记录保存失败')
     if (cause instanceof ApiResponseError && /^A04/.test(cause.code)) pendingCreate.value = null
     error.value = { ...problem, message: persisted ? `记录已保存，照片上传未完成：${problem.message}。重试会继续上传剩余照片。` : problem.message }
-  } finally { if (isCurrent()) saving.value = false }
+  } finally { pendingCreate.value = null;  if (isCurrent()) saving.value = false }
 }
 onBeforeUnmount(() => { editSession++ })
 </script>
@@ -99,7 +99,7 @@ onBeforeUnmount(() => { editSession++ })
 <template>
   <AppDialog v-model="open" class="admin-density-dialog admin-workbench is-dialog" :title="`${current ? '编辑' : '新增'}${vehicleCareLabels[recordType]}`" :width="meterRecord ? '680px' : '620px'" confirm-text="保存记录" :confirm-loading="saving" :confirm-disabled="!canEdit && !selected.length" @confirm="save">
     <LoadErrorState v-if="error" title="保存未完成" :message="error.message" @retry="save"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState>
-    <p v-if="pendingCreate && !current" class="care-hint">正在核对原保存结果，请保留当前窗口并重试。</p>
+
     <el-form label-position="top" class="density-form care-form" :disabled="locked" @submit.prevent="save">
       <el-form-item label="车牌号"><el-input :model-value="plate" readonly /></el-form-item>
       <el-form-item label="发生时间" required><el-date-picker v-model="form.occurredAt" type="datetime" value-format="YYYY-MM-DDTHH:mm:ssZ" /></el-form-item>

src/modules/overseas-master-data/components/VehicleCareFinanceLedger.test.ts

@@ -54,28 +54,28 @@ it('has no requests without Finance list permission and does not give readers wr
   access.permissions.add(api.companyCostPermissions.list); const w = mount(); await flushPromises()
   expect(button(w, '登记付款')).toBeUndefined(); expect(button(w, '作废费用')).toBeUndefined(); expect(button(w, '确认入账')).toBeUndefined()
 })
-it('keeps one immutable payment request and key after an unknown response', async () => {
+it('releases failed payment and submits the current amount with a new key', async () => {
   vi.mocked(api.payCompanyCost).mockRejectedValueOnce(new Error('unknown outcome')).mockResolvedValueOnce({ ...detail, status: 'PARTIALLY_PAID', paidAmount: 20, outstandingAmount: 50, recordVersion: '3' })
   const w = mount(); await flushPromises(); await button(w, '登记付款').trigger('click'); await flushPromises()
   w.findComponent({ name: 'ElInputNumber' }).vm.$emit('update:modelValue', 20); await files(w)
   await button(w, '确认操作').trigger('click'); await flushPromises()
   const first = vi.mocked(api.payCompanyCost).mock.calls[0]!
   expect(first).toEqual(['VC-ONE', expect.any(String), expect.objectContaining({ expectedVersion: '2', amount: 20, voucherFileIds: ['11'] })])
-  expect(w.text()).toContain('上次操作结果尚未确认')
+  expect(w.text()).not.toContain('上次操作结果尚未确认')
   w.findComponent({ name: 'ElInputNumber' }).vm.$emit('update:modelValue', 60)
-  await button(w, '重试原操作').trigger('click'); await flushPromises()
-  expect(vi.mocked(api.payCompanyCost).mock.calls[1]).toEqual(first)
+  await button(w, '确认操作').trigger('click'); await flushPromises()
+  expect(vi.mocked(api.payCompanyCost).mock.calls[1]).toEqual([first[0], expect.any(String), { ...first[2], amount: 60 }]); expect(vi.mocked(api.payCompanyCost).mock.calls[1]![1]).not.toBe(first[1])
   expect(w.text()).toContain('部分付款'); expect(w.text()).toContain('未付 CNY 50.00')
   expect(api.uploadCompanyCostVoucher).toHaveBeenCalledTimes(1); expect(w.emitted('changed')).toHaveLength(1)
 })
-it('preserves successfully uploaded vouchers and resumes remaining uploads without paying', async () => {
+it('preserves successful vouchers and lets the user reselect failed uploads without paying', async () => {
   vi.mocked(api.uploadCompanyCostVoucher).mockResolvedValueOnce(voucher).mockRejectedValueOnce(new Error('upload failed'))
     .mockResolvedValueOnce({ ...voucher, fileId: '12', fileName: 'second.png' })
   const w = mount(); await flushPromises(); await button(w, '登记付款').trigger('click'); await flushPromises()
   await files(w, ['payment.png', 'second.png'])
-  expect(w.text()).toContain('已上传：payment.png'); expect(w.text()).toContain('1 张凭证待完成上传')
+  expect(w.text()).toContain('已上传：payment.png'); expect(w.text()).toContain('凭证上传未完成')
   expect(api.payCompanyCost).not.toHaveBeenCalled()
-  await button(w, '重试剩余凭证').trigger('click'); await flushPromises()
+  await files(w, ['second.png'])
   expect(api.uploadCompanyCostVoucher).toHaveBeenCalledTimes(3)
   expect((vi.mocked(api.uploadCompanyCostVoucher).mock.calls[2]![1]).name).toBe('second.png')
   expect(w.text()).toContain('已上传：second.png'); expect(api.payCompanyCost).not.toHaveBeenCalled()

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

@@ -83,7 +83,7 @@ async function uploadFiles() {
       pendingFiles.value.shift()
     }
   } catch (cause) { if (!disposed && scope === epoch) writeError.value = getApiErrorDetails(cause, '凭证上传未完成；已成功上传的凭证已保留，尚未登记付款') }
-  finally { if (scope === epoch) uploading.value = false }
+  finally { if (scope === epoch) { uploading.value = false; pendingFiles.value = [] } }
 }
 async function submit() {
   const chosen = pending.value?.action ?? action.value
@@ -113,7 +113,7 @@ async function submit() {
     if (disposed || scope !== epoch) return
     if (cause instanceof ApiResponseError && (/^A04/.test(cause.code) || ['FIN_400', 'FIN_404', 'FIN_409'].includes(cause.code))) pending.value = null
     writeError.value = getApiErrorDetails(cause, '财务操作未完成，请保留输入并重试')
-  } finally { if (scope === epoch) saving.value = false }
+  } finally { pending.value = null;  if (scope === epoch) saving.value = false }
 }
 async function loadRecords() {
   const request = ++recordsRequest, scope = epoch, current = tab.value
@@ -154,8 +154,8 @@ onBeforeUnmount(() => { disposed = true; epoch++; readRequest++; recordsRequest+
     <template v-else>
       <div class="ledger-actions"><el-button :disabled="loading || saving || uploading" @click="load">刷新费用</el-button><el-button @click="tab = 'current'">费用详情</el-button><el-button @click="tab = 'history'">操作历史</el-button><el-button @click="tab = 'payments'">付款流水</el-button></div>
       <LoadErrorState v-if="error" title="公司费用读取失败" :message="error.message" @retry="load"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState>
-      <LoadErrorState v-if="writeError" title="财务操作未完成" :message="writeError.message" @retry="pendingFiles.length ? uploadFiles() : submit()"><template #details><ApiErrorMeta :details="writeError" /></template></LoadErrorState>
-      <p v-if="pending">上次操作结果尚未确认。重试使用原版本、原内容和原请求键。</p>
+      <LoadErrorState v-if="writeError" title="财务操作未完成" :message="writeError.message" :show-retry="false"><template #details><ApiErrorMeta :details="writeError" /></template></LoadErrorState>
+
       <template v-if="tab === 'current' && cost">
         <p>{{ cost.costNo }} · {{ statusLabels[cost.status] }} · {{ cost.supplierName }}</p>
         <p>{{ cost.source.feeName }} · {{ cost.source.businessDate }} · 原币 {{ cost.source.originalCurrency }} {{ cost.source.originalAmount.toFixed(2) }}</p>
@@ -172,8 +172,7 @@ onBeforeUnmount(() => { disposed = true; epoch++; readRequest++; recordsRequest+
               <input v-if="access.can(permissions.upload)" type="file" accept="image/png,image/jpeg" multiple :disabled="busy" aria-label="上传公司付款凭证" @change="selectFiles" />
               <p v-else>登记新付款需公司付款凭证上传权限。</p>
               <p v-for="file in vouchers" :key="file.fileId">已上传：{{ file.fileName }}</p>
-              <p v-if="pendingFiles.length">{{ pendingFiles.length }} 张凭证待完成上传。</p>
-              <el-button v-if="pendingFiles.length" :disabled="busy" @click="uploadFiles">重试剩余凭证</el-button>
+
             </el-form-item>
             <el-form-item label="付款说明（选填）" class="ledger-wide"><el-input v-model="form.remark" type="textarea" maxlength="1000" placeholder="补充本次付款用途或说明" /></el-form-item>
           </template>
@@ -181,7 +180,7 @@ onBeforeUnmount(() => { disposed = true; epoch++; readRequest++; recordsRequest+
         </el-form>
         <template v-if="action">
           <p>{{ action === 'pay' ? '确认实际付款及凭证后登记。此操作不会发起银行转账。' : action === 'void' ? '确认作废这笔未付款费用；历史记录保留，重新登记须重新入账。' : '确认将这笔公司费用入账为应付；不会自动付款。' }}</p>
-          <el-button :loading="saving" :disabled="uploading || !access.can(permissions[action])" :type="action === 'void' ? 'danger' : 'primary'" @click="submit">{{ pending ? '重试原操作' : '确认操作' }}</el-button>
+          <el-button :loading="saving" :disabled="uploading || !access.can(permissions[action])" :type="action === 'void' ? 'danger' : 'primary'" @click="submit">{{ '确认操作' }}</el-button>
           <el-button :disabled="busy" @click="action = null">取消操作</el-button>
         </template>
       </template>

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

@@ -139,7 +139,7 @@ async function submitFinance() {
     if (disposed || scope !== operationEpoch) return
     if (cause instanceof ApiResponseError && /^A04/.test(cause.code)) pendingFinance.value = null
     financeSaveError.value = getApiErrorDetails(cause, '财务提交未完成')
-  } finally { if (scope === operationEpoch) financeSaving.value = false }
+  } finally { pendingFinance.value = null;  if (scope === operationEpoch) financeSaving.value = false }
 }
 async function edit(row: VehicleCareRecord | null) {
   if (openingRecord.value) return
@@ -203,7 +203,7 @@ onBeforeUnmount(() => { request++; operationEpoch++; supplierRequest++; disposed
         <p>已付 CNY {{ financeStatus.finance.paidAmount.toFixed(2) }} · 未付 {{ financeStatus.finance.outstandingAmount == null ? '未形成应付' : `CNY ${financeStatus.finance.outstandingAmount.toFixed(2)}` }}</p>
       </template>
       <LoadErrorState v-if="financeSaveError" title="财务提交未完成" :message="financeSaveError.message" @retry="submitFinance"><template #details><ApiErrorMeta :details="financeSaveError" /></template></LoadErrorState>
-      <p v-if="pendingFinance">提交结果待核对；重试使用原请求，不重复登记。</p>
+
       <el-form v-if="canSubmitFinance || pendingFinance" label-position="top" :disabled="financeSaving || !!pendingFinance">
         <el-form-item label="供应商" required><el-select v-model="supplierId" filterable remote :remote-method="searchSuppliers" :loading="suppliersLoading" placeholder="搜索启用的供应商" @focus="searchSuppliers()"><el-option v-for="supplier in suppliers" :key="supplier.id" :label="supplier.name" :value="supplier.id" /></el-select></el-form-item>
         <el-form-item label="费用业务日期" required><template #label><span>费用业务日期<InlineHelp title="公司成本说明"><p>按公司成本登记，不生成客户应收。财务接收、入账和付款分别确认。</p></InlineHelp></span></template><el-date-picker v-model="businessDate" type="date" value-format="YYYY-MM-DD" placeholder="用于确定原币折算月份" /></el-form-item>