优化

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

@@ -11,9 +11,9 @@ 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 { completeLoadingDeclaration, downloadLoadingDeclaration, getLoadingDeclaration, uploadLoadingDeclaration } from '@/modules/loading-lists'
 import { confirmContainerOutboundDispatch, getContainerOutboundDispatch } from '@/modules/outbound-dispatch/api/platformOutboundDispatch'
 import type { ContainerOutboundDispatchDetail, ContainerOutboundGateItem } from '@/modules/outbound-dispatch/types'
+import ContainerCustomsPanel from '../components/ContainerCustomsPanel.vue'
 import ContainerOverviewPanel from '../components/ContainerOverviewPanel.vue'
 import {
   cancelContainerException,
@@ -35,7 +35,7 @@ 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 canDownloadCustoms = computed(() => access.can('platform:firstleg:loading-list:list'))
+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 loading = ref(false)
@@ -44,15 +44,13 @@ 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' | 'CUSTOMS_DECLARATION'
+type UploadDocumentType = 'DELIVERY_ORDER' | 'PICKUP_ORDER'
 const documentType = ref<UploadDocumentType>('DELIVERY_ORDER')
 const documentFile = ref<File | null>(null)
 const documentUploadKey = ref(0)
 const documentSaving = ref(false)
 const documentDownloading = ref(false)
 const documentError = ref<ApiErrorDetails | null>(null)
-const customsCompleting = ref(false)
-const customsActionError = ref<ApiErrorDetails | null>(null)
 const documentRefreshWarning = ref<ApiErrorDetails | null>(null)
 const clearanceOpen = ref(false)
 const clearanceDocument = ref<BusinessDocument | null>(null)
@@ -72,7 +70,7 @@ const showPassedGates = ref(false)
 const carrierRefreshKey = ref(0)
 
 const selectedDocument = computed(() => overview.value?.documents.find((item) => item.documentType === documentType.value) || null)
-const documentTitle = computed(() => ({ DELIVERY_ORDER: 'DO 资料', PICKUP_ORDER: 'PU 资料', CUSTOMS_DECLARATION: '国内出口报关附件' })[documentType.value])
+const documentTitle = computed(() => ({ DELIVERY_ORDER: 'DO 资料', PICKUP_ORDER: 'PU 资料' })[documentType.value])
 const title = computed(() => detail.value?.containerNo || detail.value?.cabinetNo || '货柜详情')
 const exceptionTitle = computed(() => overview.value?.exception.active ? '取消货柜异常' : '标记货柜异常')
 type AggregatedGateRow = ContainerOutboundGateItem & { key: string; inboundCodes: string[] }
@@ -100,6 +98,8 @@ const outboundGateSummary = computed(() => ({
 const canConfirmDeparture = computed(() => canConfirmOutboundDispatch.value
   && 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')
 
 function toOverviewDocument(document: BusinessDocument, documentType: string, fallback?: ContainerOverviewDocument | null): ContainerOverviewDocument {
   return {
@@ -113,16 +113,14 @@ function replaceOverviewDocument(document: ContainerOverviewDocument) {
   if (!overview.value) return
   overview.value = { ...overview.value, documents: [...overview.value.documents.filter((item) => item.documentType !== document.documentType), document] }
 }
-async function refreshOverviewDocument(documentType: 'CUSTOMS_DECLARATION' | 'DESTINATION_CLEARANCE') {
+async function refreshOverviewDocument(documentType: 'DESTINATION_CLEARANCE') {
   let refreshCause: unknown
   let refreshed: ContainerOverview | null = null
   try { refreshed = await getContainerOverview(containerId.value) } catch (cause) { refreshCause = cause }
   let current = refreshed?.documents.find((item) => item.documentType === documentType) || null
   if (!current) {
     try {
-      const business = documentType === 'CUSTOMS_DECLARATION'
-        ? overview.value?.loadingPlanId && detail.value ? await getLoadingDeclaration(overview.value.loadingPlanId, detail.value.warehouseId) : null
-        : await getContainerClearance(containerId.value)
+      const business = await getContainerClearance(containerId.value)
       if (business) {
         if (documentType === 'DESTINATION_CLEARANCE') clearanceDocument.value = business
         current = toOverviewDocument(business, documentType, overview.value?.documents.find((item) => item.documentType === documentType))
@@ -158,6 +156,10 @@ async function loadOutboundDispatch() {
   catch (cause) { outboundDetail.value = null; outboundError.value = getApiErrorDetails(cause, '国内出仓门禁加载失败') }
   finally { outboundLoading.value = false }
 }
+async function refreshAfterCustoms() {
+  if (canViewOutboundDispatch.value) await loadOutboundDispatch()
+  try { overview.value = await getContainerOverview(containerId.value) } catch { /* 报关操作已成功，保留组件返回事实 */ }
+}
 
 async function confirmDeparture() {
   const aggregate = outboundDetail.value?.aggregate
@@ -192,13 +194,9 @@ function truckReferenceText(status?: string | null) {
 
 function openDocument(type: string) {
   if (type === 'DESTINATION_CLEARANCE') { if (canManageCustoms.value) void openClearance(); return }
-  if (!['DELIVERY_ORDER', 'PICKUP_ORDER', 'CUSTOMS_DECLARATION'].includes(type)) return
-  if (type === 'CUSTOMS_DECLARATION' ? !canManageCustoms.value : !canEdit.value) return
+  if (!['DELIVERY_ORDER', 'PICKUP_ORDER'].includes(type) || !canEdit.value) return
   documentType.value = type as UploadDocumentType
   documentFile.value = null; documentError.value = null; documentRefreshWarning.value = null; documentUploadKey.value += 1; documentOpen.value = true
-  if (type === 'CUSTOMS_DECLARATION' && !overview.value?.loadingPlanId) {
-    documentError.value = { code: 'LOADING_PLAN_REQUIRED', message: '当前货柜没有装柜清单，无法上传国内出口报关附件' }
-  }
 }
 function selectDocumentFile(file: UploadFile) { documentFile.value = file.raw || null; documentError.value = null }
 function removeDocumentFile() { documentFile.value = null }
@@ -207,100 +205,41 @@ async function saveDocument() {
   documentSaving.value = true; documentError.value = null; documentRefreshWarning.value = null
   try {
     const expectedVersion = selectedDocument.value?.version || 0
-    if (documentType.value === 'CUSTOMS_DECLARATION') {
-      if (!overview.value.loadingPlanId) throw new Error('当前货柜没有装柜清单，无法上传国内出口报关附件')
-      const uploaded = await uploadLoadingDeclaration(overview.value.loadingPlanId, detail.value.warehouseId, documentFile.value, expectedVersion, '上传国内出口报关附件')
-      if (!uploaded) throw new Error('报关附件上传成功但未返回附件信息')
-      const optimistic = toOverviewDocument(uploaded, 'CUSTOMS_DECLARATION', selectedDocument.value)
-      replaceOverviewDocument(optimistic)
-      try {
-        const refreshed = await getContainerOverview(containerId.value)
-        if (refreshed.documents.some((item) => item.documentType === 'CUSTOMS_DECLARATION')) overview.value = refreshed
-        else {
-          overview.value = { ...refreshed, documents: [...refreshed.documents, optimistic] }
-          documentRefreshWarning.value = { code: 'CUSTOMS_DOCUMENT_STALE', message: '附件已上传，但资料汇总尚未同步；当前已保留本次上传结果' }
-        }
+    const targetType = documentType.value
+    const targetTitle = documentTitle.value
+    const uploaded = await uploadContainerDocument(containerId.value, targetType, documentFile.value, expectedVersion, `上传${targetTitle}`)
+    if (!uploaded) throw new Error(`${targetTitle}上传成功但未返回附件信息`)
+    const optimistic = toOverviewDocument(uploaded, targetType, selectedDocument.value)
+    replaceOverviewDocument(optimistic)
+    documentOpen.value = false; documentFile.value = null; documentError.value = null; documentUploadKey.value += 1
+    ElMessage.success(`${targetTitle}已上传`)
+    try {
+      const refreshed = await getContainerOverview(containerId.value)
+      const current = refreshed.documents.find((item) => item.documentType === targetType)
+      if (current && (current.fileId === optimistic.fileId || current.version > optimistic.version)) overview.value = refreshed
+      else {
+        overview.value = { ...refreshed, documents: [...refreshed.documents.filter((item) => item.documentType !== targetType), optimistic] }
+        documentRefreshWarning.value = { code: 'DOCUMENT_OVERVIEW_STALE', message: `${targetTitle}已上传，但资料汇总尚未同步；当前已保留本次上传结果` }
       }
-      catch (cause) { documentRefreshWarning.value = getApiErrorDetails(cause, '附件已上传，但最新资料刷新失败；当前已保留本次上传结果') }
-    } else {
-      const targetType = documentType.value
-      const targetTitle = documentTitle.value
-      const uploaded = await uploadContainerDocument(containerId.value, targetType, documentFile.value, expectedVersion, `上传${targetTitle}`)
-      if (!uploaded) throw new Error(`${targetTitle}上传成功但未返回附件信息`)
-      const optimistic = toOverviewDocument(uploaded, targetType, selectedDocument.value)
-      replaceOverviewDocument(optimistic)
-      documentOpen.value = false; documentFile.value = null; documentError.value = null; documentUploadKey.value += 1
-      ElMessage.success(`${targetTitle}已上传`)
-      try {
-        const refreshed = await getContainerOverview(containerId.value)
-        const current = refreshed.documents.find((item) => item.documentType === targetType)
-        if (current && (current.fileId === optimistic.fileId || current.version > optimistic.version)) overview.value = refreshed
-        else {
-          overview.value = { ...refreshed, documents: [...refreshed.documents.filter((item) => item.documentType !== targetType), optimistic] }
-          documentRefreshWarning.value = { code: 'DOCUMENT_OVERVIEW_STALE', message: `${targetTitle}已上传，但资料汇总尚未同步；当前已保留本次上传结果` }
-        }
-      } catch (cause) { documentRefreshWarning.value = getApiErrorDetails(cause, `${targetTitle}已上传，但最新资料刷新失败；当前已保留本次上传结果`) }
-      return
-    }
-    documentOpen.value = false; documentFile.value = null; documentUploadKey.value += 1; ElMessage.success(`${documentTitle.value}已上传`)
+    } catch (cause) { documentRefreshWarning.value = getApiErrorDetails(cause, `${targetTitle}已上传，但最新资料刷新失败；当前已保留本次上传结果`) }
   } catch (cause) {
     const details = getApiErrorDetails(cause, `${documentTitle.value}上传失败`)
-    if (details.code === 'A0409') {
-      if (documentType.value === 'CUSTOMS_DECLARATION') {
-        try { await refreshOverviewDocument('CUSTOMS_DECLARATION') } catch { /* 保留原并发错误证据 */ }
-      } else {
-        try { overview.value = await getContainerOverview(containerId.value) } catch { /* 保留原并发错误证据 */ }
-      }
-    }
+    if (details.code === 'A0409') try { overview.value = await getContainerOverview(containerId.value) } catch { /* 保留原并发错误证据 */ }
     documentError.value = details
   }
   finally { documentSaving.value = false }
 }
-async function refreshCustomsFacts() {
-  overview.value = await getContainerOverview(containerId.value)
-  await loadOutboundDispatch()
-}
-async function completeCustomsDeclaration(document: ContainerOverviewDocument) {
-  if (!canManageCustoms.value || customsCompleting.value || document.completed) return
-  if (!overview.value?.loadingPlanId || !detail.value) {
-    customsActionError.value = { code: 'LOADING_PLAN_REQUIRED', message: '当前货柜没有装柜清单，无法确认报关完成' }
-    return
-  }
-  customsCompleting.value = true; customsActionError.value = null; documentRefreshWarning.value = null
-  try {
-    await ElMessageBox.confirm('请确认装柜清单的国内出口报关协同已经完成。附件上传与确认报关完成是两个步骤；上传附件本身不代表正式报关放行。', '确认报关完成', { type: 'warning', confirmButtonText: '确认完成' })
-  } catch { customsCompleting.value = false; return }
-  try {
-    await completeLoadingDeclaration(overview.value.loadingPlanId, detail.value.warehouseId, document.version, '货柜详情确认国内出口报关完成')
-    try { await refreshCustomsFacts() }
-    catch (cause) { documentRefreshWarning.value = getApiErrorDetails(cause, '报关完成已确认，但最新资料刷新失败，请稍后重新加载') }
-    ElMessage.success('已确认装柜清单报关协同完成；正式报关放行仍由报关业务事实核验')
-  } catch (cause) {
-    const details = getApiErrorDetails(cause, '确认报关完成失败')
-    if (details.code === 'A0409') {
-      try { await refreshCustomsFacts() } catch { /* 保留原并发错误证据 */ }
-    }
-    customsActionError.value = details
-  } finally { customsCompleting.value = false }
-}
 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', 'CUSTOMS_DECLARATION', 'DESTINATION_CLEARANCE'].includes(item.documentType)) return
-  if (item.documentType === 'CUSTOMS_DECLARATION' && (!overview.value?.loadingPlanId || !detail.value)) {
-    customsActionError.value = { code: 'LOADING_PLAN_REQUIRED', message: '当前货柜没有装柜清单，无法下载国内出口报关附件' }
-    return
-  }
+  if (!['DELIVERY_ORDER', 'PICKUP_ORDER', 'DESTINATION_CLEARANCE'].includes(item.documentType)) return
   documentDownloading.value = true
   try {
-    const blob = item.documentType === 'CUSTOMS_DECLARATION'
-      ? await downloadLoadingDeclaration(overview.value!.loadingPlanId!, detail.value!.warehouseId, item.fileId)
-      : item.documentType === 'DESTINATION_CLEARANCE'
+    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 saveBlob(blob, item.fileName); ElMessage.success('资料下载已开始')
   } catch (cause) {
     const details = getApiErrorDetails(cause, '资料下载失败')
-    if (item.documentType === 'CUSTOMS_DECLARATION') customsActionError.value = details
     if (item.documentType === 'DESTINATION_CLEARANCE') clearanceError.value = details
     ElMessage.error(details.message)
   }
@@ -383,9 +322,9 @@ onMounted(async () => { await load(); if (route.query.action === 'documents') op
     <template v-else-if="detail">
       <section class="detail-fields surface-panel"><h2>运输与单证快照</h2><dl><div><dt>真实订舱</dt><dd>{{ detail.oceanBookingId ? (detail.billOfLadingNo || '已关联') : '未关联' }}</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.shippingCompanyName || '—' }}</dd></div><div><dt>船名 / 航次</dt><dd>{{ [detail.vesselName, detail.voyageNo].filter(Boolean).join(' / ') || '—' }}</dd></div><div><dt>拖车公司</dt><dd>{{ detail.terminalTruckingCompany || '—' }}</dd></div><div><dt>预计开船</dt><dd>{{ formatTime(detail.estimatedSailingAt) }}</dd></div><div><dt>预计到港</dt><dd>{{ formatTime(detail.estimatedPortArrivalAt) }}</dd></div><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></section>
       <LoadErrorState v-if="overviewError" compact title="履约摘要加载失败" :message="overviewError.message" :show-retry="false" />
-      <ContainerOverviewPanel v-else-if="overview" :overview="overview" :can-manage-documents="canEdit" :can-manage-customs="canManageCustoms" :can-download-customs="canDownloadCustoms" :can-manage-exception="canEdit" :document-busy="documentDownloading" :customs-completing="customsCompleting" @upload-document="openDocument" @download-document="downloadDocument" @complete-customs="completeCustomsDeclaration" @manage-exception="openException" />
+      <ContainerOverviewPanel v-else-if="overview" :overview="overview" :can-manage-documents="canEdit" :can-manage-customs="canManageCustoms" :can-manage-exception="canEdit" :document-busy="documentDownloading" @upload-document="openDocument" @download-document="downloadDocument" @manage-exception="openException" />
       <el-alert v-if="documentRefreshWarning" type="warning" :closable="false" :title="documentRefreshWarning.message"><template #default><ApiErrorMeta :details="documentRefreshWarning" /></template></el-alert>
-      <LoadErrorState v-if="customsActionError" compact title="国内出口报关附件操作失败" :message="customsActionError.message" :show-retry="false"><template #details><ApiErrorMeta :details="customsActionError" /></template></LoadErrorState>
+      <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" />
       <section v-if="detail.planStatus === 'COMPLETED' && canViewOutboundDispatch" class="outbound-panel surface-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>
         <LoadErrorState v-if="outboundError" compact title="国内出仓操作失败" :message="outboundError.message" :loading="outboundLoading" @retry="loadOutboundDispatch"><template #details><ApiErrorMeta :details="outboundError" /></template></LoadErrorState>