feat: split domestic and overseas container workbenches

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,6 @@ const drayageHistoryError = ref<ApiErrorDetails | null>(null)
 let listSequence = 0
 let detailSequence = 0
 let linkSequence = 0
-let drayageSequence = 0
 
 function emptyForm(): ContainerForm {
   return {
@@ -118,11 +117,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 +171,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 +181,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 +201,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)}` },
@@ -213,7 +221,11 @@ function formatTime(value: string | null | undefined) { return value?.replace('T
 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 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 '—'
@@ -477,20 +489,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)
@@ -558,11 +556,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 +569,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 +577,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 getContainer(row.id, props.workbench)
+    if (!isDomestic.value || !hasAction(latest, 'EDIT_CONTAINER')) return
     detail.value = latest
     replaceForm(latest)
     editorOpen.value = true
@@ -612,7 +607,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,14 +630,16 @@ 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
@@ -651,10 +648,10 @@ watch(linkOpen, (open) => {
 onMounted(async () => {
   await Promise.all([loadCustomers(), loadWarehouses(), loadBusinessOptions(), 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 +659,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,7 +667,7 @@ 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" />
       </template>
@@ -678,10 +675,9 @@ onMounted(async () => {
         <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>
           <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-radio-group v-model="scope" size="small" aria-label="工作台范围"><el-radio-button value="ACTIVE">当前履约</el-radio-button><el-radio-button value="HISTORY">历史货柜</el-radio-button></el-radio-group><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-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="canDrayage(row as ContainerWorkbenchRow, 'RECORD_EMPTY_RETURN')" command="drayage:RECORD_EMPTY_RETURN">确认实际还柜</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>
@@ -697,9 +693,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>