From 41924a438c0897f84141a989d94b7fedc302bd69 Mon Sep 17 00:00:00 2001
From: ouyangxq <775153912@qq.com>
Date: Wed, 9 Sep 2026 13:33:34 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../container-loading/pages/ContainersView.test.ts    | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/modules/container-loading/pages/ContainersView.test.ts b/src/modules/container-loading/pages/ContainersView.test.ts
index 9675af1d..b61f729e 100644
--- a/src/modules/container-loading/pages/ContainersView.test.ts
+++ b/src/modules/container-loading/pages/ContainersView.test.ts
@@ -88,7 +88,14 @@ describe('ContainersView', () => {
     expect(wrapper.text()).not.toContain('报空预警')
   })
 
-  it('shows one direct empty-return action only when permission and server actions allow it', async () => {
+  it.each([3, 0])('submits direct empty return with server version %s, including unload without pickup', async (version) => {
+    const original = await listContainers({ page: 1, size: 20 }, 'OVERSEAS')
+    vi.mocked(listContainers).mockClear().mockResolvedValue({ ...original, records: original.records.map((row) => ({
+      ...row,
+      terminalDrayage: { ...drayage, version, actualPickupAt: version ? drayage.actualPickupAt : null,
+        fleetSupplierId: version ? drayage.fleetSupplierId : null, allowedActions: ['RECORD_EMPTY_RETURN'],
+        emptyReturnWarning: { status: 'PENDING', deadlineAt: drayage.estimatedEmptyReturnAt, overdueHours: 0, overdueDays: 0 } },
+    })) })
     const wrapper = await mountOverseasRoute()
     expect(listContainers).toHaveBeenCalledWith(expect.objectContaining({ scope: 'ACTIVE' }), 'OVERSEAS')
     const buttons = wrapper.findAll('button').filter((item) => item.text().includes('确认还柜'))
@@ -105,7 +112,7 @@ describe('ContainersView', () => {
     confirm.click()
     await flushPromises()
     expect(recordTerminalDrayageEmptyReturn).toHaveBeenCalledTimes(1)
-    expect(recordTerminalDrayageEmptyReturn).toHaveBeenCalledWith('9001', { expectedVersion: 3, actualAt: '2026-09-11T13:00:00', remark: '还柜凭证已核对' })
+    expect(recordTerminalDrayageEmptyReturn).toHaveBeenCalledWith('9001', { expectedVersion: version, actualAt: '2026-09-11T13:00:00', remark: '还柜凭证已核对' })
     expect(wrapper.text()).toContain('已还柜')
     expect(listContainers).toHaveBeenCalledTimes(callsBefore + 1)
     expect(wrapper.findAll('.row-actions button').some((button) => button.text() === '确认还柜')).toBe(false)

From 08a1f1e5e27a346de5374f2bdc2f1d2999dc84de Mon Sep 17 00:00:00 2001
From: ouyangxq <775153912@qq.com>
Date: Wed, 9 Sep 2026 13:51:14 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/ContainersView.test.ts              | 26 +++++++++++++++++++
 .../pages/ContainersView.vue                  |  5 +++-
 .../api/deliveryOrders.test.ts                | 14 +++++++++-
 .../overseas-warehouse/api/deliveryOrders.ts  | 10 ++++++-
 4 files changed, 52 insertions(+), 3 deletions(-)

diff --git a/src/modules/container-loading/pages/ContainersView.test.ts b/src/modules/container-loading/pages/ContainersView.test.ts
index b61f729e..cb36f1ae 100644
--- a/src/modules/container-loading/pages/ContainersView.test.ts
+++ b/src/modules/container-loading/pages/ContainersView.test.ts
@@ -485,6 +485,32 @@ describe('ContainersView', () => {
     expect(source).toContain("void router.replace({ name: 'domestic-container-workbench' })")
   })
 
+  it.each(['EDITING', 'LOADING', 'COMPLETED'] as const)('keeps released-booking linking reachable alongside the %s process action', async (planStatus) => {
+    const page = await listContainers({ page: 1, size: 20 }, 'DOMESTIC')
+    vi.mocked(listContainers).mockResolvedValue({ ...page, records: page.records.map((row) => ({
+      ...row, planStatus, containerNo: null, allowedActions: ['EDIT_CONTAINER'],
+    })) })
+    const router = createTestRouter()
+    await router.push('/'); await router.isReady()
+    const wrapper = mount(ContainersView, { attachTo: document.body, global: { plugins: [ElementPlus, router] } })
+    try {
+      await flushPromises()
+      const actions = wrapper.find('.el-table__body .row-actions')
+      expect(actions.findAll('button').map((button) => button.text())).toEqual(['查看', '编辑运输信息', ({ EDITING: '智能装柜', LOADING: '预装清单', COMPLETED: '装柜清单' })[planStatus], ''])
+      await actions.find('button[aria-label="更多货柜操作"]').trigger('click')
+      await flushPromises()
+      const link = Array.from(document.body.querySelectorAll<HTMLElement>('.el-dropdown-menu__item'))
+        .filter((item) => item.textContent?.includes('关联已放舱订舱')).at(-1)!
+      expect(link).toBeDefined()
+      link.click()
+      await flushPromises()
+      expect(wrapper.findAllComponents(AppDialog).find((dialog) => dialog.props('title') === '关联已放舱订舱')?.props('modelValue')).toBe(true)
+      expect(listOceanBookingLinkCandidates).toHaveBeenCalledWith({ warehouseId: '8', channelCode: 'ZBYHK', containerType: '40HC', page: 1, size: 200 })
+    } finally {
+      wrapper.unmount()
+    }
+  })
+
   it('normalizes an optional booking-link container number', async () => {
     vi.mocked(linkContainerOceanBooking).mockResolvedValue({} as never)
     const router = createTestRouter()
diff --git a/src/modules/container-loading/pages/ContainersView.vue b/src/modules/container-loading/pages/ContainersView.vue
index c8fc56c1..853b3e89 100644
--- a/src/modules/container-loading/pages/ContainersView.vue
+++ b/src/modules/container-loading/pages/ContainersView.vue
@@ -210,7 +210,10 @@ const allColumns: DataTableColumn[] = [
 ]
 const domesticColumnKeys = new Set(['actions', 'containerNo', 'planNo', 'planStatus', 'exceptionActive', 'cabinetNo', 'oceanBooking', 'warehouseName', 'billOfLadingNo', 'route', 'containerType', 'capacity', 'vessel', 'shippingCompanyName', 'loadingAt', 'estimatedSailingAt'])
 const overseasColumnKeys = new Set(['actions', 'emptyReturnWarning', 'containerNo', 'cabinetNo', 'destinationClearanceDocumentStatus', 'deliveryOrderDocumentStatus', 'pickupCode', 'terminalTruckingCompany', 'pickupAppointmentAt', 'actualPickupAt', 'estimatedEmptyReturnAt', 'actualEmptyReturnAt', 'billOfLadingNo', 'route', 'vessel', 'actualSailingAt', 'estimatedPortArrivalAt', 'actualPortArrivalAt'])
-const columns = computed(() => allColumns.filter((column) => (isDomestic.value ? domesticColumnKeys : overseasColumnKeys).has(String(column.key))))
+const columns = computed(() => allColumns
+  .filter((column) => (isDomestic.value ? domesticColumnKeys : overseasColumnKeys).has(String(column.key)))
+  // 国内同时展示查看、运输信息、装柜流程和更多菜单，须为四个入口预留空间。
+  .map((column) => isDomestic.value && column.key === 'actions' ? { ...column, width: 380, minWidth: 380 } : column))
 const drayageHistoryColumns: DataTableColumn[] = [
   { key: 'action', label: '动作', width: 130, formatter: (row: TerminalDrayageHistory) => drayageActionText(row.action) },
   { key: 'status', label: '状态变化', minWidth: 180, formatter: (row: TerminalDrayageHistory) => `${drayageStatusText(row.fromStatus)} → ${drayageStatusText(row.toStatus)}` },
diff --git a/src/modules/overseas-warehouse/api/deliveryOrders.test.ts b/src/modules/overseas-warehouse/api/deliveryOrders.test.ts
index 3d073756..2aa59f70 100644
--- a/src/modules/overseas-warehouse/api/deliveryOrders.test.ts
+++ b/src/modules/overseas-warehouse/api/deliveryOrders.test.ts
@@ -18,11 +18,23 @@ describe('delivery order API', () => {
   })
 
   it('loads an encoded detail in its explicit customer scope', async () => {
-    vi.mocked(overseasHttp.get).mockResolvedValue({ code: '200', data: { order: { deliveryNo: 'DEL/1' }, skus: [], fees: [], operations: [] } })
+    vi.mocked(overseasHttp.get).mockResolvedValue({ code: '200', data: { order: { deliveryNo: 'DEL/1', version: '0' }, skus: [], fees: [], operations: [] } })
     await getDeliveryOrder('DEL/1', '1001')
     expect(overseasHttp.get).toHaveBeenCalledWith('/platform/v1/last-leg/delivery-orders/DEL%2F1', { params: { customerId: '1001', page: 1, size: 200 } })
   })
 
+  it.each(['0', '7', '9007199254740991'])('reads Java Long version %s for status editing', async version => {
+    vi.mocked(overseasHttp.get).mockResolvedValue({ code: '200', data: { order: { version, id: '2097515131537313794' } } })
+    const detail = await getDeliveryOrder('DEL/1', '1001')
+    expect(detail.order.version).toBe(Number(version))
+    expect(detail.order.id).toBe('2097515131537313794')
+  })
+
+  it.each([null, undefined, '', ' ', '-1', '1.5', '9007199254740992', -1])('rejects invalid version %s', async version => {
+    vi.mocked(overseasHttp.get).mockResolvedValue({ code: '200', data: { order: { version } } })
+    await expect(getDeliveryOrder('DEL/1', '1001')).rejects.toThrow('派送单缺少有效版本')
+  })
+
   it('loads return options and marks a return in the explicit customer scope', async () => {
     vi.mocked(overseasHttp.get).mockResolvedValue({ code: '200', data: [{ inboundOrderId: '9', inboundCode: 'IN-1' }] })
     await listDeliveryReturnInboundOptions('DEL/1', '1001')
diff --git a/src/modules/overseas-warehouse/api/deliveryOrders.ts b/src/modules/overseas-warehouse/api/deliveryOrders.ts
index 4e2bd314..9aa54e71 100644
--- a/src/modules/overseas-warehouse/api/deliveryOrders.ts
+++ b/src/modules/overseas-warehouse/api/deliveryOrders.ts
@@ -97,7 +97,15 @@ export async function getDeliveryOrder(deliveryNo: string, customerId: string) {
   const response = await overseasHttp.get<ApiEnvelope<DeliveryOrderDetail>, ApiEnvelope<DeliveryOrderDetail>>(
     `/platform/v1/last-leg/delivery-orders/${encodeURIComponent(deliveryNo)}`, { params: { customerId, page: 1, size: 200 } },
   )
-  return unwrapApiResponse(response)
+  const detail = unwrapApiResponse(response)
+  // Java Long values are serialized as decimal strings, including the version.
+  const rawVersion: unknown = detail.order.version
+  const version = typeof rawVersion === 'string' && /^(0|[1-9]\d*)$/.test(rawVersion)
+    ? Number(rawVersion) : rawVersion
+  if (typeof version !== 'number' || !Number.isSafeInteger(version) || version < 0) {
+    throw new Error('派送单缺少有效版本，请刷新后重试')
+  }
+  return { ...detail, order: { ...detail.order, version } }
 }
 
 export async function listDeliveryReturnInboundOptions(deliveryNo: string, customerId: string) {

From f62a3175f76d10bdbfb8775ab5356f2b30cc29bb Mon Sep 17 00:00:00 2001
From: ouyangxq <775153912@qq.com>
Date: Wed, 9 Sep 2026 13:54:43 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../container-loading/api/terminalDrayages.ts | 32 ++++++++++++++++++-
 .../pages/ContainersView.vue                  |  6 ++--
 2 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/src/modules/container-loading/api/terminalDrayages.ts b/src/modules/container-loading/api/terminalDrayages.ts
index 82b200f8..bf176078 100644
--- a/src/modules/container-loading/api/terminalDrayages.ts
+++ b/src/modules/container-loading/api/terminalDrayages.ts
@@ -1,7 +1,37 @@
 import { http, unwrapApiResponse, type ApiEnvelope } from '@/shared/api/http'
 
 export type TerminalDrayageStatus = 'WAITING_FOR_ARRIVAL' | 'ARRIVED' | 'PICKUP_SCHEDULED' | 'PICKED_UP' | 'UNLOADED' | 'EMPTY_RETURNED'
-export type TerminalDrayageAction = 'SELECT_FLEET' | 'SCHEDULE_PICKUP' | 'RECORD_PICKUP' | 'RECORD_EMPTY_RETURN'
+export type TerminalDrayageAction = 'SELECT_FLEET' | 'SCHEDULE_PICKUP' | 'RECORD_PICKUP' | 'RECORD_EMPTY_RETURN' | 'SEND_PICKUP_EMAIL'
+
+export interface TerminalDrayageEmail {
+  id: string
+  fleetName: string
+  recipient: string
+  kind: 'REQUEST_PICKUP' | 'CANCEL_PICKUP'
+  subject: string
+  body: string
+  status: 'PENDING' | 'SENDING' | 'SENT' | 'FAILED'
+  attempts: number
+  failureReason: string | null
+  createdAt: string
+  sentAt: string | null
+}
+
+export async function getTerminalDrayageEmails(containerId: string) {
+  type Mailbox = { deliveryEnabled: boolean; records: TerminalDrayageEmail[] }
+  const response = await http.get<ApiEnvelope<Mailbox>, ApiEnvelope<Mailbox>>(`${path}/${encodeURIComponent(containerId)}/emails`)
+  const result = unwrapApiResponse(response)
+  return { ...result, records: result.records.map((mail) => ({ ...mail, id: String(mail.id) })) }
+}
+
+export function sendTerminalDrayageEmail(containerId: string, expectedVersion: number) {
+  return command(containerId, 'pickup-email', { expectedVersion })
+}
+
+export async function retryTerminalDrayageEmail(containerId: string, mailId: string) {
+  const response = await http.post<ApiEnvelope<null>, ApiEnvelope<null>>(`${path}/${encodeURIComponent(containerId)}/emails/${encodeURIComponent(mailId)}/retry`)
+  unwrapApiResponse(response)
+}
 export type EmptyReturnWarningStatus = 'NOT_APPLICABLE' | 'PENDING' | 'OVERDUE' | 'RESOLVED'
 
 export interface EmptyReturnWarning {
diff --git a/src/modules/container-loading/pages/ContainersView.vue b/src/modules/container-loading/pages/ContainersView.vue
index 853b3e89..aabe3fa5 100644
--- a/src/modules/container-loading/pages/ContainersView.vue
+++ b/src/modules/container-loading/pages/ContainersView.vue
@@ -179,7 +179,7 @@ const queryFields = computed<QueryField[]>(() => [
   { key: 'sailingRange', type: 'daterange', label: '预计开船', width: 260, props: { 'aria-label': '预计开船日期范围' } },
 ])
 const allColumns: DataTableColumn[] = [
-  { key: 'actions', label: '操作', width: 310, fixed: 'left', slotName: 'actions' },
+  { key: 'actions', label: '操作', width: 140, fixed: 'left', slotName: 'actions' },
   { key: 'emptyReturnWarning', label: '报空预警', width: 120, slotName: 'emptyReturnWarning' },
   { key: 'containerNo', label: '集装箱号', minWidth: 150, slotName: 'containerNo' },
   { key: 'planNo', prop: 'planNo', label: '装柜清单号', minWidth: 165, formatter: (row: ContainerBookingResource) => row.planNo || '—' },
@@ -213,7 +213,7 @@ const overseasColumnKeys = new Set(['actions', 'emptyReturnWarning', 'containerN
 const columns = computed(() => allColumns
   .filter((column) => (isDomestic.value ? domesticColumnKeys : overseasColumnKeys).has(String(column.key)))
   // 国内同时展示查看、运输信息、装柜流程和更多菜单，须为四个入口预留空间。
-  .map((column) => isDomestic.value && column.key === 'actions' ? { ...column, width: 380, minWidth: 380 } : column))
+  .map((column) => isDomestic.value && column.key === 'actions' ? { ...column, width: 290 } : column))
 const drayageHistoryColumns: DataTableColumn[] = [
   { key: 'action', label: '动作', width: 130, formatter: (row: TerminalDrayageHistory) => drayageActionText(row.action) },
   { key: 'status', label: '状态变化', minWidth: 180, formatter: (row: TerminalDrayageHistory) => `${drayageStatusText(row.fromStatus)} → ${drayageStatusText(row.toStatus)}` },
@@ -727,7 +727,7 @@ onMounted(async () => {
         <section v-if="!loadError" id="container-workbench-results" class="surface-panel table-panel">
           <DataTable v-model:page="page" v-model:page-size="pageSize" :data="rows" :columns="columns" :total="total" :loading="loading" stripe preference-key="container-loading-table" empty-text="暂无货柜">
             <template #toolbar-actions><el-button v-if="isDomestic && canCreate" type="primary" @click="openSimulation"><Plus :size="16" />新增模拟柜</el-button></template>
-            <template #actions="{ row }"><div class="row-actions"><el-button v-if="canView" size="small" type="primary" plain :aria-label="containerViewLabel(row as ContainerBookingResource)" @click="openDetail(row)"><Eye :size="15" />查看</el-button><template v-if="isDomestic"><el-button v-if="canEdit && hasAction(row as ContainerWorkbenchRow, 'EDIT_CONTAINER')" size="small" @click="openEdit(row)"><Pencil :size="15" />编辑运输信息</el-button><el-button v-if="row.planStatus === 'EDITING' && canSmartLoading" size="small" type="primary" @click="goContainerProcess(row)"><Sparkles :size="15" />智能装柜</el-button><el-button v-else-if="row.planStatus === 'LOADING' && canViewPreload" size="small" type="primary" plain @click="goContainerProcess(row)"><ListChecks :size="15" />预装清单</el-button><el-button v-else-if="row.planStatus === 'COMPLETED' && canViewLoadingList" size="small" type="primary" plain @click="goContainerProcess(row)"><ListChecks :size="15" />装柜清单</el-button></template><el-button v-if="canDrayage(row as ContainerWorkbenchRow, 'RECORD_EMPTY_RETURN')" size="small" type="primary" @click="openDrayageAction(row as ContainerBookingResource, 'RECORD_EMPTY_RETURN')">确认还柜</el-button><el-dropdown v-if="canView" trigger="click" @command="handleMoreAction($event, row)"><el-button size="small" plain aria-label="更多货柜操作" title="更多货柜操作"><MoreHorizontal :size="16" /></el-button><template #dropdown><el-dropdown-menu><el-dropdown-item command="overview"><FileText :size="15" />轨迹与日志</el-dropdown-item><template v-if="isOverseas"><el-dropdown-item command="drayage-history"><FileText :size="15" />码头拖车记录</el-dropdown-item><el-dropdown-item v-if="canDrayage(row as ContainerWorkbenchRow, 'SCHEDULE_PICKUP')" command="drayage:SCHEDULE_PICKUP">预约提柜</el-dropdown-item><el-dropdown-item v-if="canDrayage(row as ContainerWorkbenchRow, 'RECORD_PICKUP')" command="drayage:RECORD_PICKUP">确认实际提柜</el-dropdown-item><el-dropdown-item v-if="canOverseasDocumentEdit && hasAction(row as ContainerWorkbenchRow, 'MANAGE_DESTINATION_DOCUMENTS')" command="documents"><FileUp :size="15" />清关 / DO / PU</el-dropdown-item></template><el-dropdown-item v-if="isDomestic && canEdit && hasAction(row as ContainerWorkbenchRow, 'EDIT_CONTAINER') && row.sourceType === 'SIMULATION' && !row.oceanBookingId" command="link"><Link2 :size="15" />关联已放舱订舱</el-dropdown-item></el-dropdown-menu></template></el-dropdown></div></template>
+            <template #actions="{ row }"><div class="row-actions"><el-button v-if="canView" size="small" type="primary" plain :aria-label="containerViewLabel(row as ContainerBookingResource)" @click="openDetail(row)"><Eye :size="15" />查看</el-button><template v-if="isDomestic"><el-button v-if="canEdit && hasAction(row as ContainerWorkbenchRow, 'EDIT_CONTAINER')" size="small" @click="openEdit(row)"><Pencil :size="15" />编辑</el-button><el-button v-if="row.planStatus === 'EDITING' && canSmartLoading" size="small" type="primary" @click="goContainerProcess(row)"><Sparkles :size="15" />装柜</el-button><el-button v-else-if="row.planStatus === 'LOADING' && canViewPreload" size="small" type="primary" plain @click="goContainerProcess(row)"><ListChecks :size="15" />预装清单</el-button><el-button v-else-if="row.planStatus === 'COMPLETED' && canViewLoadingList" size="small" type="primary" plain @click="goContainerProcess(row)"><ListChecks :size="15" />装柜清单</el-button></template><el-button v-if="canDrayage(row as ContainerWorkbenchRow, 'RECORD_EMPTY_RETURN')" size="small" type="primary" @click="openDrayageAction(row as ContainerBookingResource, 'RECORD_EMPTY_RETURN')">确认还柜</el-button><el-dropdown v-if="canView" trigger="click" @command="handleMoreAction($event, row)"><el-button size="small" plain aria-label="更多货柜操作" title="更多货柜操作"><MoreHorizontal :size="16" /></el-button><template #dropdown><el-dropdown-menu><el-dropdown-item command="overview"><FileText :size="15" />轨迹与日志</el-dropdown-item><template v-if="isOverseas"><el-dropdown-item command="drayage-history"><FileText :size="15" />码头拖车记录</el-dropdown-item><el-dropdown-item v-if="canDrayage(row as ContainerWorkbenchRow, 'SCHEDULE_PICKUP')" command="drayage:SCHEDULE_PICKUP">预约提柜</el-dropdown-item><el-dropdown-item v-if="canDrayage(row as ContainerWorkbenchRow, 'RECORD_PICKUP')" command="drayage:RECORD_PICKUP">确认实际提柜</el-dropdown-item><el-dropdown-item v-if="canOverseasDocumentEdit && hasAction(row as ContainerWorkbenchRow, 'MANAGE_DESTINATION_DOCUMENTS')" command="documents"><FileUp :size="15" />清关 / DO / PU</el-dropdown-item></template><el-dropdown-item v-if="isDomestic && canEdit && hasAction(row as ContainerWorkbenchRow, 'EDIT_CONTAINER') && row.sourceType === 'SIMULATION' && !row.oceanBookingId" command="link"><Link2 :size="15" />关联已放舱订舱</el-dropdown-item></el-dropdown-menu></template></el-dropdown></div></template>
             <template #emptyReturnWarning="{ row }"><el-tag :type="drayageWarningType(row as ContainerBookingResource)" effect="light" :title="drayageWarningTitle(row as ContainerBookingResource)">{{ drayageWarningText(row as ContainerBookingResource) }}</el-tag></template>
             <template #cabinet="{ row }"><strong>{{ row.cabinetNo }}</strong><small>系统生成</small></template>
             <template #oceanBooking="{ row }"><span v-if="row.oceanBookingId"><strong>{{ row.billOfLadingNo || '已关联订舱' }}</strong><small>{{ row.containerNo ? `集装箱号：${row.containerNo}` : '集装箱号：待补录' }}</small></span><span v-else>未关联</span></template>

From a2515119b7db8ed0e8e02d1aecb34cb0c0b11681 Mon Sep 17 00:00:00 2001
From: ouyangxq <775153912@qq.com>
Date: Wed, 9 Sep 2026 14:32:04 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 AGENTS.md                                     |  4 +-
 .../api/terminalDrayages.test.ts              | 15 +++
 .../pages/ContainersView.test.ts              | 59 ++++++++----
 .../pages/ContainersView.vue                  | 94 +++++++++++++++++--
 src/modules/container-loading/types.ts        |  4 +-
 .../pages/OceanBookingDetailView.vue          |  4 +-
 .../pages/OceanBookingsView.test.ts           | 15 +++
 .../pages/OceanBookingsView.vue               |  4 +-
 8 files changed, 166 insertions(+), 33 deletions(-)

diff --git a/AGENTS.md b/AGENTS.md
index e2831fde..9f97338c 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -53,9 +53,9 @@
 | 货柜双工作台、排柜、预装/装柜清单、真实柜号后补与整柜报关 | 国内 `modules/container-loading/pages/DomesticContainersView.vue`、海外 `OverseasContainersView.vue`，共享详情实现 `ContainerDetailView.vue`；预装详情 `modules/loading-lists/pages/PreloadPlanDetailView.vue`，资料/PDA 证据 `components/ContainerOverviewPanel.vue`，报关 `components/ContainerCustomsPanel.vue` | 国内“送柜报关”只消费 `/containers/domestic` 与服务端 `allowedActions`，承载模拟柜、订舱关联、智能装柜、装柜清单页签、出口报关和国内出仓；创建柜次时自动生成唯一预装计划，预装详情先调用 `/loading-plans/{planId}/lifecycle`，完成后深链进入国内货柜详情的装柜清单页签，不再注册独立正式清单导航和路由。订舱关联允许真实集装箱号为空，但 PDA 最终完成前必须补齐；全买单柜继续使用 `complete-all-buy`。海外“清关提柜”只消费 `/containers/overseas`，承载船节点、目的港清关、DO/PU、码头车队、提柜和还空；还空截止事实由服务端基于卸柜完成时间加 72 小时计算，前端不重算。两端统一使用 `containerBookingId`，列表范围由服务端 `scope=ACTIVE/HISTORY` 分页，禁止浏览器筛选或本地推导写资格。后端为 `LoadingListService`、`firstleg/customs/container/`、`firstleg/terminaldrayage/`，文件归 `file/` |
 | 合柜报关 / 同柜不可拆组 | `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/` | 订舱草稿按当前版本维护资料，放舱后资料与表单只读；打印只对 `RELEASED` 开放。`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/` | 订舱草稿按当前版本维护资料，放舱后资料与表单只读；打印对草稿与已放舱订舱均开放，按当前已保存资料生成，未填写字段显示“—”。`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` 订舱与拖车供应商，不选择或提交客户、柜次、装柜计划或真实集装箱号；提单号和仓库由订舱冻结事实带入。一个订舱最多一张非终态拖车单，重复创建转入现有单继续编辑；PDA 完成不自动推进拖车。附件为平台作用域且不重复提单文件；Backend `TruckAppointmentService`、`truck-appointments-v1.yaml` |
-| 目的港码头拖车与还空预警 | 海外清关提柜工作台/详情 `modules/container-loading/pages/OverseasContainersView.vue`、`OverseasContainerDetailView.vue`，API `modules/container-loading/api/terminalDrayages.ts` | 按 `containerBookingId` 读取服务端状态、`allowedActions` 和历史，不能复用订舱级拖车表单或自行推进状态；实际到港后选择 `ACTIVE + TRUCKING` 车队，再预约提柜、确认实际提柜与实际还柜。还空截止、超时天/小时只展示服务端基于权威卸柜完成时间加 72 小时计算的结果；Backend `firstleg/terminaldrayage/`、`terminal-drayage-v1.yaml` |
+| 目的港码头拖车与还空预警 | 海外清关提柜工作台/详情 `modules/container-loading/pages/OverseasContainersView.vue`、`OverseasContainerDetailView.vue`，API `modules/container-loading/api/terminalDrayages.ts` | 按 `containerBookingId` 读取服务端状态、`allowedActions` 和历史，不能复用订舱级拖车表单或自行推进状态；实际到港后选择 `ACTIVE + TRUCKING` 车队，再预约提柜、确认实际提柜与实际还柜。还空截止、超时天/小时只展示服务端基于权威卸柜完成时间加 72 小时计算的结果；Backend `firstleg/terminaldrayage/`、`terminal-drayage-v1.yaml` 列表消费 `SEND_PICKUP_EMAIL`，邮件记录通过 `terminalDrayages.ts` 查询与重试；发送及换队成功只提示已入队，发送权限复用码头车队编辑权限。 |
 | 历史报关协同与国内出仓 | `modules/customs/`、`modules/outbound-dispatch/` | `modules/customs/` 是历史报关案件/清单/代理提交与回执入口；装柜完成后的整柜退税/买单资料从货柜详情进入，不在旧模块复制；Backend `firstleg/outbound/dispatch/`、`firstleg/customs/`、`file/` |
 | 主数据、下载、退避任务重试、审计 | `modules/master-data/`、`modules/downloads/pages/DownloadCenterView.vue`、`modules/audit/` | File 导出任务返回 `attemptCount/maxAttempts/nextRetryAt`；仅失败或已进入自动退避的等待任务显示重试，等待任务重试用于立即执行当前投递，不创建新任务；联查 `warehouse/`、`file/`、`audit-service/` |
 | 海外接柜、入库、库存与库内服务 | `modules/overseas-warehouse/` | `gateway-overseas/`、`lastleg-service/`、`warehouse-overseas-service/`；与排车、出库、派送、异常退回和一件代发共同组成海外仓全流程 |
diff --git a/src/modules/container-loading/api/terminalDrayages.test.ts b/src/modules/container-loading/api/terminalDrayages.test.ts
index 524bf6e6..4856d849 100644
--- a/src/modules/container-loading/api/terminalDrayages.test.ts
+++ b/src/modules/container-loading/api/terminalDrayages.test.ts
@@ -1,6 +1,9 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { http } from '@/shared/api/http'
 import {
+  sendTerminalDrayageEmail,
+  getTerminalDrayageEmails,
+  retryTerminalDrayageEmail,
   getTerminalDrayageHistory,
   listTerminalDrayages,
   recordTerminalDrayageEmptyReturn,
@@ -26,6 +29,18 @@ const view = {
 describe('terminal drayages API', () => {
   beforeEach(() => vi.clearAllMocks())
 
+  it('queues pickup email with version and idempotency and scopes retries to the container', async () => {
+    vi.mocked(http.post).mockResolvedValueOnce({ data: view })
+    await sendTerminalDrayageEmail('9007199254740993', 3)
+    expect(http.post).toHaveBeenCalledWith('/platform/v1/terminal-drayages/9007199254740993/pickup-email',
+      { expectedVersion: 3 }, { headers: { 'Idempotency-Key': expect.any(String) } })
+    vi.mocked(http.get).mockResolvedValueOnce({ data: { deliveryEnabled: false, records: [{ id: '9007199254740999', status: 'FAILED' }] } })
+    expect((await getTerminalDrayageEmails('9007199254740993')).records[0].id).toBe('9007199254740999')
+    vi.mocked(http.post).mockResolvedValueOnce({ data: null })
+    await retryTerminalDrayageEmail('9007199254740993', '9007199254740999')
+    expect(http.post).toHaveBeenLastCalledWith('/platform/v1/terminal-drayages/9007199254740993/emails/9007199254740999/retry')
+  })
+
   it('sends repeated container ids and preserves long identifiers as strings', async () => {
     vi.mocked(http.get).mockResolvedValueOnce({ data: [view] })
     const result = await listTerminalDrayages(['9007199254740993', '9007199254740994'])
diff --git a/src/modules/container-loading/pages/ContainersView.test.ts b/src/modules/container-loading/pages/ContainersView.test.ts
index cb36f1ae..161e5db9 100644
--- a/src/modules/container-loading/pages/ContainersView.test.ts
+++ b/src/modules/container-loading/pages/ContainersView.test.ts
@@ -11,7 +11,7 @@ import { listPlatformPartners } from '@/modules/master-data'
 import { listSuppliers } from '@/modules/suppliers'
 import { getOceanBooking, listOceanBookingLinkCandidates, listOceanBookings } from '@/modules/ocean-bookings'
 import { getContainer, getContainerOverview, linkContainerOceanBooking, listContainers, updateContainer } from '../api/platformContainerLoading'
-import { getTerminalDrayage, getTerminalDrayageHistory, recordTerminalDrayageEmptyReturn, selectTerminalDrayageFleet } from '../api/terminalDrayages'
+import { getTerminalDrayage, getTerminalDrayageHistory, recordTerminalDrayageEmptyReturn, selectTerminalDrayageFleet, sendTerminalDrayageEmail, getTerminalDrayageEmails } from '../api/terminalDrayages'
 import AppDialog from '@/shared/components/AppDialog.vue'
 import { containerLoadingRoutes } from '../routes'
 
@@ -23,7 +23,7 @@ vi.mock('@/modules/iam', () => ({ listPlatformTenants: vi.fn().mockResolvedValue
 const accessCan = vi.hoisted(() => vi.fn())
 vi.mock('@/core/access/accessPreview', () => ({ useAccessPreviewStore: () => ({ can: accessCan }) }))
 vi.mock('../api/platformContainerLoading', () => ({ listContainers: vi.fn(), getContainer: vi.fn(), getContainerOverview: vi.fn(), getContainerClearance: vi.fn(), uploadContainerClearance: vi.fn(), completeContainerClearance: vi.fn(), uploadContainerDocument: vi.fn(), downloadContainerDocument: vi.fn(), downloadContainerPdaPhoto: vi.fn(), markContainerException: vi.fn(), cancelContainerException: vi.fn(), createContainerSimulation: vi.fn(), linkContainerOceanBooking: vi.fn(), unlinkContainerOceanBooking: vi.fn(), updateContainer: vi.fn() }))
-vi.mock('../api/terminalDrayages', () => ({ listTerminalDrayages: vi.fn(), getTerminalDrayage: vi.fn(), getTerminalDrayageHistory: vi.fn(), selectTerminalDrayageFleet: vi.fn(), scheduleTerminalDrayagePickup: vi.fn(), recordTerminalDrayagePickup: vi.fn(), recordTerminalDrayageEmptyReturn: vi.fn() }))
+vi.mock('../api/terminalDrayages', () => ({ sendTerminalDrayageEmail: vi.fn(), getTerminalDrayageEmails: vi.fn(), retryTerminalDrayageEmail: vi.fn(), listTerminalDrayages: vi.fn(), getTerminalDrayage: vi.fn(), getTerminalDrayageHistory: vi.fn(), selectTerminalDrayageFleet: vi.fn(), scheduleTerminalDrayagePickup: vi.fn(), recordTerminalDrayagePickup: vi.fn(), recordTerminalDrayageEmptyReturn: vi.fn() }))
 
 const drayage = {
   containerBookingId: '9001', containerNo: 'MSCU-1', oceanBookingId: '101', status: 'UNLOADED' as const, version: 3,
@@ -88,6 +88,31 @@ describe('ContainersView', () => {
     expect(wrapper.text()).not.toContain('报空预警')
   })
 
+  it('sends pickup mail from the list once while pending and shows disabled delivery in history', async () => {
+    const original = await listContainers({ page: 1, size: 20 }, 'OVERSEAS')
+    vi.mocked(listContainers).mockResolvedValue({ ...original, records: original.records.map((row) => ({
+      ...row, allowedActions: ['SEND_PICKUP_EMAIL'], terminalDrayage: { ...drayage, allowedActions: ['SEND_PICKUP_EMAIL'] },
+    })) })
+    let resolveSend!: (value: Awaited<ReturnType<typeof sendTerminalDrayageEmail>>) => void
+    vi.mocked(sendTerminalDrayageEmail).mockReset().mockReturnValue(new Promise((resolve) => { resolveSend = resolve }))
+    vi.mocked(getTerminalDrayageEmails).mockResolvedValue({ deliveryEnabled: false, records: [] })
+    const wrapper = await mountOverseasRoute()
+    const button = wrapper.findAll('.row-actions button').find((item) => item.text().includes('发送邮件'))!
+    expect(button.exists()).toBe(true)
+    await button.trigger('click'); await button.trigger('click')
+    expect(sendTerminalDrayageEmail).toHaveBeenCalledTimes(1)
+    expect(sendTerminalDrayageEmail).toHaveBeenCalledWith('9001', 3)
+    resolveSend({ ...drayage, version: 4, allowedActions: ['SEND_PICKUP_EMAIL'] })
+    await flushPromises()
+    await wrapper.find('.el-table__body button[aria-label="更多货柜操作"]').trigger('click')
+    await flushPromises()
+    Array.from(document.body.querySelectorAll<HTMLElement>('.el-dropdown-menu__item')).filter((item) => item.textContent?.includes('邮件记录')).at(-1)!.click()
+    await flushPromises()
+    expect(getTerminalDrayageEmails).toHaveBeenCalledWith('9001')
+    expect(document.body.textContent).toContain('发信尚未启用')
+    wrapper.unmount()
+  })
+
   it.each([3, 0])('submits direct empty return with server version %s, including unload without pickup', async (version) => {
     const original = await listContainers({ page: 1, size: 20 }, 'OVERSEAS')
     vi.mocked(listContainers).mockClear().mockResolvedValue({ ...original, records: original.records.map((row) => ({
@@ -233,14 +258,14 @@ describe('ContainersView', () => {
     await flushPromises()
     expect(listAllPlatformWarehouses).toHaveBeenCalledTimes(1)
 
-    await wrapper.findAll('button').find((button) => button.text().includes('编辑运输信息'))!.trigger('click')
+    await wrapper.findAll('button').find((button) => button.text().trim() === '编辑')!.trigger('click')
     await flushPromises()
     expect(listAllPlatformWarehouses).toHaveBeenCalledTimes(1)
     expect(listPlatformPartners).toHaveBeenCalledTimes(1)
     expect(listSuppliers).toHaveBeenCalledTimes(1)
     expect(listOceanBookings).toHaveBeenCalledTimes(1)
     wrapper.findAllComponents(AppDialog).find((dialog) => dialog.props('title') === '编辑')!.vm.$emit('update:modelValue', false)
-    await wrapper.findAll('button').find((button) => button.text().includes('编辑运输信息'))!.trigger('click')
+    await wrapper.findAll('button').find((button) => button.text().trim() === '编辑')!.trigger('click')
     await flushPromises()
     expect(listPlatformPartners).toHaveBeenCalledTimes(1)
     expect(listSuppliers).toHaveBeenCalledTimes(1)
@@ -315,11 +340,11 @@ describe('ContainersView', () => {
     const wrapper = mount(ContainersView, { global: { plugins: [ElementPlus, router] } })
     await flushPromises()
 
-    expect(wrapper.text()).toContain('智能装柜')
+    expect(wrapper.text()).toContain('装柜')
     expect(wrapper.text()).toContain('预装清单')
     expect(wrapper.text()).toContain('装柜清单')
 
-    await wrapper.findAll('button').find((button) => button.text().trim() === '智能装柜')!.trigger('click')
+    await wrapper.findAll('button').find((button) => button.text().trim() === '装柜')!.trigger('click')
     await wrapper.findAll('button').find((button) => button.text().includes('预装清单'))!.trigger('click')
     await wrapper.findAll('button').find((button) => button.text().includes('装柜清单'))!.trigger('click')
     expect(push).toHaveBeenNthCalledWith(1, { name: 'smart-loading-workbench', params: { containerId: '9001' } })
@@ -343,7 +368,7 @@ describe('ContainersView', () => {
     await flushPromises()
 
     expect(wrapper.find('button[aria-label="查看 CB-1"]').exists()).toBe(true)
-    expect(wrapper.find('button[aria-label="更多货柜操作"]').exists()).toBe(true)
+    expect(wrapper.find('.el-table__body button[aria-label="更多货柜操作"]').exists()).toBe(true)
     expect(wrapper.findAll('button').some((button) => button.text().trim() === '编辑')).toBe(false)
   })
 
@@ -355,7 +380,7 @@ describe('ContainersView', () => {
     await flushPromises()
 
     expect(wrapper.find('button[aria-label="查看 CB-1"]').exists()).toBe(false)
-    expect(wrapper.find('button[aria-label="更多货柜操作"]').exists()).toBe(false)
+    expect(wrapper.find('.el-table__body button[aria-label="更多货柜操作"]').exists()).toBe(false)
     expect(wrapper.findAll('button').some((button) => button.text().trim() === '编辑')).toBe(false)
   })
 
@@ -449,6 +474,8 @@ describe('ContainersView', () => {
       drayageActionAt: string
       saveDrayageAction: () => Promise<void>
     }
+    const beforeFleet = await listContainers({ page: 1, size: 20 }, 'OVERSEAS')
+    vi.mocked(listContainers).mockResolvedValueOnce({ ...beforeFleet, records: beforeFleet.records.map((row) => ({ ...row, terminalDrayage: { ...drayage, version: 4, fleetSupplierId: '502', allowedActions: [...drayage.allowedActions] } })) })
     await vm.selectRowFleet(vm.rows[0], '502')
     expect(selectTerminalDrayageFleet).toHaveBeenCalledWith('9001', { expectedVersion: 3, fleetSupplierId: '502', fleetSupplierName: '新车队' })
 
@@ -496,7 +523,7 @@ describe('ContainersView', () => {
     try {
       await flushPromises()
       const actions = wrapper.find('.el-table__body .row-actions')
-      expect(actions.findAll('button').map((button) => button.text())).toEqual(['查看', '编辑运输信息', ({ EDITING: '智能装柜', LOADING: '预装清单', COMPLETED: '装柜清单' })[planStatus], ''])
+      expect(actions.findAll('button').map((button) => button.text())).toEqual(['查看', '编辑', ({ EDITING: '装柜', LOADING: '预装清单', COMPLETED: '装柜清单' })[planStatus], ''])
       await actions.find('button[aria-label="更多货柜操作"]').trigger('click')
       await flushPromises()
       const link = Array.from(document.body.querySelectorAll<HTMLElement>('.el-dropdown-menu__item'))
@@ -610,7 +637,7 @@ describe('ContainersView', () => {
     await router.push('/'); await router.isReady()
     const wrapper = mount(ContainersView, { attachTo: document.body, global: { plugins: [ElementPlus, router] } })
     await flushPromises()
-    await wrapper.find('button[aria-label="更多货柜操作"]').trigger('click')
+    await wrapper.find('.el-table__body button[aria-label="更多货柜操作"]').trigger('click')
     await flushPromises()
     Array.from(document.body.querySelectorAll<HTMLElement>('.el-dropdown-menu__item'))
       .filter((item) => item.textContent?.includes('关联已放舱订舱')).at(-1)!.click()
@@ -637,7 +664,7 @@ describe('ContainersView', () => {
     await router.push('/'); await router.isReady()
     const wrapper = mount(ContainersView, { attachTo: document.body, global: { plugins: [ElementPlus, router] } })
     await flushPromises()
-    await wrapper.find('button[aria-label="更多货柜操作"]').trigger('click')
+    await wrapper.find('.el-table__body button[aria-label="更多货柜操作"]').trigger('click')
     await flushPromises()
     const linkAction = Array.from(document.body.querySelectorAll<HTMLElement>('.el-dropdown-menu__item'))
       .filter((item) => item.textContent?.includes('关联已放舱订舱')).at(-1)!
@@ -666,7 +693,7 @@ describe('ContainersView', () => {
     const wrapper = mount(ContainersView, { attachTo: document.body, global: { plugins: [ElementPlus, router] } })
     await flushPromises()
 
-    await wrapper.find('button[aria-label="更多货柜操作"]').trigger('click')
+    await wrapper.find('.el-table__body button[aria-label="更多货柜操作"]').trigger('click')
     await flushPromises()
     Array.from(document.body.querySelectorAll<HTMLElement>('.el-dropdown-menu__item'))
       .filter((item) => item.textContent?.includes('关联已放舱订舱')).at(-1)!.click()
@@ -675,7 +702,7 @@ describe('ContainersView', () => {
       .find((dialog) => dialog.props('title') === '关联已放舱订舱')!.vm.$emit('update:modelValue', false)
     await flushPromises()
 
-    await wrapper.find('button[aria-label="更多货柜操作"]').trigger('click')
+    await wrapper.find('.el-table__body button[aria-label="更多货柜操作"]').trigger('click')
     await flushPromises()
     Array.from(document.body.querySelectorAll<HTMLElement>('.el-dropdown-menu__item'))
       .filter((item) => item.textContent?.includes('关联已放舱订舱')).at(-1)!.click()
@@ -700,7 +727,7 @@ describe('ContainersView', () => {
     const wrapper = mount(ContainersView, { global: { plugins: [ElementPlus, router] } })
     await flushPromises()
 
-    await wrapper.findAll('button').find((button) => button.text().includes('编辑运输信息'))!.trigger('click')
+    await wrapper.findAll('button').find((button) => button.text().trim() === '编辑')!.trigger('click')
     await flushPromises()
     await wrapper.findAll('button').find((button) => button.text().trim() === '确定')!.trigger('click')
     await flushPromises()
@@ -720,7 +747,7 @@ describe('ContainersView', () => {
     const wrapper = mount(ContainersView, { global: { plugins: [ElementPlus, router] } })
     await flushPromises()
 
-    await wrapper.findAll('button').find((button) => button.text().includes('编辑运输信息'))!.trigger('click')
+    await wrapper.findAll('button').find((button) => button.text().trim() === '编辑')!.trigger('click')
     await flushPromises()
     const truckingSelect = wrapper.findAllComponents({ name: 'ElSelect' }).find((select) => select.props('placeholder') === '请选择拖车供应商')
     truckingSelect!.vm.$emit('update:modelValue', '')
@@ -742,7 +769,7 @@ describe('ContainersView', () => {
     const wrapper = mount(ContainersView, { global: { plugins: [ElementPlus, router] } })
     await flushPromises()
 
-    await wrapper.findAll('button').find((button) => button.text().includes('编辑运输信息'))!.trigger('click')
+    await wrapper.findAll('button').find((button) => button.text().trim() === '编辑')!.trigger('click')
     await flushPromises()
     const truckingSelect = wrapper.findAllComponents({ name: 'ElSelect' }).find((select) => select.props('placeholder') === '请选择拖车供应商')
     expect(truckingSelect?.props('modelValue')).toBe('')
diff --git a/src/modules/container-loading/pages/ContainersView.vue b/src/modules/container-loading/pages/ContainersView.vue
index aabe3fa5..a73165f7 100644
--- a/src/modules/container-loading/pages/ContainersView.vue
+++ b/src/modules/container-loading/pages/ContainersView.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
 import { computed, onMounted, reactive, ref, watch } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
-import { Boxes, Check, Eye, FileText, FileUp, Link2, ListChecks, MoreHorizontal, Pencil, Plus, Sparkles } from '@lucide/vue'
-import { ElMessage, type FormInstance, type FormRules } from 'element-plus'
+import { Boxes, Check, Eye, FileText, FileUp, Link2, ListChecks, Mail, MoreHorizontal, Pencil, Plus, Sparkles } from '@lucide/vue'
+import { ElMessage, ElMessageBox, type FormInstance, type FormRules } from 'element-plus'
 import { useAccessPreviewStore } from '@/core/access/accessPreview'
 import { listPlatformTenants, type PlatformTenantResource } from '@/modules/iam'
 import { listAllPlatformWarehouses, type PlatformWarehouseSummaryResource } from '@/modules/warehouses'
@@ -20,6 +20,10 @@ import { CONTAINER_SPECIFICATIONS, applyContainerSpecification, containerSpecifi
 import { getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
 import { createContainerSimulation, getContainer, linkContainerOceanBooking, listContainers, updateContainer } from '../api/platformContainerLoading'
 import {
+  getTerminalDrayageEmails,
+  sendTerminalDrayageEmail,
+  retryTerminalDrayageEmail,
+  type TerminalDrayageEmail,
   getTerminalDrayage,
   getTerminalDrayageHistory,
   recordTerminalDrayageEmptyReturn,
@@ -85,7 +89,7 @@ const unresolvedTruckingSupplierName = ref<string | null>(null)
 const drayages = ref<Record<string, TerminalDrayageView>>({})
 const drayageSavingIds = ref<string[]>([])
 const drayageActionOpen = ref(false)
-const drayageAction = ref<Exclude<TerminalDrayageAction, 'SELECT_FLEET'>>('SCHEDULE_PICKUP')
+const drayageAction = ref<Exclude<TerminalDrayageAction, 'SELECT_FLEET' | 'SEND_PICKUP_EMAIL'>>('SCHEDULE_PICKUP')
 const drayageTarget = ref<ContainerBookingResource | null>(null)
 const drayageActionAt = ref('')
 const drayageReason = ref('')
@@ -95,6 +99,66 @@ const drayageHistoryOpen = ref(false)
 const drayageHistory = ref<TerminalDrayageHistory[]>([])
 const drayageHistoryLoading = ref(false)
 const drayageHistoryError = ref<ApiErrorDetails | null>(null)
+const emailHistoryOpen = ref(false)
+const emailTarget = ref<ContainerBookingResource | null>(null)
+const emails = ref<TerminalDrayageEmail[]>([])
+const emailsLoading = ref(false)
+const emailsError = ref<ApiErrorDetails | null>(null)
+const emailDeliveryEnabled = ref(false)
+const retryingEmail = ref('')
+let emailSequence = 0
+const emailColumns: DataTableColumn[] = [
+  { key: 'actions', label: '操作', width: 90, fixed: 'left', slotName: 'emailActions' },
+  { key: 'kind', label: '类型', width: 100, formatter: (row: TerminalDrayageEmail) => row.kind === 'CANCEL_PICKUP' ? '取消提柜' : '请求提柜' },
+  { key: 'fleetName', label: '车队', minWidth: 130 },
+  { key: 'recipient', label: '收件邮箱', minWidth: 210 },
+  { key: 'status', label: '发送状态', width: 100, formatter: (row: TerminalDrayageEmail) => ({ PENDING: '待发送', SENDING: '发送中', SENT: '已发送', FAILED: '失败待核对' })[row.status] },
+  { key: 'content', label: '邮件内容', minWidth: 270, slotName: 'emailContent' },
+  { key: 'failureReason', label: '失败说明', minWidth: 200 },
+  { key: 'createdAt', label: '创建时间', width: 165, formatter: (row: TerminalDrayageEmail) => formatTime(row.createdAt) },
+  { key: 'sentAt', label: '发送时间', width: 165, formatter: (row: TerminalDrayageEmail) => formatTime(row.sentAt) },
+]
+
+async function sendPickupEmail(row: ContainerWorkbenchRow) {
+  const current = drayageFor(row.id)
+  if (!current || !canDrayage(row, 'SEND_PICKUP_EMAIL') || drayageSavingIds.value.includes(row.id)) return
+  drayageSavingIds.value.push(row.id)
+  try {
+    replaceDrayage(await sendTerminalDrayageEmail(row.id, current.version))
+    ElMessage.success('提柜邮件已加入发送队列，可在邮件记录中查看结果')
+    await loadRows()
+  } catch (error) {
+    ElMessage.error(getApiErrorDetails(error, '提交提柜邮件失败').message)
+    await loadRows()
+  } finally { drayageSavingIds.value = drayageSavingIds.value.filter((id) => id !== row.id) }
+}
+
+async function openEmailHistory(row: ContainerBookingResource) {
+  const sequence = ++emailSequence
+  emailTarget.value = row; emailHistoryOpen.value = true; emailsLoading.value = true
+  emailsError.value = null; emails.value = []
+  try {
+    const result = await getTerminalDrayageEmails(row.id)
+    if (sequence !== emailSequence) return
+    emails.value = result.records; emailDeliveryEnabled.value = result.deliveryEnabled
+  } catch (error) {
+    if (sequence === emailSequence) emailsError.value = getApiErrorDetails(error, '邮件记录加载失败')
+  } finally { if (sequence === emailSequence) emailsLoading.value = false }
+}
+
+async function retryEmail(mail: TerminalDrayageEmail) {
+  const target = emailTarget.value
+  if (!target || !canFleetEdit.value || retryingEmail.value || mail.status !== 'FAILED') return
+  retryingEmail.value = mail.id
+  try {
+    await ElMessageBox.confirm('发送失败时邮件仍可能已送达。请先核对车队未收到，再确认重试；同柜后续邮件会等待本邮件发送成功。', '重试邮件', { confirmButtonText: '确认重试', cancelButtonText: '取消', type: 'warning' })
+    await retryTerminalDrayageEmail(target.id, mail.id)
+    ElMessage.success('邮件已重新加入发送队列')
+    await openEmailHistory(target)
+  } catch (error) {
+    if (error !== 'cancel' && error !== 'close') ElMessage.error(getApiErrorDetails(error, '重试邮件失败').message)
+  } finally { retryingEmail.value = '' }
+}
 let listSequence = 0
 let detailSequence = 0
 let linkSequence = 0
@@ -230,10 +294,10 @@ function documentStatusText(status: ContainerDocumentStatus | null | undefined)
 function formatTime(value: string | null | undefined) { return value?.replace('T', ' ').slice(0, 16) || '—' }
 function drayageFor(containerBookingId: string) { return drayages.value[containerBookingId] }
 function drayageStatusText(status?: string | null) { return ({ WAITING_FOR_ARRIVAL: '待到港', ARRIVED: '已到港', PICKUP_SCHEDULED: '已约提柜', PICKED_UP: '已提柜', UNLOADED: '已卸柜', EMPTY_RETURNED: '已还柜' } as Record<string, string>)[status || ''] || status || '—' }
-function drayageActionText(action: TerminalDrayageAction) { return ({ SELECT_FLEET: '选择码头车队', SCHEDULE_PICKUP: '预约提柜', RECORD_PICKUP: '确认实际提柜', RECORD_EMPTY_RETURN: '确认还柜' } as Record<TerminalDrayageAction, string>)[action] }
+function drayageActionText(action: TerminalDrayageAction) { return ({ SELECT_FLEET: '选择码头车队', SCHEDULE_PICKUP: '预约提柜', RECORD_PICKUP: '确认实际提柜', RECORD_EMPTY_RETURN: '确认还柜', SEND_PICKUP_EMAIL: '发送提柜邮件' } as Record<TerminalDrayageAction, string>)[action] }
 function hasAction(row: ContainerWorkbenchRow, action: ContainerWorkbenchAction) { return Boolean(row.allowedActions?.includes(action)) }
 function canDrayage(row: ContainerWorkbenchRow, action: TerminalDrayageAction) {
-  const permission = action === 'SELECT_FLEET' ? canFleetEdit.value : action === 'SCHEDULE_PICKUP' ? canPickupAppointmentEdit.value : action === 'RECORD_PICKUP' ? canPickupConfirm.value : canEmptyReturnConfirm.value
+  const permission = action === 'SELECT_FLEET' || action === 'SEND_PICKUP_EMAIL' ? canFleetEdit.value : action === 'SCHEDULE_PICKUP' ? canPickupAppointmentEdit.value : action === 'RECORD_PICKUP' ? canPickupConfirm.value : canEmptyReturnConfirm.value
   return Boolean(isOverseas.value && permission && hasAction(row, action) && drayageFor(row.id)?.allowedActions.includes(action))
 }
 function drayageWarningText(row: ContainerBookingResource) {
@@ -545,7 +609,8 @@ async function selectRowFleet(source: object, supplierIdValue: unknown) {
   drayageSavingIds.value = [...drayageSavingIds.value, row.id]
   try {
     replaceDrayage(await selectTerminalDrayageFleet(row.id, { expectedVersion: current.version, fleetSupplierId: supplier.id, fleetSupplierName: supplier.name }))
-    ElMessage.success('码头车队已更新')
+    ElMessage.success(current.fleetSupplierId && current.fleetSupplierId !== supplier.id ? '码头车队已更新，取消及提柜邮件已加入发送队列' : '码头车队已更新')
+    await loadRows()
   } catch (error) {
     const details = getApiErrorDetails(error, '码头车队更新失败')
     if (details.code === 'A0409') {
@@ -554,7 +619,7 @@ async function selectRowFleet(source: object, supplierIdValue: unknown) {
     } else ElMessage.error(details.message)
   } finally { drayageSavingIds.value = drayageSavingIds.value.filter((id) => id !== row.id) }
 }
-function openDrayageAction(row: ContainerBookingResource, action: Exclude<TerminalDrayageAction, 'SELECT_FLEET'>) {
+function openDrayageAction(row: ContainerBookingResource, action: Exclude<TerminalDrayageAction, 'SELECT_FLEET' | 'SEND_PICKUP_EMAIL'>) {
   if (!canDrayage(row, action)) return
   drayageTarget.value = row; drayageAction.value = action; drayageActionAt.value = localDateTimeValue(); drayageReason.value = ''
   drayageActionError.value = null; drayageActionOpen.value = true
@@ -619,8 +684,9 @@ function handleMoreAction(command: string, source: object) {
   const row = source as ContainerBookingResource
   if (command === 'link') { void openLink(row); return }
   if (command === 'overview') { openDetail(row); return }
+  if (command === 'email-history') { void openEmailHistory(row); return }
   if (command === 'drayage-history') { void openDrayageHistory(row); return }
-  if (command.startsWith('drayage:')) { openDrayageAction(row, command.slice('drayage:'.length) as Exclude<TerminalDrayageAction, 'SELECT_FLEET'>); return }
+  if (command.startsWith('drayage:')) { openDrayageAction(row, command.slice('drayage:'.length) as Exclude<TerminalDrayageAction, 'SELECT_FLEET' | 'SEND_PICKUP_EMAIL'>); return }
   if (command === 'documents' && isOverseas.value && hasAction(row as ContainerWorkbenchRow, 'MANAGE_DESTINATION_DOCUMENTS')) void router.push({ name: 'overseas-container-detail', params: { containerId: row.id }, query: { action: command } })
 }
 async function openEdit(source: object) {
@@ -727,7 +793,7 @@ onMounted(async () => {
         <section v-if="!loadError" id="container-workbench-results" class="surface-panel table-panel">
           <DataTable v-model:page="page" v-model:page-size="pageSize" :data="rows" :columns="columns" :total="total" :loading="loading" stripe preference-key="container-loading-table" empty-text="暂无货柜">
             <template #toolbar-actions><el-button v-if="isDomestic && canCreate" type="primary" @click="openSimulation"><Plus :size="16" />新增模拟柜</el-button></template>
-            <template #actions="{ row }"><div class="row-actions"><el-button v-if="canView" size="small" type="primary" plain :aria-label="containerViewLabel(row as ContainerBookingResource)" @click="openDetail(row)"><Eye :size="15" />查看</el-button><template v-if="isDomestic"><el-button v-if="canEdit && hasAction(row as ContainerWorkbenchRow, 'EDIT_CONTAINER')" size="small" @click="openEdit(row)"><Pencil :size="15" />编辑</el-button><el-button v-if="row.planStatus === 'EDITING' && canSmartLoading" size="small" type="primary" @click="goContainerProcess(row)"><Sparkles :size="15" />装柜</el-button><el-button v-else-if="row.planStatus === 'LOADING' && canViewPreload" size="small" type="primary" plain @click="goContainerProcess(row)"><ListChecks :size="15" />预装清单</el-button><el-button v-else-if="row.planStatus === 'COMPLETED' && canViewLoadingList" size="small" type="primary" plain @click="goContainerProcess(row)"><ListChecks :size="15" />装柜清单</el-button></template><el-button v-if="canDrayage(row as ContainerWorkbenchRow, 'RECORD_EMPTY_RETURN')" size="small" type="primary" @click="openDrayageAction(row as ContainerBookingResource, 'RECORD_EMPTY_RETURN')">确认还柜</el-button><el-dropdown v-if="canView" trigger="click" @command="handleMoreAction($event, row)"><el-button size="small" plain aria-label="更多货柜操作" title="更多货柜操作"><MoreHorizontal :size="16" /></el-button><template #dropdown><el-dropdown-menu><el-dropdown-item command="overview"><FileText :size="15" />轨迹与日志</el-dropdown-item><template v-if="isOverseas"><el-dropdown-item command="drayage-history"><FileText :size="15" />码头拖车记录</el-dropdown-item><el-dropdown-item v-if="canDrayage(row as ContainerWorkbenchRow, 'SCHEDULE_PICKUP')" command="drayage:SCHEDULE_PICKUP">预约提柜</el-dropdown-item><el-dropdown-item v-if="canDrayage(row as ContainerWorkbenchRow, 'RECORD_PICKUP')" command="drayage:RECORD_PICKUP">确认实际提柜</el-dropdown-item><el-dropdown-item v-if="canOverseasDocumentEdit && hasAction(row as ContainerWorkbenchRow, 'MANAGE_DESTINATION_DOCUMENTS')" command="documents"><FileUp :size="15" />清关 / DO / PU</el-dropdown-item></template><el-dropdown-item v-if="isDomestic && canEdit && hasAction(row as ContainerWorkbenchRow, 'EDIT_CONTAINER') && row.sourceType === 'SIMULATION' && !row.oceanBookingId" command="link"><Link2 :size="15" />关联已放舱订舱</el-dropdown-item></el-dropdown-menu></template></el-dropdown></div></template>
+            <template #actions="{ row }"><div class="row-actions"><el-button v-if="canView" size="small" type="primary" plain :aria-label="containerViewLabel(row as ContainerBookingResource)" @click="openDetail(row)"><Eye :size="15" />查看</el-button><template v-if="isDomestic"><el-button v-if="canEdit && hasAction(row as ContainerWorkbenchRow, 'EDIT_CONTAINER')" size="small" @click="openEdit(row)"><Pencil :size="15" />编辑</el-button><el-button v-if="row.planStatus === 'EDITING' && canSmartLoading" size="small" type="primary" @click="goContainerProcess(row)"><Sparkles :size="15" />装柜</el-button><el-button v-else-if="row.planStatus === 'LOADING' && canViewPreload" size="small" type="primary" plain @click="goContainerProcess(row)"><ListChecks :size="15" />预装清单</el-button><el-button v-else-if="row.planStatus === 'COMPLETED' && canViewLoadingList" size="small" type="primary" plain @click="goContainerProcess(row)"><ListChecks :size="15" />装柜清单</el-button></template><el-button v-if="canDrayage(row as ContainerWorkbenchRow, 'RECORD_EMPTY_RETURN')" size="small" type="primary" @click="openDrayageAction(row as ContainerBookingResource, 'RECORD_EMPTY_RETURN')">确认还柜</el-button><el-button v-if="canDrayage(row as ContainerWorkbenchRow, 'SEND_PICKUP_EMAIL')" size="small" type="primary" :loading="drayageSavingIds.includes(row.id)" @click="sendPickupEmail(row as ContainerWorkbenchRow)"><Mail :size="15" />发送邮件</el-button><el-dropdown v-if="canView" trigger="click" @command="handleMoreAction($event, row)"><el-button size="small" plain aria-label="更多货柜操作" title="更多货柜操作"><MoreHorizontal :size="16" /></el-button><template #dropdown><el-dropdown-menu><el-dropdown-item command="overview"><FileText :size="15" />轨迹与日志</el-dropdown-item><template v-if="isOverseas"><el-dropdown-item command="email-history"><Mail :size="15" />邮件记录</el-dropdown-item><el-dropdown-item command="drayage-history"><FileText :size="15" />码头拖车记录</el-dropdown-item><el-dropdown-item v-if="canDrayage(row as ContainerWorkbenchRow, 'SCHEDULE_PICKUP')" command="drayage:SCHEDULE_PICKUP">预约提柜</el-dropdown-item><el-dropdown-item v-if="canDrayage(row as ContainerWorkbenchRow, 'RECORD_PICKUP')" command="drayage:RECORD_PICKUP">确认实际提柜</el-dropdown-item><el-dropdown-item v-if="canOverseasDocumentEdit && hasAction(row as ContainerWorkbenchRow, 'MANAGE_DESTINATION_DOCUMENTS')" command="documents"><FileUp :size="15" />清关 / DO / PU</el-dropdown-item></template><el-dropdown-item v-if="isDomestic && canEdit && hasAction(row as ContainerWorkbenchRow, 'EDIT_CONTAINER') && row.sourceType === 'SIMULATION' && !row.oceanBookingId" command="link"><Link2 :size="15" />关联已放舱订舱</el-dropdown-item></el-dropdown-menu></template></el-dropdown></div></template>
             <template #emptyReturnWarning="{ row }"><el-tag :type="drayageWarningType(row as ContainerBookingResource)" effect="light" :title="drayageWarningTitle(row as ContainerBookingResource)">{{ drayageWarningText(row as ContainerBookingResource) }}</el-tag></template>
             <template #cabinet="{ row }"><strong>{{ row.cabinetNo }}</strong><small>系统生成</small></template>
             <template #oceanBooking="{ row }"><span v-if="row.oceanBookingId"><strong>{{ row.billOfLadingNo || '已关联订舱' }}</strong><small>{{ row.containerNo ? `集装箱号：${row.containerNo}` : '集装箱号：待补录' }}</small></span><span v-else>未关联</span></template>
@@ -798,6 +864,16 @@ onMounted(async () => {
       <LoadErrorState v-if="drayageActionError" compact :title="`${drayageActionText(drayageAction)}失败`" :message="drayageActionError.message" :show-retry="false"><template #details><ApiErrorMeta :details="drayageActionError" /></template></LoadErrorState>
     </AppDialog>
 
+    <AppDialog v-model="emailHistoryOpen" title="车队邮件记录" width="min(1100px, calc(100vw - 28px))" :show-footer="false">
+      <p>集装箱号：{{ emailTarget?.containerNo || '—' }} · 显示最近 100 封邮件</p>
+      <el-alert v-if="!emailsLoading && !emailsError && !emailDeliveryEnabled" title="发信尚未启用，邮件保留在待发送队列中" type="warning" :closable="false" />
+      <LoadErrorState v-if="emailsError" compact title="邮件记录加载失败" :message="emailsError.message" @retry="emailTarget && openEmailHistory(emailTarget)"><template #details><ApiErrorMeta :details="emailsError" /></template></LoadErrorState>
+      <DataTable v-else :data="emails" :columns="emailColumns" :loading="emailsLoading" column-settings-mode="hide" empty-text="暂无邮件记录">
+        <template #toolbar-actions><el-button :loading="emailsLoading" @click="emailTarget && openEmailHistory(emailTarget)">刷新记录</el-button></template>
+        <template #emailActions="{ row }"><el-button v-if="canFleetEdit && row.status === 'FAILED'" size="small" :loading="retryingEmail === row.id" :disabled="Boolean(retryingEmail)" @click="retryEmail(row as TerminalDrayageEmail)">重试</el-button><span v-else>—</span></template>
+        <template #emailContent="{ row }"><details><summary>{{ row.subject }}</summary><p style="white-space: pre-wrap">{{ row.body }}</p></details></template>
+      </DataTable>
+    </AppDialog>
     <AppDialog v-model="drayageHistoryOpen" title="码头拖车记录" width="min(980px, calc(100vw - 28px))" :show-footer="false">
       <LoadErrorState v-if="drayageHistoryError" compact title="码头拖车记录加载失败" :message="drayageHistoryError.message" :loading="drayageHistoryLoading" @retry="drayageTarget && openDrayageHistory(drayageTarget)"><template #details><ApiErrorMeta :details="drayageHistoryError" /></template></LoadErrorState>
       <template v-else><el-descriptions v-if="drayageTarget && drayageFor(drayageTarget.id)" :column="4" border class="drayage-summary"><el-descriptions-item label="当前状态">{{ drayageStatusText(drayageFor(drayageTarget.id)?.status) }}</el-descriptions-item><el-descriptions-item label="码头车队">{{ drayageFor(drayageTarget.id)?.fleetSupplierName || '—' }}</el-descriptions-item><el-descriptions-item label="预计还柜">{{ formatTime(drayageFor(drayageTarget.id)?.estimatedEmptyReturnAt) }}</el-descriptions-item><el-descriptions-item label="实际还柜">{{ formatTime(drayageFor(drayageTarget.id)?.actualEmptyReturnAt) }}</el-descriptions-item></el-descriptions><DataTable :data="drayageHistory" :columns="drayageHistoryColumns" :loading="drayageHistoryLoading" stripe column-settings-mode="hide" empty-text="暂无码头拖车操作记录" /></template>
diff --git a/src/modules/container-loading/types.ts b/src/modules/container-loading/types.ts
index 9d70d356..26f09560 100644
--- a/src/modules/container-loading/types.ts
+++ b/src/modules/container-loading/types.ts
@@ -206,7 +206,7 @@ export interface ContainerQuery {
 
 export type ContainerWorkbenchKind = 'DOMESTIC' | 'OVERSEAS'
 export type ContainerWorkbenchScope = 'ACTIVE' | 'HISTORY'
-export type ContainerWorkbenchAction = 'EDIT_CONTAINER' | 'MANAGE_CUSTOMS' | 'CONFIRM_OUTBOUND' | 'MANAGE_DESTINATION_DOCUMENTS' | 'SELECT_FLEET' | 'SCHEDULE_PICKUP' | 'RECORD_PICKUP' | 'RECORD_EMPTY_RETURN'
+export type ContainerWorkbenchAction = 'EDIT_CONTAINER' | 'MANAGE_CUSTOMS' | 'CONFIRM_OUTBOUND' | 'MANAGE_DESTINATION_DOCUMENTS' | 'SELECT_FLEET' | 'SCHEDULE_PICKUP' | 'RECORD_PICKUP' | 'RECORD_EMPTY_RETURN' | 'SEND_PICKUP_EMAIL'
 
 export interface ContainerWorkbenchStatusSummary {
   loadingStatus?: string | null
@@ -242,7 +242,7 @@ export interface ContainerWorkbenchTerminalDrayage {
   actualEmptyReturnAt: string | null
   unloadingCompletedAt: string | null
   emptyReturnWarning: { status: 'NOT_APPLICABLE' | 'PENDING' | 'OVERDUE' | 'RESOLVED'; deadlineAt: string | null; overdueHours: number; overdueDays: number }
-  allowedActions: ReadonlyArray<'SELECT_FLEET' | 'SCHEDULE_PICKUP' | 'RECORD_PICKUP' | 'RECORD_EMPTY_RETURN'>
+  allowedActions: ReadonlyArray<'SELECT_FLEET' | 'SCHEDULE_PICKUP' | 'RECORD_PICKUP' | 'RECORD_EMPTY_RETURN' | 'SEND_PICKUP_EMAIL'>
   updatedAt: string | null
 }
 
diff --git a/src/modules/ocean-bookings/pages/OceanBookingDetailView.vue b/src/modules/ocean-bookings/pages/OceanBookingDetailView.vue
index a306cc1a..93f02bd3 100644
--- a/src/modules/ocean-bookings/pages/OceanBookingDetailView.vue
+++ b/src/modules/ocean-bookings/pages/OceanBookingDetailView.vue
@@ -107,7 +107,7 @@ const canSave = computed(() => editable.value && access.can(isNew.value ? 'platf
 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?.status === 'RELEASED' && access.can('platform:firstleg:ocean-booking:list'))
+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 workflowBusy = computed(() => saving.value || actionSaving.value)
@@ -385,7 +385,7 @@ onMounted(() => { void load(); void loadOptions() })
         <div class="section-title">
           <div><h2>订舱信息</h2><p v-if="detail?.status === 'DRAFT'">草稿可反复保存；放舱后资料同步至关联货柜并锁定。</p><p v-else-if="detail">已放舱资料只读。</p></div>
           <div class="actions">
-            <el-tooltip :content="canPrint ? '选择出口货物托运单或提单确认件' : detail?.status === 'DRAFT' ? '订舱放舱后方可打印' : '暂无订舱单据打印权限'" placement="top"><span><el-button v-if="detail" plain :disabled="!canPrint || workflowBusy" @click="printOpen = true"><Printer :size="16" />打印单据</el-button></span></el-tooltip>
+            <el-tooltip :content="canPrint ? '按当前已保存资料打印出口货物托运单或提单确认件' : '暂无订舱单据打印权限'" placement="top"><span><el-button v-if="detail" plain :disabled="!canPrint || workflowBusy" @click="printOpen = true"><Printer :size="16" />打印单据</el-button></span></el-tooltip>
             <el-button v-if="canDelete" type="danger" plain :loading="actionSaving" :disabled="workflowBusy" @click="removeDraft"><Trash2 :size="16" />删除草稿</el-button>
             <el-button v-if="canRelease" type="primary" plain :loading="actionSaving" :disabled="workflowBusy" @click="openReleaseDialog">放舱</el-button>
             <el-button v-if="canSave" type="primary" :loading="saving" :disabled="workflowBusy" @click="save"><Save :size="16" />保存草稿</el-button>
diff --git a/src/modules/ocean-bookings/pages/OceanBookingsView.test.ts b/src/modules/ocean-bookings/pages/OceanBookingsView.test.ts
index 345770c9..11dbdd4f 100644
--- a/src/modules/ocean-bookings/pages/OceanBookingsView.test.ts
+++ b/src/modules/ocean-bookings/pages/OceanBookingsView.test.ts
@@ -40,6 +40,21 @@ describe('OceanBookingsView', () => {
     expect(source).toContain("access.can('platform:firstleg:ocean-booking:list')")
   })
 
+  it.each(['DRAFT', 'RELEASED'] as const)('opens printing for %s with incomplete booking data', async (status) => {
+    vi.mocked(listOceanBookings).mockResolvedValueOnce({ records: [{
+      id: '183', bookingNo: 'OB-183', status, containerCount: 1,
+      billOfLadingNo: null, shipperName: null, consigneeName: null,
+    }], page: 1, size: 20, total: 1, pages: 1 } as never)
+    const wrapper = mount(OceanBookingsView, { global: { plugins: [ElementPlus], stubs: { OceanBookingPrintDialog: true } } })
+    await (wrapper.vm as unknown as { load: () => Promise<void> }).load()
+    await flushPromises()
+    const button = wrapper.findAll('button').find((item) => item.text().includes('打印单据'))!
+    expect(button.attributes('disabled')).toBeUndefined()
+    await button.trigger('click')
+    expect(wrapper.findComponent({ name: 'OceanBookingPrintDialog' }).attributes('modelvalue')).toBe('true')
+    wrapper.unmount()
+  })
+
   it('uses only the frozen DRAFT and RELEASED status options', () => {
     expect(source).toContain('options: oceanBookingStatusOptions')
     expect(source).toContain(':status="oceanBookingStatusLabel(row.status)"')
diff --git a/src/modules/ocean-bookings/pages/OceanBookingsView.vue b/src/modules/ocean-bookings/pages/OceanBookingsView.vue
index 3963a41e..0482247a 100644
--- a/src/modules/ocean-bookings/pages/OceanBookingsView.vue
+++ b/src/modules/ocean-bookings/pages/OceanBookingsView.vue
@@ -62,7 +62,7 @@ async function load() { loading.value = true; error.value = null; try { const ke
 function open(id: string) { void router.push(`/ocean-bookings/${id}`) }
 function createBooking() { void router.push('/ocean-bookings/new') }
 function openPrint(row: Record<string, unknown>) { printBooking.value = { id: String(row.id), bookingNo: typeof row.bookingNo === 'string' ? row.bookingNo : null }; printOpen.value = true }
-function printHint(row: Record<string, unknown>) { return !canPrint.value ? '暂无订舱单据打印权限' : row.status !== 'RELEASED' ? '订舱放舱后方可打印' : '选择出口货物托运单或提单确认件' }
+function printHint() { return !canPrint.value ? '暂无订舱单据打印权限' : '按当前已保存资料打印出口货物托运单或提单确认件' }
 function search() { if (page.value === 1) void load(); else page.value = 1 }
 watch([page, pageSize], () => void load()); onMounted(() => void loadCustomers())
 onActivated(() => void load())
@@ -75,7 +75,7 @@ onActivated(() => void load())
       <section v-if="!error" class="surface-panel table-panel">
       <DataTable v-model:page="page" v-model:page-size="pageSize" :data="rows" :columns="columns" :loading="loading" :total="total" stripe preference-key="ocean-bookings" aria-label="订舱列表" row-key="id" empty-text="暂无符合筛选条件的订舱">
         <template #toolbar-actions><el-button v-if="canCreate" type="primary" @click="createBooking"><Plus :size="16" />新增订舱</el-button></template>
-        <template #actions="{ row }"><div class="table-actions"><el-button size="small" type="primary" plain @click="open(row.id)"><Pencil v-if="row.status === 'DRAFT'" :size="15" /><Eye v-else :size="15" />{{ row.status === 'DRAFT' ? '编辑' : '查看' }}</el-button><el-tooltip :content="printHint(row)" placement="top"><span><el-button size="small" plain :disabled="!canPrint || row.status !== 'RELEASED'" @click="openPrint(row)"><Printer :size="15" />打印单据</el-button></span></el-tooltip></div></template>
+        <template #actions="{ row }"><div class="table-actions"><el-button size="small" type="primary" plain @click="open(row.id)"><Pencil v-if="row.status === 'DRAFT'" :size="15" /><Eye v-else :size="15" />{{ row.status === 'DRAFT' ? '编辑' : '查看' }}</el-button><el-tooltip :content="printHint()" placement="top"><span><el-button size="small" plain :disabled="!canPrint" @click="openPrint(row)"><Printer :size="15" />打印单据</el-button></span></el-tooltip></div></template>
         <template #vessel="{ row }">{{ row.vesselName || '—' }}<span v-if="row.voyageNo"> / {{ row.voyageNo }}</span></template>
         <template #etd="{ row }">{{ formatDateTime(row.etd) }}</template>
         <template #eta="{ row }">{{ formatDateTime(row.eta) }}</template>

From a869467efb8f9ba95652e70b06ef8510fc0cc8c2 Mon Sep 17 00:00:00 2001
From: ouyangxq <775153912@qq.com>
Date: Wed, 9 Sep 2026 15:26:43 +0800
Subject: [PATCH 5/7] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ContainerLastLegFeesPanel.test.ts         |  87 ++++++++++++++
 .../components/ContainerLastLegFeesPanel.vue  |  93 ++++++++++++---
 .../components/ContainerSimulationCreate.vue  | 106 ++++++++++++++++++
 src/modules/container-loading/index.ts        |   1 +
 .../pages/ContainerDetailView.test.ts         |   1 -
 .../pages/ContainersView.test.ts              |  12 +-
 .../pages/ContainersView.vue                  |  70 ++----------
 src/modules/finance/api/finance.ts            |  16 +++
 src/modules/finance/index.ts                  |   2 +
 .../FinanceCustomerStatementsView.test.ts     |  35 +++++-
 .../pages/FinanceCustomerStatementsView.vue   |   7 +-
 .../LoadingListsView.creation.test.ts         |  65 +++++++++++
 .../components/LoadingListsView.vue           |  10 ++
 13 files changed, 420 insertions(+), 85 deletions(-)
 create mode 100644 src/modules/container-loading/components/ContainerLastLegFeesPanel.test.ts
 create mode 100644 src/modules/container-loading/components/ContainerSimulationCreate.vue
 create mode 100644 src/modules/loading-lists/components/LoadingListsView.creation.test.ts

diff --git a/src/modules/container-loading/components/ContainerLastLegFeesPanel.test.ts b/src/modules/container-loading/components/ContainerLastLegFeesPanel.test.ts
new file mode 100644
index 00000000..f00836f6
--- /dev/null
+++ b/src/modules/container-loading/components/ContainerLastLegFeesPanel.test.ts
@@ -0,0 +1,87 @@
+import { mount, flushPromises } from '@vue/test-utils'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import ElementPlus from 'element-plus'
+import ContainerLastLegFeesPanel from './ContainerLastLegFeesPanel.vue'
+
+const mocks = vi.hoisted(() => ({ upload: vi.fn(), metadata: vi.fn(), download: vi.fn(), create: vi.fn(), fees: vi.fn() }))
+vi.mock('@/core/access/accessPreview', () => ({ useAccessPreviewStore: () => ({ can: () => true }) }))
+vi.mock('@/modules/finance', () => ({ getFinancePaymentVoucher: mocks.metadata, downloadFinancePaymentVoucher: mocks.download }))
+vi.mock('@/modules/loading-lists', () => ({ uploadContainerFeePaymentVoucher: mocks.upload, listContainerFeeSupplierOptions: async () => [] }))
+vi.mock('../api/overseasContainerFees', () => ({
+  listOverseasContainerFees: mocks.fees, listOverseasContainerCustomers: async () => [{ customerId: '11', customerName: '客户甲' }],
+  createOverseasContainerFee: mocks.create, adjustOverseasContainerFee: vi.fn(), reviewOverseasContainerFee: vi.fn(), submitOverseasContainerFee: vi.fn(), voidOverseasContainerFee: vi.fn(),
+}))
+
+async function setup(readonly = false) {
+  const wrapper = mount(ContainerLastLegFeesPanel, { props: { containerBookingId: '99', containerNo: 'CONT-99', readonly }, global: { plugins: [ElementPlus], stubs: {
+    AppDialog: { props: ['modelValue', 'title', 'confirmDisabled'], template: '<section v-if="modelValue"><h3>{{ title }}</h3><slot /><button :disabled="confirmDisabled" @click="$emit(\'confirm\')">保存</button></section>' },
+  } } })
+  await flushPromises()
+  return wrapper
+}
+type FormState = { form: { customerId: string; settlementMode: string }; dialogOpen: boolean }
+async function upload(wrapper: Awaited<ReturnType<typeof setup>>, name: string) {
+  const input = wrapper.get('input[type="file"]')
+  Object.defineProperty(input.element, 'files', { configurable: true, value: [new File(['image'], name, { type: 'image/png' })] })
+  await input.trigger('change')
+  await flushPromises()
+}
+describe('尾程付款凭证', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    mocks.fees.mockResolvedValue([])
+    vi.stubGlobal('ResizeObserver', class { observe() {} unobserve() {} disconnect() {} })
+    URL.createObjectURL = vi.fn(() => 'blob:voucher')
+    URL.revokeObjectURL = vi.fn()
+    mocks.metadata.mockResolvedValue({ fileId: '91', fileName: '付款.png', contentType: 'image/png' })
+    mocks.download.mockResolvedValue(new Blob(['image']))
+  })
+
+  it('显示上传文件名，允许再次上传替换和移除', async () => {
+    const wrapper = await setup()
+    await wrapper.get('button').trigger('click')
+    const state = (wrapper.vm.$ as unknown as { setupState: FormState }).setupState
+    state.form.settlementMode = 'DIRECT_PAID'
+    await flushPromises()
+    mocks.upload.mockResolvedValueOnce({ fileId: '91', fileName: '付款.png' }).mockResolvedValueOnce({ fileId: '92', fileName: '新凭证.png' })
+    await upload(wrapper, '付款.png')
+    expect(mocks.upload).toHaveBeenCalledWith('11', expect.any(File))
+    expect(wrapper.text()).toContain('付款.png')
+    await upload(wrapper, '新凭证.png')
+    expect(wrapper.text()).toContain('新凭证.png')
+    expect(wrapper.text()).not.toContain('付款.png')
+    await wrapper.findAll('button').find(b => b.text() === '移除')!.trigger('click')
+    expect(wrapper.text()).not.toContain('新凭证.png')
+    wrapper.unmount()
+  })
+
+  it('上传中禁止保存，客户切换后忽略旧客户上传结果', async () => {
+    const wrapper = await setup()
+    await wrapper.get('button').trigger('click')
+    const state = (wrapper.vm.$ as unknown as { setupState: FormState }).setupState
+    state.form.settlementMode = 'DIRECT_PAID'
+    await flushPromises()
+    let complete!: (file: { fileId: string; fileName: string }) => void
+    mocks.upload.mockReturnValue(new Promise(resolve => { complete = resolve }))
+    await upload(wrapper, '旧客户.png')
+    expect(wrapper.findAll('button').find(b => b.text() === '保存')!.attributes('disabled')).toBeDefined()
+    state.form.customerId = '12'
+    complete({ fileId: '91', fileName: '旧客户.png' })
+    await flushPromises()
+    expect(wrapper.text()).not.toContain('旧客户.png')
+    wrapper.unmount()
+  })
+
+  it('只读列表能查看已保存的待审核凭证，并在关闭时释放预览资源', async () => {
+    mocks.fees.mockResolvedValue([{ sourceFeeId: '81', customerId: '11', amount: 10, reviewStatus: 'PENDING', paymentVoucherFileIds: ['91'] }])
+    const wrapper = await setup(true)
+    await wrapper.findAll('button').find(b => b.text() === '付款凭证 1')!.trigger('click')
+    await flushPromises()
+    expect(mocks.metadata).toHaveBeenCalledWith('11', '91')
+    expect(mocks.download).toHaveBeenCalledWith('11', '91')
+    expect(wrapper.get('img').attributes('src')).toBe('blob:voucher')
+    expect(wrapper.get('a[download]').attributes('download')).toBe('付款.png')
+    wrapper.unmount()
+    expect(URL.revokeObjectURL).toHaveBeenCalledWith('blob:voucher')
+  })
+})
diff --git a/src/modules/container-loading/components/ContainerLastLegFeesPanel.vue b/src/modules/container-loading/components/ContainerLastLegFeesPanel.vue
index 2d9450c2..be5191b4 100644
--- a/src/modules/container-loading/components/ContainerLastLegFeesPanel.vue
+++ b/src/modules/container-loading/components/ContainerLastLegFeesPanel.vue
@@ -1,6 +1,7 @@
 <script setup lang="ts">
-import { computed, onMounted, reactive, ref } from 'vue'
-import { ElMessage, ElMessageBox, type UploadFile } from 'element-plus'
+import { computed, onMounted, onBeforeUnmount, reactive, ref, watch } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { getFinancePaymentVoucher, downloadFinancePaymentVoucher } from '@/modules/finance'
 import { useAccessPreviewStore } from '@/core/access/accessPreview'
 import { getApiErrorDetails, getApiErrorMessage, type ApiErrorDetails } from '@/shared/api/http'
 import ApiErrorMeta from '@/shared/components/ApiErrorMeta.vue'
@@ -17,6 +18,42 @@ const suppliers = ref<ContainerFeeSupplierOption[]>([])
 const loading = ref(false)
 const actionLoading = ref(false)
 const voucherUploading = ref(false)
+const voucherInput = ref<HTMLInputElement | null>(null)
+const voucherNames = reactive<Record<string, string>>({})
+let uploadSequence = 0
+let previewSequence = 0
+const previewOpen = ref(false)
+const previewLoading = ref(false)
+const previewError = ref<ApiErrorDetails | null>(null)
+const previewUrl = ref('')
+const previewName = ref('付款凭证')
+const previewIsImage = ref(false)
+function clearPreview() {
+  previewSequence++
+  if (previewUrl.value) URL.revokeObjectURL(previewUrl.value)
+  previewUrl.value = ''
+}
+async function previewVoucher(customerId: string, fileId: string) {
+  clearPreview()
+  const sequence = previewSequence
+  previewOpen.value = true; previewLoading.value = true; previewError.value = null
+  previewName.value = voucherNames[fileId] || '付款凭证'
+  try {
+    const metadata = await getFinancePaymentVoucher(customerId, fileId)
+    const blob = await downloadFinancePaymentVoucher(customerId, fileId)
+    if (sequence !== previewSequence) return
+    previewName.value = metadata.fileName || '付款凭证'
+    voucherNames[fileId] = previewName.value
+    previewIsImage.value = ['image/jpeg', 'image/png', 'image/gif', 'image/webp', 'image/bmp'].includes(metadata.contentType)
+    previewUrl.value = URL.createObjectURL(new Blob([blob], { type: previewIsImage.value ? metadata.contentType : 'application/octet-stream' }))
+  } catch (cause) {
+    if (sequence === previewSequence) previewError.value = getApiErrorDetails(cause, '付款凭证读取失败')
+  } finally {
+    if (sequence === previewSequence) previewLoading.value = false
+  }
+}
+watch(previewOpen, (open) => { if (!open) clearPreview() })
+onBeforeUnmount(() => { uploadSequence++; clearPreview() })
 const error = ref<ApiErrorDetails | null>(null)
 const dialogOpen = ref(false)
 const editing = ref<OverseasContainerFeeSource | null>(null)
@@ -32,6 +69,8 @@ const feeItemLabel = (value: string) => feeItems.find((item) => item.value === v
 const reviewLabels: Record<string, string> = { DRAFT: '草稿', PENDING: '待审核', APPROVED: '已审核', REJECTED: '已驳回' }
 const form = reactive<{ customerId: string; feeItemCode: OverseasContainerFeeItem; direction: OverseasContainerFeeDirection; businessDate: string; amount: number | null; supplierId: string; settlementMode: ContainerFeeSettlementMode; paidAt: string; paymentMethod: ContainerFeePaymentMethod; paymentReferenceNo: string; paymentVoucherFileIds: string[] }>({ customerId: '', feeItemCode: 'PORT_FEE', direction: 'PAYABLE', businessDate: new Date().toISOString().slice(0, 10), amount: null, supplierId: '', settlementMode: 'ON_ACCOUNT', paidAt: '', paymentMethod: 'BANK_TRANSFER', paymentReferenceNo: '', paymentVoucherFileIds: [] })
 
+watch(() => form.customerId, () => { uploadSequence++; voucherUploading.value = false; form.paymentVoucherFileIds = [] }, { flush: 'sync' })
+watch(dialogOpen, (open) => { if (!open) { uploadSequence++; voucherUploading.value = false } }, { flush: 'sync' })
 function key(scope: string) { return `${scope}-${Date.now()}-${Math.random().toString(36).slice(2, 10)}` }
 function customerName(customerId: string) { return customers.value.find((item) => item.customerId === customerId)?.customerName || null }
 function selectedSupplier() { return suppliers.value.find((item) => item.id === form.supplierId) || null }
@@ -63,7 +102,7 @@ async function load() {
 function openCreate() {
   editing.value = null; form.customerId = customers.value[0]?.customerId || ''; form.feeItemCode = 'PORT_FEE'; form.direction = 'PAYABLE'; form.businessDate = new Date().toISOString().slice(0, 10); form.amount = null; form.supplierId = ''; form.settlementMode = 'ON_ACCOUNT'; form.paidAt = ''; form.paymentMethod = 'BANK_TRANSFER'; form.paymentReferenceNo = ''; form.paymentVoucherFileIds = []; dialogOpen.value = true
 }
-function openAdjust(row: any) {
+function openAdjust(row: OverseasContainerFeeSource) {
   editing.value = row; form.customerId = row.customerId; form.feeItemCode = row.feeItemCode; form.direction = row.direction; form.businessDate = row.businessDate; form.amount = row.amount; form.supplierId = row.supplierId || ''; form.settlementMode = row.settlementMode === 'DIRECT_PAID' ? 'DIRECT_PAID' : 'ON_ACCOUNT'; form.paidAt = row.paidAt || ''; form.paymentMethod = (row.paymentMethod as ContainerFeePaymentMethod) || 'BANK_TRANSFER'; form.paymentReferenceNo = row.paymentReferenceNo || ''; form.paymentVoucherFileIds = [...row.paymentVoucherFileIds]; dialogOpen.value = true
 }
 async function mutate(task: () => Promise<unknown>, success: string) {
@@ -73,6 +112,7 @@ async function mutate(task: () => Promise<unknown>, success: string) {
   finally { actionLoading.value = false }
 }
 async function save() {
+  if (voucherUploading.value || actionLoading.value) return
   if (!form.customerId || !form.businessDate || !form.amount || form.amount <= 0) return ElMessage.warning('请完整填写客户、业务日期和大于 0 的金额')
   if (!props.containerNo) return ElMessage.warning('请先补录真实集装箱号后再维护尾程费用')
   if (form.direction === 'PAYABLE' && !selectedSupplier()) return ElMessage.warning('应付费用必须选择供应商')
@@ -81,24 +121,38 @@ async function save() {
   if (editing.value) await mutate(() => adjustOverseasContainerFee(editing.value!.sourceFeeId, editing.value!.sourceVersion, payload, key('container-fee-adjust')), '费用调整已提交审核')
   else await mutate(() => createOverseasContainerFee(payload, key('container-fee-create')), '费用草稿已创建')
 }
-async function uploadVoucher(file: UploadFile) {
-  if (!form.customerId || !file.raw) { ElMessage.warning('请先选择费用所属客户'); return }
+async function uploadVoucher(event: Event) {
+  const input = event.target as HTMLInputElement
+  const file = input.files?.[0]
+  input.value = ''
+  if (!file || voucherUploading.value) return
+  if (!form.customerId) { ElMessage.warning('请先选择费用所属客户'); return }
+  const customerId = form.customerId
+  const sequence = ++uploadSequence
   voucherUploading.value = true
-  try { const uploaded = await uploadContainerFeePaymentVoucher(form.customerId, file.raw); form.paymentVoucherFileIds = [uploaded.fileId]; ElMessage.success('付款凭证已上传') }
-  catch (cause) { ElMessage.error(getApiErrorMessage(cause, '付款凭证上传失败')) }
-  finally { voucherUploading.value = false }
+  try {
+    const uploaded = await uploadContainerFeePaymentVoucher(customerId, file)
+    if (sequence !== uploadSequence) return
+    form.paymentVoucherFileIds = [uploaded.fileId]
+    voucherNames[uploaded.fileId] = uploaded.fileName || file.name
+    ElMessage.success('付款凭证已上传')
+  } catch (cause) {
+    if (sequence === uploadSequence) ElMessage.error(getApiErrorMessage(cause, '付款凭证上传失败'))
+  } finally {
+    if (sequence === uploadSequence) voucherUploading.value = false
+  }
 }
-async function submit(row: any) {
+async function submit(row: OverseasContainerFeeSource) {
   await ElMessageBox.confirm(`确认提交“${row.feeItemName}”审核？`, '提交费用', { type: 'warning' })
   await mutate(() => submitOverseasContainerFee(row.sourceFeeId, key('container-fee-submit')), '费用已提交审核')
 }
-async function review(row: any, decision: 'APPROVE' | 'REJECT') {
+async function review(row: OverseasContainerFeeSource, decision: 'APPROVE' | 'REJECT') {
   let reason: string | null = null
   if (decision === 'REJECT') { const result = await ElMessageBox.prompt('请输入驳回原因', '驳回费用', { inputPattern: /\S+/, inputErrorMessage: '请输入驳回原因', type: 'warning' }); reason = result.value.trim() }
   else await ElMessageBox.confirm(`确认审核通过“${row.feeItemName}”？`, '审核费用', { type: 'warning' })
   await mutate(() => reviewOverseasContainerFee(row.sourceFeeId, decision, reason, key('container-fee-review')), decision === 'APPROVE' ? '费用已审核通过' : '费用已驳回')
 }
-async function voidFee(row: any) {
+async function voidFee(row: OverseasContainerFeeSource) {
   const result = await ElMessageBox.prompt('请输入作废原因', '作废费用', { inputPattern: /\S+/, inputErrorMessage: '请输入作废原因', type: 'warning' })
   await mutate(() => voidOverseasContainerFee(row.sourceFeeId, row.sourceVersion, result.value.trim(), key('container-fee-void')), '费用已作废')
 }
@@ -113,18 +167,24 @@ onMounted(load)
     <el-alert v-if="!canView" type="warning" :closable="false" title="当前账号无权查看尾程计费。" />
     <LoadErrorState v-else-if="error" title="尾程计费加载失败" :message="error.message" :loading="loading" @retry="load"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState>
     <el-table v-else v-loading="loading" :data="rows" empty-text="当前货柜暂无尾程费用">
-      <el-table-column label="操作" fixed="left" width="240"><template #default="{ row }"><div class="row-actions"><el-button v-if="canEdit && row.sourceStatus === 'ACTIVE' && ['DRAFT', 'REJECTED'].includes(row.reviewStatus)" link type="primary" @click="submit(row)">提交</el-button><el-button v-if="canReview && row.sourceStatus === 'ACTIVE' && row.reviewStatus === 'PENDING'" link type="success" @click="review(row, 'APPROVE')">通过</el-button><el-button v-if="canReview && row.sourceStatus === 'ACTIVE' && row.reviewStatus === 'PENDING'" link type="danger" @click="review(row, 'REJECT')">驳回</el-button><el-button v-if="canEdit && row.sourceStatus === 'ACTIVE' && row.reviewStatus === 'APPROVED'" link type="primary" @click="openAdjust(row)">调整</el-button><el-button v-if="canReview && row.sourceStatus === 'ACTIVE' && row.reviewStatus === 'APPROVED'" link type="danger" @click="voidFee(row)">作废</el-button><span v-if="row.sourceStatus !== 'ACTIVE' || (!canEdit && !canReview)">—</span></div></template></el-table-column>
+      <el-table-column label="操作" fixed="left" width="240"><template #default="{ row }"><div class="row-actions"><el-button v-if="canEdit && row.sourceStatus === 'ACTIVE' && ['DRAFT', 'REJECTED'].includes(row.reviewStatus)" link type="primary" @click="submit(row as OverseasContainerFeeSource)">提交</el-button><el-button v-if="canReview && row.sourceStatus === 'ACTIVE' && row.reviewStatus === 'PENDING'" link type="success" @click="review(row as OverseasContainerFeeSource, 'APPROVE')">通过</el-button><el-button v-if="canReview && row.sourceStatus === 'ACTIVE' && row.reviewStatus === 'PENDING'" link type="danger" @click="review(row as OverseasContainerFeeSource, 'REJECT')">驳回</el-button><el-button v-if="canEdit && row.sourceStatus === 'ACTIVE' && row.reviewStatus === 'APPROVED'" link type="primary" @click="openAdjust(row as OverseasContainerFeeSource)">调整</el-button><el-button v-if="canReview && row.sourceStatus === 'ACTIVE' && row.reviewStatus === 'APPROVED'" link type="danger" @click="voidFee(row as OverseasContainerFeeSource)">作废</el-button><span v-if="row.sourceStatus !== 'ACTIVE' || (!canEdit && !canReview)">—</span></div></template></el-table-column>
       <el-table-column prop="customerName" label="客户" min-width="160" show-overflow-tooltip><template #default="{ row }">{{ row.customerName || '—' }}</template></el-table-column>
       <el-table-column prop="feeItemCode" label="费用项目" min-width="140" show-overflow-tooltip><template #default="{ row }">{{ feeItemLabel(row.feeItemCode) }}</template></el-table-column>
       <el-table-column prop="direction" label="方向" width="100"><template #default="{ row }">{{ row.direction === 'RECEIVABLE' ? '应收' : '应付' }}</template></el-table-column>
       <el-table-column prop="supplierName" label="供应商" min-width="150" show-overflow-tooltip><template #default="{ row }">{{ row.supplierName || '—' }}</template></el-table-column>
       <el-table-column prop="amount" label="金额" min-width="130" align="right"><template #default="{ row }">¥{{ row.amount.toFixed(2) }}</template></el-table-column>
+      <el-table-column label="付款凭证" min-width="180"><template #default="{ row }"><div v-if="row.paymentVoucherFileIds.length" class="voucher-list"><el-button v-for="(fileId, index) in (row.paymentVoucherFileIds as string[])" :key="fileId" link type="primary" @click="previewVoucher(row.customerId, fileId)">{{ voucherNames[fileId] || `付款凭证 ${index + 1}` }}</el-button></div><span v-else>—</span></template></el-table-column>
       <el-table-column prop="businessDate" label="业务日期" width="120" />
       <el-table-column prop="reviewStatus" label="审核状态" width="110"><template #default="{ row }"><el-tag>{{ reviewLabels[row.reviewStatus] || row.reviewStatus }}</el-tag></template></el-table-column>
       <el-table-column prop="reviewReason" label="审核说明" min-width="180" show-overflow-tooltip><template #default="{ row }">{{ row.reviewReason || '—' }}</template></el-table-column>
     </el-table>
-    <AppDialog v-model="dialogOpen" :title="editing ? '调整尾程费用' : '新增尾程费用'" width="min(620px, calc(100vw - 28px))" confirm-text="保存" :confirm-loading="actionLoading" @confirm="save">
-      <el-form label-position="top"><div class="fee-form-grid"><el-form-item label="客户" required><el-select v-model="form.customerId" :disabled="Boolean(editing)" placeholder="请选择柜内客户"><el-option v-for="customer in customers" :key="customer.customerId" :label="customer.customerName || '未命名客户'" :value="customer.customerId" /></el-select></el-form-item><el-form-item 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><el-form-item label="费用方向" required><el-select v-model="form.direction"><el-option label="应收" value="RECEIVABLE" /><el-option label="应付" value="PAYABLE" /></el-select></el-form-item><el-form-item label="业务日期" required><el-date-picker v-model="form.businessDate" type="date" value-format="YYYY-MM-DD" /></el-form-item><el-form-item label="金额（CNY）" required><el-input-number v-model="form.amount" :min="0.01" :precision="2" :step="10" placeholder="请输入费用金额" /></el-form-item><template v-if="form.direction === 'PAYABLE'"><el-form-item 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><el-form-item label="结算方式" required><el-select v-model="form.settlementMode"><el-option label="账期结算" value="ON_ACCOUNT" /><el-option label="直接已付" value="DIRECT_PAID" /></el-select></el-form-item><template v-if="form.settlementMode === 'DIRECT_PAID'"><el-form-item label="付款时间" required><el-date-picker v-model="form.paidAt" type="datetime" value-format="YYYY-MM-DDTHH:mm:ss" /></el-form-item><el-form-item label="付款方式" required><el-select v-model="form.paymentMethod"><el-option label="线上支付" value="ONLINE" /><el-option label="银行转账" value="BANK_TRANSFER" /><el-option label="现金" value="CASH" /><el-option label="其他" value="OTHER" /></el-select></el-form-item><el-form-item label="付款流水号"><el-input v-model="form.paymentReferenceNo" maxlength="128" placeholder="请输入付款流水号（可选）" /></el-form-item><el-form-item label="付款凭证"><el-upload :auto-upload="false" :limit="1" :show-file-list="false" :on-change="uploadVoucher"><el-button :loading="voucherUploading">{{ form.paymentVoucherFileIds.length ? '重新上传凭证' : '上传付款凭证' }}</el-button></el-upload></el-form-item></template></template></div></el-form>
+    <AppDialog v-model="dialogOpen" :title="editing ? '调整尾程费用' : '新增尾程费用'" width="min(620px, calc(100vw - 28px))" confirm-text="保存" :confirm-loading="actionLoading" :confirm-disabled="voucherUploading" @confirm="save">
+      <el-form label-position="top"><div class="fee-form-grid"><el-form-item label="客户" required><el-select v-model="form.customerId" :disabled="Boolean(editing) || voucherUploading" placeholder="请选择柜内客户"><el-option v-for="customer in customers" :key="customer.customerId" :label="customer.customerName || '未命名客户'" :value="customer.customerId" /></el-select></el-form-item><el-form-item 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><el-form-item label="费用方向" required><el-select v-model="form.direction"><el-option label="应收" value="RECEIVABLE" /><el-option label="应付" value="PAYABLE" /></el-select></el-form-item><el-form-item label="业务日期" required><el-date-picker v-model="form.businessDate" type="date" value-format="YYYY-MM-DD" /></el-form-item><el-form-item label="金额（CNY）" required><el-input-number v-model="form.amount" :min="0.01" :precision="2" :step="10" placeholder="请输入费用金额" /></el-form-item><template v-if="form.direction === 'PAYABLE'"><el-form-item 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><el-form-item label="结算方式" required><el-select v-model="form.settlementMode"><el-option label="账期结算" value="ON_ACCOUNT" /><el-option label="直接已付" value="DIRECT_PAID" /></el-select></el-form-item><template v-if="form.settlementMode === 'DIRECT_PAID'"><el-form-item label="付款时间" required><el-date-picker v-model="form.paidAt" type="datetime" value-format="YYYY-MM-DDTHH:mm:ss" /></el-form-item><el-form-item label="付款方式" required><el-select v-model="form.paymentMethod"><el-option label="线上支付" value="ONLINE" /><el-option label="银行转账" value="BANK_TRANSFER" /><el-option label="现金" value="CASH" /><el-option label="其他" value="OTHER" /></el-select></el-form-item><el-form-item label="付款流水号"><el-input v-model="form.paymentReferenceNo" maxlength="128" placeholder="请输入付款流水号（可选）" /></el-form-item><el-form-item label="付款凭证"><div class="voucher-list"><input ref="voucherInput" type="file" accept="image/*" hidden @change="uploadVoucher" /><el-button :loading="voucherUploading" :disabled="!form.customerId || actionLoading" @click="voucherInput?.click()">{{ form.paymentVoucherFileIds.length ? '重新上传凭证' : '上传付款凭证' }}</el-button><div v-for="(fileId, index) in form.paymentVoucherFileIds" :key="fileId" class="voucher-item"><el-button link type="primary" @click="previewVoucher(form.customerId, fileId)">{{ voucherNames[fileId] || `付款凭证 ${index + 1}` }}</el-button><el-button link type="danger" :disabled="voucherUploading || actionLoading" @click="form.paymentVoucherFileIds = form.paymentVoucherFileIds.filter((id) => id !== fileId)">移除</el-button></div></div></el-form-item></template></template></div></el-form>
+    </AppDialog>
+    <AppDialog v-model="previewOpen" :title="previewName" width="min(900px, calc(100vw - 28px))" :show-confirm="false" cancel-text="关闭" append-to-body>
+      <p v-if="previewLoading">正在读取付款凭证…</p>
+      <div v-else-if="previewError"><el-alert type="error" :closable="false" :title="previewError.message" /><ApiErrorMeta :details="previewError" /></div>
+      <div v-else-if="previewUrl" class="voucher-preview"><img v-if="previewIsImage" :src="previewUrl" :alt="previewName" /><p v-else>此文件暂不支持预览，请下载后查看。</p><a :href="previewUrl" :download="previewName">下载付款凭证</a></div>
     </AppDialog>
   </div>
 </template>
@@ -134,6 +194,11 @@ onMounted(load)
 .last-leg-fees__header { display: flex; align-items: center; justify-content: space-between; gap: 20px; }
 .last-leg-fees__header h2 { margin: 0; color: #253553; font-size: 20px; }
 .last-leg-fees__header p { margin: 6px 0 0; color: #77839b; }
+.voucher-list { display: flex; flex-direction: column; align-items: flex-start; gap: 8px; min-width: 0; }
+.voucher-item { display: flex; gap: 8px; max-width: 100%; }
+.voucher-list :deep(.el-button) { white-space: normal; overflow-wrap: anywhere; margin-left: 0; }
+.voucher-preview { display: grid; gap: 16px; }
+.voucher-preview img { max-width: 100%; max-height: 65vh; object-fit: contain; margin: auto; }
 .row-actions { display: flex; align-items: center; white-space: nowrap; }
 .fee-form-grid { display: grid; grid-template-columns: repeat(2, minmax(0, 1fr)); gap: 0 16px; }
 .fee-form-grid :deep(.el-select), .fee-form-grid :deep(.el-date-editor), .fee-form-grid :deep(.el-input-number) { width: 100%; }
diff --git a/src/modules/container-loading/components/ContainerSimulationCreate.vue b/src/modules/container-loading/components/ContainerSimulationCreate.vue
new file mode 100644
index 00000000..f26c0703
--- /dev/null
+++ b/src/modules/container-loading/components/ContainerSimulationCreate.vue
@@ -0,0 +1,106 @@
+<script setup lang="ts">
+import { reactive, ref } from 'vue'
+import { Plus } from '@lucide/vue'
+import { ElMessage, type FormInstance, type FormRules } from 'element-plus'
+import { listAllPlatformWarehouses, type PlatformWarehouseSummaryResource } from '@/modules/warehouses'
+import { listWarehouseLogisticsChannels, type OceanLogisticsChannel } from '@/modules/ocean-bookings'
+import AppDialog from '@/shared/components/AppDialog.vue'
+import ApiErrorMeta from '@/shared/components/ApiErrorMeta.vue'
+import LoadErrorState from '@/shared/components/LoadErrorState.vue'
+import { getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
+import { CONTAINER_SPECIFICATIONS, applyContainerSpecification, containerSpecification } from '@/shared/domain/containerSpecifications'
+import { createContainerSimulation } from '../api/platformContainerLoading'
+import type { ContainerSimulationCreateRequest } from '../types'
+
+const props = withDefaults(defineProps<{
+  loadWarehouseOptions?: () => Promise<PlatformWarehouseSummaryResource[]>
+  successMessage?: string
+}>(), { successMessage: '模拟柜已创建，可先排货后关联真实订舱柜' })
+const emit = defineEmits<{ created: [] }>()
+const warehouses = ref<PlatformWarehouseSummaryResource[]>([])
+const warehouseLoading = ref(false)
+let warehousesLoaded = false
+let channelSequence = 0
+const simulationOpen = ref(false)
+const simulationSaving = ref(false)
+const simulationError = ref<ApiErrorDetails | null>(null)
+const simulationChannels = ref<OceanLogisticsChannel[]>([])
+const simulationChannelsLoading = ref(false)
+const simulationFormRef = ref<FormInstance>()
+const simulationForm = reactive<ContainerSimulationCreateRequest>({ channelCode: '', warehouseId: '', containerType: '40HC', capacityCbm: 76, maxWeightKg: 28000 })
+const simulationRules: FormRules<ContainerSimulationCreateRequest> = {
+  warehouseId: [{ required: true, message: '请选择装柜仓库', trigger: 'change' }],
+  channelCode: [{ required: true, message: '请选择物流渠道', trigger: 'change' }],
+  containerType: [{ required: true, message: '请选择柜型', trigger: 'change' }],
+}
+
+async function openSimulation() {
+  Object.assign(simulationForm, { channelCode: '', warehouseId: '', containerType: '40HC', capacityCbm: 76, maxWeightKg: 28000 })
+  simulationChannels.value = []
+  simulationError.value = null
+  simulationOpen.value = true
+  channelSequence++
+  simulationChannelsLoading.value = false
+  simulationFormRef.value?.clearValidate()
+  if (warehousesLoaded) return
+  warehouseLoading.value = true
+  try {
+    warehouses.value = props.loadWarehouseOptions
+      ? await props.loadWarehouseOptions()
+      : (await listAllPlatformWarehouses({ status: 'ACTIVE' })).filter((warehouse) => warehouse.warehouseType === 'DOMESTIC')
+    warehousesLoaded = true
+  } catch (error) { simulationError.value = getApiErrorDetails(error, '装柜仓库加载失败') }
+  finally { warehouseLoading.value = false }
+}
+function selectSimulationContainerType(containerType: string) {
+  applyContainerSpecification(simulationForm, containerType)
+}
+async function selectSimulationWarehouse(value: unknown) {
+  const sequence = ++channelSequence
+  simulationChannelsLoading.value = false
+  simulationForm.warehouseId = String(value || '')
+  simulationForm.channelCode = ''
+  simulationChannels.value = []
+  simulationError.value = null
+  if (!simulationForm.warehouseId) return
+  simulationChannelsLoading.value = true
+  try {
+    const channels = await listWarehouseLogisticsChannels(simulationForm.warehouseId)
+    if (sequence === channelSequence) simulationChannels.value = channels
+  }
+  catch (error) { if (sequence === channelSequence) simulationError.value = getApiErrorDetails(error, '物流渠道加载失败') }
+  finally { if (sequence === channelSequence) simulationChannelsLoading.value = false }
+}
+async function saveSimulation() {
+  if (simulationSaving.value || warehouseLoading.value || simulationChannelsLoading.value) return
+  if (!(await simulationFormRef.value?.validate().catch(() => false))) return
+  simulationSaving.value = true
+  simulationError.value = null
+  try {
+    await createContainerSimulation({ ...simulationForm })
+    simulationOpen.value = false
+    ElMessage.success(props.successMessage)
+    emit('created')
+  } catch (error) { simulationError.value = getApiErrorDetails(error, '模拟柜创建失败') }
+  finally { simulationSaving.value = false }
+}
+</script>
+
+<template>
+  <el-button type="primary" @click="openSimulation"><Plus :size="16" />新增模拟柜</el-button>
+    <AppDialog v-model="simulationOpen" title="新增模拟柜" width="min(560px, calc(100vw - 28px))" confirm-text="创建模拟柜" cancel-text="取消" :confirm-loading="simulationSaving" @confirm="saveSimulation">
+      <el-alert title="模拟柜用于先排货，服务端会生成稳定的柜次号；此处不填写集装箱号和船期。" type="info" :closable="false" />
+      <el-form ref="simulationFormRef" :model="simulationForm" :rules="simulationRules" label-position="top" class="simulation-form">
+        <el-form-item label="装柜仓库" prop="warehouseId"><el-select :model-value="simulationForm.warehouseId" filterable placeholder="请选择国内装柜仓库" :loading="warehouseLoading" @update:model-value="selectSimulationWarehouse"><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 v-model="simulationForm.channelCode" filterable :disabled="!simulationForm.warehouseId || simulationChannelsLoading" :loading="simulationChannelsLoading" :placeholder="simulationForm.warehouseId ? '请选择物流渠道' : '请先选择装柜仓库'" no-data-text="当前仓库暂无有效渠道"><el-option v-for="channel in simulationChannels" :key="channel.channelCode" :label="channel.channelName" :value="channel.channelCode" /></el-select></el-form-item>
+        <el-form-item label="柜型" prop="containerType"><el-select :model-value="simulationForm.containerType" @update:model-value="selectSimulationContainerType(String($event || ''))"><el-option v-for="item in CONTAINER_SPECIFICATIONS" :key="item.type" :label="item.type" :value="item.type" /></el-select></el-form-item>
+        <el-form-item label="固定规格"><el-input :model-value="`${containerSpecification(simulationForm.containerType)?.capacityCbm || '—'} m³ / ${containerSpecification(simulationForm.containerType)?.maxWeightKg || '—'} kg`" disabled /></el-form-item>
+      </el-form>
+      <LoadErrorState v-if="simulationError" compact title="模拟柜创建失败" :message="simulationError.message" :show-retry="false"><template #details><ApiErrorMeta :details="simulationError" /></template></LoadErrorState>
+    </AppDialog>
+
+</template>
+
+<style scoped>
+.simulation-form :deep(.el-select), .simulation-form :deep(.el-input-number) { width: 100%; }
+</style>
diff --git a/src/modules/container-loading/index.ts b/src/modules/container-loading/index.ts
index d8c0bdbe..da4036f4 100644
--- a/src/modules/container-loading/index.ts
+++ b/src/modules/container-loading/index.ts
@@ -1,3 +1,4 @@
 export * from './api/platformContainerLoading'
 export * from './types'
 export { default as SmartLoadingDialog } from './components/SmartLoadingDialog.vue'
+export { default as ContainerSimulationCreate } from './components/ContainerSimulationCreate.vue'
diff --git a/src/modules/container-loading/pages/ContainerDetailView.test.ts b/src/modules/container-loading/pages/ContainerDetailView.test.ts
index 0783ae76..846ee964 100644
--- a/src/modules/container-loading/pages/ContainerDetailView.test.ts
+++ b/src/modules/container-loading/pages/ContainerDetailView.test.ts
@@ -87,7 +87,6 @@ describe('ContainerDetailView customs integration', () => {
     expect(lastLegFeesSource).toContain("canEdit.value && access.can('platform:supplier:list') ? listContainerFeeSupplierOptions(null) : Promise.resolve([])")
     expect(lastLegFeesSource).toContain("sourceType: 'OVERSEAS_CONTAINER_FEE', businessType: 'OVERSEAS_CONTAINER'")
     expect(lastLegFeesSource).toContain("form.settlementMode === 'DIRECT_PAID'")
-    expect(lastLegFeesSource).toContain('uploadContainerFeePaymentVoucher(form.customerId, file.raw)')
     expect(lastLegFeesSource).toContain("access.can('platform:finance:fee-source:edit')")
     expect(lastLegFeesSource).toContain("access.can('platform:finance:fee-source:review')")
     expect(source).toContain("if (!overview.value?.loadingPlanId) return '当前货柜尚未关联装柜计划，暂无头程计费归属。'")
diff --git a/src/modules/container-loading/pages/ContainersView.test.ts b/src/modules/container-loading/pages/ContainersView.test.ts
index 161e5db9..2433a23c 100644
--- a/src/modules/container-loading/pages/ContainersView.test.ts
+++ b/src/modules/container-loading/pages/ContainersView.test.ts
@@ -609,13 +609,15 @@ describe('ContainersView', () => {
 
   it('creates an internal simulation without asking for real booking transport facts', () => {
     const source = readFileSync(resolve(process.cwd(), 'src/modules/container-loading/pages/ContainersView.vue'), 'utf8')
+    const simulationSource = readFileSync(resolve(process.cwd(), 'src/modules/container-loading/components/ContainerSimulationCreate.vue'), 'utf8')
+    expect(source).toContain('ContainerSimulationCreate')
     expect(source).not.toContain('新增货柜')
-    expect(source).toContain('新增模拟柜')
-    expect(source).toContain('createContainerSimulation({ ...simulationForm })')
-    expect(source).toContain("channelCode: '', warehouseId: '', containerType: '40HC', capacityCbm: 76, maxWeightKg: 28000")
+    expect(simulationSource).toContain('新增模拟柜')
+    expect(simulationSource).toContain('createContainerSimulation({ ...simulationForm })')
+    expect(simulationSource).toContain("channelCode: '', warehouseId: '', containerType: '40HC', capacityCbm: 76, maxWeightKg: 28000")
     expect(source).toContain('CONTAINER_SPECIFICATIONS')
-    expect(source).toContain('selectSimulationContainerType')
-    expect(source).toContain('服务端会生成稳定的柜次号')
+    expect(simulationSource).toContain('selectSimulationContainerType')
+    expect(simulationSource).toContain('服务端会生成稳定的柜次号')
     expect(source).toContain(':model-value="form.cabinetNo" disabled placeholder="系统生成"')
     expect(source).not.toContain('v-model="form.cabinetNo"')
     expect(source).not.toContain('cabinetNo: form.cabinetNo.trim()')
diff --git a/src/modules/container-loading/pages/ContainersView.vue b/src/modules/container-loading/pages/ContainersView.vue
index a73165f7..df69f727 100644
--- a/src/modules/container-loading/pages/ContainersView.vue
+++ b/src/modules/container-loading/pages/ContainersView.vue
@@ -1,14 +1,15 @@
 <script setup lang="ts">
+import ContainerSimulationCreate from '../components/ContainerSimulationCreate.vue'
 import { computed, onMounted, reactive, ref, watch } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
-import { Boxes, Check, Eye, FileText, FileUp, Link2, ListChecks, Mail, MoreHorizontal, Pencil, Plus, Sparkles } from '@lucide/vue'
+import { Boxes, Check, Eye, FileText, FileUp, Link2, ListChecks, Mail, MoreHorizontal, Pencil, Sparkles } from '@lucide/vue'
 import { ElMessage, ElMessageBox, type FormInstance, type FormRules } from 'element-plus'
 import { useAccessPreviewStore } from '@/core/access/accessPreview'
 import { listPlatformTenants, type PlatformTenantResource } from '@/modules/iam'
 import { listAllPlatformWarehouses, type PlatformWarehouseSummaryResource } from '@/modules/warehouses'
 import { listPlatformPartners, type PlatformPartnerResource } from '@/modules/master-data'
 import { listSuppliers, type Supplier } from '@/modules/suppliers'
-import { listOceanBookingLinkCandidates, listOceanBookings, listWarehouseLogisticsChannels, type OceanBookingResource, type OceanLogisticsChannel } from '@/modules/ocean-bookings'
+import { listOceanBookingLinkCandidates, listOceanBookings, type OceanBookingResource } from '@/modules/ocean-bookings'
 import AdminPage from '@/shared/components/AdminPage.vue'
 import ApiErrorMeta from '@/shared/components/ApiErrorMeta.vue'
 import AppDialog from '@/shared/components/AppDialog.vue'
@@ -18,7 +19,7 @@ import LoadErrorState from '@/shared/components/LoadErrorState.vue'
 import QueryToolbar, { type QueryField, type QueryModel } from '@/shared/components/QueryToolbar.vue'
 import { CONTAINER_SPECIFICATIONS, applyContainerSpecification, containerSpecification } from '@/shared/domain/containerSpecifications'
 import { getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
-import { createContainerSimulation, getContainer, linkContainerOceanBooking, listContainers, updateContainer } from '../api/platformContainerLoading'
+import { getContainer, linkContainerOceanBooking, listContainers, updateContainer } from '../api/platformContainerLoading'
 import {
   getTerminalDrayageEmails,
   sendTerminalDrayageEmail,
@@ -34,7 +35,7 @@ import {
   type TerminalDrayageHistory,
   type TerminalDrayageView,
 } from '../api/terminalDrayages'
-import type { ContainerBookingResource, ContainerDocumentStatus, ContainerPlanStatus, ContainerSaveRequest, ContainerSimulationCreateRequest, ContainerWorkbenchAction, ContainerWorkbenchRow } from '../types'
+import type { ContainerBookingResource, ContainerDocumentStatus, ContainerPlanStatus, ContainerSaveRequest, ContainerWorkbenchAction, ContainerWorkbenchRow } from '../types'
 
 type Filters = QueryModel & { customerId: string; keyword: string; containerType: string; status: ContainerPlanStatus | ''; sailingRange: string[] }
 type ContainerForm = ContainerSaveRequest & Pick<ContainerBookingResource, 'cabinetNo'> & { id: string; version: number }
@@ -69,13 +70,6 @@ const editorOpen = ref(false)
 const editorError = ref<ApiErrorDetails | null>(null)
 const saving = ref(false)
 const formRef = ref<FormInstance>()
-const simulationOpen = ref(false)
-const simulationSaving = ref(false)
-const simulationError = ref<ApiErrorDetails | null>(null)
-const simulationChannels = ref<OceanLogisticsChannel[]>([])
-const simulationChannelsLoading = ref(false)
-const simulationFormRef = ref<FormInstance>()
-const simulationForm = reactive<ContainerSimulationCreateRequest>({ channelCode: '', warehouseId: '', containerType: '40HC', capacityCbm: 76, maxWeightKg: 28000 })
 const linkOpen = ref(false)
 const linkLoading = ref(false)
 const linkSaving = ref(false)
@@ -204,12 +198,6 @@ const canViewLoadingList = computed(() => access.can('platform:firstleg:loading-
 const editorTitle = computed(() => form.id ? '编辑' : '新增')
 const shippingCompanies = computed(() => partners.value.filter((partner) => partner.status === 'ACTIVE' && partner.types.includes('CARRIER')))
 const truckingCompanies = computed(() => truckingSuppliers.value.filter((supplier) => supplier.status === 'ACTIVE' && supplier.category === 'TRUCKING'))
-const simulationRules: FormRules<ContainerSimulationCreateRequest> = {
-  warehouseId: [{ required: true, message: '请选择装柜仓库', trigger: 'change' }],
-  channelCode: [{ required: true, message: '请选择物流渠道', trigger: 'change' }],
-  containerType: [{ required: true, message: '请选择柜型', trigger: 'change' }],
-}
-
 interface PortOption { value: string; code: string | null; name: string | null }
 function portValue(code: string | null | undefined, name: string | null | undefined) { return code || name ? JSON.stringify([code || '', name || '']) : '' }
 function collectPorts(direction: 'departure' | 'destination'): PortOption[] {
@@ -502,39 +490,10 @@ async function loadAllOceanBookings() {
   const remaining = await Promise.all(Array.from({ length: firstPage.pages - 1 }, (_, index) => listOceanBookings({ page: index + 2, size: 200 })))
   return [firstPage, ...remaining].flatMap((pageResult) => pageResult.records)
 }
-async function openSimulation() {
-  Object.assign(simulationForm, { channelCode: '', warehouseId: '', containerType: '40HC', capacityCbm: 76, maxWeightKg: 28000 })
-  simulationChannels.value = []
-  simulationError.value = null
-  simulationOpen.value = true
+async function loadSimulationWarehouses() {
   await loadWarehouses()
-  if (warehouseError.value) simulationError.value = warehouseError.value
-}
-function selectSimulationContainerType(containerType: string) {
-  applyContainerSpecification(simulationForm, containerType)
-}
-async function selectSimulationWarehouse(value: unknown) {
-  simulationForm.warehouseId = String(value || '')
-  simulationForm.channelCode = ''
-  simulationChannels.value = []
-  simulationError.value = null
-  if (!simulationForm.warehouseId) return
-  simulationChannelsLoading.value = true
-  try { simulationChannels.value = await listWarehouseLogisticsChannels(simulationForm.warehouseId) }
-  catch (error) { simulationError.value = getApiErrorDetails(error, '物流渠道加载失败') }
-  finally { simulationChannelsLoading.value = false }
-}
-async function saveSimulation() {
-  if (!(await simulationFormRef.value?.validate().catch(() => false))) return
-  simulationSaving.value = true
-  simulationError.value = null
-  try {
-    await createContainerSimulation({ ...simulationForm })
-    simulationOpen.value = false
-    ElMessage.success('模拟柜已创建，可先排货后关联真实订舱柜')
-    await loadRows()
-  } catch (error) { simulationError.value = getApiErrorDetails(error, '模拟柜创建失败') }
-  finally { simulationSaving.value = false }
+  if (warehouseError.value) throw warehouseError.value
+  return warehouses.value
 }
 async function openLink(source: object) {
   if (linkLoading.value) return
@@ -792,7 +751,7 @@ onMounted(async () => {
       </template>
         <section v-if="!loadError" id="container-workbench-results" class="surface-panel table-panel">
           <DataTable v-model:page="page" v-model:page-size="pageSize" :data="rows" :columns="columns" :total="total" :loading="loading" stripe preference-key="container-loading-table" empty-text="暂无货柜">
-            <template #toolbar-actions><el-button v-if="isDomestic && canCreate" type="primary" @click="openSimulation"><Plus :size="16" />新增模拟柜</el-button></template>
+            <template #toolbar-actions><ContainerSimulationCreate v-if="isDomestic && canCreate" :load-warehouse-options="loadSimulationWarehouses" @created="loadRows" /></template>
             <template #actions="{ row }"><div class="row-actions"><el-button v-if="canView" size="small" type="primary" plain :aria-label="containerViewLabel(row as ContainerBookingResource)" @click="openDetail(row)"><Eye :size="15" />查看</el-button><template v-if="isDomestic"><el-button v-if="canEdit && hasAction(row as ContainerWorkbenchRow, 'EDIT_CONTAINER')" size="small" @click="openEdit(row)"><Pencil :size="15" />编辑</el-button><el-button v-if="row.planStatus === 'EDITING' && canSmartLoading" size="small" type="primary" @click="goContainerProcess(row)"><Sparkles :size="15" />装柜</el-button><el-button v-else-if="row.planStatus === 'LOADING' && canViewPreload" size="small" type="primary" plain @click="goContainerProcess(row)"><ListChecks :size="15" />预装清单</el-button><el-button v-else-if="row.planStatus === 'COMPLETED' && canViewLoadingList" size="small" type="primary" plain @click="goContainerProcess(row)"><ListChecks :size="15" />装柜清单</el-button></template><el-button v-if="canDrayage(row as ContainerWorkbenchRow, 'RECORD_EMPTY_RETURN')" size="small" type="primary" @click="openDrayageAction(row as ContainerBookingResource, 'RECORD_EMPTY_RETURN')">确认还柜</el-button><el-button v-if="canDrayage(row as ContainerWorkbenchRow, 'SEND_PICKUP_EMAIL')" size="small" type="primary" :loading="drayageSavingIds.includes(row.id)" @click="sendPickupEmail(row as ContainerWorkbenchRow)"><Mail :size="15" />发送邮件</el-button><el-dropdown v-if="canView" trigger="click" @command="handleMoreAction($event, row)"><el-button size="small" plain aria-label="更多货柜操作" title="更多货柜操作"><MoreHorizontal :size="16" /></el-button><template #dropdown><el-dropdown-menu><el-dropdown-item command="overview"><FileText :size="15" />轨迹与日志</el-dropdown-item><template v-if="isOverseas"><el-dropdown-item command="email-history"><Mail :size="15" />邮件记录</el-dropdown-item><el-dropdown-item command="drayage-history"><FileText :size="15" />码头拖车记录</el-dropdown-item><el-dropdown-item v-if="canDrayage(row as ContainerWorkbenchRow, 'SCHEDULE_PICKUP')" command="drayage:SCHEDULE_PICKUP">预约提柜</el-dropdown-item><el-dropdown-item v-if="canDrayage(row as ContainerWorkbenchRow, 'RECORD_PICKUP')" command="drayage:RECORD_PICKUP">确认实际提柜</el-dropdown-item><el-dropdown-item v-if="canOverseasDocumentEdit && hasAction(row as ContainerWorkbenchRow, 'MANAGE_DESTINATION_DOCUMENTS')" command="documents"><FileUp :size="15" />清关 / DO / PU</el-dropdown-item></template><el-dropdown-item v-if="isDomestic && canEdit && hasAction(row as ContainerWorkbenchRow, 'EDIT_CONTAINER') && row.sourceType === 'SIMULATION' && !row.oceanBookingId" command="link"><Link2 :size="15" />关联已放舱订舱</el-dropdown-item></el-dropdown-menu></template></el-dropdown></div></template>
             <template #emptyReturnWarning="{ row }"><el-tag :type="drayageWarningType(row as ContainerBookingResource)" effect="light" :title="drayageWarningTitle(row as ContainerBookingResource)">{{ drayageWarningText(row as ContainerBookingResource) }}</el-tag></template>
             <template #cabinet="{ row }"><strong>{{ row.cabinetNo }}</strong><small>系统生成</small></template>
@@ -816,17 +775,6 @@ onMounted(async () => {
         </section>
       </ListPageLayout>
 
-    <AppDialog v-model="simulationOpen" title="新增模拟柜" width="min(560px, calc(100vw - 28px))" confirm-text="创建模拟柜" cancel-text="取消" :confirm-loading="simulationSaving" @confirm="saveSimulation">
-      <el-alert title="模拟柜用于先排货，服务端会生成稳定的柜次号；此处不填写集装箱号和船期。" type="info" :closable="false" />
-      <el-form ref="simulationFormRef" :model="simulationForm" :rules="simulationRules" label-position="top" class="simulation-form">
-        <el-form-item label="装柜仓库" prop="warehouseId"><el-select :model-value="simulationForm.warehouseId" filterable placeholder="请选择国内装柜仓库" :loading="warehouseLoading" @update:model-value="selectSimulationWarehouse"><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 v-model="simulationForm.channelCode" filterable :disabled="!simulationForm.warehouseId || simulationChannelsLoading" :loading="simulationChannelsLoading" :placeholder="simulationForm.warehouseId ? '请选择物流渠道' : '请先选择装柜仓库'" no-data-text="当前仓库暂无有效渠道"><el-option v-for="channel in simulationChannels" :key="channel.channelCode" :label="channel.channelName" :value="channel.channelCode" /></el-select></el-form-item>
-        <el-form-item label="柜型" prop="containerType"><el-select :model-value="simulationForm.containerType" @update:model-value="selectSimulationContainerType(String($event || ''))"><el-option v-for="item in CONTAINER_SPECIFICATIONS" :key="item.type" :label="item.type" :value="item.type" /></el-select></el-form-item>
-        <el-form-item label="固定规格"><el-input :model-value="`${containerSpecification(simulationForm.containerType)?.capacityCbm || '—'} m³ / ${containerSpecification(simulationForm.containerType)?.maxWeightKg || '—'} kg`" disabled /></el-form-item>
-      </el-form>
-      <LoadErrorState v-if="simulationError" compact title="模拟柜创建失败" :message="simulationError.message" :show-retry="false"><template #details><ApiErrorMeta :details="simulationError" /></template></LoadErrorState>
-    </AppDialog>
-
     <AppDialog v-model="linkOpen" title="关联已放舱订舱" width="min(680px, calc(100vw - 28px))" confirm-text="确认关联" cancel-text="取消" :confirm-loading="linkSaving" :confirm-disabled="!linkCandidateKey" @confirm="saveLink">
       <el-alert title="关联后保留当前柜次号、装柜计划和明细，并补充订舱快照；真实集装箱号可待司机提柜时录入。" type="info" :closable="false" />
       <el-form label-position="top"><el-form-item label="柜次号"><el-input :model-value="linkTarget?.cabinetNo || ''" disabled /></el-form-item><el-form-item label="已放舱订舱及柜型需求" required><el-select v-model="linkCandidateKey" filterable :loading="linkLoading" placeholder="请选择仍有剩余数量的柜型需求" no-data-text="暂无符合当前装柜仓库、物流渠道和柜型的已放舱需求"><el-option v-for="candidate in linkCandidates" :key="candidate.key" :label="candidate.label" :value="candidate.key" :disabled="candidate.disabled" /></el-select></el-form-item><el-form-item label="真实集装箱号（可选）"><el-input v-model="linkContainerNo" maxlength="64" placeholder="如未取得可留空，后续显示待补录" @blur="linkContainerNo = normalizedContainerNo(linkContainerNo)" /></el-form-item></el-form>
diff --git a/src/modules/finance/api/finance.ts b/src/modules/finance/api/finance.ts
index 82171a66..c9aaf947 100644
--- a/src/modules/finance/api/finance.ts
+++ b/src/modules/finance/api/finance.ts
@@ -465,3 +465,19 @@ export async function createFinanceCost(payload: Record<string, unknown>, vouche
   const response = await http.post<ApiEnvelope<FinanceCostResource>, ApiEnvelope<FinanceCostResource>>(`${basePath}/cost-entries`, { ...payload, currency: 'CNY', voucherFileIds }, { headers: { 'Idempotency-Key': idempotencyKey('cost') } })
   return unwrapApiResponse(response)
 }
+
+export interface FinancePaymentVoucher {
+  fileId: string
+  fileName: string
+  contentType: string
+  sizeBytes: number
+}
+export async function getFinancePaymentVoucher(customerId: string, fileId: string): Promise<FinancePaymentVoucher> {
+  return unwrapApiResponse(await http.get<ApiEnvelope<FinancePaymentVoucher>, ApiEnvelope<FinancePaymentVoucher>>(
+    `${basePath}/vouchers/${encodeURIComponent(fileId)}`, { params: { customerId } }))
+}
+export function downloadFinancePaymentVoucher(customerId: string, fileId: string): Promise<Blob> {
+  return http.get<Blob, Blob>(`${basePath}/vouchers/${encodeURIComponent(fileId)}/content`, {
+    params: { customerId }, responseType: 'blob',
+  })
+}
diff --git a/src/modules/finance/index.ts b/src/modules/finance/index.ts
index 7c88f2d5..17bb1a6a 100644
--- a/src/modules/finance/index.ts
+++ b/src/modules/finance/index.ts
@@ -2,6 +2,8 @@ export { financeRoutes } from './routes'
 export { default as CustomerStatementsPanel } from './components/CustomerStatementsPanel.vue'
 export {
   getFinanceCustomerAccountSummary,
+  getFinancePaymentVoucher,
+  downloadFinancePaymentVoucher,
   getFinanceSettlement,
   listFinancePayableSettlements,
   listFinanceReceivableSettlements,
diff --git a/src/modules/finance/pages/FinanceCustomerStatementsView.test.ts b/src/modules/finance/pages/FinanceCustomerStatementsView.test.ts
index 0d43659f..9ef725ad 100644
--- a/src/modules/finance/pages/FinanceCustomerStatementsView.test.ts
+++ b/src/modules/finance/pages/FinanceCustomerStatementsView.test.ts
@@ -232,6 +232,37 @@ describe('FinanceCustomerStatementsView', () => {
     expect(vm.filteredRows).toHaveLength(0)
   })
 
+  it('does not issue one detail request per statement for an ordinary query', async () => {
+    vi.mocked(listFinanceStatements).mockResolvedValue(Array.from({ length: 60 }, (_, index) => ({
+      ...statement,
+      id: String(501 + index),
+      billNo: `REC-${501 + index}`,
+    })))
+    const { wrapper } = await mountPage()
+    vi.mocked(listFinanceStatements).mockClear()
+    vi.mocked(getReconciliationStatement).mockClear()
+
+    await (wrapper.vm as unknown as { load(model: Record<string, unknown>): Promise<void> }).load({ status: 'ISSUED' })
+    await flushPromises()
+
+    expect(listFinanceStatements).toHaveBeenCalledTimes(1)
+    expect(getReconciliationStatement).not.toHaveBeenCalled()
+  })
+
+  it('uses only the statement list request for an ordinary search', async () => {
+    const { wrapper } = await mountPage()
+    vi.mocked(listFinanceStatements).mockClear()
+    vi.mocked(getReconciliationStatement).mockClear()
+
+    await (wrapper.vm as unknown as { load(model: Record<string, unknown>): Promise<void> }).load({
+      status: 'ISSUED', billNo: '501', customerId: '', containerNo: '',
+      periodStartRange: [], periodEndRange: [], settled: '', lastPaymentRange: [], createdRange: [],
+    })
+
+    expect(listFinanceStatements).toHaveBeenCalledTimes(1)
+    expect(getReconciliationStatement).not.toHaveBeenCalled()
+  })
+
   it('keeps statement status filter options aligned with the list status column', async () => {
     const { wrapper } = await mountPage()
     const vm = wrapper.vm as unknown as {
@@ -355,10 +386,10 @@ describe('FinanceCustomerStatementsView', () => {
     expect(document.body.textContent).not.toContain('hash-81')
   })
 
-  it('surfaces detail hydration failures instead of silently returning an empty filtered list', async () => {
+  it('surfaces container-filter detail hydration failures instead of silently returning an empty filtered list', async () => {
     const { wrapper } = await mountPage()
     vi.mocked(getReconciliationStatement).mockRejectedValueOnce(new Error('detail unavailable'))
-    await (wrapper.vm as unknown as { load(model: Record<string, unknown>): Promise<void> }).load({ status: 'ISSUED' })
+    await (wrapper.vm as unknown as { load(model: Record<string, unknown>): Promise<void> }).load({ status: 'ISSUED', containerNo: 'CONT-31' })
     await flushPromises()
     expect(document.body.textContent).toContain('筛选字段加载失败')
   })
diff --git a/src/modules/finance/pages/FinanceCustomerStatementsView.vue b/src/modules/finance/pages/FinanceCustomerStatementsView.vue
index 7f54c724..2ef0757c 100644
--- a/src/modules/finance/pages/FinanceCustomerStatementsView.vue
+++ b/src/modules/finance/pages/FinanceCustomerStatementsView.vue
@@ -246,7 +246,10 @@ async function loadCustomers() {
 }
 
 async function load(model?: QueryModel) {
-  const hydrateDetails = model !== undefined
+  // The list response already contains every normal filter field. Only the
+  // container-number filter still depends on statement lines from the detail API.
+  // Avoid loading every statement detail for an ordinary search (N+1 requests).
+  const hydrateDetails = Boolean(String(model?.containerNo || '').trim())
   if (model) {
     filters.value = { ...model }
     appliedFilters.value = { ...model }
@@ -647,7 +650,7 @@ watch(detailRouteId, (statementId) => {
       </el-tabs>
     </DetailPageLayout>
     <ListPageLayout v-else aria-label="客户对账单">
-      <template #toolbar><QueryToolbar v-model="filters" class="surface-panel" ariaLabel="客户对账单筛选" :fields="fields" preference-key="finance-statements-query" :search-on-clear="false" @search="load" /></template>
+      <template #toolbar><QueryToolbar v-model="filters" class="surface-panel" ariaLabel="客户对账单筛选" :fields="fields" :loading="loading" preference-key="finance-statements-query" :search-on-clear="false" @search="load" /></template>
       <template v-if="customerError || error" #state><LoadErrorState title="客户对账单加载失败" :message="(customerError || error)?.message || ''" :loading="loading" @retry="customerError ? loadCustomers() : load()"><template #details><ApiErrorMeta :details="(customerError || error)!" /></template></LoadErrorState></template>
       <template v-if="!customerError && !error">
         <section class="surface-panel table-panel">
diff --git a/src/modules/loading-lists/components/LoadingListsView.creation.test.ts b/src/modules/loading-lists/components/LoadingListsView.creation.test.ts
new file mode 100644
index 00000000..29691556
--- /dev/null
+++ b/src/modules/loading-lists/components/LoadingListsView.creation.test.ts
@@ -0,0 +1,65 @@
+import ElementPlus from 'element-plus'
+import { createPinia, setActivePinia } from 'pinia'
+import { createMemoryHistory, createRouter } from 'vue-router'
+import { flushPromises, mount } from '@vue/test-utils'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import LoadingListsView from './LoadingListsView.vue'
+import { ContainerSimulationCreate } from '@/modules/container-loading'
+import { listPreloadPlans } from '../api/platformLoadingLists'
+
+const accessCan = vi.hoisted(() => vi.fn())
+vi.mock('@/core/access/accessPreview', () => ({ useAccessPreviewStore: () => ({ can: accessCan }) }))
+vi.mock('@/modules/iam', () => ({ listPlatformTenants: vi.fn().mockResolvedValue({ records: [] }) }))
+vi.mock('@/modules/container-loading', () => ({ ContainerSimulationCreate: { emits: ['created'], template: '<button @click="$emit(\'created\')">新增模拟柜</button>' } }))
+vi.mock('../api/platformLoadingLists', () => ({
+  listPreloadPlans: vi.fn().mockResolvedValue({ records: [], total: 0 }),
+  listConfirmedLoadingLists: vi.fn().mockResolvedValue({ records: [], total: 0 }),
+}))
+
+async function mountList(mode: 'preload' | 'confirmed' = 'preload') {
+  const router = createRouter({ history: createMemoryHistory(), routes: [{ path: '/', component: { template: '<div />' } }] })
+  await router.push('/')
+  await router.isReady()
+  const wrapper = mount(LoadingListsView, { props: { mode }, global: { plugins: [ElementPlus, router] } })
+  await flushPromises()
+  return wrapper
+}
+
+describe('preload simulation entry', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    setActivePinia(createPinia())
+    accessCan.mockReturnValue(true)
+  })
+
+  it('refreshes the first page without old filters after creation, staying on the list', async () => {
+    const wrapper = await mountList()
+    const state = wrapper.vm as unknown as { page: number; query: { customerId: string; keyword: string; createdRange: string[] } }
+    Object.assign(state.query, { customerId: '11', keyword: 'OLD', createdRange: ['2026-01-01', '2026-01-02'] })
+    state.page = 3
+    await flushPromises()
+    vi.mocked(listPreloadPlans).mockClear()
+    wrapper.findComponent(ContainerSimulationCreate).vm.$emit('created')
+    await flushPromises()
+    expect(listPreloadPlans).toHaveBeenCalledTimes(1)
+    expect(listPreloadPlans).toHaveBeenLastCalledWith({ page: 1, size: 20, customerId: undefined, keyword: undefined, createdFrom: undefined, createdTo: undefined })
+    expect(wrapper.vm.$route.path).toBe('/')
+    wrapper.findComponent(ContainerSimulationCreate).vm.$emit('created')
+    await flushPromises()
+    expect(listPreloadPlans).toHaveBeenCalledTimes(2)
+    wrapper.unmount()
+  })
+
+  it('hides creation without container create permission', async () => {
+    accessCan.mockImplementation((code: string) => code !== 'platform:firstleg:container:create')
+    const wrapper = await mountList()
+    expect(wrapper.findComponent(ContainerSimulationCreate).exists()).toBe(false)
+    wrapper.unmount()
+  })
+
+  it('does not add creation to confirmed loading lists', async () => {
+    const wrapper = await mountList('confirmed')
+    expect(wrapper.findComponent(ContainerSimulationCreate).exists()).toBe(false)
+    wrapper.unmount()
+  })
+})
diff --git a/src/modules/loading-lists/components/LoadingListsView.vue b/src/modules/loading-lists/components/LoadingListsView.vue
index e485adaf..f835424e 100644
--- a/src/modules/loading-lists/components/LoadingListsView.vue
+++ b/src/modules/loading-lists/components/LoadingListsView.vue
@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import { computed, onMounted, reactive, ref, watch } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
+import { ContainerSimulationCreate } from '@/modules/container-loading'
 import { Eye } from '@lucide/vue'
 import { useAccessPreviewStore } from '@/core/access/accessPreview'
 import { listPlatformTenants, type PlatformTenantResource } from '@/modules/iam'
@@ -43,6 +44,7 @@ const isPreload = computed(() => props.mode === 'preload')
 const title = computed(() => isPreload.value ? '预装清单' : '装柜清单')
 const listPermission = computed(() => isPreload.value ? 'platform:firstleg:preload:list' : 'platform:firstleg:loading-list:list')
 const canList = computed(() => access.can(listPermission.value))
+const canCreate = computed(() => isPreload.value && canList.value && access.can('platform:firstleg:container:create'))
 const canView = computed(() => canList.value)
 const fields = computed<QueryField[]>(() => [
   { key: 'customerId', type: 'select', label: '客户', placeholder: '全部客户', width: 220, options: customers.value.filter((customer) => customer.status === 'ACTIVE').map((customer) => ({ label: customer.tenantName, value: String(customer.id) })), props: { filterable: true, loading: customersLoading.value } },
@@ -138,6 +140,11 @@ async function openDeepLinkedDetail() {
   await router.replace({ name: 'loading-list-detail', params: { planId }, query: { warehouseId } })
 }
 
+function onSimulationCreated() {
+  Object.assign(query, { customerId: '', keyword: '', createdRange: [] })
+  search()
+}
+
 function search() {
   if (page.value !== 1) page.value = 1
   else void load()
@@ -207,6 +214,9 @@ onMounted(() => {
         :empty-text="`暂无符合筛选条件的${title}`"
         :aria-label="title"
       >
+        <template #toolbar-actions>
+          <ContainerSimulationCreate v-if="canCreate" success-message="模拟柜及预装清单已创建" @created="onSimulationCreated" />
+        </template>
         <template #actions="{ row }">
           <div class="row-actions">
             <el-button v-if="canView" size="small" type="primary" plain @click="openDetail(row)"><Eye :size="15" />查看</el-button>

From 8f6d4fc03eac2436c1c3d9593b35d27b5884e48e Mon Sep 17 00:00:00 2001
From: ouyangxq <775153912@qq.com>
Date: Wed, 9 Sep 2026 16:37:36 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E8=A1=A5=E9=BD=90=E8=B4=A2=E5=8A=A1?=
 =?UTF-8?q?=E8=B4=B9=E7=94=A8=E5=8E=9F=E5=B8=81=E4=B8=8E=E5=B0=BE=E7=A8=8B?=
 =?UTF-8?q?=E5=BD=95=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/finance/api/finance.ts            |  6 ++-
 .../finance/pages/FinanceCustomerArapView.vue | 12 +++---
 src/modules/finance/types.ts                  | 11 +++++-
 .../overseas-warehouse/api/dispatches.test.ts |  2 +-
 .../overseas-warehouse/api/dispatches.ts      |  6 ++-
 .../overseas-warehouse/api/lastMileOrders.ts  | 30 +++++++--------
 .../pages/DispatchesView.vue                  |  2 +-
 .../pages/LastMileOrderDetailView.vue         | 37 ++++++++++++-------
 8 files changed, 66 insertions(+), 40 deletions(-)

diff --git a/src/modules/finance/api/finance.ts b/src/modules/finance/api/finance.ts
index c9aaf947..8b5f7173 100644
--- a/src/modules/finance/api/finance.ts
+++ b/src/modules/finance/api/finance.ts
@@ -247,7 +247,11 @@ function normalizeFeeSourceSummary(item: RawResource): FinanceFeeSourceSummary {
     customerId: stringValue(item.customerId), customerName: stringValue(item.customerName), supplierId: nullableString(item.supplierId), supplierName: stringValue(item.supplierName),
     orderId: nullableString(item.orderId), inboundId: nullableString(item.inboundId), inboundCode: stringValue(item.inboundCode),
     containerId: nullableString(item.containerId), containerNo: stringValue(item.containerNo), businessDate: stringValue(item.businessDate),
-    feeItemName: stringValue(item.feeItemName), quantity: nullableNumber(item.quantity), unitPrice: nullableNumber(item.unitPrice), amount: numberValue(item.amount), currency: 'CNY',
+    feeItemName: stringValue(item.feeItemName), quantity: nullableNumber(item.quantity), quantityUnit: nullableString(item.quantityUnit),
+    unitPrice: nullableNumber(item.unitPrice), periodStart: nullableString(item.periodStart), periodEnd: nullableString(item.periodEnd),
+    amount: numberValue(item.amount), currency: 'CNY', originalCurrency: (stringValue(item.originalCurrency) || 'CNY') as 'CNY' | 'USD',
+    originalAmount: item.originalAmount == null ? numberValue(item.amount) : numberValue(item.originalAmount),
+    exchangeRate: item.exchangeRate == null ? 1 : numberValue(item.exchangeRate), exchangeRateMonth: nullableString(item.exchangeRateMonth),
     reviewStatus: stringValue(item.reviewStatus) as FinanceFeeSourceDetail['reviewStatus'],
     sourceStatus: stringValue(item.sourceStatus), status: stringValue(item.sourceStatus), statementGenerated: Boolean(item.statementGenerated),
     createdAt: stringValue(item.businessDate),
diff --git a/src/modules/finance/pages/FinanceCustomerArapView.vue b/src/modules/finance/pages/FinanceCustomerArapView.vue
index f6c10082..8dc9922b 100644
--- a/src/modules/finance/pages/FinanceCustomerArapView.vue
+++ b/src/modules/finance/pages/FinanceCustomerArapView.vue
@@ -114,7 +114,7 @@ const queryFields = computed<QueryField[]>(() => [
     options: activeCustomers.value.map((item) => ({ label: item.tenantName, value: String(item.id) })),
   },
   { key: 'direction', type: 'select', label: '收付方向', width: 140, placeholder: '请选择收付方向', options: [{ label: '应收', value: 'RECEIVABLE' }, { label: '应付', value: 'PAYABLE' }] },
-  { key: 'status', type: 'select', label: '来源状态', width: 150, placeholder: '请选择来源状态', options: [{ label: '可结算', value: 'AVAILABLE' }, { label: '已占用', value: 'LOCKED' }, { label: '已生成对账单', value: 'BILLED' }, { label: '已作废', value: 'VOIDED' }, { label: '已被调整替代', value: 'SUPERSEDED' }] },
+  { key: 'status', type: 'select', label: '来源状态', width: 150, placeholder: '请选择来源状态', options: [{ label: '可结算', value: 'AVAILABLE' }, { label: '已占用', value: 'LOCKED' }, { label: '已生成对账单', value: 'BILLED' }, { label: '资金账户已结清', value: 'SETTLED' }, { label: '已作废', value: 'VOIDED' }, { label: '已被调整替代', value: 'SUPERSEDED' }] },
   { key: 'reviewStatus', type: 'select', label: '审核状态', width: 150, placeholder: '请选择审核状态', options: financeArapStatusOptions },
   { key: 'statementGenerated', type: 'select', label: '已生成对账单', width: 160, placeholder: '请选择对账单状态', options: [{ label: '已生成', value: 'true' }, { label: '未生成', value: 'false' }] },
   { key: 'businessRange', type: 'daterange', label: '业务日期', width: 280 },
@@ -149,7 +149,9 @@ function sourceTypeDisplay(value: unknown) {
     MANUAL_COST: '人工成本', STORAGE_FEE: '仓储费用',
     OVERSEAS_INBOUND_FEE: '海外入仓费用', OVERSEAS_PROCUREMENT_FEE: '海外采购费用',
     OVERSEAS_TRUCK_FEE: '本土卡车费用', OVERSEAS_LOOSEBOARD_FEE: '本土散板费用',
-    OVERSEAS_WAREHOUSE_FEE: '海外仓服务费',
+    OVERSEAS_WAREHOUSE_FEE: '海外仓服务费', OVERSEAS_CONTAINER_FEE: '海外柜子费用',
+    OVERSEAS_ORDER_FEE: '尾程订单费用', OVERSEAS_DELIVERY_FEE: '尾程派送费用',
+    OVERSEAS_RELABEL_FEE: '换标费用',
   }
   return labels[code] || (code ? '其他费用来源' : '来源类型暂不可用')
 }
@@ -177,7 +179,7 @@ function businessReference(row: ArapRow) {
 }
 function supplierDisplay(row: ArapRow) { return row.direction === 'RECEIVABLE' ? '不适用' : row.supplierName.trim() || '供应商待补充' }
 function sourceStatusDisplay(value: unknown) {
-  const labels: Record<string, string> = { AVAILABLE: '可结算', LOCKED: '已占用', BILLED: '已生成对账单', VOIDED: '已作废', SUPERSEDED: '已被调整替代' }
+  const labels: Record<string, string> = { AVAILABLE: '可结算', LOCKED: '已占用', BILLED: '已生成对账单', SETTLED: '资金账户已结清', VOIDED: '已作废', SUPERSEDED: '已被调整替代' }
   return labels[String(value || '').toUpperCase()] || '状态待确认'
 }
 function formatDateTime(value: unknown) {
@@ -384,9 +386,9 @@ watch(() => [route.name, String(route.params.feeSourceId || '')], ([name, feeSou
       <section class="surface-panel finance-arap-detail__surface">
       <DetailPageLayout class="finance-arap-detail__layout" aria-label="费用来源详情">
         <template #header><div class="detail-heading"><el-button @click="closeDetail"><ArrowLeft :size="16" />返回客户应收应付</el-button><div class="detail-title"><h2>费用来源详情</h2><p>{{ selected?.documentNo || '费用来源' }} · {{ selected ? customerName(selected.customerId, selected.customerName) : '客户名称暂不可用' }}</p></div><div class="detail-actions"><el-button v-if="canEditSource && detail && !isUpstreamSource(detail) && ['DRAFT','REJECTED'].includes(detail.reviewStatus)" @click="openMutation(selected as unknown as Record<string, unknown>, 'EDIT')"><Pencil :size="16" />编辑</el-button><el-button v-if="canEditSource && detail && ['DRAFT','REJECTED'].includes(detail.reviewStatus)" @click="openMutation(selected as unknown as Record<string, unknown>, 'SUBMIT')"><Send :size="16" />提交审核</el-button><el-button v-if="canReviewSource && detail?.reviewStatus === 'PENDING' && selected" @click="openReview(selected as unknown as Record<string, unknown>)"><FileCheck2 :size="16" />审核</el-button></div></div></template>
-        <template v-if="detail" #summary><section class="arap-metrics" aria-label="费用来源概览"><div class="arap-metric is-amount"><span>费用金额</span><strong>{{ money(detail.amount) }}</strong><small>CNY</small></div><div class="arap-metric"><span>收付方向</span><strong>{{ financeDirectionLabel(detail.direction) }}</strong></div><div class="arap-metric"><span>来源状态</span><strong>{{ sourceStatusDisplay(detail.sourceStatus) }}</strong></div><div class="arap-metric"><span>审核状态</span><strong>{{ statusLabel(detail.reviewStatus) }}</strong></div></section></template>
+        <template v-if="detail" #summary><section class="arap-metrics" aria-label="费用来源概览"><div class="arap-metric is-amount"><span>结算金额</span><strong>{{ money(detail.amount) }}</strong><small>CNY</small></div><div class="arap-metric"><span>收付方向</span><strong>{{ financeDirectionLabel(detail.direction) }}</strong></div><div class="arap-metric"><span>来源状态</span><strong>{{ sourceStatusDisplay(detail.sourceStatus) }}</strong></div><div class="arap-metric"><span>审核状态</span><strong>{{ statusLabel(detail.reviewStatus) }}</strong></div></section></template>
         <LoadErrorState v-if="detailError" title="费用来源详情加载失败" :message="detailError.message" :loading="detailLoading" @retry="selected && loadDetail(selected)"><template #details><ApiErrorMeta :details="detailError" /></template></LoadErrorState>
-        <template v-else-if="detail"><div class="arap-detail-grid"><FormSection class="arap-information" title="单据信息" :bordered="false"><el-descriptions :column="2" class="arap-detail"><el-descriptions-item label="客户">{{ customerName(detail.customerId, detail.customerName || selected?.customerName) }}</el-descriptions-item><el-descriptions-item label="费用项目">{{ displayFeeName(detail.feeItemName) }}</el-descriptions-item><el-descriptions-item label="来源类型">{{ sourceTypeDisplay(detail.sourceType) }}</el-descriptions-item><el-descriptions-item label="关联业务">{{ detail.inboundCode || detail.containerNo || detail.sourceBusinessId || '业务关联待补充' }}</el-descriptions-item><el-descriptions-item v-if="detail.direction === 'PAYABLE'" label="供应商">{{ detail.supplierName || '供应商待补充' }}</el-descriptions-item><el-descriptions-item label="业务日期">{{ formatBusinessDate(detail.businessDate) }}</el-descriptions-item></el-descriptions></FormSection><FormSection class="arap-settlement" title="审核与结算" :bordered="false"><el-descriptions :column="1" class="arap-detail"><el-descriptions-item label="费用状态">{{ sourceStatusDisplay(detail.sourceStatus) }}</el-descriptions-item><el-descriptions-item label="已生成对账单">{{ detail.statementGenerated ? '是' : '否' }}</el-descriptions-item><el-descriptions-item label="审核原因">{{ detail.reviewReason || '未填写' }}</el-descriptions-item></el-descriptions></FormSection></div><FormSection class="operation-log" title="操作记录" :bordered="false"><el-timeline v-if="detail.operationLogs?.length"><el-timeline-item v-for="(log, index) in detail.operationLogs" :key="`${log.occurredAt}-${index}`" :timestamp="formatDateTime(log.occurredAt)">{{ financeOperationActionLabel(log.action) }} · {{ displayOperator(log.operatorName) }}<small>{{ log.remark || financeOperationResultLabel(log.result) }}</small></el-timeline-item></el-timeline><el-empty v-else description="暂无操作记录" /></FormSection></template>
+        <template v-else-if="detail"><div class="arap-detail-grid"><FormSection class="arap-information" title="单据信息" :bordered="false"><el-descriptions :column="2" class="arap-detail"><el-descriptions-item label="客户">{{ customerName(detail.customerId, detail.customerName || selected?.customerName) }}</el-descriptions-item><el-descriptions-item label="费用项目">{{ displayFeeName(detail.feeItemName) }}</el-descriptions-item><el-descriptions-item label="来源类型">{{ sourceTypeDisplay(detail.sourceType) }}</el-descriptions-item><el-descriptions-item label="关联业务">{{ detail.inboundCode || detail.containerNo || detail.sourceBusinessId || '业务关联待补充' }}</el-descriptions-item><el-descriptions-item v-if="detail.direction === 'PAYABLE'" label="供应商">{{ detail.supplierName || '供应商待补充' }}</el-descriptions-item><el-descriptions-item label="业务日期">{{ formatBusinessDate(detail.businessDate) }}</el-descriptions-item><el-descriptions-item label="原币金额">{{ detail.originalCurrency }} {{ money(detail.originalAmount) }}</el-descriptions-item><el-descriptions-item label="折算汇率">{{ detail.exchangeRate }}<template v-if="detail.exchangeRateMonth">（{{ detail.exchangeRateMonth }}）</template></el-descriptions-item><el-descriptions-item v-if="detail.quantity != null" label="计费依据">{{ detail.quantity }} {{ detail.quantityUnit || '' }}<template v-if="detail.unitPrice != null"> × {{ detail.originalCurrency }} {{ detail.unitPrice }}</template></el-descriptions-item><el-descriptions-item v-if="detail.periodStart" label="计费期间">{{ detail.periodStart }} 至 {{ detail.periodEnd }}</el-descriptions-item></el-descriptions></FormSection><FormSection class="arap-settlement" title="审核与结算" :bordered="false"><el-descriptions :column="1" class="arap-detail"><el-descriptions-item label="费用状态">{{ sourceStatusDisplay(detail.sourceStatus) }}</el-descriptions-item><el-descriptions-item label="已生成对账单">{{ detail.statementGenerated ? '是' : '否' }}</el-descriptions-item><el-descriptions-item label="审核原因">{{ detail.reviewReason || '未填写' }}</el-descriptions-item></el-descriptions></FormSection></div><FormSection class="operation-log" title="操作记录" :bordered="false"><el-timeline v-if="detail.operationLogs?.length"><el-timeline-item v-for="(log, index) in detail.operationLogs" :key="`${log.occurredAt}-${index}`" :timestamp="formatDateTime(log.occurredAt)">{{ financeOperationActionLabel(log.action) }} · {{ displayOperator(log.operatorName) }}<small>{{ log.remark || financeOperationResultLabel(log.result) }}</small></el-timeline-item></el-timeline><el-empty v-else description="暂无操作记录" /></FormSection></template>
       </DetailPageLayout>
       </section>
     </AdminPage>
diff --git a/src/modules/finance/types.ts b/src/modules/finance/types.ts
index 490f07a9..94caae36 100644
--- a/src/modules/finance/types.ts
+++ b/src/modules/finance/types.ts
@@ -74,8 +74,15 @@ export interface FinanceFeeSourceSummary extends FinanceFeePoolItem {
   inboundCode: string
   containerNo: string
   businessDate: string
-  quantity: number | null
-  unitPrice: number | null
+  quantity?: number | null
+  quantityUnit?: string | null
+  unitPrice?: number | null
+  periodStart?: string | null
+  periodEnd?: string | null
+  originalCurrency?: 'CNY' | 'USD'
+  originalAmount?: number
+  exchangeRate?: number
+  exchangeRateMonth?: string | null
   reviewStatus: FinanceReviewStatus
   sourceStatus: string
   statementGenerated: boolean
diff --git a/src/modules/overseas-warehouse/api/dispatches.test.ts b/src/modules/overseas-warehouse/api/dispatches.test.ts
index 9a326fd7..6f0d730e 100644
--- a/src/modules/overseas-warehouse/api/dispatches.test.ts
+++ b/src/modules/overseas-warehouse/api/dispatches.test.ts
@@ -81,7 +81,7 @@ describe('dispatch overseas API', () => {
 
   it('transfers to delivery only by dispatchNo without customerId', async () => {
     vi.mocked(overseasHttp.post).mockResolvedValue({ code: '200', message: 'success', data: { dispatchNo: 'PC/1', outboundNo: 'OUT-1', deliveryNo: 'DEL-1' } })
-    const payload = { idempotencyKey: 'transfer-1', plannedDeliveryAt: '2026-09-01T10:00:00', deliveryMethod: 'TRUCK_PALLET', pickupMethod: 'WAREHOUSE_PICKUP', loadingType: 'PALLET', fees: [{ feeType: 'DELIVERY_FEE', currency: 'USD', amount: 10 }] }
+    const payload = { idempotencyKey: 'transfer-1', plannedDeliveryAt: '2026-09-01T10:00:00', deliveryMethod: 'TRUCK_PALLET', pickupMethod: 'WAREHOUSE_PICKUP', loadingType: 'PALLET', fees: [{ feeType: 'DELIVERY_FEE', feeName: '派送费用', direction: 'RECEIVABLE' as const, currency: 'USD' as const, amount: 10 }] }
     await transferDispatchToDelivery('PC/1', payload)
     expect(overseasHttp.post).toHaveBeenCalledWith('/platform/v1/last-leg/dispatches/PC%2F1/transfer-delivery', payload)
   })
diff --git a/src/modules/overseas-warehouse/api/dispatches.ts b/src/modules/overseas-warehouse/api/dispatches.ts
index 9fa660bb..e027f736 100644
--- a/src/modules/overseas-warehouse/api/dispatches.ts
+++ b/src/modules/overseas-warehouse/api/dispatches.ts
@@ -214,7 +214,11 @@ export interface TransferDeliveryPayload {
   appointmentAccount?: string
   sellerName?: string
   remark?: string
-  fees: Array<{ feeType: string; currency: string; amount: number; remark?: string }>
+  fees: Array<{ feeType: string; feeName: string; direction: 'RECEIVABLE' | 'PAYABLE'; currency: 'CNY' | 'USD'; amount: number
+    supplierId?: string; supplierName?: string; supplierCategory?: string; settlementMode?: 'ON_ACCOUNT' | 'DIRECT_PAID'
+    paidAt?: string; paymentMethod?: 'ONLINE' | 'BANK_TRANSFER' | 'CASH' | 'OTHER'; paymentReferenceNo?: string
+    paymentVoucherFileIds?: string[]; chargeableQuantity?: number; quantityUnit?: string; unitPrice?: number
+    periodStart?: string; periodEnd?: string; remark?: string }>
 }
 export async function transferDispatchToDelivery(dispatchNo: string, payload: TransferDeliveryPayload) {
   const response = await overseasHttp.post<ApiEnvelope<TransferDeliveryResult>, ApiEnvelope<TransferDeliveryResult>>(
diff --git a/src/modules/overseas-warehouse/api/lastMileOrders.ts b/src/modules/overseas-warehouse/api/lastMileOrders.ts
index 601fc96b..f6f74abe 100644
--- a/src/modules/overseas-warehouse/api/lastMileOrders.ts
+++ b/src/modules/overseas-warehouse/api/lastMileOrders.ts
@@ -125,17 +125,14 @@ export interface LastMileStatusHistoryDto {
 }
 
 export interface LastMileFeeDto {
-  id: string
-  customerId: string
-  orderId: string
-  feeItem: string
-  currency: string
-  amount: number
-  status: string
-  supplierDescription?: string | null
-  createdBy: string
-  createdAt: string
-  updatedAt: string
+  id: string; sourceFeeId: string; sourceVersion: number; customerId: string; orderId?: string | null
+  feeItemCode: string; feeItemName: string; direction: 'RECEIVABLE' | 'PAYABLE'
+  currency: 'CNY'; amount: number; originalCurrency: 'CNY' | 'USD'; originalAmount: number
+  exchangeRate: number; exchangeRateMonth: string; reviewStatus: 'DRAFT' | 'PENDING' | 'APPROVED' | 'REJECTED'
+  publicationStatus: string; sourceStatus: string; supplierId?: string | null; supplierName?: string | null
+  settlementMode?: 'ON_ACCOUNT' | 'DIRECT_PAID' | null; businessDate: string
+  chargeableQuantity?: number | null; quantityUnit?: string | null; unitPrice?: number | null
+  periodStart?: string | null; periodEnd?: string | null; createdAt: string; updatedAt: string
 }
 
 export interface LastMileOperationDto {
@@ -147,11 +144,11 @@ export interface LastMileOperationDto {
 }
 
 export interface CreateLastMileFeePayload {
-  feeItem: string
-  currency: string
-  amount: number
-  status: string
-  supplierDescription?: string
+  feeItemCode: string; feeItemName: string; direction: 'RECEIVABLE' | 'PAYABLE'; currency: 'CNY' | 'USD'
+  amount: number; businessDate: string; supplierId?: string; supplierName?: string; supplierCategory?: string
+  settlementMode?: 'ON_ACCOUNT' | 'DIRECT_PAID'; paidAt?: string; paymentMethod?: 'ONLINE' | 'BANK_TRANSFER' | 'CASH' | 'OTHER'
+  paymentReferenceNo?: string; paymentVoucherFileIds?: string[]; chargeableQuantity?: number
+  quantityUnit?: string; unitPrice?: number; periodStart?: string; periodEnd?: string
 }
 
 export interface TransferDestinationPayload {
@@ -378,6 +375,7 @@ export async function downloadLastMileOrders(query: Partial<LastMileOrderQuery>)
 export async function createLastMileOrderFee(orderId: string, payload: CreateLastMileFeePayload) {
   const response = await overseasHttp.post<ApiEnvelope<LastMileFeeDto>, ApiEnvelope<LastMileFeeDto>>(
     `/platform/v1/last-leg/orders/${encodeURIComponent(orderId)}/fees`, payload,
+    { headers: { 'Idempotency-Key': `last-mile-fee-${orderId}-${Date.now()}-${Math.random().toString(36).slice(2)}` } },
   )
   return unwrapApiResponse(response)
 }
diff --git a/src/modules/overseas-warehouse/pages/DispatchesView.vue b/src/modules/overseas-warehouse/pages/DispatchesView.vue
index f13727b2..521e651e 100644
--- a/src/modules/overseas-warehouse/pages/DispatchesView.vue
+++ b/src/modules/overseas-warehouse/pages/DispatchesView.vue
@@ -201,7 +201,7 @@ async function submitTransfer() {
   if (needsLoadingFee.value && transferForm.loadingFee == null) { ElMessage.warning('当前装车类型需要填写装车费'); return }
   if (isBuyAppointment.value && (!transferForm.sellerName.trim() || transferForm.appointmentFee == null)) { ElMessage.warning('买约时请填写卖家姓名和买约费用'); return }
   const feeInputs = [['DELIVERY_FEE', transferForm.deliveryFee, '派送费用'], ['LOADING_FEE', needsLoadingFee.value ? transferForm.loadingFee : undefined, '装车费'], ['APPOINTMENT_FEE', isBuyAppointment.value ? transferForm.appointmentFee : undefined, '买约费用']] as const
-  const fees = feeInputs.filter(([, amount]) => amount != null).map(([feeType, amount, remark]) => ({ feeType, currency: 'USD', amount: Number(amount), remark }))
+  const fees = feeInputs.filter(([, amount]) => amount != null).map(([feeType, amount, feeName]) => ({ feeType, feeName, direction: 'RECEIVABLE' as const, currency: 'USD' as const, amount: Number(amount), remark: feeName }))
   transferSaving.value = true
   try { await transferDispatchToDelivery(transferRow.value.dispatchNo, { idempotencyKey: `web-transfer-${transferRow.value.dispatchNo}-${Date.now()}`, plannedDeliveryAt: transferForm.plannedDeliveryAt, deliveryMethod: transferForm.deliveryMethod, waybillNo: transferForm.waybillNo.trim() || undefined, carrierName: transferForm.carrierName.trim() || undefined, pickupMethod: transferForm.pickupMethod, loadingType: transferForm.loadingType, vehicleType: transferForm.vehicleType || undefined, vehicleSize: transferForm.vehicleSize || undefined, driverName: transferForm.driverName.trim() || undefined, driverPhone: transferForm.driverPhone.trim() || undefined, vehiclePlate: transferForm.vehiclePlate.trim() || undefined, appointmentAccount: transferForm.appointmentAccount || undefined, sellerName: isBuyAppointment.value ? transferForm.sellerName.trim() : undefined, remark: transferForm.remark.trim() || undefined, fees }); transferOpen.value = false; ElMessage.success('已生成出库单和派送单'); await load() } catch (cause) { mutationError.value = getApiErrorDetails(cause, '转派送失败，请重试') } finally { transferSaving.value = false }
 }
diff --git a/src/modules/overseas-warehouse/pages/LastMileOrderDetailView.vue b/src/modules/overseas-warehouse/pages/LastMileOrderDetailView.vue
index 4ff14c13..1aa1314c 100644
--- a/src/modules/overseas-warehouse/pages/LastMileOrderDetailView.vue
+++ b/src/modules/overseas-warehouse/pages/LastMileOrderDetailView.vue
@@ -4,6 +4,7 @@ import { Plus } from '@lucide/vue'
 import { ElMessage } from 'element-plus'
 import { useRoute, useRouter } from 'vue-router'
 import { useAccessPreviewStore } from '@/core/access/accessPreview'
+import { listSuppliers, type Supplier } from '@/modules/suppliers'
 import { getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
 import ApiErrorMeta from '@/shared/components/ApiErrorMeta.vue'
 import AppDialog from '@/shared/components/AppDialog.vue'
@@ -33,8 +34,9 @@ const loadError = ref<ApiErrorDetails | null>(null)
 const mutationError = ref<ApiErrorDetails | null>(null)
 const activeTab = ref('basic')
 const feeDialogOpen = ref(false)
-const feeForm = reactive({ item: '', currency: 'USD', amount: 0, status: 'PENDING_REVIEW', description: '' })
-const feeItemOptions = ['仓储费', '入库操作费', '出库操作费', '换标费', '托盘费', '派送费', '转仓费', '异常处理费', '其他']
+const supplierOptions = ref<Supplier[]>([])
+const feeForm = reactive({ itemCode: '', itemName: '', direction: 'RECEIVABLE' as 'RECEIVABLE' | 'PAYABLE', currency: 'USD' as 'CNY' | 'USD', amount: 0, businessDate: new Date().toISOString().slice(0, 10), supplierId: '', quantity: undefined as number | undefined, quantityUnit: '', periodStart: '', periodEnd: '' })
+const feeItemOptions = [{ code: 'STORAGE_FEE', name: '仓租' }, { code: 'INBOUND_OPERATION', name: '入库操作费' }, { code: 'OUTBOUND_OPERATION', name: '出库操作费' }, { code: 'RELABEL_FEE', name: '换标费' }, { code: 'REBOX_FEE', name: '换箱费' }, { code: 'PALLET_FEE', name: '托盘费' }, { code: 'DELIVERY_FEE', name: '派送费' }, { code: 'TRANSFER_FEE', name: '转仓费' }, { code: 'EXCEPTION_FEE', name: '异常处理费' }, { code: 'OTHER', name: '其他' }]
 
 function text(value: unknown) { return String(value ?? '').trim() || '—' }
 function yesNo(value: boolean | null | undefined) { return value == null ? '—' : value ? '是' : '否' }
@@ -93,8 +95,8 @@ const cargo = computed<CargoRow[]>(() => (detail.value?.cargo || []).map((item)
   cartons: Number(item.packageCount || 0), quantity: Number(item.productQuantity || 0), weight: Number(item.grossWeightKg || 0), volume: Number(item.volumeCbm || 0),
 })))
 const fees = computed<FeeRow[]>(() => (detail.value?.fees || []).map((item) => ({
-  id: String(item.id), item: item.feeItem, currency: item.currency, amount: `${item.currency} ${Number(item.amount).toFixed(2)}`,
-  status: feeStatusLabel(item.status), description: text(item.supplierDescription),
+  id: String(item.id), item: item.feeItemName, currency: item.originalCurrency, amount: `${item.originalCurrency} ${Number(item.originalAmount).toFixed(2)}`,
+  status: feeStatusLabel(item.reviewStatus === 'PENDING' ? 'PENDING_REVIEW' : item.reviewStatus), description: text(item.supplierName || (item.chargeableQuantity == null ? null : `${item.chargeableQuantity} ${item.quantityUnit || ''}`)),
 })))
 const logs = computed<LogRow[]>(() => {
   const statusRows = (detail.value?.statusHistory || []).map((item) => ({
@@ -134,16 +136,22 @@ async function load() {
   catch (error) { loadError.value = error instanceof Error && error.message === '当前环境未签发海外访问令牌' ? { message: error.message } : getApiErrorDetails(error, '尾程订单详情加载失败，请重试') }
   finally { loading.value = false }
 }
-function openFeeDialog() {
-  Object.assign(feeForm, { item: '', currency: 'USD', amount: 0, status: 'PENDING_REVIEW', description: '' })
+async function openFeeDialog() {
+  Object.assign(feeForm, { itemCode: '', itemName: '', direction: 'RECEIVABLE', currency: 'USD', amount: 0, businessDate: new Date().toISOString().slice(0, 10), supplierId: '', quantity: undefined, quantityUnit: '', periodStart: '', periodEnd: '' })
   mutationError.value = null; feeDialogOpen.value = true
+  if (access.can('platform:supplier:list') && supplierOptions.value.length === 0) {
+    try { supplierOptions.value = (await listSuppliers({ page: 1, size: 200, status: 'ACTIVE' })).records.filter((item) => item.status === 'ACTIVE') }
+    catch (error) { mutationError.value = getApiErrorDetails(error, '供应商列表加载失败') }
+  }
 }
 async function saveFee() {
-  if (!feeForm.item.trim() || feeForm.amount <= 0) { ElMessage.warning('请填写费用项目和大于 0 的金额'); return }
+  if (!feeForm.itemCode || !feeForm.itemName.trim() || feeForm.amount <= 0 || !feeForm.businessDate) { ElMessage.warning('请填写费用项目、业务日期和大于 0 的金额'); return }
+  const supplier = supplierOptions.value.find((item) => String(item.id) === feeForm.supplierId)
+  if (feeForm.direction === 'PAYABLE' && !supplier) { ElMessage.warning('应付费用必须选择供应商'); return }
   saving.value = true; mutationError.value = null
   try {
-    await createLastMileOrderFee(orderId.value, { feeItem: feeForm.item.trim(), currency: feeForm.currency, amount: feeForm.amount, status: feeForm.status, supplierDescription: feeForm.description.trim() || undefined })
-    feeDialogOpen.value = false; ElMessage.success('费用已新增'); await load(); activeTab.value = 'fees'
+    await createLastMileOrderFee(orderId.value, { feeItemCode: feeForm.itemCode, feeItemName: feeForm.itemName.trim(), direction: feeForm.direction, currency: feeForm.currency, amount: feeForm.amount, businessDate: feeForm.businessDate, supplierId: supplier ? String(supplier.id) : undefined, supplierName: supplier?.name, supplierCategory: supplier?.category, settlementMode: supplier ? 'ON_ACCOUNT' : undefined, chargeableQuantity: feeForm.quantity, quantityUnit: feeForm.quantity == null ? undefined : feeForm.quantityUnit.trim(), unitPrice: feeForm.quantity ? feeForm.amount / feeForm.quantity : undefined, periodStart: feeForm.periodStart || undefined, periodEnd: feeForm.periodEnd || undefined })
+    feeDialogOpen.value = false; ElMessage.success('费用已提交财务审核'); await load(); activeTab.value = 'fees'
   } catch (error) { mutationError.value = getApiErrorDetails(error, '费用新增失败，请重试') }
   finally { saving.value = false }
 }
@@ -175,11 +183,14 @@ onMounted(load)
     </section>
     <AppDialog v-model="feeDialogOpen" title="新增费用" width="min(720px, calc(100vw - 28px))" confirm-text="保存费用" :confirm-loading="saving" @confirm="saveFee">
       <el-form class="fee-form" label-position="top"><div class="fee-form-grid">
-        <el-form-item label="费用项目" required><el-select v-model="feeForm.item" filterable allow-create clearable default-first-option placeholder="选择或输入费用项目"><el-option v-for="item in feeItemOptions" :key="item" :label="item" :value="item" /></el-select></el-form-item>
-        <el-form-item label="供应商/说明"><el-input v-model="feeForm.description" maxlength="500" placeholder="请输入供应商或费用说明" /></el-form-item>
-        <el-form-item label="币种" required><el-select v-model="feeForm.currency" placeholder="请选择币种"><el-option v-for="currency in ['USD', 'CNY', 'EUR', 'GBP', 'CAD', 'MXN']" :key="currency" :label="currency" :value="currency" /></el-select></el-form-item>
+        <el-form-item label="费用项目" required><el-select v-model="feeForm.itemCode" filterable placeholder="请选择费用项目" @change="feeForm.itemName = feeItemOptions.find(item => item.code === feeForm.itemCode)?.name || ''"><el-option v-for="item in feeItemOptions" :key="item.code" :label="item.name" :value="item.code" /></el-select></el-form-item>
+        <el-form-item label="收付方向" required><el-select v-model="feeForm.direction"><el-option label="应收客户" value="RECEIVABLE" /><el-option label="应付供应商" value="PAYABLE" /></el-select></el-form-item>
+        <el-form-item v-if="feeForm.direction === 'PAYABLE'" label="供应商" required><el-select v-model="feeForm.supplierId" filterable placeholder="请选择供应商"><el-option v-for="item in supplierOptions" :key="String(item.id)" :label="item.name" :value="String(item.id)" /></el-select></el-form-item>
+        <el-form-item label="业务日期" required><el-date-picker v-model="feeForm.businessDate" type="date" value-format="YYYY-MM-DD" /></el-form-item>
+        <el-form-item label="币种" required><el-select v-model="feeForm.currency" placeholder="请选择币种"><el-option label="USD" value="USD" /><el-option label="CNY" value="CNY" /></el-select></el-form-item>
         <el-form-item label="金额" required><el-input-number v-model="feeForm.amount" :min="0" :precision="2" :step="10" controls-position="right" placeholder="请输入费用金额" /></el-form-item>
-        <el-form-item class="fee-form-full" label="状态" required><el-select v-model="feeForm.status" placeholder="请选择费用状态"><el-option label="待审核" value="PENDING_REVIEW" /><el-option label="审核通过" value="APPROVED" /><el-option label="已驳回" value="REJECTED" /></el-select></el-form-item>
+        <el-form-item label="计费数量"><el-input-number v-model="feeForm.quantity" :min="0.0001" :precision="4" controls-position="right" /></el-form-item><el-form-item label="计费单位"><el-input v-model="feeForm.quantityUnit" :disabled="feeForm.quantity == null" placeholder="如 箱、托、天、m³" /></el-form-item>
+        <el-form-item label="计费开始日期"><el-date-picker v-model="feeForm.periodStart" type="date" value-format="YYYY-MM-DD" placeholder="仓租等周期费用填写" /></el-form-item><el-form-item label="计费结束日期"><el-date-picker v-model="feeForm.periodEnd" type="date" value-format="YYYY-MM-DD" placeholder="仓租等周期费用填写" /></el-form-item>
       </div></el-form>
     </AppDialog>
   </OverseasDetailShell>

From f58c433fa4e74ac225eb5129a250a521d2ac48b0 Mon Sep 17 00:00:00 2001
From: ouyangxq <775153912@qq.com>
Date: Wed, 9 Sep 2026 17:17:05 +0800
Subject: [PATCH 7/7] fix: complete container and overseas fee contracts

---
 .../pages/ContainersView.test.ts              | 20 +++++++++++++++++++
 .../pages/ContainersView.vue                  |  2 +-
 .../pages/LastMileOrderDetailView.vue         |  4 ++--
 .../pages/OutboundsView.test.ts               |  6 +++---
 .../pages/prototypeContract.test.ts           |  5 ++++-
 5 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/src/modules/container-loading/pages/ContainersView.test.ts b/src/modules/container-loading/pages/ContainersView.test.ts
index 380f18de..2982e732 100644
--- a/src/modules/container-loading/pages/ContainersView.test.ts
+++ b/src/modules/container-loading/pages/ContainersView.test.ts
@@ -699,6 +699,26 @@ describe('ContainersView', () => {
     wrapper.unmount()
   })
 
+  it.each([undefined, null, '', '客户一'])('renders optional booking customer %s without leaking a missing value', async (customerName) => {
+    vi.mocked(listOceanBookingLinkCandidates).mockResolvedValueOnce({ records: [{
+      oceanBookingId: '315', bookingNo: 'OB-OPTIONAL-CUSTOMER', requirementId: '45315',
+      containerType: '40HC', remainingQuantity: 1, customerName, warehouseName: '义乌仓', channelName: 'EXX海卡',
+    }], page: 1, size: 200, total: 1, pages: 1 } as never)
+    const router = createTestRouter()
+    await router.push('/'); await router.isReady()
+    const wrapper = mount(ContainersView, { attachTo: document.body, global: { plugins: [ElementPlus, router] } })
+    await flushPromises()
+    await wrapper.find('button[aria-label="更多货柜操作"]').trigger('click')
+    await flushPromises()
+    Array.from(document.body.querySelectorAll<HTMLElement>('.el-dropdown-menu__item'))
+      .filter((item) => item.textContent?.includes('关联已放舱订舱')).at(-1)!.click()
+    await flushPromises()
+    const label = `OB-OPTIONAL-CUSTOMER · 40HC × 1 · ${customerName || '未关联客户'} · 义乌仓 · EXX海卡`
+    expect(document.body.textContent).toContain(label)
+    expect((wrapper.vm as unknown as { linkCandidates: Array<{ label: string }> }).linkCandidates[0]?.label).toBe(label)
+    wrapper.unmount()
+  })
+
   it('keeps a three-field match selectable when only capacity snapshots differ and blocks duplicate waves', async () => {
     let resolveCandidates!: (value: Awaited<ReturnType<typeof listOceanBookingLinkCandidates>>) => void
     vi.mocked(listContainers).mockResolvedValue({ records: [{
diff --git a/src/modules/container-loading/pages/ContainersView.vue b/src/modules/container-loading/pages/ContainersView.vue
index 14cf01a1..642b8a90 100644
--- a/src/modules/container-loading/pages/ContainersView.vue
+++ b/src/modules/container-loading/pages/ContainersView.vue
@@ -526,7 +526,7 @@ async function openLink(source: object) {
       oceanBookingId: candidate.oceanBookingId,
       requirementId: candidate.requirementId,
       disabled: false,
-      label: `${candidate.bookingNo} · ${candidate.containerType} × ${candidate.remainingQuantity} · ${candidate.customerName} · ${candidate.warehouseName} · ${candidate.channelName}`,
+      label: `${candidate.bookingNo} · ${candidate.containerType} × ${candidate.remainingQuantity} · ${candidate.customerName || '未关联客户'} · ${candidate.warehouseName} · ${candidate.channelName}`,
     }))
   } catch (error) {
     if (sequence === linkSequence) linkError.value = getApiErrorDetails(error, '已放舱订舱候选加载失败')
diff --git a/src/modules/overseas-warehouse/pages/LastMileOrderDetailView.vue b/src/modules/overseas-warehouse/pages/LastMileOrderDetailView.vue
index 1aa1314c..6886a3a6 100644
--- a/src/modules/overseas-warehouse/pages/LastMileOrderDetailView.vue
+++ b/src/modules/overseas-warehouse/pages/LastMileOrderDetailView.vue
@@ -183,13 +183,13 @@ onMounted(load)
     </section>
     <AppDialog v-model="feeDialogOpen" title="新增费用" width="min(720px, calc(100vw - 28px))" confirm-text="保存费用" :confirm-loading="saving" @confirm="saveFee">
       <el-form class="fee-form" label-position="top"><div class="fee-form-grid">
-        <el-form-item label="费用项目" required><el-select v-model="feeForm.itemCode" filterable placeholder="请选择费用项目" @change="feeForm.itemName = feeItemOptions.find(item => item.code === feeForm.itemCode)?.name || ''"><el-option v-for="item in feeItemOptions" :key="item.code" :label="item.name" :value="item.code" /></el-select></el-form-item>
+         <el-form-item label="费用项目" required><el-select v-model="feeForm.itemCode" filterable allow-create clearable default-first-option placeholder="请选择或输入费用项目" @change="feeForm.itemName = feeItemOptions.find(item => item.code === feeForm.itemCode)?.name || String(feeForm.itemCode).trim()"><el-option v-for="item in feeItemOptions" :key="item.code" :label="item.name" :value="item.code" /></el-select></el-form-item>
         <el-form-item label="收付方向" required><el-select v-model="feeForm.direction"><el-option label="应收客户" value="RECEIVABLE" /><el-option label="应付供应商" value="PAYABLE" /></el-select></el-form-item>
         <el-form-item v-if="feeForm.direction === 'PAYABLE'" label="供应商" required><el-select v-model="feeForm.supplierId" filterable placeholder="请选择供应商"><el-option v-for="item in supplierOptions" :key="String(item.id)" :label="item.name" :value="String(item.id)" /></el-select></el-form-item>
         <el-form-item label="业务日期" required><el-date-picker v-model="feeForm.businessDate" type="date" value-format="YYYY-MM-DD" /></el-form-item>
         <el-form-item label="币种" required><el-select v-model="feeForm.currency" placeholder="请选择币种"><el-option label="USD" value="USD" /><el-option label="CNY" value="CNY" /></el-select></el-form-item>
         <el-form-item label="金额" required><el-input-number v-model="feeForm.amount" :min="0" :precision="2" :step="10" controls-position="right" placeholder="请输入费用金额" /></el-form-item>
-        <el-form-item label="计费数量"><el-input-number v-model="feeForm.quantity" :min="0.0001" :precision="4" controls-position="right" /></el-form-item><el-form-item label="计费单位"><el-input v-model="feeForm.quantityUnit" :disabled="feeForm.quantity == null" placeholder="如 箱、托、天、m³" /></el-form-item>
+         <el-form-item label="计费数量"><el-input-number v-model="feeForm.quantity" :min="0.0001" :precision="4" controls-position="right" placeholder="请输入计费数量" /></el-form-item><el-form-item label="计费单位"><el-input v-model="feeForm.quantityUnit" :disabled="feeForm.quantity == null" placeholder="如 箱、托、天、m³" /></el-form-item>
         <el-form-item label="计费开始日期"><el-date-picker v-model="feeForm.periodStart" type="date" value-format="YYYY-MM-DD" placeholder="仓租等周期费用填写" /></el-form-item><el-form-item label="计费结束日期"><el-date-picker v-model="feeForm.periodEnd" type="date" value-format="YYYY-MM-DD" placeholder="仓租等周期费用填写" /></el-form-item>
       </div></el-form>
     </AppDialog>
diff --git a/src/modules/overseas-warehouse/pages/OutboundsView.test.ts b/src/modules/overseas-warehouse/pages/OutboundsView.test.ts
index 426df26b..d293f0f7 100644
--- a/src/modules/overseas-warehouse/pages/OutboundsView.test.ts
+++ b/src/modules/overseas-warehouse/pages/OutboundsView.test.ts
@@ -29,17 +29,17 @@ describe('OutboundsView permissions and navigation', () => {
     const wrapper = mount(OutboundsView, { global: { plugins: [ElementPlus] } })
     await flushPromises()
     expect(wrapper.text()).toContain('详情')
-    expect(wrapper.text()).not.toContain('一件代发出库')
+    expect(wrapper.text()).not.toContain('新建出库单')
     expect(wrapper.text()).not.toContain('取消')
     expect(OutboundsView.__file).toContain('OutboundsView.vue')
     wrapper.unmount()
   })
 
-  it('shows one-click creation and cancellation only with their exact permissions', async () => {
+  it('shows outbound creation and cancellation only with their exact permissions', async () => {
     canPermission.mockImplementation((code: string) => ['platform:overseas-warehouse:outbound:create', 'platform:overseas-warehouse:outbound:cancel'].includes(code))
     const wrapper = mount(OutboundsView, { global: { plugins: [ElementPlus] } })
     await flushPromises()
-    expect(wrapper.text()).toContain('一件代发出库')
+    expect(wrapper.text()).toContain('新建出库单')
     expect(wrapper.text()).toContain('取消')
     wrapper.unmount()
   })
diff --git a/src/modules/overseas-warehouse/pages/prototypeContract.test.ts b/src/modules/overseas-warehouse/pages/prototypeContract.test.ts
index 918fac90..d3b1a48e 100644
--- a/src/modules/overseas-warehouse/pages/prototypeContract.test.ts
+++ b/src/modules/overseas-warehouse/pages/prototypeContract.test.ts
@@ -84,9 +84,12 @@ describe('overseas warehouse first-batch prototype contract', () => {
       const value = source(fileName)
       expect(value).toContain('<OverseasReadOnlyDetail')
       expect(value).toContain('@back="back"')
-      expect(value).not.toContain('AppDialog')
       expect(value).not.toContain('AppDrawer')
+      if (fileName !== 'RelabelOrderDetailView.vue') expect(value).not.toContain('AppDialog')
     }
+    const relabel = source('RelabelOrderDetailView.vue')
+    expect(relabel).toContain('<AppDialog v-if="previewUrl"')
+    expect(relabel).toContain('<iframe :src="previewUrl"')
   })
 
   it('keeps second-batch forms non-submitting until overseas write contracts exist', () => {