fix(admin): integrate workbench contracts and dropship review states

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

@@ -0,0 +1,25 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { overseasHttp } from '@/shared/api/overseasHttp'
+import { adjustOverseasContainerFee, createOverseasContainerFee, listOverseasContainerCustomers, listOverseasContainerFees, reviewOverseasContainerFee, submitOverseasContainerFee, voidOverseasContainerFee, type OverseasContainerFeeSaveRequest } from './overseasContainerFees'
+
+const raw = { id: 91, sourceFeeId: 81, sourceVersion: 2, customerId: 11, customerName: '客户A', sourceType: 'OVERSEAS_CONTAINER_FEE', businessType: 'OVERSEAS_CONTAINER', businessId: 99, businessNo: 'CONT-99', containerBookingId: 99, containerNo: 'CONT-99', feeItemCode: 'PORT_FEE', feeItemName: '港口费', direction: 'PAYABLE', amount: 300, currency: 'CNY', reviewStatus: 'DRAFT', sourceStatus: 'ACTIVE', businessDate: '2026-09-08' }
+const fee: OverseasContainerFeeSaveRequest = { customerId: '11', customerName: '客户A', sourceType: 'OVERSEAS_CONTAINER_FEE', businessType: 'OVERSEAS_CONTAINER', businessId: '99', businessNo: 'CONT-99', orderId: null, inboundId: null, inboundCode: null, containerId: null, containerBookingId: '99', containerNo: 'CONT-99', warehouseId: null, feeItemCode: 'PORT_FEE', feeItemName: '港口费', direction: 'PAYABLE', supplierId: '71', supplierName: '港口服务商', supplierCategory: 'TRUCKING', settlementMode: 'ON_ACCOUNT', paidAt: null, paymentMethod: null, paymentReferenceNo: null, paymentVoucherFileIds: null, businessDate: '2026-09-08', currency: 'CNY', amount: 300 }
+describe('overseas container fees API', () => {
+  beforeEach(() => vi.restoreAllMocks())
+  it('loads all fees and customers with two container aggregate requests', async () => {
+    const get = vi.spyOn(overseasHttp, 'get').mockResolvedValueOnce({ code: '200', data: [raw] }).mockResolvedValueOnce({ code: '200', data: [{ customerId: 11, customerName: '客户A' }] })
+    await expect(listOverseasContainerFees('99')).resolves.toMatchObject([{ sourceFeeId: '81', containerBookingId: '99', feeItemCode: 'PORT_FEE' }])
+    await expect(listOverseasContainerCustomers('99')).resolves.toEqual([{ customerId: '11', customerName: '客户A' }])
+    expect(get).toHaveBeenNthCalledWith(1, '/platform/v1/last-leg/finance-fee-sources', { params: { containerBookingId: '99', businessType: 'OVERSEAS_CONTAINER' } })
+    expect(get).toHaveBeenNthCalledWith(2, '/platform/v1/last-leg/finance-fee-sources/container-customers', { params: { containerBookingId: '99' } })
+  })
+  it('uses the exact create and lifecycle action contracts', async () => {
+    const post = vi.spyOn(overseasHttp, 'post').mockResolvedValue({ code: '200', data: raw })
+    await createOverseasContainerFee(fee, 'create-1'); await submitOverseasContainerFee('81', 'submit-1'); await reviewOverseasContainerFee('81', 'APPROVE', null, 'review-1'); await adjustOverseasContainerFee('81', 2, fee, 'adjust-1'); await voidOverseasContainerFee('81', 2, '重复费用', 'void-1')
+    expect(post).toHaveBeenCalledWith('/platform/v1/last-leg/finance-fee-sources', fee, { headers: { 'Idempotency-Key': 'create-1' } })
+    expect(post).toHaveBeenCalledWith('/platform/v1/last-leg/finance-fee-sources/81/submit', { idempotencyKey: 'submit-1' })
+    expect(post).toHaveBeenCalledWith('/platform/v1/last-leg/finance-fee-sources/81/review', { decision: 'APPROVE', reason: null, idempotencyKey: 'review-1' })
+    expect(post).toHaveBeenCalledWith('/platform/v1/last-leg/finance-fee-sources/81/adjust', { expectedVersion: 2, fee, idempotencyKey: 'adjust-1' })
+    expect(post).toHaveBeenCalledWith('/platform/v1/last-leg/finance-fee-sources/81/void', { expectedVersion: 2, reason: '重复费用', idempotencyKey: 'void-1' })
+  })
+})

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

@@ -0,0 +1,66 @@
+import { overseasHttp } from '@/shared/api/overseasHttp'
+import { unwrapApiResponse, type ApiEnvelope } from '@/shared/api/http'
+
+const basePath = '/platform/v1/last-leg/finance-fee-sources'
+type RawResource = Record<string, unknown>
+
+export type OverseasContainerFeeItem = 'PORT_FEE' | 'STORAGE_FEE' | 'CONTAINER_REPAIR_FEE' | 'CRANE_FEE' | 'TERMINAL_DRAYAGE_FEE' | 'OTHER'
+export type OverseasContainerFeeDirection = 'RECEIVABLE' | 'PAYABLE'
+
+export interface OverseasContainerCustomer { customerId: string; customerName: string | null }
+export interface OverseasContainerFeeSource {
+  id: string; sourceFeeId: string; sourceVersion: number; customerId: string; customerName: string | null
+  sourceType: 'OVERSEAS_CONTAINER_FEE'; businessType: 'OVERSEAS_CONTAINER'; businessId: string; businessNo: string
+  containerBookingId: string; containerNo: string; feeItemCode: OverseasContainerFeeItem; feeItemName: string
+  direction: OverseasContainerFeeDirection; supplierId: string | null; supplierName: string | null; supplierCategory: string | null
+  settlementMode: string | null; paidAt: string | null; paymentMethod: string | null; paymentReferenceNo: string | null
+  paymentVoucherFileIds: string[]; businessDate: string; currency: 'CNY'; amount: number
+  reviewStatus: 'DRAFT' | 'PENDING' | 'APPROVED' | 'REJECTED'; sourceStatus: 'ACTIVE' | 'SUPERSEDED' | 'VOIDED'
+  reviewReason: string | null; reviewedAt: string | null
+}
+export interface OverseasContainerFeeSaveRequest {
+  customerId: string; customerName: string | null; sourceType: 'OVERSEAS_CONTAINER_FEE'; businessType: 'OVERSEAS_CONTAINER'
+  businessId: string; businessNo: string; orderId: null; inboundId: null; inboundCode: null; containerId: null
+  containerBookingId: string; containerNo: string; warehouseId: null; feeItemCode: OverseasContainerFeeItem; feeItemName: string
+  direction: OverseasContainerFeeDirection; supplierId: string | null; supplierName: string | null; supplierCategory: string | null
+  settlementMode: 'ON_ACCOUNT' | 'DIRECT_PAID' | null; paidAt: string | null
+  paymentMethod: 'ONLINE' | 'BANK_TRANSFER' | 'CASH' | 'OTHER' | null; paymentReferenceNo: string | null; paymentVoucherFileIds: string[] | null
+  businessDate: string; currency: 'CNY'; amount: number
+}
+
+const text = (value: unknown) => value == null || value === '' ? null : String(value)
+const requiredText = (value: unknown) => String(value ?? '')
+const numberValue = (value: unknown) => Number.isFinite(Number(value)) ? Number(value) : 0
+function normalizeFee(raw: RawResource): OverseasContainerFeeSource {
+  return {
+    id: requiredText(raw.id), sourceFeeId: requiredText(raw.sourceFeeId), sourceVersion: numberValue(raw.sourceVersion), customerId: requiredText(raw.customerId), customerName: text(raw.customerName),
+    sourceType: 'OVERSEAS_CONTAINER_FEE', businessType: 'OVERSEAS_CONTAINER', businessId: requiredText(raw.businessId), businessNo: requiredText(raw.businessNo), containerBookingId: requiredText(raw.containerBookingId), containerNo: requiredText(raw.containerNo),
+    feeItemCode: raw.feeItemCode as OverseasContainerFeeItem, feeItemName: requiredText(raw.feeItemName), direction: raw.direction as OverseasContainerFeeDirection,
+    supplierId: text(raw.supplierId), supplierName: text(raw.supplierName), supplierCategory: text(raw.supplierCategory), settlementMode: text(raw.settlementMode), paidAt: text(raw.paidAt), paymentMethod: text(raw.paymentMethod), paymentReferenceNo: text(raw.paymentReferenceNo),
+    paymentVoucherFileIds: Array.isArray(raw.paymentVoucherFileIds) ? raw.paymentVoucherFileIds.map(String) : [], businessDate: requiredText(raw.businessDate), currency: 'CNY', amount: numberValue(raw.amount),
+    reviewStatus: raw.reviewStatus as OverseasContainerFeeSource['reviewStatus'], sourceStatus: raw.sourceStatus as OverseasContainerFeeSource['sourceStatus'], reviewReason: text(raw.reviewReason), reviewedAt: text(raw.reviewedAt),
+  }
+}
+export async function listOverseasContainerFees(containerBookingId: string) {
+  const response = await overseasHttp.get<ApiEnvelope<RawResource[]>, ApiEnvelope<RawResource[]>>(basePath, { params: { containerBookingId, businessType: 'OVERSEAS_CONTAINER' } })
+  return unwrapApiResponse(response).map(normalizeFee)
+}
+export async function listOverseasContainerCustomers(containerBookingId: string) {
+  const response = await overseasHttp.get<ApiEnvelope<Array<{ customerId: unknown; customerName?: unknown }>>, ApiEnvelope<Array<{ customerId: unknown; customerName?: unknown }>>>(`${basePath}/container-customers`, { params: { containerBookingId } })
+  return unwrapApiResponse(response).map((item) => ({ customerId: requiredText(item.customerId), customerName: text(item.customerName) }))
+}
+export async function createOverseasContainerFee(payload: OverseasContainerFeeSaveRequest, idempotencyKey: string) {
+  return normalizeFee(unwrapApiResponse(await overseasHttp.post<ApiEnvelope<RawResource>, ApiEnvelope<RawResource>>(basePath, payload, { headers: { 'Idempotency-Key': idempotencyKey } })))
+}
+export async function submitOverseasContainerFee(sourceFeeId: string, idempotencyKey: string) {
+  return normalizeFee(unwrapApiResponse(await overseasHttp.post<ApiEnvelope<RawResource>, ApiEnvelope<RawResource>>(`${basePath}/${encodeURIComponent(sourceFeeId)}/submit`, { idempotencyKey })))
+}
+export async function reviewOverseasContainerFee(sourceFeeId: string, decision: 'APPROVE' | 'REJECT', reason: string | null, idempotencyKey: string) {
+  return normalizeFee(unwrapApiResponse(await overseasHttp.post<ApiEnvelope<RawResource>, ApiEnvelope<RawResource>>(`${basePath}/${encodeURIComponent(sourceFeeId)}/review`, { decision, reason, idempotencyKey })))
+}
+export async function adjustOverseasContainerFee(sourceFeeId: string, expectedVersion: number, fee: OverseasContainerFeeSaveRequest, idempotencyKey: string) {
+  return normalizeFee(unwrapApiResponse(await overseasHttp.post<ApiEnvelope<RawResource>, ApiEnvelope<RawResource>>(`${basePath}/${encodeURIComponent(sourceFeeId)}/adjust`, { expectedVersion, fee, idempotencyKey })))
+}
+export async function voidOverseasContainerFee(sourceFeeId: string, expectedVersion: number, reason: string, idempotencyKey: string) {
+  return normalizeFee(unwrapApiResponse(await overseasHttp.post<ApiEnvelope<RawResource>, ApiEnvelope<RawResource>>(`${basePath}/${encodeURIComponent(sourceFeeId)}/void`, { expectedVersion, reason, idempotencyKey })))
+}

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

@@ -6,7 +6,7 @@ import {
   adjustSmartLoadingItem, assignPendingReviewSmartLoadingOrder, assignSmartLoadingGroup, assignSmartLoadingItem, assignSmartLoadingPallet, getContainer,
   listContainers, listSmartLoadingCandidates, listSmartLoadingWorkbenchContainers, removeAllUnpickedSmartLoadingItems, removeSmartLoadingGroup, removeSmartLoadingItem,
   getContainerClearance, downloadContainerClearance, uploadContainerClearance, completeContainerClearance,
-  getContainerOverview, markContainerException, cancelContainerException, uploadContainerDocument, downloadContainerDocument, downloadContainerPdaPhoto,
+  getContainerOverview, updateContainerPickupCode, markContainerException, cancelContainerException, uploadContainerDocument, downloadContainerDocument, downloadContainerPdaPhoto,
   getCustomerContainerTransitSummary,
   createContainerSimulation, linkContainerOceanBooking, unlinkContainerOceanBooking,
   updateContainer,
@@ -17,7 +17,7 @@ vi.mock('@/shared/api/http', () => ({
   unwrapApiResponse: <T>(response: { data: T }) => response.data,
 }))
 
-const container = { id: 9007199254740993, planId: 9007199254740994, planNo: 'LP-001', warehouseId: 9007199254740995, shippingCompanyId: 9007199254740996, terminalTruckingCompanyId: '9007199254740998', terminalTruckingCompany: '测试拖车供应商', sourceType: 'SIMULATION', recordStatus: 'ACTIVE', mergedIntoContainerBookingId: null, channelCode: 'NY_EXX', channelName: '纽约EXX海铁', exceptionActive: true, destinationClearanceDocumentStatus: 'COMPLETED', customsDeclarationDocumentStatus: 'UPLOADED', deliveryOrderDocumentStatus: 'UPLOADED', pickupOrderDocumentStatus: 'MISSING', unloadingCompletedAt: '2026-08-20T10:00:00', unloadingPhotoUploadedAt: '2026-08-20T10:15:00', estimatedEmptyReportedAt: '2026-08-21T09:00:00', actualEmptyReportedAt: null, emptyReportSourceVersion: '9007199254740997', version: '2', capacityCbm: '76', maxWeightKg: '28000' }
+const container = { id: 9007199254740993, planId: 9007199254740994, planNo: 'LP-001', warehouseId: 9007199254740995, shippingCompanyId: 9007199254740996, terminalTruckingCompanyId: '9007199254740998', terminalTruckingCompany: '测试拖车供应商', sourceType: 'SIMULATION', recordStatus: 'ACTIVE', mergedIntoContainerBookingId: null, channelCode: 'NY_EXX', channelName: '纽约EXX海铁', exceptionActive: true, destinationClearanceDocumentStatus: 'COMPLETED', customsDeclarationDocumentStatus: 'UPLOADED', deliveryOrderDocumentStatus: 'UPLOADED', pickupCode: '00123456', pickupCodeUpdatedBy: 9007199254740999, unloadingCompletedAt: '2026-08-20T10:00:00', unloadingPhotoUploadedAt: '2026-08-20T10:15:00', estimatedEmptyReportedAt: '2026-08-21T09:00:00', actualEmptyReportedAt: null, emptyReportSourceVersion: '9007199254740997', version: '2', capacityCbm: '76', maxWeightKg: '28000' }
 const plan = {
   id: 9007199254740993, bookingId: 9007199254740994, version: '3', status: 'LOADING',
   canAssign: true, canEdit: true, blockedReason: null, finalCompletionStatus: 'NOT_STARTED',
@@ -38,10 +38,10 @@ describe('platform container loading API', () => {
   })
 
   it('normalizes paged container ids and numeric metadata', async () => {
-    vi.mocked(http.get).mockResolvedValueOnce({ code: '200', data: { records: [container], page: '1', size: '20', total: '1', pages: '1' } })
+    vi.mocked(http.get).mockResolvedValueOnce({ code: '200', data: { records: [{ container, workbenchStage: 'PRE_LOADING', statusSummary: { loadingStatus: 'WAIT_LOADING' }, allowedActions: ['EDIT_CONTAINER'], actualFacts: {}, terminalDrayage: null }], page: '1', size: '20', total: '1', pages: '1' } })
     const result = await listContainers({ page: 1, size: 20 })
-    expect(result.records[0]).toMatchObject({ id: String(container.id), planId: String(container.planId), planNo: 'LP-001', warehouseId: String(container.warehouseId), terminalTruckingCompanyId: String(container.terminalTruckingCompanyId), terminalTruckingCompany: '测试拖车供应商', channelCode: 'NY_EXX', channelName: '纽约EXX海铁', exceptionActive: true, destinationClearanceDocumentStatus: 'COMPLETED', customsDeclarationDocumentStatus: 'UPLOADED', deliveryOrderDocumentStatus: 'UPLOADED', pickupOrderDocumentStatus: 'MISSING', unloadingCompletedAt: '2026-08-20T10:00:00', unloadingPhotoUploadedAt: '2026-08-20T10:15:00', estimatedEmptyReportedAt: '2026-08-21T09:00:00', actualEmptyReportedAt: null, emptyReportSourceVersion: '9007199254740997', version: 2, capacityCbm: 76 })
-    expect(http.get).toHaveBeenCalledWith('/platform/v1/containers', { params: { page: 1, size: 20 } })
+    expect(result.records[0]).toMatchObject({ id: String(container.id), planId: String(container.planId), planNo: 'LP-001', warehouseId: String(container.warehouseId), terminalTruckingCompanyId: String(container.terminalTruckingCompanyId), terminalTruckingCompany: '测试拖车供应商', channelCode: 'NY_EXX', channelName: '纽约EXX海铁', exceptionActive: true, destinationClearanceDocumentStatus: 'COMPLETED', customsDeclarationDocumentStatus: 'UPLOADED', deliveryOrderDocumentStatus: 'UPLOADED', pickupCode: '00123456', pickupCodeUpdatedBy: String(container.pickupCodeUpdatedBy), unloadingCompletedAt: '2026-08-20T10:00:00', unloadingPhotoUploadedAt: '2026-08-20T10:15:00', estimatedEmptyReportedAt: '2026-08-21T09:00:00', actualEmptyReportedAt: null, emptyReportSourceVersion: '9007199254740997', version: 2, capacityCbm: 76 })
+    expect(http.get).toHaveBeenCalledWith('/platform/v1/containers/domestic', { params: { page: 1, size: 20, scope: 'ACTIVE' } })
   })
 
   it('uses the full-edit request shape without retaining the retired container transport endpoint', async () => {
@@ -52,6 +52,35 @@ describe('platform container loading API', () => {
     expect(readFileSync(resolve(process.cwd(), 'src/modules/container-loading/api/platformContainerLoading.ts'), 'utf8')).not.toContain('/transport')
   })
 
+  it.each(['DOMESTIC', 'OVERSEAS'] as const)('reads the %s detail envelope and exact long identifiers in one request', async (workbench) => {
+    vi.mocked(http.get).mockResolvedValueOnce({ code: '200', data: {
+      container: { ...container, id: '9007199254740993', planId: '9007199254740995' },
+      workbenchStage: 'PRE_LOADING', allowedActions: ['EDIT_CONTAINER'], statusSummary: {}, actualFacts: null, terminalDrayage: null,
+    } })
+    expect(await getContainer('9007199254740993', workbench)).toMatchObject({ id: '9007199254740993', planId: '9007199254740995', allowedActions: ['EDIT_CONTAINER'] })
+    expect(http.get).toHaveBeenCalledExactlyOnceWith(`/platform/v1/containers/${workbench.toLowerCase()}/9007199254740993`)
+  })
+
+  it('keeps empty overseas history pages and query filters without fetching individual details', async () => {
+    vi.mocked(http.get).mockResolvedValueOnce({ code: '200', data: { records: [], page: 2, size: 20, total: 0, pages: 0 } })
+    const query = { page: 2, size: 20, warehouseId: '9007199254740993', cabinetNo: 'CB-TEST', scope: 'HISTORY' as const }
+    expect(await listContainers(query, 'OVERSEAS')).toEqual({ records: [], page: 2, size: 20, total: 0, pages: 0 })
+    expect(http.get).toHaveBeenCalledExactlyOnceWith('/platform/v1/containers/overseas', { params: query })
+  })
+
+  it('propagates a failed workbench request without retrying retired routes', async () => {
+    const failure = new Error('workbench unavailable')
+    vi.mocked(http.get).mockRejectedValueOnce(failure)
+    await expect(listContainers({ page: 1, size: 20 })).rejects.toBe(failure)
+    expect(http.get).toHaveBeenCalledTimes(1)
+  })
+
+  it('rejects a retired flat response instead of rendering incorrect container rows', async () => {
+    vi.mocked(http.get).mockResolvedValueOnce({ code: '200', data: { records: [container], page: 1, size: 20, total: 1, pages: 1 } })
+    await expect(listContainers({ page: 1, size: 20 })).rejects.toThrow()
+    expect(http.get).toHaveBeenCalledTimes(1)
+  })
+
   it('uses the frozen simulation create and ocean booking link contracts', async () => {
     vi.mocked(http.post).mockResolvedValue({ code: '200', data: { ...container, oceanBookingId: 101, oceanBookingRequirementId: 202 } })
     vi.mocked(http.delete).mockResolvedValue({ code: '200', data: { ...container, oceanBookingId: null, oceanBookingRequirementId: null } })
@@ -65,7 +94,7 @@ describe('platform container loading API', () => {
 
   it('normalizes every long id in candidates and plans', async () => {
     vi.mocked(http.get)
-      .mockResolvedValueOnce({ code: '200', data: container })
+      .mockResolvedValueOnce({ code: '200', data: { container, workbenchStage: 'PRE_LOADING', statusSummary: {}, allowedActions: [], actualFacts: {}, terminalDrayage: null } })
       .mockResolvedValueOnce({ code: '200', data: { records: [{ accountId: 1, inboundId: 2, orderId: 4, orderNo: 'ORD-1', inboundCode: 'IN-1', orderStatusSnapshot: 'WAIT_SPLIT', expectedArrivalAt: '2026-09-10T09:30:00', warehouseId: 5, destinationWarehouseId: 6, channelCode: 'NY_EXX', channelName: '纽约EXX海铁', customerName: '示例企业', goodsSummary: '服装、鞋类', availablePackageCount: '7', unitGrossWeightKg: '12.5', unitNetWeightKg: '11.8', averageUnitVolumeCbm: '0.187', availableVolumeCbm: '1.309', estimatedVolumeCbm: '2.5', coLoadGroupId: 9007199254740999n, groupNo: 'CLG-9007199254740999', memberCount: '3', groupTotalBoxes: '21', locked: false, blockReason: null, groupMembers: [] }], page: '1', size: '20', total: '1', pages: '1' } })
     expect((await getContainer('9')).id).toBe(String(container.id))
     expect(await listSmartLoadingCandidates({ channelGroupCodes: ['EXX', 'HEDE'], warehouseId: '5', orderStatuses: ['PENDING_REVIEW', 'WAIT_MEASURE'], page: 1, size: 20 })).toMatchObject({ records: [{ accountId: '1', customerId: '1', inboundId: '2', inboundCode: 'IN-1', orderStatusSnapshot: 'WAIT_SPLIT', expectedArrivalAt: '2026-09-10T09:30:00', destinationWarehouseId: '6', channelCode: 'NY_EXX', channelName: '纽约EXX海铁', goodsSummary: '服装、鞋类', availablePackageCount: 7, unitGrossWeightKg: 12.5, unitNetWeightKg: 11.8, averageUnitVolumeCbm: 0.187, availableVolumeCbm: 1.309, estimatedVolumeCbm: 2.5, coLoadGroupId: '9007199254740999', groupNo: 'CLG-9007199254740999', memberCount: 3, groupTotalBoxes: 21, locked: false, blockReason: null }], total: 1 })
@@ -214,6 +243,13 @@ describe('platform container loading API', () => {
     expect(http.get).toHaveBeenCalledWith('/platform/v1/containers/7/documents/DELIVERY_ORDER/2/download', { responseType: 'blob' })
   })
 
+  it('saves the PU numeric code as a string with the container version', async () => {
+    vi.mocked(http.put).mockResolvedValueOnce({ code: '200', data: { container: { id: 7, warehouseId: 8, pickupCode: '00123456', pickupCodeUpdatedBy: 9, version: 3 }, documents: [], exception: {}, exceptionHistory: [], timeline: [] } })
+    const result = await updateContainerPickupCode('7', '00123456', 2)
+    expect(http.put).toHaveBeenCalledWith('/platform/v1/containers/7/pickup-code', { pickupCode: '00123456', expectedVersion: 2 })
+    expect(result.container).toMatchObject({ pickupCode: '00123456', pickupCodeUpdatedBy: '9', version: 3 })
+  })
+
   it('normalizes the gateway /api prefix once and accepts only exact protected container photo paths', async () => {
     vi.mocked(http.get).mockResolvedValue(new Blob(['photo']))
     const longPath = '/api/platform/v1/containers/2092437461590446082/pda/photos/2092439032600797185/download'

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

@@ -25,6 +25,10 @@ import type {
   ContainerDocumentType,
   ContainerOverview,
   ContainerOverviewDocument,
+  ContainerWorkbenchKind,
+  ContainerWorkbenchRow,
+  ContainerWorkbenchItem,
+  ContainerWorkbenchPage,
 } from '../types'
 
 const containerPath = '/platform/v1/containers'
@@ -49,7 +53,7 @@ function overviewDocument(raw: ContainerOverviewDocument): ContainerOverviewDocu
 function overview(raw: ContainerOverview): ContainerOverview {
   return {
     ...raw,
-    container: { ...raw.container, id: id(raw.container.id), warehouseId: id(raw.container.warehouseId), version: numberValue(raw.container.version) },
+    container: { ...raw.container, id: id(raw.container.id), warehouseId: id(raw.container.warehouseId), pickupCodeUpdatedBy: optionalId(raw.container.pickupCodeUpdatedBy), version: numberValue(raw.container.version) },
     loadingPlanId: optionalId(raw.loadingPlanId),
     pda: raw.pda ? {
       ...raw.pda, taskId: id(raw.pda.taskId), loadingPlanId: id(raw.pda.loadingPlanId),
@@ -87,6 +91,7 @@ function container(raw: ContainerBookingResource): ContainerBookingResource {
     shippingCompanyId: optionalId(raw.shippingCompanyId),
     terminalTruckingCompanyId: optionalId(raw.terminalTruckingCompanyId),
     emptyReportSourceVersion: optionalId(raw.emptyReportSourceVersion),
+    pickupCodeUpdatedBy: optionalId(raw.pickupCodeUpdatedBy),
     version: numberValue(raw.version),
     capacityCbm: raw.capacityCbm == null ? null : numberValue(raw.capacityCbm),
     maxWeightKg: raw.maxWeightKg == null ? null : numberValue(raw.maxWeightKg),
@@ -95,6 +100,29 @@ function container(raw: ContainerBookingResource): ContainerBookingResource {
   }
 }
 
+function normalizeWorkbenchRow(raw: ContainerWorkbenchItem): ContainerWorkbenchRow {
+  const drayage = raw.terminalDrayage
+  return {
+    ...container(raw.container),
+    workbenchStage: raw.workbenchStage || null,
+    statusSummary: raw.statusSummary || {},
+    allowedActions: raw.allowedActions || [],
+    actualFacts: raw.actualFacts || {},
+    terminalDrayage: drayage ? {
+      ...drayage,
+      containerBookingId: id(drayage.containerBookingId),
+      version: numberValue(drayage.version),
+      fleetSupplierId: optionalId(drayage.fleetSupplierId),
+      emptyReturnWarning: {
+        ...drayage.emptyReturnWarning,
+        overdueHours: numberValue(drayage.emptyReturnWarning?.overdueHours),
+        overdueDays: numberValue(drayage.emptyReturnWarning?.overdueDays),
+      },
+      allowedActions: drayage.allowedActions || [],
+    } : null,
+  }
+}
+
 function item(raw: SmartLoadingItem): SmartLoadingItem {
   return {
     ...raw,
@@ -135,10 +163,11 @@ function plan(raw: SmartLoadingPlan): SmartLoadingPlan {
   }
 }
 
-export async function listContainers(query: ContainerQuery): Promise<ContainerPage> {
-  const response = await http.get<ApiEnvelope<ContainerPage>, ApiEnvelope<ContainerPage>>(containerPath, { params: query })
+export async function listContainers(query: ContainerQuery, workbench: ContainerWorkbenchKind = 'DOMESTIC'): Promise<ContainerPage> {
+  const params = { ...query, scope: query.scope || 'ACTIVE' }
+  const response = await http.get<ApiEnvelope<ContainerWorkbenchPage>, ApiEnvelope<ContainerWorkbenchPage>>(`${containerPath}/${workbench.toLowerCase()}`, { params })
   const result = unwrapApiResponse(response)
-  return { ...result, records: (result.records || []).map(container), page: numberValue(result.page, query.page), size: numberValue(result.size, query.size), total: numberValue(result.total), pages: numberValue(result.pages) }
+  return { ...result, records: result.records.map(normalizeWorkbenchRow), page: numberValue(result.page, query.page), size: numberValue(result.size, query.size), total: numberValue(result.total), pages: numberValue(result.pages) }
 }
 
 export async function getCustomerContainerTransitSummary(customerId: string): Promise<CustomerContainerTransitSummary> {
@@ -153,9 +182,9 @@ export async function getCustomerContainerTransitSummary(customerId: string): Pr
   }
 }
 
-export async function getContainer(containerId: string) {
-  const response = await http.get<ApiEnvelope<ContainerBookingResource>, ApiEnvelope<ContainerBookingResource>>(`${containerPath}/${encodeURIComponent(containerId)}`)
-  return container(unwrapApiResponse(response))
+export async function getContainer(containerId: string, workbench: ContainerWorkbenchKind = 'DOMESTIC'): Promise<ContainerWorkbenchRow> {
+  const response = await http.get<ApiEnvelope<ContainerWorkbenchItem>, ApiEnvelope<ContainerWorkbenchItem>>(`${containerPath}/${workbench.toLowerCase()}/${encodeURIComponent(containerId)}`)
+  return normalizeWorkbenchRow(unwrapApiResponse(response))
 }
 
 export async function getContainerOverview(containerId: string) {
@@ -163,6 +192,14 @@ export async function getContainerOverview(containerId: string) {
   return overview(unwrapApiResponse(response))
 }
 
+export async function updateContainerPickupCode(containerId: string, pickupCode: string, expectedVersion: number) {
+  const response = await http.put<ApiEnvelope<ContainerOverview>, ApiEnvelope<ContainerOverview>>(
+    `${containerPath}/${encodeURIComponent(containerId)}/pickup-code`,
+    { pickupCode, expectedVersion },
+  )
+  return overview(unwrapApiResponse(response))
+}
+
 export async function markContainerException(containerId: string, expectedVersion: number, reason: string) {
   const response = await http.post<ApiEnvelope<null>, ApiEnvelope<null>>(`${containerPath}/${encodeURIComponent(containerId)}/exception`, { expectedVersion, reason }, { headers: { 'Idempotency-Key': operationId('container-exception-mark') } })
   unwrapApiResponse(response)
@@ -173,7 +210,7 @@ export async function cancelContainerException(containerId: string, expectedVers
   unwrapApiResponse(response)
 }
 
-export async function uploadContainerDocument(containerId: string, documentType: Extract<ContainerDocumentType, 'DELIVERY_ORDER' | 'PICKUP_ORDER'>, file: File, expectedVersion: number, operationReason?: string | null) {
+export async function uploadContainerDocument(containerId: string, documentType: Extract<ContainerDocumentType, 'DELIVERY_ORDER'>, file: File, expectedVersion: number, operationReason?: string | null) {
   const body = new FormData()
   body.append('file', file)
   body.append('expectedVersion', String(expectedVersion))
@@ -182,7 +219,7 @@ export async function uploadContainerDocument(containerId: string, documentType:
   return document(unwrapApiResponse(response))
 }
 
-export function downloadContainerDocument(containerId: string, documentType: Extract<ContainerDocumentType, 'DELIVERY_ORDER' | 'PICKUP_ORDER'>, fileId: string) {
+export function downloadContainerDocument(containerId: string, documentType: Extract<ContainerDocumentType, 'DELIVERY_ORDER'>, fileId: string) {
   return http.get<Blob, Blob>(`${containerPath}/${encodeURIComponent(containerId)}/documents/${documentType}/${encodeURIComponent(fileId)}/download`, { responseType: 'blob' })
 }
 

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

@@ -39,12 +39,12 @@ describe('terminal drayages API', () => {
     vi.mocked(http.post).mockResolvedValue({ data: view })
     await selectTerminalDrayageFleet('101', { expectedVersion: 3, fleetSupplierId: '501', fleetSupplierName: '港运车队' })
     await scheduleTerminalDrayagePickup('101', { expectedVersion: 4, pickupAppointmentAt: '2026-09-07T08:00:00' })
-    await recordTerminalDrayagePickup('101', { expectedVersion: 5, actualAt: '2026-09-07T09:00:00' })
-    await recordTerminalDrayageEmptyReturn('101', { expectedVersion: 6, actualAt: '2026-09-10T09:00:00' })
+    await recordTerminalDrayagePickup('101', { expectedVersion: 5, actualAt: '2026-09-07T09:00:00', remark: '实际提柜' })
+    await recordTerminalDrayageEmptyReturn('101', { expectedVersion: 6, actualAt: '2026-09-10T09:00:00', remark: '实际还柜' })
     expect(http.post).toHaveBeenNthCalledWith(1, '/platform/v1/terminal-drayages/101/fleet', expect.objectContaining({ expectedVersion: 3, fleetSupplierId: '501' }), expect.objectContaining({ headers: { 'Idempotency-Key': expect.stringContaining('terminal-drayage-fleet-') } }))
     expect(http.post).toHaveBeenNthCalledWith(2, '/platform/v1/terminal-drayages/101/pickup-appointment', expect.objectContaining({ expectedVersion: 4 }), expect.any(Object))
-    expect(http.post).toHaveBeenNthCalledWith(3, '/platform/v1/terminal-drayages/101/pickup', expect.objectContaining({ expectedVersion: 5 }), expect.any(Object))
-    expect(http.post).toHaveBeenNthCalledWith(4, '/platform/v1/terminal-drayages/101/empty-return', expect.objectContaining({ expectedVersion: 6 }), expect.any(Object))
+    expect(http.post).toHaveBeenNthCalledWith(3, '/platform/v1/terminal-drayages/101/pickup', expect.objectContaining({ expectedVersion: 5, remark: '实际提柜' }), expect.objectContaining({ headers: { 'Idempotency-Key': expect.stringContaining('terminal-drayage-pickup-') } }))
+    expect(http.post).toHaveBeenNthCalledWith(4, '/platform/v1/terminal-drayages/101/empty-return', expect.objectContaining({ expectedVersion: 6, remark: '实际还柜' }), expect.objectContaining({ headers: { 'Idempotency-Key': expect.stringContaining('terminal-drayage-empty-return-') } }))
   })
 
   it('loads operation history from the container business id', async () => {

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

@@ -93,9 +93,9 @@ export function selectTerminalDrayageFleet(containerBookingId: string, body: { e
 export function scheduleTerminalDrayagePickup(containerBookingId: string, body: { expectedVersion: number; pickupAppointmentAt: string; reason?: string }) {
   return command(containerBookingId, 'pickup-appointment', body)
 }
-export function recordTerminalDrayagePickup(containerBookingId: string, body: { expectedVersion: number; actualAt: string; reason?: string }) {
+export function recordTerminalDrayagePickup(containerBookingId: string, body: { expectedVersion: number; actualAt: string; remark?: string }) {
   return command(containerBookingId, 'pickup', body)
 }
-export function recordTerminalDrayageEmptyReturn(containerBookingId: string, body: { expectedVersion: number; actualAt: string; reason?: string }) {
+export function recordTerminalDrayageEmptyReturn(containerBookingId: string, body: { expectedVersion: number; actualAt: string; remark?: string }) {
   return command(containerBookingId, 'empty-return', body)
 }

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

@@ -0,0 +1,141 @@
+<script setup lang="ts">
+import { computed, onMounted, reactive, ref } from 'vue'
+import { ElMessage, ElMessageBox, type UploadFile } from 'element-plus'
+import { useAccessPreviewStore } from '@/core/access/accessPreview'
+import { getApiErrorDetails, getApiErrorMessage, type ApiErrorDetails } from '@/shared/api/http'
+import ApiErrorMeta from '@/shared/components/ApiErrorMeta.vue'
+import AppDialog from '@/shared/components/AppDialog.vue'
+import LoadErrorState from '@/shared/components/LoadErrorState.vue'
+import { listContainerFeeSupplierOptions, uploadContainerFeePaymentVoucher, type ContainerFeePaymentMethod, type ContainerFeeSettlementMode, type ContainerFeeSupplierOption } from '@/modules/loading-lists'
+import { adjustOverseasContainerFee, createOverseasContainerFee, listOverseasContainerCustomers, listOverseasContainerFees, reviewOverseasContainerFee, submitOverseasContainerFee, voidOverseasContainerFee, type OverseasContainerCustomer, type OverseasContainerFeeDirection, type OverseasContainerFeeItem, type OverseasContainerFeeSaveRequest, type OverseasContainerFeeSource } from '../api/overseasContainerFees'
+
+const props = withDefaults(defineProps<{ title?: string; containerBookingId: string; containerNo: string | null; readonly?: boolean }>(), { title: '目的港及海外段费用（尾程）', readonly: false })
+const access = useAccessPreviewStore()
+const rows = ref<OverseasContainerFeeSource[]>([])
+const customers = ref<OverseasContainerCustomer[]>([])
+const suppliers = ref<ContainerFeeSupplierOption[]>([])
+const loading = ref(false)
+const actionLoading = ref(false)
+const voucherUploading = ref(false)
+const error = ref<ApiErrorDetails | null>(null)
+const dialogOpen = ref(false)
+const editing = ref<OverseasContainerFeeSource | null>(null)
+const canView = computed(() => access.can('platform:finance:customer-arap:list'))
+const canEdit = computed(() => !props.readonly && access.can('platform:finance:fee-source:edit'))
+const canReview = computed(() => !props.readonly && access.can('platform:finance:fee-source:review'))
+const feeItems: Array<{ value: OverseasContainerFeeItem; label: string }> = [
+  { value: 'PORT_FEE', label: '港口费' }, { value: 'STORAGE_FEE', label: '堆存费' },
+  { value: 'CONTAINER_REPAIR_FEE', label: '修箱费' }, { value: 'CRANE_FEE', label: '吊机费' },
+  { value: 'TERMINAL_DRAYAGE_FEE', label: '码头拖车费' }, { value: 'OTHER', label: '其他' },
+]
+const feeItemLabel = (value: string) => feeItems.find((item) => item.value === value)?.label || value
+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: [] })
+
+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 }
+function saveRequest(row?: OverseasContainerFeeSource): OverseasContainerFeeSaveRequest {
+  const item = feeItems.find((option) => option.value === form.feeItemCode)
+  return {
+    customerId: form.customerId, customerName: customerName(form.customerId), sourceType: 'OVERSEAS_CONTAINER_FEE', businessType: 'OVERSEAS_CONTAINER',
+    businessId: props.containerBookingId, businessNo: props.containerNo || '', orderId: null, inboundId: null, inboundCode: null, containerId: null,
+    containerBookingId: props.containerBookingId, containerNo: props.containerNo || '', warehouseId: null,
+    feeItemCode: form.feeItemCode, feeItemName: item?.label || row?.feeItemName || form.feeItemCode, direction: form.direction,
+    supplierId: form.direction === 'PAYABLE' ? selectedSupplier()?.id || null : null,
+    supplierName: form.direction === 'PAYABLE' ? selectedSupplier()?.supplierName || null : null,
+    supplierCategory: form.direction === 'PAYABLE' ? selectedSupplier()?.category || null : null,
+    settlementMode: form.direction === 'PAYABLE' ? form.settlementMode : null,
+    paidAt: form.direction === 'PAYABLE' && form.settlementMode === 'DIRECT_PAID' ? form.paidAt || null : null,
+    paymentMethod: form.direction === 'PAYABLE' && form.settlementMode === 'DIRECT_PAID' ? form.paymentMethod : null,
+    paymentReferenceNo: form.direction === 'PAYABLE' && form.settlementMode === 'DIRECT_PAID' ? form.paymentReferenceNo.trim() || null : null,
+    paymentVoucherFileIds: form.direction === 'PAYABLE' && form.settlementMode === 'DIRECT_PAID' && form.paymentVoucherFileIds.length ? form.paymentVoucherFileIds : null,
+    businessDate: form.businessDate, currency: 'CNY', amount: Number(form.amount),
+  }
+}
+async function load() {
+  if (!canView.value) return
+  loading.value = true; error.value = null
+  try { [rows.value, customers.value, suppliers.value] = await Promise.all([listOverseasContainerFees(props.containerBookingId), listOverseasContainerCustomers(props.containerBookingId), props.readonly ? Promise.resolve([]) : listContainerFeeSupplierOptions(null)]) }
+  catch (cause) { error.value = getApiErrorDetails(cause, '尾程计费加载失败') }
+  finally { loading.value = false }
+}
+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) {
+  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) {
+  actionLoading.value = true
+  try { await task(); ElMessage.success(success); dialogOpen.value = false; await load() }
+  catch (cause) { ElMessage.error(getApiErrorMessage(cause, '尾程计费操作失败')) }
+  finally { actionLoading.value = false }
+}
+async function save() {
+  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('应付费用必须选择供应商')
+  if (form.direction === 'PAYABLE' && form.settlementMode === 'DIRECT_PAID' && (!form.paidAt || !form.paymentMethod || (!form.paymentReferenceNo.trim() && form.paymentVoucherFileIds.length === 0))) return ElMessage.warning('直接已付必须填写付款时间、方式，并提供流水号或付款凭证')
+  const payload = saveRequest(editing.value || undefined)
+  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 }
+  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 }
+}
+async function submit(row: any) {
+  await ElMessageBox.confirm(`确认提交“${row.feeItemName}”审核？`, '提交费用', { type: 'warning' })
+  await mutate(() => submitOverseasContainerFee(row.sourceFeeId, key('container-fee-submit')), '费用已提交审核')
+}
+async function review(row: any, 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) {
+  const result = await ElMessageBox.prompt('请输入作废原因', '作废费用', { inputPattern: /\S+/, inputErrorMessage: '请输入作废原因', type: 'warning' })
+  await mutate(() => voidOverseasContainerFee(row.sourceFeeId, row.sourceVersion, result.value.trim(), key('container-fee-void')), '费用已作废')
+}
+onMounted(load)
+</script>
+
+<template>
+  <div class="last-leg-fees">
+    <header class="last-leg-fees__header"><div><h2>{{ title }}</h2><p>按真实货柜展示港口、堆存、修箱、吊机和码头拖车费用，金额按币种分别列示。</p></div><el-button v-if="canEdit" type="primary" :disabled="!containerNo || customers.length === 0" @click="openCreate">新增费用</el-button></header>
+    <el-alert v-if="readonly" type="info" :closable="false" title="当前路由仅查看海外段费用，写操作请从清关提柜详情进入。" />
+    <el-alert v-if="!containerNo" type="warning" :closable="false" title="当前货柜尚未补录真实集装箱号，暂不能新增尾程费用。" />
+    <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 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 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>
+  </div>
+</template>
+
+<style scoped>
+.last-leg-fees { display: grid; gap: 16px; min-width: 0; }
+.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; }
+.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%; }
+@media (max-width: 760px) { .last-leg-fees__header { align-items: flex-start; flex-direction: column; } .fee-form-grid { grid-template-columns: 1fr; } }
+</style>

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

@@ -8,7 +8,7 @@ import { downloadContainerPdaPhoto } from '../api/platformContainerLoading'
 vi.mock('../api/platformContainerLoading', () => ({ downloadContainerPdaPhoto: vi.fn() }))
 
 const overview: ContainerOverview = {
-  container: { id: '7', bookingNo: 'BK-1', cabinetNo: 'CB-1', containerNo: 'MSCU-1', status: 'LOADING', warehouseId: '8', warehouseName: '义乌仓', voyageNo: 'V1', vesselName: '船一', version: 2 },
+  container: { id: '7', bookingNo: 'BK-1', cabinetNo: 'CB-1', containerNo: 'MSCU-1', status: 'LOADING', warehouseId: '8', warehouseName: '义乌仓', voyageNo: 'V1', vesselName: '船一', pickupCode: '00123456', pickupCodeUpdatedBy: '13', pickupCodeUpdatedByName: '操作员', pickupCodeUpdatedAt: '2026-08-13T10:30:00', version: 2 },
   loadingPlanId: '9',
   pda: { taskId: '10', loadingPlanId: '9', containerBookingId: '7', taskStatus: 'IN_PROGRESS', workflowStatus: 'AWAITING_REVIEW', taskVersion: 2, itemCount: 4, completedItemCount: 4, unresolvedItemCount: 0, photoCounts: [{ evidenceType: 'PHOTO_STEP_EMPTY_CONTAINER', count: 2 }], photos: [{ evidenceId: '20', tenantId: '21', inboundId: '22', evidenceType: 'PHOTO_STEP_EMPTY_CONTAINER', fileId: '23', fileName: 'empty.jpg', status: 'ACTIVE', downloadPath: '/api/platform/v1/containers/7/pda/photos/23/download', uploadedAt: '2026-08-13T12:30:00' }], exceptionReasons: ['一项待复核'] },
   documents: [{ id: '11', documentType: 'DELIVERY_ORDER', fileId: '9007199254740999', fileName: 'do.pdf', fileHash: null, uploadedBy: '13', uploadedByName: '操作员', uploadedAt: '2026-08-13T10:00:00', version: 1, completed: false }],
@@ -47,13 +47,19 @@ describe('ContainerOverviewPanel', () => {
     expect(wrapper.text()).not.toContain('9007199254740999')
   })
 
-  it('renders three compact non-customs document rows with the operation column first', () => {
+  it('renders two file rows and one inline PU code row without a nested heading', async () => {
     const wrapper = mount(ContainerOverviewPanel, { props: { overview, canManageDocuments: true, canManageCustoms: true, canManageException: true }, global: { plugins: [ElementPlus] } })
     const headers = wrapper.findAll('.document-table thead th').map((cell) => cell.text())
-    expect(headers).toEqual(['操作', '资料类型', '文件名', '上传人', '上传时间', '状态'])
+    expect(headers).toEqual(['操作', '资料类型', '资料内容', '更新人', '更新时间', '状态'])
     expect(wrapper.findAll('.document-table tbody tr')).toHaveLength(3)
     expect(wrapper.findAll('.document-item')).toHaveLength(0)
     expect(wrapper.find('.document-table-wrap').exists()).toBe(true)
+    expect(wrapper.text()).not.toContain('业务资料')
+    const pickupInput = wrapper.find('input[aria-label="PU码"]')
+    expect((pickupInput.element as HTMLInputElement).value).toBe('00123456')
+    await pickupInput.setValue('998877')
+    await wrapper.find('.pickup-code-row button').trigger('click')
+    expect(wrapper.emitted('savePickupCode')?.[0]).toEqual(['998877'])
     const deliveryRow = wrapper.findAll('.document-table tbody tr').find((row) => row.text().includes('DO 资料'))!
     expect(deliveryRow.text()).toContain('do.pdf')
     expect(deliveryRow.text()).toContain('操作员')

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

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { computed, onBeforeUnmount, reactive, watch } from 'vue'
+import { computed, onBeforeUnmount, reactive, ref, watch } from 'vue'
 import { Download, FileUp, TriangleAlert } from '@lucide/vue'
 import { getApiErrorDetails } from '@/shared/api/http'
 import StatusBadge from '@/shared/components/StatusBadge.vue'
@@ -12,23 +12,27 @@ const props = defineProps<{
   canManageCustoms: boolean
   canManageException: boolean
   documentBusy?: boolean
+  pickupCodeBusy?: boolean
   sections?: Array<'exception' | 'documents' | 'pda'>
 }>()
 
 const emit = defineEmits<{
   uploadDocument: [documentType: string]
   downloadDocument: [document: ContainerOverviewDocument]
+  savePickupCode: [pickupCode: string]
   manageException: []
 }>()
 
 const documentTypes = [
   { type: 'DESTINATION_CLEARANCE', label: '目的港清关资料' },
   { type: 'DELIVERY_ORDER', label: 'DO 资料' },
-  { type: 'PICKUP_ORDER', label: 'PU 资料' },
 ] as const
 
 const documentsByType = computed(() => new Map(props.overview.documents.map((item) => [item.documentType, item])))
-const containerDownloadableTypes = new Set(['DELIVERY_ORDER', 'PICKUP_ORDER'])
+const containerDownloadableTypes = new Set(['DELIVERY_ORDER'])
+const pickupCodeInput = ref('')
+watch(() => props.overview.container.pickupCode, (value) => { pickupCodeInput.value = value || '' }, { immediate: true })
+const pickupCodeValid = computed(() => /^[0-9]{1,64}$/.test(pickupCodeInput.value))
 function canDownloadDocument(documentType: string) {
   return containerDownloadableTypes.has(documentType)
     || (documentType === 'DESTINATION_CLEARANCE' && props.canManageCustoms)
@@ -119,11 +123,10 @@ onBeforeUnmount(() => { photoGeneration += 1; revokePhotoUrls() })
       <div class="exception-history"><div class="exception-history__head"><span>时间</span><span>动作</span><span>操作人</span><span>原因</span></div><p v-if="overview.exceptionHistory.length === 0" class="exception-history__empty">暂无异常处理记录</p><ol v-else><li v-for="history in overview.exceptionHistory" :key="history.id"><time>{{ formatTime(history.occurredAt) }}</time><strong>{{ eventLabel(history.action) }}</strong><span>{{ history.operatorName || '操作人信息缺失' }}</span><span :title="history.reason">{{ history.reason }}</span></li></ol></div>
     </section>
 
-    <section v-if="visibleSections.has('documents')" class="overview-section" aria-label="货柜业务资料">
-      <header><h3>业务资料</h3><span>{{ overview.documents.length }} 份</span></header>
+    <section v-if="visibleSections.has('documents')" class="overview-section overview-section--documents" aria-label="报关清关资料">
       <div class="document-table-wrap">
         <table class="document-table">
-          <thead><tr><th class="document-table__actions">操作</th><th>资料类型</th><th>文件名</th><th>上传人</th><th>上传时间</th><th>状态</th></tr></thead>
+          <thead><tr><th class="document-table__actions">操作</th><th>资料类型</th><th>资料内容</th><th>更新人</th><th>更新时间</th><th>状态</th></tr></thead>
           <tbody><tr v-for="item in documentTypes" :key="item.type">
             <td class="document-table__actions"><div class="document-actions"><el-button v-if="documentsByType.get(item.type) && canDownloadDocument(item.type)" size="small" :loading="documentBusy" @click="emit('downloadDocument', documentsByType.get(item.type)!)"><Download :size="15" />下载</el-button><el-button v-if="canUploadDocument(item.type) && !documentsByType.get(item.type)?.completed" size="small" @click="emit('uploadDocument', item.type)"><FileUp :size="15" />{{ documentsByType.get(item.type) ? '更新附件' : '上传附件' }}</el-button><span v-if="!hasDocumentAction(item.type)" class="no-action">—</span></div></td>
             <td><strong>{{ item.label }}</strong></td>
@@ -131,6 +134,13 @@ onBeforeUnmount(() => { photoGeneration += 1; revokePhotoUrls() })
             <td>{{ documentsByType.get(item.type)?.uploadedByName || '—' }}</td>
             <td>{{ documentsByType.get(item.type) ? formatTime(documentsByType.get(item.type)?.uploadedAt) : '—' }}</td>
             <td><el-tag size="small" :type="documentStatusType(item.type)">{{ documentStatusLabel(item.type) }}</el-tag></td>
+          </tr><tr class="pickup-code-row">
+            <td class="document-table__actions"><el-button v-if="canManageDocuments" size="small" type="primary" :loading="pickupCodeBusy" :disabled="!pickupCodeValid || pickupCodeInput === (overview.container.pickupCode || '')" @click="emit('savePickupCode', pickupCodeInput)">保存</el-button><span v-else class="no-action">—</span></td>
+            <td><strong>PU 资料</strong></td>
+            <td><el-input v-model="pickupCodeInput" :disabled="!canManageDocuments" maxlength="64" inputmode="numeric" placeholder="请输入数字 PU 码" aria-label="PU码" @input="pickupCodeInput = pickupCodeInput.replace(/\D/g, '')" /></td>
+            <td>{{ overview.container.pickupCodeUpdatedByName || '—' }}</td>
+            <td>{{ formatTime(overview.container.pickupCodeUpdatedAt) }}</td>
+            <td><el-tag size="small" :type="overview.container.pickupCode ? 'success' : 'info'">{{ overview.container.pickupCode ? '已填写' : '未填写' }}</el-tag></td>
           </tr></tbody>
         </table>
       </div>
@@ -149,12 +159,13 @@ onBeforeUnmount(() => { photoGeneration += 1; revokePhotoUrls() })
 <style scoped>
 .overview-panel { display: grid; gap: 12px; }
 .overview-section { min-width: 0; padding: 12px 16px; border: 1px solid var(--cc-border); background: #fff; }
+.overview-section--documents{padding:0;border:0}
 .overview-section > header { display: flex; align-items: center; justify-content: space-between; gap: 12px; margin-bottom: 14px; }
 .overview-section h3 { margin: 0; font-size: 15px; }
 .overview-section header > span, .overview-section small { color: var(--cc-muted); font-size: 12px; }
 .overview-section p { margin: 5px 0; color: var(--cc-muted); font-size: 13px; }
 .exception-management{padding-top:10px;padding-bottom:10px}.exception-management__header{margin-bottom:7px!important}.exception-management__header>div:first-child{display:flex;min-width:0;align-items:center;gap:14px}.exception-current{display:flex;min-width:0;align-items:center;gap:9px;margin:0!important}.exception-current strong,.exception-current span{overflow:hidden;max-width:360px;text-overflow:ellipsis;white-space:nowrap}.exception-current strong{color:var(--el-color-danger)}.exception-current span{font-size:12px}.exception-management__actions{display:flex;align-items:center;gap:8px}.exception-history{overflow-x:auto;border-top:1px solid var(--cc-border);font-size:12px}.exception-history__head,.exception-history li{display:grid;grid-template-columns:145px 120px 130px minmax(220px,1fr);gap:8px;align-items:center;min-width:680px;padding:6px 4px}.exception-history__head{color:var(--cc-muted);font-weight:650}.exception-history ol{margin:0;padding:0;list-style:none}.exception-history li{border-top:1px solid var(--cc-border)}.exception-history li time,.exception-history li span{overflow:hidden;color:var(--cc-muted);text-overflow:ellipsis;white-space:nowrap}.exception-history__empty{margin:0!important;padding:7px 4px;border-top:1px solid var(--cc-border);font-size:12px!important}
-.document-table-wrap{width:100%;overflow-x:auto;border:1px solid var(--cc-border)}.document-table{width:100%;min-width:940px;border-collapse:collapse;table-layout:fixed;font-size:12px}.document-table th,.document-table td{height:40px;padding:5px 10px;border-bottom:1px solid var(--cc-border);background:#fff;text-align:left;vertical-align:middle}.document-table tbody tr:last-child td{border-bottom:0}.document-table th{background:var(--cc-bg-subtle,#f7f8fa);color:var(--cc-muted);font-weight:650}.document-table th:nth-child(1){width:260px}.document-table th:nth-child(2){width:180px}.document-table th:nth-child(3){width:210px}.document-table th:nth-child(4){width:120px}.document-table th:nth-child(5){width:150px}.document-table th:nth-child(6){width:90px}.document-table__actions{position:sticky;left:0;z-index:1;box-shadow:1px 0 0 var(--cc-border)}.document-table th.document-table__actions{z-index:2}.document-table td strong{font-size:13px}.document-table td small{display:block;overflow:hidden;max-width:170px;margin-top:2px;text-overflow:ellipsis;white-space:nowrap}.document-file-name{display:block;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.document-actions{display:flex;align-items:center;gap:5px;white-space:nowrap}.document-actions :deep(.el-button){margin-left:0}.no-action{color:var(--cc-muted)}
+.document-table-wrap{width:100%;overflow-x:auto;border:1px solid var(--cc-border)}.document-table{width:100%;min-width:940px;border-collapse:collapse;table-layout:fixed;font-size:12px}.document-table th,.document-table td{height:40px;padding:5px 10px;border-bottom:1px solid var(--cc-border);background:#fff;text-align:left;vertical-align:middle}.document-table tbody tr:last-child td{border-bottom:0}.document-table th{background:var(--cc-bg-subtle,#f7f8fa);color:var(--cc-muted);font-weight:650}.document-table th:nth-child(1){width:260px}.document-table th:nth-child(2){width:180px}.document-table th:nth-child(3){width:210px}.document-table th:nth-child(4){width:120px}.document-table th:nth-child(5){width:150px}.document-table th:nth-child(6){width:90px}.document-table__actions{position:sticky;left:0;z-index:1;box-shadow:1px 0 0 var(--cc-border)}.document-table th.document-table__actions{z-index:2}.document-table td strong{font-size:13px}.document-table td small{display:block;overflow:hidden;max-width:170px;margin-top:2px;text-overflow:ellipsis;white-space:nowrap}.document-file-name{display:block;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.document-actions{display:flex;align-items:center;gap:5px;white-space:nowrap}.document-actions :deep(.el-button){margin-left:0}.no-action{color:var(--cc-muted)}.pickup-code-row :deep(.el-input){max-width:260px}.pickup-code-row :deep(.el-input__inner){font-variant-numeric:tabular-nums}
 .pda-summary{display:grid;grid-template-columns:minmax(220px,1fr) minmax(0,2fr);align-items:center;gap:16px;margin-bottom:10px}.metric-grid { display: grid; grid-template-columns: repeat(4, minmax(0, 1fr)); gap: 6px; margin:0; }
 .metric-grid > div { display: grid; gap: 2px; padding: 6px 9px; background: var(--cc-bg-subtle, #f7f8fa); }
 .metric-grid span { color: var(--cc-muted); font-size: 12px; }

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

@@ -0,0 +1,64 @@
+import ElementPlus from 'element-plus'
+import { createPinia } from 'pinia'
+import { enableAutoUnmount, flushPromises, mount } from '@vue/test-utils'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import ContainerDetailView from './ContainerDetailView.vue'
+import { getContainer, getContainerOverview } from '../api/platformContainerLoading'
+import { recordTerminalDrayageEmptyReturn } from '../api/terminalDrayages'
+
+const canAccess = vi.hoisted(() => vi.fn<(code: string) => boolean>(() => true))
+vi.mock('@/core/access/accessPreview', () => ({ useAccessPreviewStore: () => ({ can: canAccess }) }))
+vi.mock('vue-router', () => ({ useRoute: () => ({ params: { containerId: '9001' }, query: {} }), useRouter: () => ({ push: vi.fn() }) }))
+vi.mock('@/modules/loading-lists', () => ({ ContainerFeesPanel: { template: '<div />' }, LoadingListDetailDrawer: { template: '<div />' }, getConfirmedLoadingList: vi.fn(), getPreloadPlan: vi.fn() }))
+vi.mock('@/modules/outbound-dispatch', () => ({ confirmContainerOutboundDispatch: vi.fn(), getContainerOutboundDispatch: vi.fn() }))
+vi.mock('@/modules/port-schedules', () => ({ CarrierScheduleQueryPanel: { template: '<div />' } }))
+vi.mock('../api/platformContainerLoading', () => ({ getContainer: vi.fn(), getContainerOverview: vi.fn(), cancelContainerException: vi.fn(), completeContainerClearance: vi.fn(), downloadContainerClearance: vi.fn(), downloadContainerDocument: vi.fn(), getContainerClearance: vi.fn(), markContainerException: vi.fn(), uploadContainerClearance: vi.fn(), uploadContainerDocument: vi.fn(), updateContainerPickupCode: vi.fn() }))
+vi.mock('../api/terminalDrayages', () => ({ recordTerminalDrayageEmptyReturn: vi.fn() }))
+
+const base = { id: '9001', cabinetNo: 'CB-1', containerNo: 'MSCU-1', planNo: 'LP-1', planStatus: 'COMPLETED', warehouseName: '义乌仓', destinationWarehouseCode: 'LAX01', destinationWarehouseName: '洛杉矶接柜仓', workbenchStage: 'UNLOADED', statusSummary: { terminalDrayageStatus: 'UNLOADED' }, allowedActions: ['RECORD_EMPTY_RETURN'], terminalDrayage: { containerBookingId: '9001', status: 'UNLOADED', version: 3, fleetSupplierId: '501', fleetSupplierName: '港运车队', pickupAppointmentAt: '2026-09-07T08:00:00', actualPickupAt: '2026-09-07T09:00:00', estimatedEmptyReturnAt: '2026-09-10T10:00:00', actualEmptyReturnAt: null, unloadingCompletedAt: '2026-09-07T10:00:00', emptyReturnWarning: { status: 'PENDING', deadlineAt: '2026-09-10T10:00:00', overdueHours: 0, overdueDays: 0 }, allowedActions: ['RECORD_EMPTY_RETURN'], updatedAt: '2026-09-09T10:00:00' }, actualFacts: { unloadingCompletedAt: '2026-09-07T10:00:00' } }
+const overview = { container: { id: '9001', version: 1 }, loadingPlanId: null, documents: [], exception: { active: false }, timeline: [] }
+
+enableAutoUnmount(afterEach)
+
+async function mountDetail() {
+  const wrapper = mount(ContainerDetailView, { props: { workbench: 'OVERSEAS' }, attachTo: document.body, global: { plugins: [createPinia(), ElementPlus], stubs: { ContainerOverviewPanel: true, ContainerCustomsPanel: true, ContainerLastLegFeesPanel: true } } })
+  await flushPromises()
+  return wrapper
+}
+
+describe('ContainerDetailView empty return', () => {
+  beforeEach(() => {
+    canAccess.mockReset().mockReturnValue(true)
+    vi.mocked(getContainer).mockReset().mockResolvedValue(base as never)
+    vi.mocked(getContainerOverview).mockReset().mockResolvedValue(overview as never)
+    vi.mocked(recordTerminalDrayageEmptyReturn).mockReset().mockResolvedValue({ ...base.terminalDrayage, status: 'EMPTY_RETURNED', version: 4, actualEmptyReturnAt: '2026-09-09T12:00:00', allowedActions: [] } as never)
+  })
+
+  it('uses the overseas stage, submits one versioned command and refreshes to returned state', async () => {
+    vi.mocked(getContainer).mockResolvedValueOnce(base as never).mockResolvedValue({ ...base, workbenchStage: 'EMPTY_RETURNED', statusSummary: { terminalDrayageStatus: 'EMPTY_RETURNED' }, allowedActions: [], terminalDrayage: { ...base.terminalDrayage, status: 'EMPTY_RETURNED', version: 4, actualEmptyReturnAt: '2026-09-09T12:00:00', allowedActions: [] } } as never)
+    const wrapper = await mountDetail()
+    expect(wrapper.text()).toContain('待还柜')
+    expect(wrapper.text()).not.toContain('装柜完成')
+    await wrapper.findAll('button').find((item) => item.text() === '确认还柜')!.trigger('click')
+    await flushPromises()
+    const confirm = [...document.body.querySelectorAll('button')].filter((item) => item.textContent?.trim() === '确认还柜').at(-1) as HTMLButtonElement
+    confirm.click()
+    await flushPromises()
+    expect(recordTerminalDrayageEmptyReturn).toHaveBeenCalledTimes(1)
+    expect(recordTerminalDrayageEmptyReturn).toHaveBeenCalledWith('9001', expect.objectContaining({ expectedVersion: 3, actualAt: expect.any(String), remark: undefined }))
+    expect(getContainer).toHaveBeenCalledTimes(2)
+    expect(wrapper.text()).toContain('已还柜')
+    expect(wrapper.find('.detail-section__heading').findAll('button').some((item) => item.text() === '确认还柜')).toBe(false)
+  })
+
+  it.each([
+    ['缺权限', false, ['RECORD_EMPTY_RETURN'], ['RECORD_EMPTY_RETURN'], 'UNLOADED'],
+    ['缺服务端动作', true, [], [], 'UNLOADED'],
+    ['已还柜', true, [], [], 'EMPTY_RETURNED'],
+  ])('%s时不提供确认还柜', async (_name, allowed, rowActions, drayageActions, status) => {
+    canAccess.mockImplementation((code) => code !== 'platform:firstleg:terminal-drayage:empty-return:confirm' || allowed)
+    vi.mocked(getContainer).mockResolvedValue({ ...base, workbenchStage: status, statusSummary: { terminalDrayageStatus: status }, allowedActions: rowActions, terminalDrayage: { ...base.terminalDrayage, status, allowedActions: drayageActions } } as never)
+    const wrapper = await mountDetail()
+    expect(wrapper.findAll('button').some((item) => item.text() === '确认还柜')).toBe(false)
+  })
+})

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

@@ -4,15 +4,18 @@ import { describe, expect, it } from 'vitest'
 
 const source = readFileSync(resolve(process.cwd(), 'src/modules/container-loading/pages/ContainerDetailView.vue'), 'utf8')
 const overviewSource = readFileSync(resolve(process.cwd(), 'src/modules/container-loading/components/ContainerOverviewPanel.vue'), 'utf8')
+const routeSource = readFileSync(resolve(process.cwd(), 'src/modules/container-loading/routes.ts'), 'utf8')
+const loadingRouteSource = readFileSync(resolve(process.cwd(), 'src/modules/loading-lists/routes.ts'), 'utf8')
+const navigationSource = readFileSync(resolve(process.cwd(), 'src/core/navigation/adminNavigation.ts'), 'utf8')
+const lastLegFeesSource = readFileSync(resolve(process.cwd(), 'src/modules/container-loading/components/ContainerLastLegFeesPanel.vue'), 'utf8')
 
 describe('ContainerDetailView customs integration', () => {
   it('renders the requested detail sections in the confirmed business order', () => {
     const headings = [
       'container-information-heading">货柜信息',
       'container-voyage-heading">船名航次信息',
-      'container-customs-heading">报关清关信息',
-      'container-receiving-heading">签收信息',
-      'container-fees-heading">费用明细',
+      'container-customs-heading">{{ isDomestic',
+      'container-receiving-heading">装柜作业与国内出仓',
     ]
     let previous = -1
     for (const heading of headings) {
@@ -26,9 +29,79 @@ describe('ContainerDetailView customs integration', () => {
     expect(source).toContain('<CarrierScheduleQueryPanel')
     expect(source).toContain(':sections="[\'documents\']"')
     expect(source).toContain(':sections="[\'pda\']"')
-    expect(source).toContain('<ContainerFeesPanel')
+    expect(source).toContain('<LoadingListDetailDrawer')
     expect(source).toContain('getConfirmedLoadingList')
     expect(source).toContain('getPreloadPlan')
+    expect(source).toContain('label="装柜清单"')
+    expect(source).toContain('打印装柜清单')
+    expect(source).toContain(':sections="[\'pda\']"')
+  })
+
+  it('keeps the confirmed loading list inside the domestic container detail only', () => {
+    expect(routeSource).toContain("name: 'domestic-container-detail'")
+    expect(routeSource).toContain("name: 'overseas-container-detail'")
+    expect(loadingRouteSource).not.toContain("name: 'loading-lists'")
+    expect(navigationSource).not.toContain("title: '装柜清单'")
+    expect(source).toContain('<el-tabs v-model="activeTab"')
+    expect(source).toContain("v-if=\"isDomestic && activeTab === 'loading-list'\"")
+    expect(source).toContain("loadingDetail.value = await getConfirmedLoadingList(aggregate.loadingPlanId, resource.warehouseId)")
+    expect(source).toContain("getContainer(containerId.value, props.workbench), getContainerOverview(containerId.value)")
+    expect(source).toContain(':can-edit="false"')
+  })
+
+  it('keeps the loaded overview mounted while switching fee tabs', () => {
+    expect(source).toContain("v-show=\"activeTab === 'overview'\" class=\"detail-section surface-panel\" aria-labelledby=\"container-voyage-heading\"")
+    expect(source).toContain("v-if=\"isOverseas\" v-show=\"activeTab === 'overview'\"")
+    expect(source).not.toContain("v-if=\"activeTab === 'overview'\" class=\"detail-section surface-panel\"")
+  })
+
+  it('exposes empty return directly in overseas detail only when permission and server action both allow it', () => {
+    expect(source).toContain("access.can('platform:firstleg:terminal-drayage:empty-return:confirm')")
+    expect(source).toContain("hasAction('RECORD_EMPTY_RETURN')")
+    expect(source).toContain("terminalDrayage?.allowedActions.includes('RECORD_EMPTY_RETURN')")
+    expect(source).toContain('v-if="canRecordEmptyReturn" type="primary"')
+    expect(source).toContain('>确认还柜</el-button>')
+    expect(source).toContain('expectedVersion: current.version')
+    expect(source).toContain('actualAt: emptyReturnAt.value')
+    expect(source).toContain('remark: emptyReturnReason.value.trim() || undefined')
+    expect(source).toContain('await load()')
+  })
+
+  it('separates domestic first-leg fees and connects the overseas fee lifecycle lazily', () => {
+    expect(source).toContain('label="国内段费用（头程）" name="first-leg-fees"')
+    expect(source).toContain('label="目的港及海外段费用（尾程）" name="last-leg-fees"')
+    expect(source).toContain('v-if="firstLegFeesOpened"')
+    expect(source).toContain('v-show="activeTab === \'first-leg-fees\'"')
+    expect(source).toContain('title="国内段费用（头程）" :plan-id="overview.loadingPlanId" :container-booking-id="detail.id"')
+    expect(source).toContain(':readonly="isOverseas"')
+    expect(source).toContain('v-if="lastLegFeesOpened"')
+    expect(source).toContain('title="目的港及海外段费用（尾程）"')
+    expect(source).toContain(':readonly="isDomestic"')
+    expect(source).toContain("if (isDomestic.value && activeTab.value === 'loading-list') await loadLoadingDetail(resource, aggregate)")
+    expect(source).toContain("const needsLoadingDetail = tabName === 'first-leg-fees' || (isDomestic.value && tabName === 'loading-list')")
+    expect(lastLegFeesSource.indexOf('label="操作"')).toBeLessThan(lastLegFeesSource.indexOf('label="客户"'))
+    expect(lastLegFeesSource).toContain('show-overflow-tooltip')
+    expect(lastLegFeesSource).toContain('尾程计费加载失败')
+    expect(lastLegFeesSource).toContain('empty-text="当前货柜暂无尾程费用"')
+    expect(lastLegFeesSource).toContain('v-loading="loading"')
+    expect(lastLegFeesSource).toContain('props.readonly ? Promise.resolve([]) : listContainerFeeSupplierOptions(null)')
+    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 '当前货柜尚未关联装柜计划，暂无头程计费归属。'")
+    expect(source).toContain(':description="firstLegFeesEmptyReason"')
+    expect(source).toContain("const needsLoadingDetail = tabName === 'first-leg-fees' || (isDomestic.value && tabName === 'loading-list')")
+  })
+
+  it('uses domestic and overseas route-specific primary status and summary labels', () => {
+    expect(source).toContain("const primaryStatusText = computed(() => isDomestic.value ? statusText(detail.value?.planStatus) : overseasStageText.value)")
+    expect(source).toContain("UNLOADED: '待还柜'")
+    expect(source).toContain("EMPTY_RETURNED: '已还柜'")
+    expect(source).toContain("{{ isDomestic ? '装柜清单号' : '当前海外阶段' }}")
+    expect(source).toContain("{{ isDomestic ? '装柜仓库' : '目的仓 / 接柜仓' }}")
+    expect(source).toContain('emptyReturnWarningText')
   })
 
   it('mounts the new container customs panel only after loading completes', () => {

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

@@ -11,7 +11,7 @@ import AppDialog from '@/shared/components/AppDialog.vue'
 import LoadErrorState from '@/shared/components/LoadErrorState.vue'
 import StatusBadge from '@/shared/components/StatusBadge.vue'
 import { CarrierScheduleQueryPanel } from '@/modules/port-schedules'
-import { ContainerFeesPanel, getConfirmedLoadingList, getPreloadPlan, type LoadingDetail } from '@/modules/loading-lists'
+import { ContainerFeesPanel, getConfirmedLoadingList, getPreloadPlan, LoadingListDetailDrawer, type LoadingDetail } from '@/modules/loading-lists'
 import {
   confirmContainerOutboundDispatch,
   getContainerOutboundDispatch,
@@ -19,6 +19,7 @@ import {
   type ContainerOutboundGateItem,
 } from '@/modules/outbound-dispatch'
 import ContainerCustomsPanel from '../components/ContainerCustomsPanel.vue'
+import ContainerLastLegFeesPanel from '../components/ContainerLastLegFeesPanel.vue'
 import ContainerOverviewPanel from '../components/ContainerOverviewPanel.vue'
 import {
   cancelContainerException,
@@ -31,21 +32,60 @@ import {
   markContainerException,
   uploadContainerClearance,
   uploadContainerDocument,
+  updateContainerPickupCode,
 } from '../api/platformContainerLoading'
-import type { BusinessDocument, ContainerBookingResource, ContainerOverview, ContainerOverviewDocument, ContainerPlanStatus } from '../types'
+import { recordTerminalDrayageEmptyReturn } from '../api/terminalDrayages'
+import type { BusinessDocument, ContainerBookingResource, ContainerOverview, ContainerOverviewDocument, ContainerPlanStatus, ContainerWorkbenchAction, ContainerWorkbenchRow } from '../types'
+
+const props = withDefaults(defineProps<{ workbench?: 'DOMESTIC' | 'OVERSEAS' }>(), { workbench: 'DOMESTIC' })
 
 const route = useRoute()
 const router = useRouter()
 const access = useAccessPreviewStore()
 const containerId = computed(() => String(route.params.containerId || ''))
-const canEdit = computed(() => access.can('platform:firstleg:container:edit'))
-const canManageCustoms = computed(() => access.can('platform:firstleg:customs:manage'))
+const isDomestic = computed(() => props.workbench === 'DOMESTIC')
+const isOverseas = computed(() => props.workbench === 'OVERSEAS')
+const activeTab = ref(route.query.tab === 'loading-list' ? 'loading-list' : 'overview')
+const firstLegFeesOpened = ref(false)
+const lastLegFeesOpened = ref(false)
+const feeCustomers = computed(() => {
+  const customers = new Map<string, string | null>()
+  for (const item of loadingDetail.value?.items || []) if (item.accountId) customers.set(item.accountId, item.customerName)
+  return [...customers].map(([accountId, customerName]) => ({ accountId, customerName }))
+})
+const feeBusinessReferences = computed(() => (loadingDetail.value?.items || []).map((item) => ({
+  accountId: item.accountId, customerName: item.customerName, orderId: item.orderId, orderNo: item.orderNo,
+  inboundId: item.inboundId, inboundCode: item.inboundCode,
+})))
+const firstLegFeesEmptyReason = computed(() => {
+  if (!overview.value?.loadingPlanId) return '当前货柜尚未关联装柜计划，暂无头程计费归属。'
+  if (!detail.value?.warehouseId) return '当前货柜尚未关联装柜仓库，无法加载头程计费归属。'
+  if (detail.value.planStatus === 'COMPLETED' && !canViewLoadingList.value) return '当前账号无权读取已确认装柜清单，无法查看头程计费。'
+  if (detail.value.planStatus !== 'COMPLETED' && !canViewPreload.value) return '当前账号无权读取预装计划，无法查看头程计费。'
+  return '当前柜次暂无可用费用归属明细。'
+})
+async function rememberWorkbenchTab(tabName: string | number) {
+  if (tabName === 'first-leg-fees') firstLegFeesOpened.value = true
+  if (tabName === 'last-leg-fees') lastLegFeesOpened.value = true
+  const needsLoadingDetail = tabName === 'first-leg-fees' || (isDomestic.value && tabName === 'loading-list')
+  if (needsLoadingDetail && detail.value && overview.value) {
+    await loadLoadingDetail(detail.value, overview.value)
+  }
+}
+const workbenchDetail = ref<ContainerWorkbenchRow | null>(null)
+const hasAction = (action: ContainerWorkbenchAction) => Boolean(workbenchDetail.value?.allowedActions?.includes(action))
+const canEdit = computed(() => isDomestic.value && access.can('platform:firstleg:container:edit') && hasAction('EDIT_CONTAINER'))
+const canManageCustoms = computed(() => isDomestic.value && access.can('platform:firstleg:customs:manage') && hasAction('MANAGE_CUSTOMS'))
+const canManageDestinationDocuments = computed(() => isOverseas.value && access.can('platform:firstleg:terminal-drayage:document:edit') && hasAction('MANAGE_DESTINATION_DOCUMENTS'))
+const canRecordEmptyReturn = computed(() => isOverseas.value
+  && access.can('platform:firstleg:terminal-drayage:empty-return:confirm')
+  && hasAction('RECORD_EMPTY_RETURN')
+  && Boolean(workbenchDetail.value?.terminalDrayage?.allowedActions.includes('RECORD_EMPTY_RETURN')))
 const canListCustoms = computed(() => access.can('platform:firstleg:customs:list'))
 const canViewOutboundDispatch = computed(() => access.can('platform:firstleg:outbound-dispatch:view'))
 const canConfirmOutboundDispatch = computed(() => access.can('platform:firstleg:outbound-dispatch:confirm'))
 const canViewPreload = computed(() => access.can('platform:firstleg:preload:list'))
 const canViewLoadingList = computed(() => access.can('platform:firstleg:loading-list:list'))
-const canViewContainerFees = computed(() => access.can('firstleg:inbound:fee-detail:view'))
 const canLinkOceanBooking = computed(() => Boolean(canEdit.value
   && detail.value?.sourceType === 'SIMULATION'
   && !detail.value.oceanBookingId
@@ -56,7 +96,7 @@ const overview = ref<ContainerOverview | null>(null)
 const error = ref<ApiErrorDetails | null>(null)
 const overviewError = ref<ApiErrorDetails | null>(null)
 const documentOpen = ref(false)
-type UploadDocumentType = 'DELIVERY_ORDER' | 'PICKUP_ORDER'
+type UploadDocumentType = 'DELIVERY_ORDER'
 const documentType = ref<UploadDocumentType>('DELIVERY_ORDER')
 const documentFile = ref<File | null>(null)
 const documentUploadKey = ref(0)
@@ -64,6 +104,7 @@ const documentSaving = ref(false)
 const documentDownloading = ref(false)
 const documentError = ref<ApiErrorDetails | null>(null)
 const documentRefreshWarning = ref<ApiErrorDetails | null>(null)
+const pickupCodeSaving = ref(false)
 const clearanceOpen = ref(false)
 const clearanceDocument = ref<BusinessDocument | null>(null)
 const clearanceFile = ref<File | null>(null)
@@ -81,11 +122,37 @@ const outboundError = ref<ApiErrorDetails | null>(null)
 const showPassedGates = ref(false)
 const carrierRefreshKey = ref(0)
 const loadingDetail = ref<LoadingDetail | null>(null)
+const loadingDetailLoading = ref(false)
 const loadingDetailError = ref<ApiErrorDetails | null>(null)
+const emptyReturnOpen = ref(false)
+const emptyReturnAt = ref('')
+const emptyReturnReason = ref('')
+const emptyReturnSaving = ref(false)
+const emptyReturnError = ref<ApiErrorDetails | null>(null)
 
 const selectedDocument = computed(() => overview.value?.documents.find((item) => item.documentType === documentType.value) || null)
-const documentTitle = computed(() => ({ DELIVERY_ORDER: 'DO 资料', PICKUP_ORDER: 'PU 资料' })[documentType.value])
+const documentTitle = computed(() => 'DO 资料')
 const title = computed(() => detail.value?.containerNo || detail.value?.cabinetNo || '货柜详情')
+const overseasStageText = computed(() => {
+  const status = workbenchDetail.value?.statusSummary?.terminalDrayageStatus
+    || workbenchDetail.value?.terminalDrayage?.status
+    || workbenchDetail.value?.workbenchStage
+  return ({
+    WAIT_LOADING: '待装柜', LOADING: '装柜中', WAIT_CUSTOMS: '待出口报关', WAIT_OUTBOUND: '待国内出仓',
+    DEPARTED_WAREHOUSE: '已从国内仓出仓', IN_TRANSIT: '海运在途', ARRIVED_DESTINATION_PORT: '已到目的港',
+    WAITING_FOR_ARRIVAL: '待到港', ARRIVED: '已到港', PICKUP_READY: '可安排提柜', PICKUP_SCHEDULED: '已预约提柜',
+    PICKED_UP: '已提柜', UNLOADED: '待还柜', EMPTY_RETURNED: '已还柜',
+  } as Record<string, string>)[status || ''] || '海外履约中'
+})
+const primaryStatusText = computed(() => isDomestic.value ? statusText(detail.value?.planStatus) : overseasStageText.value)
+const overseasDestinationText = computed(() => [detail.value?.destinationWarehouseCode, detail.value?.destinationWarehouseName].filter(Boolean).join(' / ') || '—')
+const emptyReturnWarningText = computed(() => {
+  const warning = workbenchDetail.value?.terminalDrayage?.emptyReturnWarning
+  if (!warning || warning.status === 'NOT_APPLICABLE') return '当前暂无还空预警'
+  if (warning.status === 'RESOLVED') return `已完成还柜${warning.deadlineAt ? ` · 截止 ${formatTime(warning.deadlineAt)}` : ''}`
+  const overdue = warning.status === 'OVERDUE' ? (warning.overdueDays > 0 ? `已超时 ${warning.overdueDays} 天` : `已超时 ${warning.overdueHours} 小时`) : '待还柜'
+  return `${overdue}${warning.deadlineAt ? ` · 截止 ${formatTime(warning.deadlineAt)}` : ''}`
+})
 const exceptionTitle = computed(() => overview.value?.exception.active ? '取消货柜异常' : '标记货柜异常')
 type AggregatedGateRow = ContainerOutboundGateItem & { key: string; inboundCodes: string[] }
 const referenceOnlyGateCodes = new Set(['TRUCK_DEPARTED', 'SAILING_SCHEDULE'])
@@ -110,27 +177,14 @@ const outboundGateSummary = computed(() => ({
   blocked: outboundGateRows.value.filter((row) => !row.passed).length,
 }))
 const canConfirmDeparture = computed(() => canConfirmOutboundDispatch.value
+  && hasAction('CONFIRM_OUTBOUND')
   && outboundDetail.value?.aggregate.dispatchStatus === 'READY_FOR_DISPATCH'
   && outboundGateSummary.value.blocked === 0)
 const customsDepartureState = computed<'DEPARTED' | 'WAITING_OTHER_GATES'>(() =>
   outboundDetail.value?.aggregate.dispatchStatus === 'WAITING_FOR_LOADING' ? 'DEPARTED' : 'WAITING_OTHER_GATES')
-const feeCustomers = computed(() => {
-  const customers = new Map<string, string | null>()
-  for (const item of loadingDetail.value?.items || []) if (item.accountId) customers.set(item.accountId, item.customerName)
-  return [...customers].map(([accountId, customerName]) => ({ accountId, customerName }))
-})
-const feeBusinessReferences = computed(() => (loadingDetail.value?.items || []).map((item) => ({
-  accountId: item.accountId,
-  customerName: item.customerName,
-  orderId: item.orderId,
-  orderNo: item.orderNo,
-  inboundId: item.inboundId,
-  inboundCode: item.inboundCode,
-})))
-
 function openOceanBookingLink() {
   if (!detail.value || !canLinkOceanBooking.value) return
-  void router.push({ name: 'container-loading', query: { linkContainerId: detail.value.id } })
+  void router.push({ name: 'domestic-container-workbench', query: { linkContainerId: detail.value.id } })
 }
 
 function toOverviewDocument(document: BusinessDocument, documentType: string, fallback?: ContainerOverviewDocument | null): ContainerOverviewDocument {
@@ -169,15 +223,47 @@ async function refreshOverviewDocument(documentType: 'DESTINATION_CLEARANCE') {
 
 function statusText(status?: ContainerPlanStatus | null) { return status ? ({ WAIT_LOADING: '待装柜', EDITING: '预装柜中', LOADING: '拣货中', COMPLETED: '装柜完成' })[status] : '—' }
 function formatTime(value?: string | null) { return value?.replace('T', ' ').slice(0, 16) || '—' }
+function localDateTimeValue() {
+  const now = new Date(Date.now() - new Date().getTimezoneOffset() * 60_000)
+  return now.toISOString().slice(0, 19)
+}
+function openEmptyReturn() {
+  if (!canRecordEmptyReturn.value || emptyReturnSaving.value) return
+  emptyReturnAt.value = localDateTimeValue()
+  emptyReturnReason.value = ''
+  emptyReturnError.value = null
+  emptyReturnOpen.value = true
+}
+async function confirmEmptyReturn() {
+  const current = workbenchDetail.value?.terminalDrayage
+  if (!current || !canRecordEmptyReturn.value || !emptyReturnAt.value || emptyReturnSaving.value) return
+  emptyReturnSaving.value = true
+  emptyReturnError.value = null
+  try {
+    await recordTerminalDrayageEmptyReturn(containerId.value, {
+      expectedVersion: current.version,
+      actualAt: emptyReturnAt.value,
+      remark: emptyReturnReason.value.trim() || undefined,
+    })
+    emptyReturnOpen.value = false
+    ElMessage.success('还柜已确认')
+    await load()
+  } catch (cause) {
+    const details = getApiErrorDetails(cause, '确认还柜失败')
+    if (details.code === 'A0409') await load()
+    emptyReturnError.value = details
+  } finally { emptyReturnSaving.value = false }
+}
 
 async function load() {
   if (!containerId.value) return
   loading.value = true; error.value = null; overviewError.value = null
   try {
-    const [resource, aggregate] = await Promise.all([getContainer(containerId.value), getContainerOverview(containerId.value)])
-    detail.value = resource; overview.value = aggregate
-    await loadLoadingDetail(resource, aggregate)
-    if (resource.planStatus === 'COMPLETED' && canViewOutboundDispatch.value) await loadOutboundDispatch()
+    const [resource, aggregate] = await Promise.all([getContainer(containerId.value, props.workbench), getContainerOverview(containerId.value)])
+    workbenchDetail.value = resource; detail.value = resource; overview.value = aggregate
+    if (activeTab.value === 'loading-list' && resource.planStatus !== 'COMPLETED') activeTab.value = 'overview'
+    if (isDomestic.value && activeTab.value === 'loading-list') await loadLoadingDetail(resource, aggregate)
+    if (isDomestic.value && resource.planStatus === 'COMPLETED' && canViewOutboundDispatch.value) await loadOutboundDispatch()
   } catch (cause) { error.value = getApiErrorDetails(cause, '货柜详情加载失败') }
   finally { loading.value = false }
 }
@@ -191,8 +277,10 @@ async function loadOutboundDispatch() {
 }
 
 async function loadLoadingDetail(resource: ContainerBookingResource, aggregate: ContainerOverview) {
+  if (loadingDetail.value || loadingDetailLoading.value) return
   loadingDetail.value = null; loadingDetailError.value = null
-  if (!canViewContainerFees.value || !aggregate.loadingPlanId || !resource.warehouseId) return
+  if (!aggregate.loadingPlanId || !resource.warehouseId) return
+  loadingDetailLoading.value = true
   try {
     if (resource.planStatus === 'COMPLETED') {
       if (!canViewLoadingList.value) return
@@ -202,7 +290,9 @@ async function loadLoadingDetail(resource: ContainerBookingResource, aggregate:
     if (!canViewPreload.value) return
     loadingDetail.value = await getPreloadPlan(aggregate.loadingPlanId, resource.warehouseId)
   } catch (cause) {
-    loadingDetailError.value = getApiErrorDetails(cause, '费用归属信息加载失败')
+    loadingDetailError.value = getApiErrorDetails(cause, '装柜清单加载失败')
+  } finally {
+    loadingDetailLoading.value = false
   }
 }
 async function refreshAfterCustoms() {
@@ -242,8 +332,8 @@ function truckReferenceText(status?: string | null) {
 }
 
 function openDocument(type: string) {
-  if (type === 'DESTINATION_CLEARANCE') { if (canManageCustoms.value) void openClearance(); return }
-  if (!['DELIVERY_ORDER', 'PICKUP_ORDER'].includes(type) || !canEdit.value) return
+  if (type === 'DESTINATION_CLEARANCE') { if (canManageDestinationDocuments.value) void openClearance(); return }
+  if (type !== 'DELIVERY_ORDER' || !canManageDestinationDocuments.value) return
   documentType.value = type as UploadDocumentType
   documentFile.value = null; documentError.value = null; documentRefreshWarning.value = null; documentUploadKey.value += 1; documentOpen.value = true
 }
@@ -280,12 +370,12 @@ async function saveDocument() {
 }
 async function saveBlob(blob: Blob, fileName: string) { const url = URL.createObjectURL(blob); const anchor = document.createElement('a'); anchor.href = url; anchor.download = fileName || '货柜资料'; anchor.click(); URL.revokeObjectURL(url) }
 async function downloadDocument(item: ContainerOverviewDocument) {
-  if (!['DELIVERY_ORDER', 'PICKUP_ORDER', 'DESTINATION_CLEARANCE'].includes(item.documentType)) return
+  if (!['DELIVERY_ORDER', 'DESTINATION_CLEARANCE'].includes(item.documentType)) return
   documentDownloading.value = true
   try {
     const blob = item.documentType === 'DESTINATION_CLEARANCE'
         ? await downloadContainerClearance(containerId.value, item.fileId)
-        : await downloadContainerDocument(containerId.value, item.documentType as 'DELIVERY_ORDER' | 'PICKUP_ORDER', item.fileId)
+        : await downloadContainerDocument(containerId.value, 'DELIVERY_ORDER', item.fileId)
     await saveBlob(blob, item.fileName); ElMessage.success('资料下载已开始')
   } catch (cause) {
     const details = getApiErrorDetails(cause, '资料下载失败')
@@ -294,6 +384,20 @@ async function downloadDocument(item: ContainerOverviewDocument) {
   }
   finally { documentDownloading.value = false }
 }
+async function savePickupCode(pickupCode: string) {
+  if (!overview.value || !canManageDestinationDocuments.value || !/^[0-9]{1,64}$/.test(pickupCode)) return
+  pickupCodeSaving.value = true; documentRefreshWarning.value = null
+  try {
+    const refreshed = await updateContainerPickupCode(containerId.value, pickupCode, overview.value.container.version)
+    overview.value = refreshed
+    if (detail.value) detail.value = { ...detail.value, pickupCode: refreshed.container.pickupCode, pickupCodeUpdatedBy: refreshed.container.pickupCodeUpdatedBy, pickupCodeUpdatedByName: refreshed.container.pickupCodeUpdatedByName, pickupCodeUpdatedAt: refreshed.container.pickupCodeUpdatedAt, version: refreshed.container.version }
+    ElMessage.success('PU 码已保存')
+  } catch (cause) {
+    const details = getApiErrorDetails(cause, 'PU 码保存失败')
+    documentRefreshWarning.value = details
+    if (details.code === 'A0409') try { overview.value = await getContainerOverview(containerId.value) } catch { /* 保留并发错误证据 */ }
+  } finally { pickupCodeSaving.value = false }
+}
 function openException() { exceptionReason.value = ''; exceptionError.value = null; exceptionOpen.value = true }
 async function saveException() {
   if (!overview.value || !exceptionReason.value.trim()) { exceptionError.value = { code: 'REASON_REQUIRED', message: '请输入异常原因或取消备注' }; return }
@@ -358,40 +462,44 @@ async function completeClearance() {
   finally { clearanceSaving.value = false }
 }
 
-onMounted(async () => { await load(); if (route.query.action === 'documents') openDocument('DELIVERY_ORDER'); if (route.query.action === 'exception' && canEdit.value) openException() })
+function goBack() { void router.push({ name: isDomestic.value ? 'domestic-container-workbench' : 'overseas-container-workbench' }) }
+function printLoadingList() { window.print() }
+
+onMounted(async () => { await load(); if (isOverseas.value && route.query.action === 'documents') openDocument('DELIVERY_ORDER') })
 </script>
 
 <template>
   <AdminPage class="container-detail-page">
     <section class="container-overview surface-panel">
-      <header class="container-overview__header"><el-button link type="primary" @click="router.push({ name: 'container-loading' })"><ArrowLeft :size="16" />返回列表</el-button><div><h1>{{ title }}</h1><p>柜次资料、履约轨迹、PDA 进度与单证</p></div><StatusBadge v-if="detail" :status="statusText(detail.planStatus)" /></header>
-      <div v-if="detail" class="container-overview__summary"><div><span>柜次号</span><strong>{{ detail.cabinetNo || '—' }}</strong></div><div><span>集装箱号</span><strong>{{ detail.containerNo || '待补录' }}</strong></div><div><span>装柜清单号</span><strong>{{ detail.planNo || '—' }}</strong></div><div><span>柜型</span><strong>{{ detail.containerType || '—' }}</strong></div><div><span>装柜仓库</span><strong>{{ detail.warehouseName || '—' }}</strong></div></div>
+      <header class="container-overview__header"><el-button link type="primary" @click="goBack"><ArrowLeft :size="16" />返回列表</el-button><div><h1>{{ title }}</h1><p>{{ isDomestic ? '送柜、装柜、出口报关与国内出仓' : '海运节点、目的港清关、提柜与还空' }}</p></div><StatusBadge v-if="detail" :status="primaryStatusText" /></header>
+      <div v-if="detail" class="container-overview__summary"><div><span>柜次号</span><strong>{{ detail.cabinetNo || '—' }}</strong></div><div><span>集装箱号</span><strong>{{ detail.containerNo || '待补录' }}</strong></div><div><span>{{ isDomestic ? '装柜清单号' : '当前海外阶段' }}</span><strong>{{ isDomestic ? (detail.planNo || '—') : primaryStatusText }}</strong></div><div><span>{{ isDomestic ? '柜型' : '起运仓' }}</span><strong>{{ isDomestic ? (detail.containerType || '—') : (detail.warehouseName || '—') }}</strong></div><div><span>{{ isDomestic ? '装柜仓库' : '目的仓 / 接柜仓' }}</span><strong :title="isDomestic ? detail.warehouseName || '—' : overseasDestinationText">{{ isDomestic ? (detail.warehouseName || '—') : overseasDestinationText }}</strong></div></div>
+      <div v-if="isOverseas && detail" class="overseas-stage-strip" :class="{ 'is-overdue': workbenchDetail?.terminalDrayage?.emptyReturnWarning.status === 'OVERDUE' }"><div><span>当前海外履约状态</span><strong>{{ primaryStatusText }}</strong></div><p>{{ emptyReturnWarningText }}</p></div>
     </section>
     <LoadErrorState v-if="error" title="货柜详情加载失败" :message="error.message" :loading="loading" @retry="load"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState>
     <template v-else-if="detail">
+      <el-tabs v-model="activeTab" class="workbench-tabs" @tab-change="rememberWorkbenchTab"><el-tab-pane :label="isDomestic ? '送柜报关' : '清关提柜'" name="overview" /><el-tab-pane v-if="isDomestic && detail.planStatus === 'COMPLETED' && canViewLoadingList" label="装柜清单" name="loading-list" /><el-tab-pane label="国内段费用（头程）" name="first-leg-fees" /><el-tab-pane label="目的港及海外段费用（尾程）" name="last-leg-fees" /></el-tabs>
       <LoadErrorState v-if="overviewError" compact title="履约摘要加载失败" :message="overviewError.message" :show-retry="false" />
-      <section class="detail-section surface-panel" aria-labelledby="container-information-heading">
+      <section v-show="activeTab === 'overview'" class="detail-section surface-panel" aria-labelledby="container-information-heading">
         <h2 id="container-information-heading">货柜信息</h2>
         <div class="detail-fields"><dl><div><dt>真实订舱</dt><dd><span>{{ detail.oceanBookingId ? (detail.billOfLadingNo || '已关联') : '未关联' }}</span><el-button v-if="canLinkOceanBooking" link type="primary" @click="openOceanBookingLink"><Link2 :size="14" />关联已放舱订舱</el-button></dd></div><div><dt>异常状态</dt><dd>{{ detail.exceptionActive ? '异常' : '正常' }}</dd></div><div><dt>目的仓</dt><dd>{{ detail.destinationWarehouseName || detail.destinationWarehouseCode || '—' }}</dd></div><div><dt>拖车公司</dt><dd>{{ detail.terminalTruckingCompany || '—' }}</dd></div></dl></div>
-        <ContainerOverviewPanel v-if="overview" :overview="overview" :sections="['exception']" :can-manage-documents="canEdit" :can-manage-customs="canManageCustoms" :can-manage-exception="canEdit" @manage-exception="openException" />
+        <ContainerOverviewPanel v-if="isDomestic && overview" :overview="overview" :sections="['exception']" :can-manage-documents="canEdit" :can-manage-customs="canManageCustoms" :can-manage-exception="canEdit" @manage-exception="openException" />
       </section>
 
-      <section class="detail-section surface-panel" aria-labelledby="container-voyage-heading">
+      <section v-show="activeTab === 'overview'" class="detail-section surface-panel" aria-labelledby="container-voyage-heading">
         <h2 id="container-voyage-heading">船名航次信息</h2>
         <div class="detail-fields"><dl><div><dt>船公司</dt><dd>{{ detail.shippingCompanyName || '—' }}</dd></div><div><dt>船名 / 航次</dt><dd>{{ [detail.vesselName, detail.voyageNo].filter(Boolean).join(' / ') || '—' }}</dd></div><div><dt>预计开船</dt><dd>{{ formatTime(detail.estimatedSailingAt) }}</dd></div><div><dt>预计到港</dt><dd>{{ formatTime(detail.estimatedPortArrivalAt) }}</dd></div></dl></div>
         <div class="carrier-panel"><CarrierScheduleQueryPanel :key="carrierRefreshKey" :ocean-booking-id="detail.oceanBookingId" :container-booking-id="detail.id" :warehouse-timeline="overview?.timeline || []" /></div>
       </section>
 
-      <section class="detail-section surface-panel" aria-labelledby="container-customs-heading">
-        <h2 id="container-customs-heading">报关清关信息</h2>
-        <ContainerOverviewPanel v-if="overview" :overview="overview" :sections="['documents']" :can-manage-documents="canEdit" :can-manage-customs="canManageCustoms" :can-manage-exception="canEdit" :document-busy="documentDownloading" @upload-document="openDocument" @download-document="downloadDocument" />
+      <section v-show="activeTab === 'overview'" class="detail-section surface-panel" aria-labelledby="container-customs-heading">
+        <h2 id="container-customs-heading">{{ isDomestic ? '出口报关信息' : '目的港清关与提柜资料' }}</h2>
+        <ContainerOverviewPanel v-if="isOverseas && overview" :overview="overview" :sections="['documents']" :can-manage-documents="canManageDestinationDocuments" :can-manage-customs="canManageDestinationDocuments" :can-manage-exception="false" :document-busy="documentDownloading" :pickup-code-busy="pickupCodeSaving" @upload-document="openDocument" @download-document="downloadDocument" @save-pickup-code="savePickupCode" />
         <el-alert v-if="documentRefreshWarning" type="warning" :closable="false" :title="documentRefreshWarning.message"><template #default><ApiErrorMeta :details="documentRefreshWarning" /></template></el-alert>
-        <ContainerCustomsPanel v-if="detail.planStatus === 'COMPLETED' && overview?.loadingPlanId && canListCustoms" :loading-plan-id="overview.loadingPlanId" :can-list="canListCustoms" :can-manage="canManageCustoms" :departure-state="customsDepartureState" @refreshed="refreshAfterCustoms" />
+        <ContainerCustomsPanel v-if="isDomestic && detail.planStatus === 'COMPLETED' && overview?.loadingPlanId && canListCustoms" :loading-plan-id="overview.loadingPlanId" :can-list="canListCustoms" :can-manage="canManageCustoms" :departure-state="customsDepartureState" @refreshed="refreshAfterCustoms" />
       </section>
 
-      <section class="detail-section surface-panel" aria-labelledby="container-receiving-heading">
-        <h2 id="container-receiving-heading">签收信息</h2>
-        <div class="detail-fields"><dl><div><dt>卸柜完成</dt><dd>{{ formatTime(detail.unloadingCompletedAt) }}</dd></div><div><dt>卸柜照片上传</dt><dd>{{ formatTime(detail.unloadingPhotoUploadedAt) }}</dd></div><div><dt>预计报空</dt><dd>{{ formatTime(detail.estimatedEmptyReportedAt) }}</dd></div><div><dt>实际报空</dt><dd>{{ formatTime(detail.actualEmptyReportedAt) }}</dd></div></dl></div>
+      <section v-if="isDomestic" v-show="activeTab === 'overview'" class="detail-section surface-panel" aria-labelledby="container-receiving-heading">
+        <h2 id="container-receiving-heading">装柜作业与国内出仓</h2>
         <ContainerOverviewPanel v-if="overview" :overview="overview" :sections="['pda']" :can-manage-documents="canEdit" :can-manage-customs="canManageCustoms" :can-manage-exception="canEdit" />
         <div v-if="detail.planStatus === 'COMPLETED' && canViewOutboundDispatch" class="outbound-panel" aria-label="国内出仓门禁">
         <header class="outbound-panel__header"><div><h2>国内出仓门禁</h2><p>按整柜核验全部入库绑定，仅确认一次离仓。</p></div><div v-if="outboundDetail" class="outbound-panel__actions"><el-tag :type="outboundGateSummary.blocked === 0 ? 'success' : 'danger'">{{ outboundGateSummary.blocked === 0 ? '门禁通过' : '门禁阻断' }}</el-tag><StatusBadge :status="outboundStatusText(outboundDetail.aggregate.dispatchStatus)" /><el-button v-if="canConfirmDeparture" type="primary" :loading="outboundConfirming" @click="confirmDeparture">确认离仓</el-button></div></header>
@@ -411,15 +519,30 @@ onMounted(async () => { await load(); if (route.query.action === 'documents') op
         </div>
       </section>
 
-      <section class="detail-section surface-panel" aria-labelledby="container-fees-heading">
-        <h2 id="container-fees-heading">费用明细</h2>
-        <LoadErrorState v-if="loadingDetailError" compact title="费用明细加载失败" :message="loadingDetailError.message" @retry="overview && loadLoadingDetail(detail, overview)"><template #details><ApiErrorMeta :details="loadingDetailError" /></template></LoadErrorState>
-        <ContainerFeesPanel v-else-if="overview?.loadingPlanId && loadingDetail" :plan-id="overview.loadingPlanId" :container-booking-id="detail.id" :customers="feeCustomers" :business-references="feeBusinessReferences" />
-        <el-alert v-else-if="!canViewContainerFees" type="warning" :closable="false" show-icon title="当前账号没有查看柜次费用的权限" />
-        <el-empty v-else description="当前货柜尚无可读取的装柜费用上下文" :image-size="64" />
+      <section v-if="isOverseas" v-show="activeTab === 'overview'" class="detail-section surface-panel" aria-labelledby="container-overseas-receiving-heading">
+        <header class="detail-section__heading"><h2 id="container-overseas-receiving-heading">提柜、卸柜与还空</h2><el-button v-if="canRecordEmptyReturn" type="primary" :loading="emptyReturnSaving" @click="openEmptyReturn">确认还柜</el-button></header>
+        <div class="detail-fields"><dl><div><dt>码头拖车状态</dt><dd>{{ workbenchDetail?.statusSummary?.terminalDrayageStatus || '—' }}</dd></div><div><dt>码头车队</dt><dd>{{ workbenchDetail?.terminalDrayage?.fleetSupplierName || '—' }}</dd></div><div><dt>预约提柜</dt><dd>{{ formatTime(workbenchDetail?.terminalDrayage?.pickupAppointmentAt) }}</dd></div><div><dt>实际提柜</dt><dd>{{ formatTime(workbenchDetail?.terminalDrayage?.actualPickupAt) }}</dd></div><div><dt>卸柜完成</dt><dd>{{ formatTime(workbenchDetail?.actualFacts?.unloadingCompletedAt as string | null) }}</dd></div><div><dt>实际还柜</dt><dd>{{ formatTime(workbenchDetail?.terminalDrayage?.actualEmptyReturnAt) }}</dd></div></dl></div>
+      </section>
+
+      <section v-if="isDomestic && activeTab === 'loading-list'" class="detail-section surface-panel" aria-labelledby="container-loading-list-heading">
+        <header class="loading-list-heading"><div><h2 id="container-loading-list-heading">装柜清单</h2><p>清单明细、PDA 证据与报关关联均以当前柜次为边界。</p></div><el-button v-if="loadingDetail" @click="printLoadingList">打印装柜清单</el-button></header>
+        <ContainerOverviewPanel v-if="overview" :overview="overview" :sections="['pda']" :can-manage-documents="false" :can-manage-customs="false" :can-manage-exception="false" />
+        <ContainerCustomsPanel v-if="overview?.loadingPlanId && canListCustoms" :loading-plan-id="overview.loadingPlanId" :can-list="canListCustoms" :can-manage="canManageCustoms" :departure-state="customsDepartureState" @refreshed="refreshAfterCustoms" />
+        <LoadingListDetailDrawer mode="confirmed" :loading="loadingDetailLoading" :detail="loadingDetail" :error="loadingDetailError" :can-edit="false" @back="activeTab = 'overview'" @retry="overview && loadLoadingDetail(detail, overview)" />
+      </section>
+
+      <section v-if="firstLegFeesOpened" v-show="activeTab === 'first-leg-fees'" v-loading="loadingDetailLoading" class="detail-section surface-panel" aria-label="头程计费">
+        <LoadErrorState v-if="loadingDetailError" compact title="头程计费归属明细加载失败" :message="loadingDetailError.message" :loading="loadingDetailLoading" @retry="overview && loadLoadingDetail(detail, overview)"><template #details><ApiErrorMeta :details="loadingDetailError" /></template></LoadErrorState>
+        <ContainerFeesPanel v-else-if="overview?.loadingPlanId && loadingDetail" title="国内段费用（头程）" :plan-id="overview.loadingPlanId" :container-booking-id="detail.id" :customers="feeCustomers" :business-references="feeBusinessReferences" :readonly="isOverseas" />
+        <el-empty v-else-if="!loadingDetailLoading" :description="firstLegFeesEmptyReason" :image-size="72" />
+      </section>
+
+      <section v-if="lastLegFeesOpened" v-show="activeTab === 'last-leg-fees'" class="detail-section surface-panel" aria-label="尾程计费">
+        <ContainerLastLegFeesPanel title="目的港及海外段费用（尾程）" :container-booking-id="detail.id" :container-no="detail.containerNo" :readonly="isDomestic" />
       </section>
     </template>
 
+    <AppDialog v-model="emptyReturnOpen" title="确认还柜" width="min(520px, calc(100vw - 28px))" confirm-text="确认还柜" :confirm-loading="emptyReturnSaving" :confirm-disabled="!emptyReturnAt || !canRecordEmptyReturn" @confirm="confirmEmptyReturn"><el-alert title="提交后货柜将进入已还柜状态，请核对实际还柜时间。" type="warning" :closable="false" show-icon /><el-form label-position="top"><el-form-item label="实际还柜时间" required><el-date-picker v-model="emptyReturnAt" type="datetime" value-format="YYYY-MM-DDTHH:mm:ss" placeholder="请选择实际还柜时间" /></el-form-item><el-form-item label="备注"><el-input v-model="emptyReturnReason" type="textarea" :rows="3" maxlength="500" show-word-limit placeholder="请输入备注（选填）" /></el-form-item></el-form><LoadErrorState v-if="emptyReturnError" compact title="确认还柜失败" :message="emptyReturnError.message" :show-retry="false"><template #details><ApiErrorMeta :details="emptyReturnError" /></template></LoadErrorState></AppDialog>
     <AppDialog v-model="documentOpen" :title="documentTitle" width="min(520px, calc(100vw - 28px))" confirm-text="上传资料" :confirm-loading="documentSaving" :confirm-disabled="!documentFile" @confirm="saveDocument"><el-form label-position="top"><el-form-item :label="documentTitle"><el-upload :key="documentUploadKey" :auto-upload="false" :limit="1" :on-change="selectDocumentFile" :on-remove="removeDocumentFile"><el-button><FileUp :size="16" />选择文件</el-button><template #tip><div class="el-upload__tip">{{ selectedDocument ? '上传新文件将替换当前资料并保留历史。' : `请选择需要提交的${documentTitle}。` }}</div></template></el-upload></el-form-item></el-form><LoadErrorState v-if="documentError" compact title="资料上传失败" :message="documentError.message" :show-retry="false"><template #details><ApiErrorMeta :details="documentError" /></template></LoadErrorState></AppDialog>
     <AppDialog v-model="exceptionOpen" :title="exceptionTitle" width="min(520px, calc(100vw - 28px))" :confirm-text="overview?.exception.active ? '确认取消' : '确认标记'" :confirm-loading="exceptionSaving" :confirm-disabled="!exceptionReason.trim()" @confirm="saveException"><el-alert :title="overview?.exception.active ? '取消备注为必填项，提交后将保留历史记录。' : '异常原因将同步记录在货柜详情和操作日志中。'" :type="overview?.exception.active ? 'warning' : 'error'" :closable="false" /><el-form label-position="top"><el-form-item :label="overview?.exception.active ? '取消备注' : '异常原因'" required><el-input v-model="exceptionReason" type="textarea" :rows="4" maxlength="500" show-word-limit placeholder="请输入异常原因或取消备注" /></el-form-item></el-form><LoadErrorState v-if="exceptionError" compact title="异常处理失败" :message="exceptionError.message" :show-retry="false" /></AppDialog>
     <AppDialog v-model="clearanceOpen" title="目的港清关资料" width="min(520px, calc(100vw - 28px))" :loading="clearanceLoading" :show-confirm="!clearanceDocument?.completedAt" confirm-text="上传资料" :confirm-loading="clearanceSaving" :confirm-disabled="!clearanceFile" @confirm="uploadClearance"><el-alert v-if="clearanceDocument?.completedAt" type="success" :closable="false" :title="`目的港清关已完成：${clearanceDocument.fileName}`" /><template v-else><el-form label-position="top"><el-form-item label="目的港清关资料"><el-upload :auto-upload="false" :limit="1" :on-change="selectClearanceFile" :on-remove="removeClearanceFile"><el-button><FileUp :size="16" />选择文件</el-button></el-upload></el-form-item></el-form><el-button v-if="clearanceDocument" type="success" plain :loading="clearanceSaving" @click="completeClearance">确认目的港清关完成</el-button></template><LoadErrorState v-if="clearanceError" compact title="目的港清关资料操作失败" :message="clearanceError.message" :show-retry="false"><template #details><ApiErrorMeta :details="clearanceError" /></template></LoadErrorState></AppDialog>
@@ -428,4 +551,7 @@ onMounted(async () => { await load(); if (route.query.action === 'documents') op
 
 <style scoped>
 .container-detail-page { display:grid; min-width:0; gap:12px; }.container-overview { overflow:hidden; }.container-overview__header { display:grid; grid-template-columns:auto minmax(0,1fr) auto; align-items:center; gap:14px; padding:10px 16px; }.container-overview__header h1 { margin:0; font-size:18px; }.container-overview__header p { margin:2px 0 0; color:var(--cc-muted); font-size:12px; }.container-overview__summary { display:grid; grid-template-columns:repeat(5,minmax(0,1fr)); border-top:1px solid var(--cc-border); }.container-overview__summary>div { display:flex; min-width:0; flex-direction:column; gap:3px; padding:8px 14px; border-right:1px solid var(--cc-border); }.container-overview__summary>div:last-child { border-right:0; }.container-overview__summary span,dt { color:var(--cc-muted); font-size:12px; }.container-overview__summary strong,dd { overflow:hidden; margin:0; text-overflow:ellipsis; white-space:nowrap; }.detail-section{display:grid;min-width:0;gap:12px;padding:12px 16px}.detail-section>h2{margin:0;font-size:15px}.detail-fields { padding:0; }.detail-fields dl { display:grid; grid-template-columns:repeat(6,minmax(0,1fr)); gap:9px 16px; margin:0; }.detail-fields dl>div { min-width:0; }.detail-fields dd { margin-top:3px; font-size:13px; }.outbound-panel{padding:12px 0 0;border-top:1px solid var(--cc-border)}.outbound-panel__header{display:flex;align-items:center;justify-content:space-between;gap:12px}.outbound-panel__header h2{margin:0;font-size:15px}.outbound-panel__header p,.outbound-panel__hint{margin:3px 0 0;color:var(--cc-muted);font-size:12px}.outbound-panel__hint--success{color:var(--el-color-success)}.outbound-panel__actions{display:flex;align-items:center;gap:8px}.outbound-panel__loading{padding:8px 0}.gate-summary{display:flex;align-items:center;gap:14px;margin-top:8px;color:var(--cc-muted);font-size:12px}.gate-summary__passed strong{color:var(--el-color-success)}.gate-summary__blocked strong{color:var(--el-color-danger)}.gate-summary__reference{margin-left:auto;padding-left:10px;border-left:1px solid var(--cc-border)}.gate-list{display:grid;grid-template-columns:repeat(2,minmax(0,1fr));gap:6px 12px;margin-top:7px}.gate-row{display:grid;grid-template-columns:auto minmax(130px,.9fr) minmax(100px,1fr);align-items:center;gap:6px 8px;min-width:0;padding:6px 8px;border:1px solid var(--cc-border);border-radius:6px;background:var(--cc-surface-muted)}.gate-row__actual,.gate-row small{overflow:hidden;color:var(--cc-muted);font-size:12px;text-overflow:ellipsis;white-space:nowrap}.gate-row small{grid-column:2/-1}.gate-row__coverage{display:flex;grid-column:2/-1;min-width:0;align-items:center;gap:5px;overflow:hidden}.gate-row__coverage>span{flex:0 0 auto;color:var(--cc-muted);font-size:11px}.gate-row__coverage :deep(.el-tag){max-width:120px;overflow:hidden;text-overflow:ellipsis}.carrier-panel{padding-top:4px}@media(max-width:1200px){.detail-fields dl{grid-template-columns:repeat(4,minmax(0,1fr))}.gate-list{grid-template-columns:1fr}}@media(max-width:720px){.container-overview__header{grid-template-columns:auto minmax(0,1fr)}.container-overview__header>:last-child{grid-column:2}.container-overview__summary,.detail-fields dl{grid-template-columns:repeat(2,minmax(0,1fr))}.outbound-panel__header{align-items:flex-start;flex-direction:column}.outbound-panel__actions,.gate-summary{flex-wrap:wrap}.gate-summary__reference{width:100%;margin-left:0;padding-left:0;border-left:0}.gate-row{grid-template-columns:auto minmax(0,1fr)}.gate-row__actual,.gate-row small,.gate-row__coverage{grid-column:2}}
+.detail-section__heading { display:flex; align-items:center; justify-content:space-between; gap:12px; }
+.detail-section__heading h2 { margin:0; font-size:15px; }
+.overseas-stage-strip{display:flex;align-items:center;justify-content:space-between;gap:18px;padding:9px 16px;border-top:1px solid var(--cc-border);background:#f5f8ff}.overseas-stage-strip>div{display:flex;align-items:baseline;gap:10px}.overseas-stage-strip span,.overseas-stage-strip p{color:var(--cc-muted);font-size:12px}.overseas-stage-strip strong{color:var(--cc-primary);font-size:14px}.overseas-stage-strip p{margin:0}.overseas-stage-strip.is-overdue{background:#fff7ed}.overseas-stage-strip.is-overdue strong,.overseas-stage-strip.is-overdue p{color:#c2410c}
 </style>

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, listTerminalDrayages, recordTerminalDrayageEmptyReturn, selectTerminalDrayageFleet } from '../api/terminalDrayages'
+import { getTerminalDrayage, getTerminalDrayageHistory, recordTerminalDrayageEmptyReturn, selectTerminalDrayageFleet } from '../api/terminalDrayages'
 import AppDialog from '@/shared/components/AppDialog.vue'
 
 vi.mock('@/modules/warehouses', () => ({ listAllPlatformWarehouses: vi.fn() }))
@@ -35,9 +35,10 @@ const drayage = {
 function createTestRouter() {
   return createRouter({ history: createMemoryHistory(), routes: [
     { path: '/', component: ContainersView },
-    { path: '/container-loading/:containerId/smart-loading', name: 'smart-loading-workbench', component: { template: '<div />' } },
+    { path: '/container-loading/domestic/:containerId/smart-loading', name: 'smart-loading-workbench', component: { template: '<div />' } },
     { path: '/loading-plans', name: 'loading-plans', component: { template: '<div />' } },
-    { path: '/loading-lists', name: 'loading-lists', component: { template: '<div />' } },
+    { path: '/container-loading/domestic/:containerId', name: 'domestic-container-detail', component: { template: '<div />' } },
+    { path: '/container-loading/overseas/:containerId', name: 'overseas-container-detail', component: { template: '<div />' } },
   ] })
 }
 
@@ -51,13 +52,12 @@ describe('ContainersView', () => {
     vi.mocked(listOceanBookings).mockResolvedValue({ records: [], page: 1, size: 200, total: 0, pages: 1 })
     vi.mocked(listOceanBookingLinkCandidates).mockResolvedValue({ records: [], page: 1, size: 200, total: 0, pages: 0 })
     vi.mocked(getOceanBooking).mockResolvedValue({} as never)
-    vi.mocked(listTerminalDrayages).mockResolvedValue([{ ...drayage, allowedActions: [...drayage.allowedActions] }])
     vi.mocked(getTerminalDrayage).mockResolvedValue({ ...drayage, allowedActions: [...drayage.allowedActions] })
     vi.mocked(getTerminalDrayageHistory).mockResolvedValue([])
     vi.mocked(selectTerminalDrayageFleet).mockResolvedValue({ ...drayage, fleetSupplierId: '502', fleetSupplierName: '新车队', version: 4, allowedActions: [...drayage.allowedActions] })
-    vi.mocked(recordTerminalDrayageEmptyReturn).mockResolvedValue({ ...drayage, status: 'EMPTY_RETURNED', actualEmptyReturnAt: '2026-09-11T13:00:00', version: 4, emptyReturnWarning: { status: 'RESOLVED', deadlineAt: '2026-09-10T10:00:00', overdueHours: 0, overdueDays: 0 }, allowedActions: ['SELECT_FLEET'] })
-    vi.mocked(listContainers).mockResolvedValue({ records: [{ id: '9001', planId: null, bookingNo: 'BK-1', cabinetNo: 'CB-1', containerNo: 'MSCU-1', sourceType: 'SIMULATION', oceanBookingId: null, warehouseId: '8', warehouseName: '义乌仓', channelCode: 'ZBYHK', channelName: '美森正班海卡包税', containerType: '40HC', planStatus: 'WAIT_LOADING', version: 0, billOfLadingNo: null, vesselName: null, voyageNo: null, shippingCompanyId: null, shippingCompanyName: null, departurePortCode: null, departurePortName: '宁波', destinationPortCode: null, destinationPortName: '长滩', destinationWarehouseCode: null, destinationWarehouseName: null, capacityCbm: 76, maxWeightKg: 28000, terminalTruckingCompanyId: null, terminalTruckingCompany: null, loadingAt: null, estimatedSailingAt: null, actualSailingAt: null, estimatedPortArrivalAt: null, actualPortArrivalAt: null, estimatedWarehouseArrivalAt: null, actualWarehouseArrivalAt: null }], page: 1, size: 20, total: 1, pages: 1 })
-    vi.mocked(getContainer).mockResolvedValue({ id: '9001', planId: null, bookingNo: 'BK-1', cabinetNo: 'CB-1', containerNo: 'MSCU-1', sourceType: 'SIMULATION', oceanBookingId: null, warehouseId: '8', warehouseName: '义乌仓', channelCode: 'ZBYHK', channelName: '美森正班海卡包税', containerType: '40HC', planStatus: 'WAIT_LOADING', version: 0, billOfLadingNo: null, vesselName: null, voyageNo: null, shippingCompanyId: null, shippingCompanyName: null, departurePortCode: null, departurePortName: '宁波', destinationPortCode: null, destinationPortName: '长滩', destinationWarehouseCode: null, destinationWarehouseName: null, capacityCbm: 76, maxWeightKg: 28000, terminalTruckingCompanyId: null, terminalTruckingCompany: null, loadingAt: null, estimatedSailingAt: null, actualSailingAt: null, estimatedPortArrivalAt: null, actualPortArrivalAt: null, estimatedWarehouseArrivalAt: null, actualWarehouseArrivalAt: null })
+    vi.mocked(recordTerminalDrayageEmptyReturn).mockReset().mockResolvedValue({ ...drayage, status: 'EMPTY_RETURNED', actualEmptyReturnAt: '2026-09-11T13:00:00', version: 4, emptyReturnWarning: { status: 'RESOLVED', deadlineAt: '2026-09-10T10:00:00', overdueHours: 0, overdueDays: 0 }, allowedActions: ['SELECT_FLEET'] })
+    vi.mocked(listContainers).mockResolvedValue({ records: [{ id: '9001', planId: null, bookingNo: 'BK-1', cabinetNo: 'CB-1', containerNo: 'MSCU-1', sourceType: 'SIMULATION', allowedActions: ['EDIT_CONTAINER', 'SELECT_FLEET', 'SCHEDULE_PICKUP', 'RECORD_PICKUP', 'RECORD_EMPTY_RETURN'], terminalDrayage: drayage, oceanBookingId: null, warehouseId: '8', warehouseName: '义乌仓', channelCode: 'ZBYHK', channelName: '美森正班海卡包税', containerType: '40HC', planStatus: 'WAIT_LOADING', version: 0, billOfLadingNo: null, vesselName: null, voyageNo: null, shippingCompanyId: null, shippingCompanyName: null, departurePortCode: null, departurePortName: '宁波', destinationPortCode: null, destinationPortName: '长滩', destinationWarehouseCode: null, destinationWarehouseName: null, capacityCbm: 76, maxWeightKg: 28000, terminalTruckingCompanyId: null, terminalTruckingCompany: null, loadingAt: null, estimatedSailingAt: null, actualSailingAt: null, estimatedPortArrivalAt: null, actualPortArrivalAt: null, estimatedWarehouseArrivalAt: null, actualWarehouseArrivalAt: null }], page: 1, size: 20, total: 1, pages: 1 })
+    vi.mocked(getContainer).mockResolvedValue({ id: '9001', planId: null, bookingNo: 'BK-1', cabinetNo: 'CB-1', containerNo: 'MSCU-1', sourceType: 'SIMULATION', allowedActions: ['EDIT_CONTAINER'], oceanBookingId: null, warehouseId: '8', warehouseName: '义乌仓', channelCode: 'ZBYHK', channelName: '美森正班海卡包税', containerType: '40HC', planStatus: 'WAIT_LOADING', version: 0, billOfLadingNo: null, vesselName: null, voyageNo: null, shippingCompanyId: null, shippingCompanyName: null, departurePortCode: null, departurePortName: '宁波', destinationPortCode: null, destinationPortName: '长滩', destinationWarehouseCode: null, destinationWarehouseName: null, capacityCbm: 76, maxWeightKg: 28000, terminalTruckingCompanyId: null, terminalTruckingCompany: null, loadingAt: null, estimatedSailingAt: null, actualSailingAt: null, estimatedPortArrivalAt: null, actualPortArrivalAt: null, estimatedWarehouseArrivalAt: null, actualWarehouseArrivalAt: null })
     vi.mocked(getContainerOverview).mockResolvedValue({ container: { id: '9001', bookingNo: 'BK-1', cabinetNo: 'CB-1', containerNo: 'MSCU-1', status: 'WAIT_LOADING', warehouseId: '8', warehouseName: '义乌仓', voyageNo: null, vesselName: null, version: 0 }, loadingPlanId: null, pda: null, documents: [], exception: { active: false, reason: null, markedBy: null, markedByName: null, markedAt: null }, exceptionHistory: [], timeline: [] })
   })
 
@@ -66,27 +66,141 @@ describe('ContainersView', () => {
     await router.push('/'); await router.isReady()
     const wrapper = mount(ContainersView, { global: { plugins: [ElementPlus, router] } })
     await flushPromises()
-    expect(listContainers).toHaveBeenCalledWith(expect.objectContaining({ page: 1, size: 20 }))
+    expect(listContainers).toHaveBeenCalledWith(expect.objectContaining({ page: 1, size: 20, scope: 'ACTIVE' }), 'DOMESTIC')
     expect(wrapper.text()).toContain('待装柜')
     expect(wrapper.text()).toContain('CB-1')
     expect(wrapper.text()).toContain('MSCU-1')
     expect(wrapper.text()).toContain('宁波 → 长滩')
     expect(wrapper.find('button[aria-label="查看 CB-1"]').exists()).toBe(true)
-    expect(listTerminalDrayages).toHaveBeenCalledWith(['9001'])
-    expect(wrapper.text()).toContain('超时 1 天')
-    expect(wrapper.text()).toContain('2026-09-10 10:00')
+    expect(wrapper.text()).not.toContain('报空预警')
   })
 
-  it('keeps the cross-warehouse list usable when warehouse form options fail', async () => {
+  it('shows one direct empty-return action only when permission and server actions allow it', async () => {
+    const router = createTestRouter()
+    await router.push('/'); await router.isReady()
+    const wrapper = mount(ContainersView, { props: { workbench: 'OVERSEAS' }, attachTo: document.body, global: { plugins: [ElementPlus, router] } })
+    await flushPromises()
+    const buttons = wrapper.findAll('button').filter((item) => item.text().includes('确认还柜'))
+    expect(buttons).toHaveLength(1)
+    await buttons[0].trigger('click')
+    await flushPromises()
+    const returnDialog = wrapper.findAllComponents(AppDialog).find((dialog) => dialog.props('title') === '确认还柜')!
+    returnDialog.findComponent({ name: 'ElDatePicker' }).vm.$emit('update:modelValue', '2026-09-11T13:00:00')
+    await returnDialog.find('textarea').setValue('还柜凭证已核对')
+    const callsBefore = vi.mocked(listContainers).mock.calls.length
+    const page: Awaited<ReturnType<typeof listContainers>> = await vi.mocked(listContainers).mock.results.at(-1)!.value
+    vi.mocked(listContainers).mockResolvedValueOnce({ ...page, records: page.records.map((row) => ({ ...row, allowedActions: [], terminalDrayage: { ...drayage, status: 'EMPTY_RETURNED', version: 4, allowedActions: [], emptyReturnWarning: { status: 'RESOLVED', deadlineAt: null, overdueHours: 0, overdueDays: 0 } } })) })
+    const confirm = [...document.body.querySelectorAll('button')].filter((item) => item.textContent?.includes('确认还柜')).at(-1) as HTMLButtonElement
+    confirm.click()
+    await flushPromises()
+    expect(recordTerminalDrayageEmptyReturn).toHaveBeenCalledTimes(1)
+    expect(recordTerminalDrayageEmptyReturn).toHaveBeenCalledWith('9001', { expectedVersion: 3, 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)
+    wrapper.unmount()
+  })
+
+  it('cancels empty return without writing and preserves input on failure while preventing duplicate requests', async () => {
+    const router = createTestRouter()
+    await router.push('/'); await router.isReady()
+    const wrapper = mount(ContainersView, { props: { workbench: 'OVERSEAS' }, attachTo: document.body, global: { plugins: [ElementPlus, router] } })
+    await flushPromises()
+    const open = async () => {
+      await wrapper.findAll('.row-actions button').find((button) => button.text() === '确认还柜')!.trigger('click')
+      await flushPromises()
+      return wrapper.findAllComponents(AppDialog).find((dialog) => dialog.props('title') === '确认还柜')!
+    }
+    const first = await open()
+    first.vm.$emit('update:modelValue', false)
+    await flushPromises()
+    expect(recordTerminalDrayageEmptyReturn).not.toHaveBeenCalled()
+    const dialog = await open()
+    const state = wrapper.vm as unknown as { drayageActionAt: string; drayageReason: string; drayageActionOpen: boolean; drayageActionError: { message: string } | null }
+    state.drayageActionAt = '2026-09-11T13:00:00'
+    state.drayageReason = '还柜凭证已核对'
+    let reject!: (reason: Error) => void
+    vi.mocked(recordTerminalDrayageEmptyReturn).mockReturnValueOnce(new Promise((_resolve, rejectRequest) => { reject = rejectRequest }))
+    dialog.vm.$emit('confirm')
+    dialog.vm.$emit('confirm')
+    expect(recordTerminalDrayageEmptyReturn).toHaveBeenCalledTimes(1)
+    expect(recordTerminalDrayageEmptyReturn).toHaveBeenCalledWith('9001', { expectedVersion: 3, actualAt: '2026-09-11T13:00:00', remark: '还柜凭证已核对' })
+    reject(new Error('还柜时间不符合业务要求'))
+    await flushPromises()
+    expect(state.drayageActionOpen).toBe(true)
+    expect(state.drayageActionAt).toBe('2026-09-11T13:00:00')
+    expect(state.drayageReason).toBe('还柜凭证已核对')
+    expect(state.drayageActionError).not.toBeNull()
+    wrapper.unmount()
+  })
+
+  it('hides the direct empty-return action without permission or without the server action', async () => {
+    const router = createTestRouter()
+    await router.push('/'); await router.isReady()
+    accessCan.mockImplementation((code) => code !== 'platform:firstleg:terminal-drayage:empty-return:confirm')
+    const wrapper = mount(ContainersView, { props: { workbench: 'OVERSEAS' }, global: { plugins: [ElementPlus, router] } })
+    await flushPromises()
+    expect(wrapper.findAll('button').some((item) => item.text().includes('确认还柜'))).toBe(false)
+    wrapper.unmount()
+    accessCan.mockReturnValue(true)
+    const allowedWrapper = mount(ContainersView, { props: { workbench: 'OVERSEAS' }, global: { plugins: [ElementPlus, router] } })
+    await flushPromises()
+    const vm = allowedWrapper.vm as unknown as { rows: Array<{ allowedActions?: string[] }> }
+    vm.rows[0].allowedActions = vm.rows[0].allowedActions?.filter((action) => action !== 'RECORD_EMPTY_RETURN')
+    await allowedWrapper.vm.$nextTick()
+    expect(allowedWrapper.findAll('button').some((item) => item.text().includes('确认还柜'))).toBe(false)
+  })
+
+  it('defers form options until their dialogs open and caches successful loads', async () => {
+    const router = createTestRouter()
+    await router.push('/'); await router.isReady()
+    const wrapper = mount(ContainersView, { attachTo: document.body, global: { plugins: [ElementPlus, router] } })
+    await flushPromises()
+
+    expect(listAllPlatformWarehouses).not.toHaveBeenCalled()
+    expect(listPlatformPartners).not.toHaveBeenCalled()
+    expect(listSuppliers).not.toHaveBeenCalled()
+    expect(listOceanBookings).not.toHaveBeenCalled()
+
+    await wrapper.findAll('button').find((button) => button.text().includes('新增模拟柜'))!.trigger('click')
+    await flushPromises()
+    expect(listAllPlatformWarehouses).toHaveBeenCalledTimes(1)
+    expect(listPlatformPartners).not.toHaveBeenCalled()
+    expect(listSuppliers).not.toHaveBeenCalled()
+    expect(listOceanBookings).not.toHaveBeenCalled()
+    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 flushPromises()
+    expect(listAllPlatformWarehouses).toHaveBeenCalledTimes(1)
+
+    await wrapper.findAll('button').find((button) => button.text().includes('编辑运输信息'))!.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 flushPromises()
+    expect(listPlatformPartners).toHaveBeenCalledTimes(1)
+    expect(listSuppliers).toHaveBeenCalledTimes(1)
+    expect(listOceanBookings).toHaveBeenCalledTimes(1)
+    wrapper.unmount()
+  })
+
+  it('keeps the cross-warehouse list usable when lazy warehouse form options fail', async () => {
     vi.mocked(listAllPlatformWarehouses).mockRejectedValueOnce(new Error('warehouse unavailable'))
     const router = createTestRouter()
     await router.push('/'); await router.isReady()
     const wrapper = mount(ContainersView, { global: { plugins: [ElementPlus, router] } })
     await flushPromises()
 
+    expect(listAllPlatformWarehouses).not.toHaveBeenCalled()
     expect(wrapper.text()).toContain('CB-1')
-    expect(wrapper.text()).not.toContain('装柜仓库加载失败')
     expect(wrapper.find('button[aria-label="查看 CB-1"]').exists()).toBe(true)
+    await wrapper.findAll('button').find((button) => button.text().includes('新增模拟柜'))!.trigger('click')
+    await flushPromises()
+    expect(wrapper.text()).toContain('装柜仓库加载失败')
   })
 
   it('uses stable view labels when cabinetNo is missing', async () => {
@@ -150,7 +264,7 @@ describe('ContainersView', () => {
     await wrapper.findAll('button').find((button) => button.text().includes('装柜清单'))!.trigger('click')
     expect(push).toHaveBeenNthCalledWith(1, { name: 'smart-loading-workbench', params: { containerId: '9001' } })
     expect(push).toHaveBeenNthCalledWith(2, { name: 'loading-plans', query: { planId: '9102', warehouseId: '8' } })
-    expect(push).toHaveBeenNthCalledWith(3, { name: 'loading-lists', query: { planId: '9103', warehouseId: '8' } })
+    expect(push).toHaveBeenNthCalledWith(3, { name: 'domestic-container-detail', params: { containerId: '9003' }, query: { tab: 'loading-list' } })
   })
 
   it('uses active customer names and sends the stable customerId filter', () => {
@@ -209,8 +323,7 @@ describe('ContainersView', () => {
 
   it('opens container detail as an independent route while keeping create and edit dialogs', () => {
     const source = readFileSync(resolve(process.cwd(), 'src/modules/container-loading/pages/ContainersView.vue'), 'utf8')
-    expect(source).toContain("router.push({ name: 'container-detail', params: { containerId: row.id } })")
-    expect(source).toContain("query: { action: command }")
+    expect(source).toContain("'domestic-container-detail' : 'overseas-container-detail'")
     expect(source).not.toContain('<AppDialog v-model="detailOpen"')
     expect(source).toContain('<AppDialog v-model="editorOpen" class="container-editor-dialog"')
     expect(source).toContain('max-height: 90vh')
@@ -223,10 +336,11 @@ describe('ContainersView', () => {
   it('registers a list-authorized independent container detail page', () => {
     const routes = readFileSync(resolve(process.cwd(), 'src/modules/container-loading/routes.ts'), 'utf8')
     const detail = readFileSync(resolve(process.cwd(), 'src/modules/container-loading/pages/ContainerDetailView.vue'), 'utf8')
-    expect(routes).toContain("path: 'container-loading/:containerId'")
-    expect(routes).toContain("name: 'container-detail'")
+    expect(routes).toContain("path: 'container-loading/domestic/:containerId'")
+    expect(routes).toContain("name: 'domestic-container-detail'")
+    expect(routes).toContain("name: 'overseas-container-detail'")
     expect(routes).toContain("permission: 'platform:firstleg:container:list'")
-    expect(detail).toContain('getContainer(containerId.value)')
+    expect(detail).toContain('getContainer(containerId.value, props.workbench)')
     expect(detail).toContain('getContainerOverview(containerId.value)')
     expect(detail).toContain('<ContainerOverviewPanel')
     expect(detail).toContain("@upload-document=\"openDocument\"")
@@ -249,7 +363,7 @@ describe('ContainersView', () => {
   it('renders container business actions as buttons without changing the transport gate', () => {
     const source = readFileSync(resolve(process.cwd(), 'src/modules/container-loading/pages/ContainersView.vue'), 'utf8')
     expect(source).toContain('size="small" type="primary" plain :aria-label="containerViewLabel')
-    expect(source).toContain("['WAIT_LOADING', 'EDITING'].includes(row.planStatus)")
+    expect(source).toContain("hasAction(row as ContainerWorkbenchRow, 'EDIT_CONTAINER')")
     expect(source).not.toContain("row.containerNo ? '修改集装箱号' : '录入集装箱号'")
     expect(source).toContain('货柜基础资料不提供柜号写入')
     expect(source).toContain('containerNo: optional(detail.value?.containerNo || null)')
@@ -265,7 +379,7 @@ describe('ContainersView', () => {
     vi.mocked(listSuppliers).mockResolvedValue({ records: [{ id: '502', name: '新车队', category: 'TRUCKING', status: 'ACTIVE' } as never], page: 1, size: 200, total: 1, pages: 1 })
     const router = createTestRouter()
     await router.push('/'); await router.isReady()
-    const wrapper = mount(ContainersView, { global: { plugins: [ElementPlus, router] } })
+    const wrapper = mount(ContainersView, { props: { workbench: 'OVERSEAS' }, global: { plugins: [ElementPlus, router] } })
     await flushPromises()
 
     const vm = wrapper.vm as unknown as {
@@ -280,8 +394,10 @@ describe('ContainersView', () => {
 
     vm.openDrayageAction(vm.rows[0], 'RECORD_EMPTY_RETURN')
     vm.drayageActionAt = '2026-09-11T13:00:00'
+    const page: Awaited<ReturnType<typeof listContainers>> = await vi.mocked(listContainers).mock.results.at(-1)!.value
+    vi.mocked(listContainers).mockResolvedValueOnce({ ...page, records: page.records.map((row) => ({ ...row, allowedActions: [], terminalDrayage: { ...drayage, status: 'EMPTY_RETURNED', version: 5, allowedActions: [], emptyReturnWarning: { status: 'RESOLVED', deadlineAt: null, overdueHours: 0, overdueDays: 0 } } })) })
     await vm.saveDrayageAction()
-    expect(recordTerminalDrayageEmptyReturn).toHaveBeenCalledWith('9001', { expectedVersion: 4, actualAt: '2026-09-11T13:00:00', reason: undefined })
+    expect(recordTerminalDrayageEmptyReturn).toHaveBeenCalledWith('9001', { expectedVersion: 4, actualAt: '2026-09-11T13:00:00', remark: undefined })
     expect(wrapper.text()).toContain('已还柜')
     wrapper.unmount()
   })
@@ -304,9 +420,9 @@ describe('ContainersView', () => {
   it('opens the existing released-booking workflow when entered from container detail', () => {
     const source = readFileSync(resolve(process.cwd(), 'src/modules/container-loading/pages/ContainersView.vue'), 'utf8')
     expect(source).toContain('route.query.linkContainerId')
-    expect(source).toContain('const target = await getContainer(linkContainerId)')
+    expect(source).toContain("const target = await getContainer(linkContainerId, 'DOMESTIC')")
     expect(source).toContain('await openLink(target)')
-    expect(source).toContain("void router.replace({ name: 'container-loading' })")
+    expect(source).toContain("void router.replace({ name: 'domestic-container-workbench' })")
   })
 
   it('normalizes an optional booking-link container number', async () => {
@@ -399,7 +515,7 @@ describe('ContainersView', () => {
   it('filters OB-260825-0183 for CAB-260825-0215 because the real warehouses differ', async () => {
     vi.mocked(listContainers).mockResolvedValue({ records: [{
       id: '215', planId: null, bookingNo: 'CB-260825-0215', cabinetNo: 'CAB-260825-0215', containerNo: null,
-      sourceType: 'SIMULATION', oceanBookingId: null, warehouseId: '193000000000200002', warehouseName: '东莞仓',
+      sourceType: 'SIMULATION', allowedActions: ['EDIT_CONTAINER'], oceanBookingId: null, warehouseId: '193000000000200002', warehouseName: '东莞仓',
       channelCode: 'EXX_RAIL_NY', channelName: '纽约铁路', containerType: '45HC', planStatus: 'EDITING',
       capacityCbm: 86, maxWeightKg: 29000, version: 7,
     }], page: 1, size: 20, total: 1, pages: 1 } as never)
@@ -426,7 +542,7 @@ describe('ContainersView', () => {
     let resolveCandidates!: (value: Awaited<ReturnType<typeof listOceanBookingLinkCandidates>>) => void
     vi.mocked(listContainers).mockResolvedValue({ records: [{
       id: '315', planId: null, bookingNo: 'CB-CAPACITY-SNAPSHOT', cabinetNo: 'CAB-CAPACITY-SNAPSHOT', containerNo: null,
-      sourceType: 'SIMULATION', oceanBookingId: null, warehouseId: '193000000000200002', warehouseName: '东莞仓',
+      sourceType: 'SIMULATION', allowedActions: ['EDIT_CONTAINER'], oceanBookingId: null, warehouseId: '193000000000200002', warehouseName: '东莞仓',
       channelCode: 'EXX_RAIL_NY', channelName: '纽约铁路', containerType: '45HC', planStatus: 'WAIT_LOADING',
       capacityCbm: 86, maxWeightKg: 29000, version: 7,
     }], page: 1, size: 20, total: 1, pages: 1 } as never)
@@ -491,7 +607,7 @@ describe('ContainersView', () => {
 
   it('backfills a legacy trucking supplier name and submits the frozen id-name pair', async () => {
     vi.mocked(listSuppliers).mockResolvedValue({ records: [{ id: '9007199254740998', tenantId: '1', name: '测试拖车供应商', category: 'TRUCKING', carrierCodes: [], region: 'CN', legalRepresentative: '张三', contactName: '李四', phone: '13800000000', email: null, address: null, businessLicenseNo: null, licenseFileId: null, status: 'ACTIVE', settlementPeriod: 'MONTHLY_30', remark: null, createdBy: null, createdAt: '2026-08-25T10:00:00', updatedBy: null, updatedAt: '2026-08-25T10:00:00', deleted: false, version: 0 }], page: 1, size: 200, total: 1, pages: 1 })
-    vi.mocked(getContainer).mockResolvedValueOnce({ id: '9001', planStatus: 'WAIT_LOADING', containerType: '40HC', warehouseId: '8', terminalTruckingCompanyId: null, terminalTruckingCompany: '测试拖车供应商' } as never)
+    vi.mocked(getContainer).mockResolvedValueOnce({ id: '9001', allowedActions: ['EDIT_CONTAINER'], planStatus: 'WAIT_LOADING', containerType: '40HC', warehouseId: '8', terminalTruckingCompanyId: null, terminalTruckingCompany: '测试拖车供应商' } as never)
     vi.mocked(updateContainer).mockResolvedValue({} as never)
     const router = createTestRouter()
     await router.push('/'); await router.isReady()
@@ -511,7 +627,7 @@ describe('ContainersView', () => {
 
   it('clears the trucking supplier id and name together', async () => {
     vi.mocked(listSuppliers).mockResolvedValue({ records: [{ id: '9007199254740998', tenantId: '1', name: '测试拖车供应商', category: 'TRUCKING', carrierCodes: [], region: 'CN', legalRepresentative: '张三', contactName: '李四', phone: '13800000000', email: null, address: null, businessLicenseNo: null, licenseFileId: null, status: 'ACTIVE', settlementPeriod: 'MONTHLY_30', remark: null, createdBy: null, createdAt: '2026-08-25T10:00:00', updatedBy: null, updatedAt: '2026-08-25T10:00:00', deleted: false, version: 0 }], page: 1, size: 200, total: 1, pages: 1 })
-    vi.mocked(getContainer).mockResolvedValueOnce({ id: '9001', planStatus: 'WAIT_LOADING', containerType: '40HC', warehouseId: '8', terminalTruckingCompanyId: '9007199254740998', terminalTruckingCompany: '测试拖车供应商' } as never)
+    vi.mocked(getContainer).mockResolvedValueOnce({ id: '9001', allowedActions: ['EDIT_CONTAINER'], planStatus: 'WAIT_LOADING', containerType: '40HC', warehouseId: '8', terminalTruckingCompanyId: '9007199254740998', terminalTruckingCompany: '测试拖车供应商' } as never)
     vi.mocked(updateContainer).mockResolvedValue({} as never)
     const router = createTestRouter()
     await router.push('/'); await router.isReady()
@@ -533,7 +649,7 @@ describe('ContainersView', () => {
   })
 
   it('blocks saving a legacy trucking supplier name that no longer matches an active option', async () => {
-    vi.mocked(getContainer).mockResolvedValueOnce({ id: '9001', planStatus: 'WAIT_LOADING', containerType: '40HC', warehouseId: '8', terminalTruckingCompanyId: null, terminalTruckingCompany: '已停用拖车供应商' } as never)
+    vi.mocked(getContainer).mockResolvedValueOnce({ id: '9001', allowedActions: ['EDIT_CONTAINER'], planStatus: 'WAIT_LOADING', containerType: '40HC', warehouseId: '8', terminalTruckingCompanyId: null, terminalTruckingCompany: '已停用拖车供应商' } as never)
     vi.mocked(updateContainer).mockClear()
     const router = createTestRouter()
     await router.push('/'); await router.isReady()
@@ -555,7 +671,7 @@ describe('ContainersView', () => {
 describe('ContainersView trucking supplier contract', () => {
   it('shows the frozen plan, exception and document aggregates without deriving them client-side', () => {
     const source = readFileSync(resolve(process.cwd(), 'src/modules/container-loading/pages/ContainersView.vue'), 'utf8')
-    const fields = ['containerNo', 'planNo', 'planStatus', 'exceptionActive', 'cabinetNo', 'destinationClearanceDocumentStatus', 'deliveryOrderDocumentStatus', 'pickupOrderDocumentStatus']
+    const fields = ['containerNo', 'planNo', 'planStatus', 'exceptionActive', 'cabinetNo', 'destinationClearanceDocumentStatus', 'deliveryOrderDocumentStatus', 'pickupCode']
     let previous = source.indexOf("key: 'actions'")
     for (const field of fields) {
       const current = source.indexOf(`key: '${field}'`, previous + 1)

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

@@ -1,7 +1,7 @@
 <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, TriangleAlert } from '@lucide/vue'
+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 { useAccessPreviewStore } from '@/core/access/accessPreview'
 import { listPlatformTenants, type PlatformTenantResource } from '@/modules/iam'
@@ -22,7 +22,6 @@ import { createContainerSimulation, getContainer, linkContainerOceanBooking, lis
 import {
   getTerminalDrayage,
   getTerminalDrayageHistory,
-  listTerminalDrayages,
   recordTerminalDrayageEmptyReturn,
   recordTerminalDrayagePickup,
   scheduleTerminalDrayagePickup,
@@ -31,15 +30,17 @@ import {
   type TerminalDrayageHistory,
   type TerminalDrayageView,
 } from '../api/terminalDrayages'
-import type { ContainerBookingResource, ContainerDocumentStatus, ContainerPlanStatus, ContainerSaveRequest, ContainerSimulationCreateRequest } from '../types'
+import type { ContainerBookingResource, ContainerDocumentStatus, ContainerPlanStatus, ContainerSaveRequest, ContainerSimulationCreateRequest, 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 }
 
+const props = withDefaults(defineProps<{ workbench?: 'DOMESTIC' | 'OVERSEAS' }>(), { workbench: 'DOMESTIC' })
+
 const router = useRouter()
 const route = useRoute()
 const access = useAccessPreviewStore()
-const rows = ref<ContainerBookingResource[]>([])
+const rows = ref<ContainerWorkbenchRow[]>([])
 const customers = ref<PlatformTenantResource[]>([])
 const customersLoading = ref(false)
 const warehouses = ref<PlatformWarehouseSummaryResource[]>([])
@@ -56,6 +57,7 @@ const businessOptionsError = ref('')
 const page = ref(1)
 const pageSize = ref(20)
 const total = ref(0)
+const scope = ref<'ACTIVE' | 'HISTORY'>('ACTIVE')
 const filters = ref<Filters>({ customerId: '', keyword: '', containerType: '', status: '', sailingRange: [] })
 const applied = ref<Filters>({ ...filters.value })
 const detail = ref<ContainerBookingResource | null>(null)
@@ -81,8 +83,6 @@ const linkCandidates = ref<Array<{ key: string; oceanBookingId: string; requirem
 const selectedTruckingSupplierId = ref('')
 const unresolvedTruckingSupplierName = ref<string | null>(null)
 const drayages = ref<Record<string, TerminalDrayageView>>({})
-const drayageLoading = ref(false)
-const drayageLoadError = ref<ApiErrorDetails | null>(null)
 const drayageSavingIds = ref<string[]>([])
 const drayageActionOpen = ref(false)
 const drayageAction = ref<Exclude<TerminalDrayageAction, 'SELECT_FLEET'>>('SCHEDULE_PICKUP')
@@ -98,7 +98,13 @@ const drayageHistoryError = ref<ApiErrorDetails | null>(null)
 let listSequence = 0
 let detailSequence = 0
 let linkSequence = 0
-let drayageSequence = 0
+let warehousesLoaded = false
+let warehouseOptionsPromise: Promise<void> | null = null
+let partnersLoaded = false
+let truckingSuppliersLoaded = false
+let truckingSuppliersPromise: Promise<Supplier[]> | null = null
+let oceanBookingsLoaded = false
+let businessOptionsPromise: Promise<void> | null = null
 
 function emptyForm(): ContainerForm {
   return {
@@ -118,11 +124,17 @@ const rules: FormRules<ContainerForm> = {
   terminalTruckingCompany: [{ validator: (_rule, value, callback) => callback(unresolvedTruckingSupplierName.value || (value && !selectedTruckingSupplierId.value) ? new Error('请选择有效的合作中拖车供应商') : undefined), trigger: 'change' }],
 }
 
-const canView = computed(() => access.can('platform:firstleg:container:list'))
+const isDomestic = computed(() => props.workbench === 'DOMESTIC')
+const isOverseas = computed(() => props.workbench === 'OVERSEAS')
+const canView = computed(() => isDomestic.value ? access.can('platform:firstleg:container:list') : access.can('platform:firstleg:terminal-drayage:list'))
 const canEdit = computed(() => access.can('platform:firstleg:container:edit'))
 const canCreate = computed(() => access.can('platform:firstleg:container:create'))
+const canOverseasDocumentEdit = computed(() => access.can('platform:firstleg:terminal-drayage:document:edit'))
+const canFleetEdit = computed(() => access.can('platform:firstleg:terminal-drayage:fleet:edit'))
+const canPickupAppointmentEdit = computed(() => access.can('platform:firstleg:terminal-drayage:pickup-appointment:edit'))
+const canPickupConfirm = computed(() => access.can('platform:firstleg:terminal-drayage:pickup:confirm'))
+const canEmptyReturnConfirm = computed(() => access.can('platform:firstleg:terminal-drayage:empty-return:confirm'))
 const canSmartLoading = computed(() => access.can('platform:firstleg:smart-loading:list'))
-const canCustomsManage = computed(() => access.can('platform:firstleg:customs:manage'))
 const canViewPreload = computed(() => access.can('platform:firstleg:preload:list'))
 const canViewLoadingList = computed(() => access.can('platform:firstleg:loading-list:list'))
 const editorTitle = computed(() => form.id ? '编辑' : '新增')
@@ -166,7 +178,7 @@ const queryFields = computed<QueryField[]>(() => [
   { key: 'status', type: 'select', label: '装柜状态', width: 150, placeholder: '请选择货柜状态', options: [{ label: '待装柜', value: 'WAIT_LOADING' }, { label: '预装柜中', value: 'EDITING' }, { label: '拣货中', value: 'LOADING' }, { label: '装柜完成', value: 'COMPLETED' }], props: { 'aria-label': '装柜状态' } },
   { key: 'sailingRange', type: 'daterange', label: '预计开船', width: 260, props: { 'aria-label': '预计开船日期范围' } },
 ])
-const columns: DataTableColumn[] = [
+const allColumns: DataTableColumn[] = [
   { key: 'actions', label: '操作', width: 310, fixed: 'left', slotName: 'actions' },
   { key: 'emptyReturnWarning', label: '报空预警', width: 120, slotName: 'emptyReturnWarning' },
   { key: 'containerNo', label: '集装箱号', minWidth: 150, slotName: 'containerNo' },
@@ -176,7 +188,7 @@ const columns: DataTableColumn[] = [
   { key: 'cabinetNo', label: '柜次号', minWidth: 180, slotName: 'cabinet' },
   { key: 'destinationClearanceDocumentStatus', label: '清关资料', width: 110, formatter: (row: ContainerBookingResource) => documentStatusText(row.destinationClearanceDocumentStatus) },
   { key: 'deliveryOrderDocumentStatus', label: 'DO资料', width: 100, formatter: (row: ContainerBookingResource) => documentStatusText(row.deliveryOrderDocumentStatus) },
-  { key: 'pickupOrderDocumentStatus', label: 'PU资料', width: 100, formatter: (row: ContainerBookingResource) => documentStatusText(row.pickupOrderDocumentStatus) },
+  { key: 'pickupCode', label: 'PU码', minWidth: 140, formatter: (row: ContainerBookingResource) => row.pickupCode || '—' },
   { key: 'oceanBooking', label: '真实订舱', minWidth: 170, slotName: 'oceanBooking' },
   { key: 'warehouseName', prop: 'warehouseName', label: '装柜仓库', minWidth: 160 },
   { key: 'terminalTruckingCompany', label: '码头车队', width: 190, slotName: 'terminalTruckingCompany' },
@@ -196,6 +208,9 @@ const columns: DataTableColumn[] = [
   { key: 'estimatedPortArrivalAt', label: '预计到港', minWidth: 160, slotName: 'estimatedPortArrivalAt' },
   { key: 'actualPortArrivalAt', label: '实际到港', minWidth: 160, slotName: 'actualPortArrivalAt' },
 ]
+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 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)}` },
@@ -212,8 +227,12 @@ 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 canDrayage(row: ContainerBookingResource, action: TerminalDrayageAction) { return Boolean(canEdit.value && drayageFor(row.id)?.allowedActions.includes(action)) }
+function drayageActionText(action: TerminalDrayageAction) { return ({ SELECT_FLEET: '选择码头车队', SCHEDULE_PICKUP: '预约提柜', RECORD_PICKUP: '确认实际提柜', RECORD_EMPTY_RETURN: '确认还柜' } 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
+  return Boolean(isOverseas.value && permission && hasAction(row, action) && drayageFor(row.id)?.allowedActions.includes(action))
+}
 function drayageWarningText(row: ContainerBookingResource) {
   const warning = drayageFor(row.id)?.emptyReturnWarning
   if (!warning || warning.status === 'NOT_APPLICABLE') return '—'
@@ -333,14 +352,21 @@ function selectDestinationWarehouse(warehouseCode: string) {
 }
 
 async function loadWarehouses() {
-  warehouseLoading.value = true; warehouseError.value = null
-  try {
-    const records = await listAllPlatformWarehouses({ status: 'ACTIVE' })
-    warehouses.value = records.filter((warehouse) => warehouse.warehouseType === 'DOMESTIC')
-    destinationWarehouses.value = records.filter((warehouse) => warehouse.warehouseType !== 'DOMESTIC')
-  }
-  catch (error) { warehouseError.value = getApiErrorDetails(error, '装柜仓库加载失败') }
-  finally { warehouseLoading.value = false }
+  if (warehousesLoaded) return
+  if (warehouseOptionsPromise) return warehouseOptionsPromise
+  warehouseOptionsPromise = (async () => {
+    warehouseLoading.value = true; warehouseError.value = null
+    try {
+      const records = await listAllPlatformWarehouses({ status: 'ACTIVE' })
+      warehouses.value = records.filter((warehouse) => warehouse.warehouseType === 'DOMESTIC')
+      destinationWarehouses.value = records.filter((warehouse) => warehouse.warehouseType !== 'DOMESTIC')
+      warehousesLoaded = true
+    }
+    catch (error) { warehouseError.value = getApiErrorDetails(error, '装柜仓库加载失败') }
+    finally { warehouseLoading.value = false }
+  })()
+  try { await warehouseOptionsPromise }
+  finally { warehouseOptionsPromise = null }
 }
 async function loadCustomers() {
   customersLoading.value = true
@@ -354,25 +380,48 @@ async function loadCustomers() {
   }
 }
 async function loadBusinessOptions() {
-  businessOptionsLoading.value = true
-  businessOptionsError.value = ''
-  const errors: string[] = []
-  const [partnerResult, supplierResult, bookingResult] = await Promise.allSettled([
-    loadAllPartners(),
-    listSuppliers({ page: 1, size: 200, category: 'TRUCKING', status: 'ACTIVE' }),
-    loadAllOceanBookings(),
-  ])
-  if (partnerResult.status === 'fulfilled') partners.value = partnerResult.value
-  else errors.push(getApiErrorDetails(partnerResult.reason, '船公司与拖车公司加载失败').message)
-  if (supplierResult.status === 'fulfilled') {
-    truckingSuppliers.value = supplierResult.value.records.filter((supplier) => supplier.category === 'TRUCKING' && supplier.status === 'ACTIVE')
-    if (form.id) reconcileTruckingSupplier()
-  }
-  else errors.push(getApiErrorDetails(supplierResult.reason, '拖车供应商加载失败').message)
-  if (bookingResult.status === 'fulfilled') oceanBookings.value = bookingResult.value
-  else errors.push(getApiErrorDetails(bookingResult.reason, '港口候选加载失败').message)
-  businessOptionsError.value = errors.join('；')
-  businessOptionsLoading.value = false
+  if (partnersLoaded && truckingSuppliersLoaded && oceanBookingsLoaded) return
+  if (businessOptionsPromise) return businessOptionsPromise
+  businessOptionsPromise = (async () => {
+    businessOptionsLoading.value = true
+    businessOptionsError.value = ''
+    const errors: string[] = []
+    const [partnerResult, supplierResult, bookingResult] = await Promise.allSettled([
+      partnersLoaded ? Promise.resolve(partners.value) : loadAllPartners(),
+      loadTruckingSuppliers(),
+      oceanBookingsLoaded ? Promise.resolve(oceanBookings.value) : loadAllOceanBookings(),
+    ])
+    if (partnerResult.status === 'fulfilled') { partners.value = partnerResult.value; partnersLoaded = true }
+    else errors.push(getApiErrorDetails(partnerResult.reason, '船公司与拖车公司加载失败').message)
+    if (supplierResult.status === 'fulfilled') {
+      if (form.id) reconcileTruckingSupplier()
+    }
+    else errors.push(getApiErrorDetails(supplierResult.reason, '拖车供应商加载失败').message)
+    if (bookingResult.status === 'fulfilled') { oceanBookings.value = bookingResult.value; oceanBookingsLoaded = true }
+    else errors.push(getApiErrorDetails(bookingResult.reason, '港口候选加载失败').message)
+    businessOptionsError.value = errors.join('；')
+    businessOptionsLoading.value = false
+  })()
+  try { await businessOptionsPromise }
+  finally { businessOptionsPromise = null }
+}
+async function loadTruckingSuppliers(): Promise<Supplier[]> {
+  if (truckingSuppliersLoaded) return truckingSuppliers.value
+  if (truckingSuppliersPromise) return truckingSuppliersPromise
+  truckingSuppliersPromise = (async () => {
+    const result = await listSuppliers({ page: 1, size: 200, category: 'TRUCKING', status: 'ACTIVE' })
+    const records = result.records.filter((supplier) => supplier.category === 'TRUCKING' && supplier.status === 'ACTIVE')
+    truckingSuppliers.value = records
+    truckingSuppliersLoaded = true
+    return records
+  })()
+  try { return await truckingSuppliersPromise }
+  finally { truckingSuppliersPromise = null }
+}
+async function ensureTruckingSuppliers(open: unknown = true) {
+  if (!open) return false
+  try { await loadTruckingSuppliers(); return true }
+  catch (error) { ElMessage.error(getApiErrorDetails(error, '拖车供应商加载失败').message); return false }
 }
 async function loadAllPartners() {
   const firstPage = await listPlatformPartners({ page: 1, size: 200, status: 'ACTIVE' })
@@ -386,11 +435,13 @@ 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)
 }
-function openSimulation() {
+async function openSimulation() {
   Object.assign(simulationForm, { channelCode: '', warehouseId: '', containerType: '40HC', capacityCbm: 76, maxWeightKg: 28000 })
   simulationChannels.value = []
   simulationError.value = null
   simulationOpen.value = true
+  await loadWarehouses()
+  if (warehouseError.value) simulationError.value = warehouseError.value
 }
 function selectSimulationContainerType(containerType: string) {
   applyContainerSpecification(simulationForm, containerType)
@@ -477,20 +528,6 @@ async function saveLink() {
 function replaceDrayage(value: TerminalDrayageView) {
   drayages.value = { ...drayages.value, [value.containerBookingId]: value }
 }
-async function loadDrayages(targetRows = rows.value) {
-  const sequence = ++drayageSequence
-  if (!targetRows.length) { drayages.value = {}; drayageLoadError.value = null; return }
-  drayageLoading.value = true; drayageLoadError.value = null
-  try {
-    const values = await listTerminalDrayages(targetRows.map((row) => row.id))
-    if (sequence !== drayageSequence) return
-    drayages.value = Object.fromEntries(values.map((value) => [value.containerBookingId, value]))
-  } catch (error) {
-    if (sequence !== drayageSequence) return
-    drayages.value = {}
-    drayageLoadError.value = getApiErrorDetails(error, '码头拖车信息加载失败，请重试')
-  } finally { if (sequence === drayageSequence) drayageLoading.value = false }
-}
 async function refreshDrayage(containerBookingId: string) {
   const value = await getTerminalDrayage(containerBookingId)
   replaceDrayage(value)
@@ -499,6 +536,7 @@ async function refreshDrayage(containerBookingId: string) {
 async function selectRowFleet(source: object, supplierIdValue: unknown) {
   const row = source as ContainerBookingResource
   const current = drayageFor(row.id)
+  if (!(await ensureTruckingSuppliers())) return
   const supplier = truckingCompanies.value.find((item) => item.id === String(supplierIdValue || ''))
   if (!current || !supplier || !canDrayage(row, 'SELECT_FLEET') || drayageSavingIds.value.includes(row.id)) return
   drayageSavingIds.value = [...drayageSavingIds.value, row.id]
@@ -528,10 +566,11 @@ async function saveDrayageAction() {
     const next = drayageAction.value === 'SCHEDULE_PICKUP'
       ? await scheduleTerminalDrayagePickup(row.id, { expectedVersion: current.version, pickupAppointmentAt: drayageActionAt.value, reason })
       : drayageAction.value === 'RECORD_PICKUP'
-        ? await recordTerminalDrayagePickup(row.id, { expectedVersion: current.version, actualAt: drayageActionAt.value, reason })
-        : await recordTerminalDrayageEmptyReturn(row.id, { expectedVersion: current.version, actualAt: drayageActionAt.value, reason })
+        ? await recordTerminalDrayagePickup(row.id, { expectedVersion: current.version, actualAt: drayageActionAt.value, remark: reason })
+        : await recordTerminalDrayageEmptyReturn(row.id, { expectedVersion: current.version, actualAt: drayageActionAt.value, remark: reason })
     replaceDrayage(next); drayageActionOpen.value = false
     ElMessage.success(`${drayageActionText(drayageAction.value)}成功`)
+    await loadRows()
   } catch (error) {
     const details = getApiErrorDetails(error, `${drayageActionText(drayageAction.value)}失败`)
     if (details.code === 'A0409') {
@@ -558,11 +597,11 @@ async function loadRows() {
       page: page.value, size: pageSize.value, customerId: applied.value.customerId || undefined, keyword: applied.value.keyword.trim() || undefined,
       containerType: applied.value.containerType || undefined,
       status: applied.value.status, estimatedSailingFrom: from ? `${from}T00:00:00` : undefined,
-      estimatedSailingTo: to ? `${to}T23:59:59` : undefined,
-    })
+      estimatedSailingTo: to ? `${to}T23:59:59` : undefined, scope: scope.value,
+    }, props.workbench)
     if (sequence !== listSequence) return
-    rows.value = result.records; total.value = result.total
-    await loadDrayages(result.records)
+    rows.value = result.records as ContainerWorkbenchRow[]; total.value = result.total
+    drayages.value = Object.fromEntries(rows.value.flatMap((row) => row.terminalDrayage ? [[row.id, row.terminalDrayage as TerminalDrayageView]] : []))
   } catch (error) {
     if (sequence !== listSequence) return
     rows.value = []; total.value = 0; loadError.value = getApiErrorDetails(error, '货柜列表加载失败，请稍后重试')
@@ -571,7 +610,7 @@ async function loadRows() {
 function search() { applied.value = { ...filters.value, sailingRange: [...filters.value.sailingRange] }; if (page.value === 1) void loadRows(); else page.value = 1 }
 function openDetail(source: object) {
   const row = source as ContainerBookingResource
-  void router.push({ name: 'container-detail', params: { containerId: row.id } })
+  void router.push({ name: props.workbench === 'DOMESTIC' ? 'domestic-container-detail' : 'overseas-container-detail', params: { containerId: row.id } })
 }
 function handleMoreAction(command: string, source: object) {
   const row = source as ContainerBookingResource
@@ -579,17 +618,14 @@ function handleMoreAction(command: string, source: object) {
   if (command === 'overview') { openDetail(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 (['exception', 'documents'].includes(command)) void router.push({ name: 'container-detail', params: { containerId: row.id }, query: { action: command } })
+  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) {
   const row = source as ContainerBookingResource
   editorError.value = null
   try {
-    const latest = await getContainer(row.id)
-    if (!['WAIT_LOADING', 'EDITING'].includes(latest.planStatus)) {
-      ElMessage.warning('当前阶段运输信息只读；真实集装箱号如需纠错，请进入预装清单')
-      return
-    }
+    const [latest] = await Promise.all([getContainer(row.id, props.workbench), loadWarehouses(), loadBusinessOptions()])
+    if (!isDomestic.value || !hasAction(latest, 'EDIT_CONTAINER')) return
     detail.value = latest
     replaceForm(latest)
     editorOpen.value = true
@@ -612,7 +648,7 @@ async function save() {
     if (details.code === 'A0409' && form.id) {
       const submitted = { ...form }
       try {
-        const latest = await getContainer(form.id)
+        const latest = await getContainer(form.id, props.workbench)
         detail.value = latest
         replaceForm(latest)
         Object.assign(form, submitted, { id: latest.id, version: latest.version })
@@ -635,26 +671,28 @@ function goContainerProcess(source: object) {
     return
   }
   void router.push({
-    name: row.planStatus === 'LOADING' ? 'loading-plans' : 'loading-lists',
-    query: { planId: row.planId || undefined, warehouseId: row.warehouseId },
+    name: row.planStatus === 'LOADING' ? 'loading-plans' : 'domestic-container-detail',
+    params: row.planStatus === 'COMPLETED' ? { containerId: row.id } : undefined,
+    query: row.planStatus === 'COMPLETED' ? { tab: 'loading-list' } : { planId: row.planId || undefined, warehouseId: row.warehouseId },
   })
 }
 
 watch([page, pageSize], ([nextPage, nextSize], [previousPage, previousSize]) => {
   if (nextPage !== previousPage || nextSize !== previousSize) void loadRows()
 })
+watch(scope, () => { if (page.value === 1) void loadRows(); else page.value = 1 })
 watch(linkOpen, (open) => {
   if (open) return
   linkSequence += 1
   linkLoading.value = false
 })
 onMounted(async () => {
-  await Promise.all([loadCustomers(), loadWarehouses(), loadBusinessOptions(), loadRows()])
+  await Promise.all([loadCustomers(), loadRows()])
   const linkContainerId = typeof route.query.linkContainerId === 'string' ? route.query.linkContainerId : ''
-  if (!linkContainerId || !canEdit.value) return
+  if (!isDomestic.value || !linkContainerId || !canEdit.value) return
   try {
-    const target = await getContainer(linkContainerId)
-    if (target.sourceType !== 'SIMULATION' || target.oceanBookingId || !['WAIT_LOADING', 'EDITING'].includes(target.planStatus)) {
+    const target = await getContainer(linkContainerId, 'DOMESTIC')
+    if (target.sourceType !== 'SIMULATION' || target.oceanBookingId || !hasAction(target, 'EDIT_CONTAINER')) {
       ElMessage.warning('当前货柜已关联订舱或所处阶段不允许关联')
       return
     }
@@ -662,7 +700,7 @@ onMounted(async () => {
   } catch (error) {
     ElMessage.error(getApiErrorDetails(error, '关联货柜加载失败').message)
   } finally {
-    void router.replace({ name: 'container-loading' })
+    void router.replace({ name: 'domestic-container-workbench' })
   }
 })
 </script>
@@ -670,23 +708,28 @@ onMounted(async () => {
 <template>
   <AdminPage as="div">
     <section class="container-page">
-      <ListPageLayout ariaLabel="货柜列表">
+      <ListPageLayout :ariaLabel="isDomestic ? '送柜报关工作台' : '清关提柜工作台'">
       <template #toolbar>
-        <QueryToolbar v-model="filters" class="surface-panel" ariaLabel="货柜筛选" :fields="queryFields" preference-key="container-loading-query" @search="search" />
+        <div class="container-query-panel">
+          <div class="container-scope-tabs" role="tablist" aria-label="货柜完结状态">
+            <button type="button" role="tab" aria-controls="container-workbench-results" :aria-selected="scope === 'ACTIVE'" :tabindex="scope === 'ACTIVE' ? 0 : -1" :class="['container-scope-tab', { 'is-active': scope === 'ACTIVE' }]" @click="scope = 'ACTIVE'">未完结</button>
+            <button type="button" role="tab" aria-controls="container-workbench-results" :aria-selected="scope === 'HISTORY'" :tabindex="scope === 'HISTORY' ? 0 : -1" :class="['container-scope-tab', { 'is-active': scope === 'HISTORY' }]" @click="scope = 'HISTORY'">已完结</button>
+          </div>
+          <QueryToolbar v-model="filters" class="container-query-toolbar" ariaLabel="货柜筛选" :fields="queryFields" preference-key="container-loading-query" @search="search" />
+        </div>
       </template>
       <template v-if="loadError" #state>
         <LoadErrorState title="货柜列表加载失败" :message="loadError.message" :loading="loading" @retry="loadRows"><template #details><ApiErrorMeta :details="loadError" /></template></LoadErrorState>
       </template>
-        <section v-if="!loadError" class="surface-panel table-panel">
-          <el-alert v-if="drayageLoadError" class="drayage-load-alert" type="warning" :closable="false" show-icon :title="drayageLoadError.message"><el-button link type="warning" :loading="drayageLoading" @click="loadDrayages()">重新加载码头拖车信息</el-button></el-alert>
+        <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="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><el-button v-if="canView && canEdit && ['WAIT_LOADING', 'EDITING'].includes(row.planStatus)" 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><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><el-dropdown-item command="drayage-history"><FileText :size="15" />码头拖车记录</el-dropdown-item><el-dropdown-item v-if="canDrayage(row as ContainerBookingResource, 'SCHEDULE_PICKUP')" command="drayage:SCHEDULE_PICKUP">预约提柜</el-dropdown-item><el-dropdown-item v-if="canDrayage(row as ContainerBookingResource, 'RECORD_PICKUP')" command="drayage:RECORD_PICKUP">确认实际提柜</el-dropdown-item><el-dropdown-item v-if="canDrayage(row as ContainerBookingResource, 'RECORD_EMPTY_RETURN')" command="drayage:RECORD_EMPTY_RETURN">确认实际还柜</el-dropdown-item><el-dropdown-item command="documents"><FileUp :size="15" />DO / PU 资料</el-dropdown-item><el-dropdown-item v-if="canEdit && row.sourceType === 'SIMULATION' && !row.oceanBookingId && ['WAIT_LOADING','EDITING'].includes(row.planStatus)" command="link"><Link2 :size="15" />关联已放舱订舱</el-dropdown-item><el-dropdown-item v-if="canEdit" command="exception" divided><TriangleAlert :size="15" />异常处理</el-dropdown-item></el-dropdown-menu></template></el-dropdown></div></template>
+            <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 #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>
             <template #containerNo="{ row }">{{ row.containerNo || '待补录' }}</template>
-            <template #terminalTruckingCompany="{ row }"><el-select class="fleet-select" :model-value="drayageFor(row.id)?.fleetSupplierId || ''" filterable placeholder="请选择车队" :loading="drayageSavingIds.includes(row.id)" :disabled="!canDrayage(row as ContainerBookingResource, 'SELECT_FLEET') || drayageSavingIds.includes(row.id)" @update:model-value="selectRowFleet(row, $event)"><el-option v-if="drayageFor(row.id)?.fleetSupplierName && !truckingCompanies.some((item) => item.id === drayageFor(row.id)?.fleetSupplierId)" :label="drayageFor(row.id)?.fleetSupplierName || '原码头车队'" :value="drayageFor(row.id)?.fleetSupplierId || ''" disabled /><el-option v-for="supplier in truckingCompanies" :key="supplier.id" :label="supplier.name" :value="supplier.id" /></el-select></template>
+            <template #terminalTruckingCompany="{ row }"><el-select class="fleet-select" :model-value="drayageFor(row.id)?.fleetSupplierId || ''" filterable placeholder="请选择车队" :loading="drayageSavingIds.includes(row.id)" :disabled="!canDrayage(row as ContainerBookingResource, 'SELECT_FLEET') || drayageSavingIds.includes(row.id)" @visible-change="ensureTruckingSuppliers" @update:model-value="selectRowFleet(row, $event)"><el-option v-if="drayageFor(row.id)?.fleetSupplierName && !truckingCompanies.some((item) => item.id === drayageFor(row.id)?.fleetSupplierId)" :label="drayageFor(row.id)?.fleetSupplierName || '原码头车队'" :value="drayageFor(row.id)?.fleetSupplierId || ''" disabled /><el-option v-for="supplier in truckingCompanies" :key="supplier.id" :label="supplier.name" :value="supplier.id" /></el-select></template>
             <template #pickupAppointmentAt="{ row }">{{ formatTime(drayageFor(row.id)?.pickupAppointmentAt) }}</template>
             <template #actualPickupAt="{ row }">{{ formatTime(drayageFor(row.id)?.actualPickupAt) }}</template>
             <template #estimatedEmptyReturnAt="{ row }">{{ formatTime(drayageFor(row.id)?.estimatedEmptyReturnAt) }}</template>
@@ -697,9 +740,9 @@ onMounted(async () => {
             <template #vessel="{ row }">{{ [row.vesselName, row.voyageNo].filter(Boolean).join(' / ') || '—' }}</template>
             <template #loadingAt="{ row }">{{ formatTime(row.loadingAt) }}</template>
             <template #estimatedSailingAt="{ row }">{{ formatTime(row.estimatedSailingAt) }}</template>
-            <template #actualSailingAt="{ row }">{{ formatTime(row.actualSailingAt) }}</template>
+            <template #actualSailingAt="{ row }">{{ formatTime(row.actualFacts?.actualSailingAt) }}</template>
             <template #estimatedPortArrivalAt="{ row }">{{ formatTime(row.estimatedPortArrivalAt) }}</template>
-            <template #actualPortArrivalAt="{ row }">{{ formatTime(row.actualPortArrivalAt) }}</template>
+            <template #actualPortArrivalAt="{ row }">{{ formatTime(row.actualFacts?.actualPortArrivalAt) }}</template>
           </DataTable>
         </section>
       </ListPageLayout>
@@ -761,11 +804,11 @@ onMounted(async () => {
 </template>
 
 <style scoped>
-.container-page { display: grid; gap: 16px; min-width: 0; }.container-page small { display: block; margin-top: 4px; color: var(--cc-muted); }.row-actions { display: flex; align-items: center; flex-wrap: nowrap; gap: 4px; white-space: nowrap; }.row-actions :deep(.el-button + .el-button) { margin-left: 0; }.form-grid { display: grid; grid-template-columns: minmax(0,1fr); gap: 0; }.form-grid :deep(.el-select),.form-grid :deep(.el-date-editor),.form-grid :deep(.el-input-number),.simulation-form :deep(.el-select),.simulation-form :deep(.el-input-number),.fleet-select { width: 100%; }.details :deep(.el-descriptions__label) { width: 120px; }.dialog-hint { margin: 4px 0 0; color: var(--cc-muted); font-size: 12px; line-height: 1.6; }.drayage-load-alert { margin-bottom: 12px; }.drayage-summary { margin-bottom: 14px; }
+.container-page { display: grid; gap: 16px; min-width: 0; }.container-page small { display: block; margin-top: 4px; color: var(--cc-muted); }.container-query-panel { overflow: hidden; border: 1px solid var(--cc-border); border-radius: 8px; background: #fff; }.container-scope-tabs { display: flex; max-width: 100%; overflow-x: auto; margin-bottom: 0; border-bottom: 1px solid #e5e7eb; background: #f9fafb; scrollbar-width: thin; }.container-scope-tab { position: relative; flex: 0 0 auto; min-height: 44px; padding: 0 18px; border: 0; background: transparent; color: var(--cc-muted); font: inherit; font-size: 14px; cursor: pointer; }.container-scope-tab::after { position: absolute; right: 12px; bottom: 0; left: 12px; height: 3px; background: transparent; content: ''; }.container-scope-tab:hover { color: var(--cc-primary); background: #f6f9fd; }.container-scope-tab:focus-visible { outline: 2px solid var(--cc-primary); outline-offset: -2px; }.container-scope-tab.is-active { color: var(--cc-primary); font-weight: 600; }.container-scope-tab.is-active::after { background: var(--cc-primary); }.container-query-toolbar { border: 0; }.row-actions { display: flex; align-items: center; flex-wrap: nowrap; gap: 4px; white-space: nowrap; }.row-actions :deep(.el-button + .el-button) { margin-left: 0; }.form-grid { display: grid; grid-template-columns: minmax(0,1fr); gap: 0; }.form-grid :deep(.el-select),.form-grid :deep(.el-date-editor),.form-grid :deep(.el-input-number),.simulation-form :deep(.el-select),.simulation-form :deep(.el-input-number),.fleet-select { width: 100%; }.details :deep(.el-descriptions__label) { width: 120px; }.dialog-hint { margin: 4px 0 0; color: var(--cc-muted); font-size: 12px; line-height: 1.6; }.drayage-load-alert { margin-bottom: 12px; }.drayage-summary { margin-bottom: 14px; }
 :global(.container-editor-dialog.el-dialog) { display: flex; width: min(820px, calc(100vw - 28px)) !important; max-height: 90vh; margin-block: 5vh !important; overflow: hidden; flex-direction: column; border-radius: 12px; }
 :global(.container-editor-dialog .el-dialog__header) { flex: 0 0 auto; margin: 0; padding: 20px 28px; border-bottom: 1px solid #e5eaf1; }
 :global(.container-editor-dialog .el-dialog__title) { color: #1e293b; font-size: 18px; font-weight: 700; }
 :global(.container-editor-dialog .el-dialog__body) { min-height: 0; padding: 28px; overflow-y: auto; }
 :global(.container-editor-dialog .el-dialog__footer) { flex: 0 0 auto; padding: 16px 28px; border-top: 1px solid #e5eaf1; background: #f8fafc; }
-@media(max-width:720px){:global(.container-editor-dialog.el-dialog){max-height:calc(100vh - 20px);margin-block:10px!important}:global(.container-editor-dialog .el-dialog__header),:global(.container-editor-dialog .el-dialog__body),:global(.container-editor-dialog .el-dialog__footer){padding-inline:16px}.details :deep(.el-descriptions__body table),.details :deep(tbody),.details :deep(tr),.details :deep(td){display:block;width:100%!important}.row-actions { min-width: 180px; }}
+@media(max-width:720px){.container-scope-tab{min-height:46px;padding:0 14px}:global(.container-editor-dialog.el-dialog){max-height:calc(100vh - 20px);margin-block:10px!important}:global(.container-editor-dialog .el-dialog__header),:global(.container-editor-dialog .el-dialog__body),:global(.container-editor-dialog .el-dialog__footer){padding-inline:16px}.details :deep(.el-descriptions__body table),.details :deep(tbody),.details :deep(tr),.details :deep(td){display:block;width:100%!important}.row-actions { min-width: 180px; }}
 </style>

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

@@ -0,0 +1,5 @@
+<script setup lang="ts">
+import ContainerDetailView from './ContainerDetailView.vue'
+</script>
+
+<template><ContainerDetailView workbench="DOMESTIC" /></template>

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

@@ -0,0 +1,5 @@
+<script setup lang="ts">
+import ContainersView from './ContainersView.vue'
+</script>
+
+<template><ContainersView workbench="DOMESTIC" /></template>

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

@@ -0,0 +1,5 @@
+<script setup lang="ts">
+import ContainerDetailView from './ContainerDetailView.vue'
+</script>
+
+<template><ContainerDetailView workbench="OVERSEAS" /></template>

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

@@ -0,0 +1,5 @@
+<script setup lang="ts">
+import ContainersView from './ContainersView.vue'
+</script>
+
+<template><ContainersView workbench="OVERSEAS" /></template>

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

@@ -220,8 +220,9 @@ async function load() {
 function openOperationalList() {
   if (!container.value || container.value.planStatus === 'EDITING') return
   void router.push({
-    name: container.value.planStatus === 'LOADING' ? 'loading-plans' : 'loading-lists',
-    query: { planId: container.value.planId || undefined, warehouseId: container.value.warehouseId },
+    name: container.value.planStatus === 'LOADING' ? 'loading-plans' : 'domestic-container-detail',
+    params: container.value.planStatus === 'COMPLETED' ? { containerId: container.value.id } : undefined,
+    query: container.value.planStatus === 'COMPLETED' ? { tab: 'loading-list' } : { planId: container.value.planId || undefined, warehouseId: container.value.warehouseId },
   })
 }
 function openAssign(source: object) {

src/modules/container-loading/routes.ts

@@ -2,21 +2,33 @@ import type { RouteRecordRaw } from 'vue-router'
 
 export const containerLoadingRoutes = [
   {
-    path: 'container-loading',
-    name: 'container-loading',
-    component: () => import('./pages/ContainersView.vue'),
-    meta: { title: '货柜管理', description: '维护货柜资料并进入智能装柜工作台', permission: 'platform:firstleg:container:list' },
+    path: 'container-loading/domestic',
+    name: 'domestic-container-workbench',
+    component: () => import('./pages/DomesticContainersView.vue'),
+    meta: { title: '送柜报关', description: '管理国内送柜、装柜、出口报关与出仓', permission: 'platform:firstleg:container:list' },
   },
   {
-    path: 'container-loading/:containerId',
-    name: 'container-detail',
-    component: () => import('./pages/ContainerDetailView.vue'),
-    meta: { title: '货柜详情', description: '查看货柜资料、履约轨迹、单证与异常', permission: 'platform:firstleg:container:list', showPageHeading: false },
+    path: 'container-loading/domestic/:containerId',
+    name: 'domestic-container-detail',
+    component: () => import('./pages/DomesticContainerDetailView.vue'),
+    meta: { title: '送柜报关详情', description: '查看送柜、装柜清单、报关与出仓', permission: 'platform:firstleg:container:list', showPageHeading: false },
   },
   {
-    path: 'container-loading/:containerId/smart-loading',
+    path: 'container-loading/domestic/:containerId/smart-loading',
     name: 'smart-loading-workbench',
     component: () => import('./pages/SmartLoadingWorkbenchView.vue'),
     meta: { title: '智能装柜', description: '生成、调整并确认可解释的装柜计划', permission: 'platform:firstleg:smart-loading:list' },
   },
+  {
+    path: 'container-loading/overseas',
+    name: 'overseas-container-workbench',
+    component: () => import('./pages/OverseasContainersView.vue'),
+    meta: { title: '清关提柜', description: '管理海运轨迹、目的港清关、提柜与还空', permission: 'platform:firstleg:terminal-drayage:list' },
+  },
+  {
+    path: 'container-loading/overseas/:containerId',
+    name: 'overseas-container-detail',
+    component: () => import('./pages/OverseasContainerDetailView.vue'),
+    meta: { title: '清关提柜详情', description: '查看清关资料、码头拖车与还空轨迹', permission: 'platform:firstleg:terminal-drayage:list', showPageHeading: false },
+  },
 ] satisfies RouteRecordRaw[]

src/modules/container-loading/types.ts

@@ -46,12 +46,15 @@ export interface ContainerBookingResource {
   estimatedEmptyReportedAt?: string | null
   actualEmptyReportedAt?: string | null
   emptyReportSourceVersion?: string | null
+  pickupCode?: string | null
+  pickupCodeUpdatedBy?: string | null
+  pickupCodeUpdatedByName?: string | null
+  pickupCodeUpdatedAt?: string | null
   planStatus: ContainerPlanStatus
   exceptionActive?: boolean
   destinationClearanceDocumentStatus?: ContainerDocumentStatus
   customsDeclarationDocumentStatus?: ContainerDocumentStatus
   deliveryOrderDocumentStatus?: ContainerDocumentStatus
-  pickupOrderDocumentStatus?: ContainerDocumentStatus
   version: number
   createdAt?: string | null
   updatedAt?: string | null
@@ -88,7 +91,7 @@ export interface BusinessDocument {
   version: number
 }
 
-export type ContainerDocumentType = 'DESTINATION_CLEARANCE' | 'DELIVERY_ORDER' | 'PICKUP_ORDER'
+export type ContainerDocumentType = 'DESTINATION_CLEARANCE' | 'DELIVERY_ORDER'
 export type ContainerDocumentStatus = 'MISSING' | 'UPLOADED' | 'COMPLETED'
 
 export interface ContainerOverviewDocument {
@@ -169,7 +172,7 @@ export interface ContainerTimelineEntry {
 }
 
 export interface ContainerOverview {
-  container: Pick<ContainerBookingResource, 'id' | 'bookingNo' | 'cabinetNo' | 'containerNo' | 'warehouseId' | 'warehouseName' | 'voyageNo' | 'vesselName' | 'version'> & { status: string }
+  container: Pick<ContainerBookingResource, 'id' | 'bookingNo' | 'cabinetNo' | 'containerNo' | 'warehouseId' | 'warehouseName' | 'voyageNo' | 'vesselName' | 'pickupCode' | 'pickupCodeUpdatedBy' | 'pickupCodeUpdatedByName' | 'pickupCodeUpdatedAt' | 'version'> & { status: string }
   loadingPlanId: string | null
   pda: ContainerPdaSummary | null
   documents: ContainerOverviewDocument[]
@@ -179,7 +182,7 @@ export interface ContainerOverview {
 }
 
 export interface ContainerPage {
-  records: ContainerBookingResource[]
+  records: ContainerWorkbenchRow[]
   page: number
   size: number
   total: number
@@ -198,6 +201,71 @@ export interface ContainerQuery {
   status?: ContainerPlanStatus | ''
   estimatedSailingFrom?: string
   estimatedSailingTo?: string
+  scope?: ContainerWorkbenchScope
+}
+
+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 interface ContainerWorkbenchStatusSummary {
+  loadingStatus?: string | null
+  customsStatus?: string | null
+  outboundStatus?: string | null
+  destinationClearanceStatus?: string | null
+  deliveryOrderStatus?: string | null
+  pickupCodeStatus?: string | null
+  latestActualNode?: string | null
+  latestActualAt?: string | null
+  terminalDrayageStatus?: string | null
+  emptyReturnWarningStatus?: string | null
+}
+
+export interface ContainerWorkbenchActualFacts {
+  actualSailingAt?: string | null
+  actualPortArrivalAt?: string | null
+  actualWarehouseArrivalAt?: string | null
+  unloadingCompletedAt?: string | null
+  actualEmptyReturnAt?: string | null
+  [key: string]: unknown
+}
+
+export interface ContainerWorkbenchTerminalDrayage {
+  containerBookingId: string
+  status: string
+  version: number
+  fleetSupplierId: string | null
+  fleetSupplierName: string | null
+  pickupAppointmentAt: string | null
+  actualPickupAt: string | null
+  estimatedEmptyReturnAt: string | null
+  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'>
+  updatedAt: string | null
+}
+
+export interface ContainerWorkbenchRow extends ContainerBookingResource {
+  workbenchStage?: string | null
+  statusSummary?: ContainerWorkbenchStatusSummary
+  allowedActions?: ContainerWorkbenchAction[]
+  actualFacts?: ContainerWorkbenchActualFacts
+  terminalDrayage?: ContainerWorkbenchTerminalDrayage | null
+}
+
+/** Wire shape returned by the domestic and overseas workbench query endpoints. */
+export interface ContainerWorkbenchItem {
+  container: ContainerBookingResource
+  workbenchStage: string
+  statusSummary: ContainerWorkbenchStatusSummary
+  allowedActions: ContainerWorkbenchAction[]
+  actualFacts: ContainerWorkbenchActualFacts | null
+  terminalDrayage: ContainerWorkbenchTerminalDrayage | null
+}
+
+export interface ContainerWorkbenchPage extends Omit<ContainerPage, 'records'> {
+  records: ContainerWorkbenchItem[]
 }
 
 export interface ContainerSaveRequest {