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] =?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>