优化

src/modules/appointment-calendar/schedule.ts

@@ -1,4 +1,4 @@
-import { projectWarehouseArrival } from '@/modules/container-loading'
+import { addDays } from './calendar'
 import type { CalendarSources, ScheduleRange, WarehouseArrival } from './scheduleApi'
 
 export const scheduleTypes = ['arrival', 'dispatch', 'return', 'warehouse'] as const
@@ -36,12 +36,12 @@ export function projectContainerSchedule(sources: CalendarSources, warehouses: W
     if (warehouses === null) continue
     const warehouse = warehouseMap.get(row.containerBookingId)
     warehouseMap.delete(row.containerBookingId)
-    const projected = projectWarehouseArrival(row.arrivalAt, warehouse)
+    const canDefault = !warehouse || warehouse.version === 0 && warehouse.planCount === 0
-    const planned = projected.date
+    const planned = warehouse?.plannedAt?.slice(0, 10) || (canDefault && date ? addDays(date, 2) : null)
     if (inRange(planned, range)) events.push({ key: `warehouse-${row.containerBookingId}`, type: 'warehouse', date: planned,
-      time: projected.time, title: `${label} 计划到仓`, sourcePath, warehouse,
+      time: warehouse?.plannedAt?.slice(11, 16) || '', title: `${label} 计划到仓`, sourcePath, warehouse,
       canEdit: warehouse?.canEdit === true,
-      subtitle: warehouse?.plannedAt ? warehouse.planCount > 0 ? '已有入库计划，日期已冻结' : '人工维护' : projected.isDefault ? '到港日期＋2个自然日（默认）' : '柜内计划时间不一致，待核实',
+      subtitle: warehouse?.plannedAt ? warehouse.planCount > 0 ? '已有入库计划，日期已冻结' : '人工维护' : canDefault ? '到港日期＋2个自然日（默认）' : '柜内计划时间不一致，待核实',
       fields: [{ label: '集装箱号', value: row.containerNo }, { label: '接仓仓库', value: warehouse?.warehouseName || warehouse?.warehouseCode },
         { label: '计划到仓', value: warehouse?.plannedAt ? timestamp(warehouse.plannedAt) : planned },
         { label: '实际到仓', value: timestamp(warehouse?.actualAt || null) }] })

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

@@ -8,8 +8,8 @@ describe('container arrival-time overseas API', () => {
   beforeEach(() => vi.clearAllMocks())
 
   it('queries visible containers and updates the whole-container expected arrival', async () => {
-    vi.mocked(http.post).mockResolvedValue({ code: '200', data: [{ sourceContainerBookingId: '9001', estimatedWarehouseArrivalAt: null, actualWarehouseArrivalAt: null, version: 0, planCount: 0 }] })
+    vi.mocked(http.post).mockResolvedValue({ code: '200', data: [{ sourceContainerBookingId: '9001', estimatedWarehouseArrivalAt: null, actualWarehouseArrivalAt: null, version: 0 }] })
-    vi.mocked(http.put).mockResolvedValue({ code: '200', data: { sourceContainerBookingId: '9001', estimatedWarehouseArrivalAt: '2026-09-25T15:31:00', actualWarehouseArrivalAt: null, version: 1, planCount: 0 } } as never)
+    vi.mocked(http.put).mockResolvedValue({ code: '200', data: { sourceContainerBookingId: '9001', estimatedWarehouseArrivalAt: '2026-09-25T15:31:00', actualWarehouseArrivalAt: null, version: 1 } } as never)
 
     await listContainerArrivalTimes(['9001'])
     await updateContainerExpectedArrival('9001', { estimatedWarehouseArrivalAt: '2026-09-25T15:31:00', expectedVersion: 0 })
@@ -17,14 +17,4 @@ describe('container arrival-time overseas API', () => {
     expect(http.post).toHaveBeenCalledWith('/platform/v1/last-leg/orders/container-arrival-times/query', { sourceContainerBookingIds: ['9001'] })
     expect(http.put).toHaveBeenCalledWith('/platform/v1/last-leg/orders/container-summaries/9001/expected-arrival', { estimatedWarehouseArrivalAt: '2026-09-25T15:31:00', expectedVersion: 0 }, { headers: { 'Idempotency-Key': expect.stringContaining('container-expected-arrival-9001-') } })
   })
-
-  it('normalizes serialized plan counts and rejects unknown counts instead of showing a default', async () => {
-    const row = { sourceContainerBookingId: '9001', estimatedWarehouseArrivalAt: null, actualWarehouseArrivalAt: null, version: 0 }
-    vi.mocked(http.post).mockResolvedValue({ code: '200', data: [{ ...row, planCount: '1' }] })
-    expect(await listContainerArrivalTimes(['9001'])).toEqual([{ ...row, planCount: 1 }])
-    for (const planCount of [undefined, null, '', 'unknown', -1, 0.5]) {
-      vi.mocked(http.post).mockResolvedValue({ code: '200', data: [{ ...row, planCount }] })
-      await expect(listContainerArrivalTimes(['9001'])).rejects.toThrow('入库计划数量无效')
-    }
-  })
 })

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

@@ -6,14 +6,6 @@ export interface ContainerArrivalTime {
   estimatedWarehouseArrivalAt: string | null
   actualWarehouseArrivalAt: string | null
   version: number
-  planCount: number
-}
-
-function normalizeArrival(item: ContainerArrivalTime): ContainerArrivalTime {
-  if (typeof item.planCount !== 'number' && (typeof item.planCount !== 'string' || !/^(0|[1-9]\d*)$/.test(item.planCount))) throw new Error('到仓记录的入库计划数量无效，请刷新后重试')
-  const count = Number(item.planCount)
-  if (item.planCount == null || !Number.isSafeInteger(count) || count < 0) throw new Error('到仓记录的入库计划数量无效，请刷新后重试')
-  return { ...item, version: Number(item.version), planCount: count }
 }
 
 const queryPath = '/platform/v1/last-leg/orders/container-arrival-times/query'
@@ -28,7 +20,7 @@ export async function listContainerArrivalTimes(sourceContainerBookingIds: strin
     queryPath,
     { sourceContainerBookingIds },
   )
-  return (unwrapApiResponse(response) || []).map(normalizeArrival)
+  return (unwrapApiResponse(response) || []).map((item) => ({ ...item, version: Number(item.version || 0) }))
 }
 
 export async function updateContainerExpectedArrival(
@@ -41,5 +33,5 @@ export async function updateContainerExpectedArrival(
     { headers: { 'Idempotency-Key': operationId(sourceContainerBookingId) } },
   )
   const result = unwrapApiResponse(response)
-  return normalizeArrival(result)
+  return { ...result, version: Number(result.version || 0) }
 }

src/modules/container-loading/index.ts

@@ -1,6 +1,5 @@
 export * from './api/platformContainerLoading'
 export * from './types'
-export { projectWarehouseArrival } from './warehouseArrival'
 export { getSmartLoadingChannelGroup, isSeaRailChannel, SMART_LOADING_CHANNEL_GROUPS } from './smartLoadingChannelGroups'
 export { default as SmartLoadingDialog } from './components/SmartLoadingDialog.vue'
 export { default as ContainerSimulationCreate } from './components/ContainerSimulationCreate.vue'

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

@@ -57,14 +57,6 @@ function accessibleText(wrapper: { element: Element } | undefined) {
 }
 
 describe('ContainerDetailView empty return', () => {
-  it('shows the same default warehouse date as the calendar, with no fabricated midnight', async () => {
-    vi.mocked(getContainer).mockResolvedValue({ ...base, estimatedPortArrivalAt: '2026-10-20T10:00:00', actualFacts: { arrivedDestinationPortAt: '2026-10-21T15:49:00' } } as never)
-    vi.mocked(listContainerArrivalTimes).mockResolvedValue([{ sourceContainerBookingId: '9001', estimatedWarehouseArrivalAt: null, actualWarehouseArrivalAt: null, version: 0, planCount: 0 }])
-    const wrapper = await mountDetail()
-    const value = wrapper.findAll('dt').find(item => item.text() === '预计到仓')!.element.nextElementSibling!.textContent
-    expect(value).toBe('2026-10-23（默认推算）')
-    expect(value).not.toContain('00:00')
-  })
   it('passes the original container to schedule maintenance and reloads its projection after save', async () => {
     const wrapper = await mountDetail('DOMESTIC')
     const panel = wrapper.findComponent({ name: 'ContainerPortSchedulePanel' })
@@ -91,7 +83,7 @@ describe('ContainerDetailView empty return', () => {
     vi.mocked(getContainerOverview).mockReset().mockResolvedValue(overview as never)
     vi.mocked(getConfirmedLoadingList).mockReset().mockResolvedValue({ planNo: 'LP-1', summary: { status: 'COMPLETED' }, items: [] } as never)
     vi.mocked(recordTerminalDrayageEmptyReturn).mockReset().mockResolvedValue({ ...base.terminalDrayage, status: 'EMPTY_RETURNED', version: 4, actualEmptyReturnAt: '2026-09-09T12:00:00', allowedActions: [] } as never)
-    vi.mocked(listContainerArrivalTimes).mockReset().mockResolvedValue([{ sourceContainerBookingId: '9001', estimatedWarehouseArrivalAt: '2026-09-25T15:31:00', actualWarehouseArrivalAt: '2026-09-26T09:00:00', version: 0, planCount: 0 }])
+    vi.mocked(listContainerArrivalTimes).mockReset().mockResolvedValue([{ sourceContainerBookingId: '9001', estimatedWarehouseArrivalAt: '2026-09-25T15:31:00', actualWarehouseArrivalAt: '2026-09-26T09:00:00', version: 0 }])
   })
 
   it('records a real direct-delivery source with explicit local time and proof, retaining the request after an unknown outcome', async () => {

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

@@ -46,7 +46,6 @@ import {
 } from '../api/platformContainerLoading'
 import { recordTerminalDrayageEmptyReturn, getDirectDeliveries, recordDirectDelivery, getTerminalDrayage, selectTerminalDrayageFleet, scheduleTerminalDrayagePickup, recordTerminalPickup, type TerminalDrayageView, type DirectDelivery, type DirectDeliveryCommand } from '../api/terminalDrayages'
 import { listContainerArrivalTimes, type ContainerArrivalTime } from '../api/containerArrivalTimes'
-import { projectWarehouseArrival } from '../warehouseArrival'
 import type { BusinessDocument, ContainerBookingResource, ContainerOverview, ContainerOverviewDocument, ContainerPlanStatus, ContainerWorkbenchAction, ContainerWorkbenchRow } from '../types'
 
 const props = withDefaults(defineProps<{ workbench?: 'DOMESTIC' | 'OVERSEAS' }>(), { workbench: 'DOMESTIC' })
@@ -92,14 +91,6 @@ async function rememberWorkbenchTab(tabName: string | number) {
 }
 const workbenchDetail = ref<ContainerWorkbenchRow | null>(null)
 const arrivalTime = ref<ContainerArrivalTime | null>(null)
-const expectedArrivalText = computed(() => {
-  const row = workbenchDetail.value
-  const arrival = arrivalTime.value
-  const projected = projectWarehouseArrival(row?.actualFacts?.arrivedDestinationPortAt || row?.actualPortArrivalAt || row?.estimatedPortArrivalAt,
-    arrival ? { ...arrival, plannedAt: arrival.estimatedWarehouseArrivalAt } : undefined)
-  return arrival?.estimatedWarehouseArrivalAt ? formatTime(arrival.estimatedWarehouseArrivalAt)
-    : projected.date ? `${projected.date}（默认推算）` : '—'
-})
 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'))
@@ -735,7 +726,7 @@ onMounted(async () => {
 
       <section v-if="isOverseas" v-show="activeTab === 'overview'" class="detail-section workbench-panel is-compact" aria-labelledby="container-overseas-receiving-heading">
         <header class="detail-section__heading"><h2 id="container-overseas-receiving-heading">提柜、卸柜与还空</h2><div class="density-actions"><el-button v-if="canReadDirect" @click="openTerminal">提柜安排与执行</el-button><el-button v-if="canReadDirect" @click="openDirect">直送卸货清单</el-button><el-button v-if="canRecordEmptyReturn" type="primary" :loading="emptyReturnSaving" @click="openEmptyReturn">确认还柜</el-button></div></header>
-        <div class="detail-fields"><dl class="density-fields"><div><dt>码头拖车状态</dt><dd>{{ workbenchDetail?.statusSummary?.terminalDrayageStatus || '—' }}</dd></div><div><dt>码头车队</dt><dd>{{ workbenchDetail?.terminalDrayage?.fleetSupplierName || '—' }}</dd></div><div><dt>预计到仓</dt><dd>{{ expectedArrivalText }}</dd></div><div><dt>实际到仓</dt><dd>{{ formatTime(arrivalTime?.actualWarehouseArrivalAt) }}</dd></div><div><dt>卸柜完成</dt><dd>{{ formatTime((workbenchDetail?.actualFacts?.unloadingCompletedAt || workbenchDetail?.terminalDrayage?.unloadingCompletedAt) as string | null) }}</dd></div><div><dt>实际还柜</dt><dd>{{ formatTime(workbenchDetail?.terminalDrayage?.actualEmptyReturnAt) }}</dd></div></dl></div>
+        <div class="detail-fields"><dl class="density-fields"><div><dt>码头拖车状态</dt><dd>{{ workbenchDetail?.statusSummary?.terminalDrayageStatus || '—' }}</dd></div><div><dt>码头车队</dt><dd>{{ workbenchDetail?.terminalDrayage?.fleetSupplierName || '—' }}</dd></div><div><dt>预计到仓</dt><dd>{{ formatTime(arrivalTime?.estimatedWarehouseArrivalAt) }}</dd></div><div><dt>实际到仓</dt><dd>{{ formatTime(arrivalTime?.actualWarehouseArrivalAt) }}</dd></div><div><dt>卸柜完成</dt><dd>{{ formatTime((workbenchDetail?.actualFacts?.unloadingCompletedAt || workbenchDetail?.terminalDrayage?.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 workbench-panel is-compact" aria-labelledby="container-loading-list-heading">

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

@@ -74,8 +74,8 @@ describe('ContainersView', () => {
     vi.mocked(getTerminalDrayageHistory).mockResolvedValue([])
     vi.mocked(selectTerminalDrayageFleet).mockResolvedValue({ ...drayage, fleetSupplierId: '502', fleetSupplierName: '新车队', version: 4, allowedActions: [...drayage.allowedActions] })
     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(listContainerArrivalTimes).mockReset().mockResolvedValue([{ sourceContainerBookingId: '9001', estimatedWarehouseArrivalAt: '2026-09-25T15:31:00', actualWarehouseArrivalAt: '2026-09-26T09:00:00', version: 0, planCount: 0 }])
+    vi.mocked(listContainerArrivalTimes).mockReset().mockResolvedValue([{ sourceContainerBookingId: '9001', estimatedWarehouseArrivalAt: '2026-09-25T15:31:00', actualWarehouseArrivalAt: '2026-09-26T09:00:00', version: 0 }])
-    vi.mocked(updateContainerExpectedArrival).mockReset().mockResolvedValue({ sourceContainerBookingId: '9001', estimatedWarehouseArrivalAt: '2026-09-25T16:00:00', actualWarehouseArrivalAt: '2026-09-26T09:00:00', version: 1, planCount: 0 })
+    vi.mocked(updateContainerExpectedArrival).mockReset().mockResolvedValue({ sourceContainerBookingId: '9001', estimatedWarehouseArrivalAt: '2026-09-25T16:00:00', actualWarehouseArrivalAt: '2026-09-26T09:00:00', version: 1 })
     vi.mocked(listContainers).mockResolvedValue({ records: [{ id: '9001', planId: null, cabinetNo: 'CB-1', containerNo: 'MSCU-1', sourceType: 'SIMULATION', allowedActions: ['EDIT_CONTAINER', 'SELECT_FLEET', 'SCHEDULE_PICKUP', 'RECORD_EMPTY_RETURN'], terminalDrayage: drayage, oceanBookingId: null, warehouseId: '8', warehouseName: '义乌仓', channelGroupCode: 'MATSON_CLX', channelCode: null, channelName: null, containerType: '40HQ', 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: 68, maxWeightKg: 19500, 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, cabinetNo: 'CB-1', containerNo: 'MSCU-1', sourceType: 'SIMULATION', allowedActions: ['EDIT_CONTAINER'], oceanBookingId: null, warehouseId: '8', warehouseName: '义乌仓', channelGroupCode: 'MATSON_CLX', channelCode: null, channelName: null, containerType: '40HQ', 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: 68, maxWeightKg: 19500, 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', 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: [] })
@@ -584,30 +584,6 @@ describe('ContainersView', () => {
     })
   })
 
-  it('shows the calendar default from actual port arrival without submitting an invented time', async () => {
-    const page = await listContainers({ page: 1, size: 20 }, 'OVERSEAS')
-    vi.mocked(listContainers).mockResolvedValue({ ...page, records: page.records.map(row => ({ ...row,
-      estimatedPortArrivalAt: '2026-10-20T10:00:00', actualFacts: { arrivedDestinationPortAt: '2026-10-21T15:49:00' },
-    })) })
-    vi.mocked(listContainerArrivalTimes).mockResolvedValue([{ sourceContainerBookingId: '9001', estimatedWarehouseArrivalAt: null, actualWarehouseArrivalAt: null, version: 0, planCount: 0 }])
-    const wrapper = await mountOverseasRoute()
-    const picker = wrapper.findAllComponents({ name: 'ElDatePicker' }).find(item => item.props('placeholder') === '2026-10-23（默认）')!
-    expect(picker).toBeDefined()
-    expect(picker.props('modelValue')).toBe('')
-    expect(updateContainerExpectedArrival).not.toHaveBeenCalled()
-    wrapper.unmount()
-  })
-
-  it('keeps a frozen missing arrival undated and prevents editing it', async () => {
-    const page = await listContainers({ page: 1, size: 20 }, 'OVERSEAS')
-    vi.mocked(listContainers).mockResolvedValue({ ...page, records: page.records.map(row => ({ ...row, estimatedPortArrivalAt: '2026-10-20T10:00:00' })) })
-    vi.mocked(listContainerArrivalTimes).mockResolvedValue([{ sourceContainerBookingId: '9001', estimatedWarehouseArrivalAt: null, actualWarehouseArrivalAt: null, version: 0, planCount: 1 }])
-    const wrapper = await mountOverseasRoute()
-    const picker = wrapper.findAllComponents({ name: 'ElDatePicker' }).find(item => item.props('placeholder') === '选择预计到仓')!
-    expect(picker.props('disabled')).toBe(true)
-    wrapper.unmount()
-  })
-
   it.each(['EDITING', 'LOADING', 'COMPLETED'] as const)('keeps released-booking linking reachable alongside the %s process action', async (planStatus) => {
     const page = await listContainers({ page: 1, size: 20 }, 'DOMESTIC')
     vi.mocked(listContainers).mockResolvedValue({ ...page, records: page.records.map((row) => ({

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

@@ -40,7 +40,6 @@ import {
   type TerminalDrayageView,
 } from '../api/terminalDrayages'
 import { listContainerArrivalTimes, updateContainerExpectedArrival, type ContainerArrivalTime } from '../api/containerArrivalTimes'
-import { projectWarehouseArrival } from '../warehouseArrival'
 import type { ContainerBookingResource, ContainerDocumentStatus, ContainerPlanStatus, ContainerSaveRequest, ContainerWorkbenchAction, ContainerWorkbenchRow } from '../types'
 
 type Filters = QueryModel & { customerId: string; keyword: string; containerType: string; status: ContainerPlanStatus | ''; sailingRange: string[] }
@@ -286,13 +285,6 @@ function optional(value: string | null) { return value?.trim() || null }
 function statusText(status: ContainerPlanStatus) { return ({ WAIT_LOADING: '待装柜', EDITING: '预装柜中', LOADING: '拣货中', COMPLETED: '装柜完成' })[status] }
 function documentStatusText(status: ContainerDocumentStatus | null | undefined) { return status ? ({ MISSING: '未上传', UPLOADED: '已上传', COMPLETED: '已完成' })[status] : '—' }
 function formatTime(value: string | null | undefined) { return value?.replace('T', ' ').slice(0, 16) || '—' }
-function defaultArrivalDate(source: object) {
-  const row = source as ContainerWorkbenchRow
-  const arrival = arrivalTimes.value[row.id]
-  const projected = projectWarehouseArrival(row.actualFacts?.arrivedDestinationPortAt || row.actualPortArrivalAt || row.estimatedPortArrivalAt,
-    arrival ? { ...arrival, plannedAt: arrival.estimatedWarehouseArrivalAt } : undefined)
-  return projected.isDefault ? projected.date : null
-}
 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_EMPTY_RETURN: '确认还柜', SEND_PICKUP_EMAIL: '发送提柜邮件' } as Record<TerminalDrayageAction, string>)[action] }
@@ -585,7 +577,7 @@ async function saveDrayageAction() {
 }
 async function saveExpectedArrival(row: ContainerBookingResource, value: string | null) {
   const current = arrivalTimes.value[row.id]
-  if (!value || !current || current.version < 0 || current.planCount > 0 || arrivalSavingIds.value.includes(row.id)) return
+  if (!value || !current || current.version < 0 || arrivalSavingIds.value.includes(row.id)) return
   arrivalSavingIds.value.push(row.id)
   try {
     const updated = await updateContainerExpectedArrival(row.id, {
@@ -768,7 +760,7 @@ onMounted(async () => { await Promise.all([loadCustomers(), loadRows()]) })
             <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 remote reserve-keyword remote-show-suffix placeholder="输入车队名称或联系人搜索" :remote-method="searchTerminalFleets" :loading="terminalFleetLoading || drayageSavingIds.includes(row.id)" :disabled="!canDrayage(row as ContainerBookingResource, 'SELECT_FLEET') || drayageSavingIds.includes(row.id)" no-data-text="未找到合作中的码头车队" @visible-change="handleTerminalFleetVisible" @update:model-value="selectRowFleet(row, $event)"><el-option v-if="drayageFor(row.id)?.fleetSupplierName && !terminalFleetOptions.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 terminalFleetOptions" :key="supplier.id" :label="supplier.name" :value="supplier.id" /></el-select></template>
-            <template #pickupAppointmentAt="{ row }"><div class="arrival-time-cell" :title="defaultArrivalDate(row) ? '到港日期＋2个自然日（默认推算）；可选择日期时间人工调整' : undefined"><el-date-picker v-model="arrivalInputs[row.id]" class="arrival-time-picker" type="datetime" value-format="YYYY-MM-DDTHH:mm:ss" format="YYYY-MM-DD HH:mm" :placeholder="defaultArrivalDate(row) ? `${defaultArrivalDate(row)}（默认）` : '选择预计到仓'" :disabled="!canExpectedArrivalEdit || !arrivalTimes[row.id] || arrivalTimes[row.id].version < 0 || arrivalTimes[row.id].planCount > 0 || arrivalSavingIds.includes(row.id)" @change="saveExpectedArrival(row as ContainerBookingResource, $event as string | null)" /></div></template>
+            <template #pickupAppointmentAt="{ row }"><div class="arrival-time-cell"><el-date-picker v-model="arrivalInputs[row.id]" class="arrival-time-picker" type="datetime" value-format="YYYY-MM-DDTHH:mm:ss" format="YYYY-MM-DD HH:mm" placeholder="选择预计到仓" :disabled="!canExpectedArrivalEdit || !arrivalTimes[row.id] || arrivalTimes[row.id].version < 0 || arrivalSavingIds.includes(row.id)" @change="saveExpectedArrival(row as ContainerBookingResource, $event as string | null)" /></div></template>
             <template #actualPickupAt="{ row }">{{ formatTime(arrivalTimes[row.id]?.actualWarehouseArrivalAt) }}</template>
             <template #estimatedEmptyReturnAt="{ row }">{{ formatTime(drayageFor(row.id)?.estimatedEmptyReturnAt) }}</template>
             <template #actualEmptyReturnAt="{ row }">{{ formatTime(drayageFor(row.id)?.actualEmptyReturnAt) }}</template>
@@ -780,7 +772,7 @@ onMounted(async () => { await Promise.all([loadCustomers(), loadRows()]) })
             <template #estimatedSailingAt="{ row }">{{ formatTime(row.estimatedSailingAt) }}</template>
             <template #actualSailingAt="{ row }">{{ formatTime(row.actualFacts?.actualSailingAt) }}</template>
             <template #estimatedPortArrivalAt="{ row }">{{ formatTime(row.estimatedPortArrivalAt) }}</template>
-            <template #actualPortArrivalAt="{ row }">{{ formatTime(row.actualFacts?.arrivedDestinationPortAt) }}</template>
+            <template #actualPortArrivalAt="{ row }">{{ formatTime(row.actualFacts?.actualPortArrivalAt) }}</template>
           </DataTable></div></section>
       </ListPageLayout>
 

src/modules/container-loading/types.ts

@@ -224,7 +224,6 @@ export interface ContainerWorkbenchStatusSummary {
 }
 
 export interface ContainerWorkbenchActualFacts {
-  arrivedDestinationPortAt?: string | null
   actualSailingAt?: string | null
   actualPortArrivalAt?: string | null
   actualWarehouseArrivalAt?: string | null

src/modules/container-loading/warehouseArrival.test.ts

@@ -1,24 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import { projectWarehouseArrival } from './warehouseArrival'
-
-describe('shared warehouse arrival projection', () => {
-  it.each([
-    ['2026-10-21T15:49:00', '2026-10-23'],
-    ['2026-10-30T23:30:00-07:00', '2026-11-01'],
-    ['2026-12-31T23:30:00', '2027-01-02'],
-    ['2026-03-07T23:30:00-08:00', '2026-03-09'],
-  ])('adds two local calendar days to %s without manufacturing a time', (arrivalAt, date) => {
-    expect(projectWarehouseArrival(arrivalAt, { plannedAt: null, version: 0, planCount: 0 })).toEqual({ date, time: '', isDefault: true })
-  })
-  it('keeps manually maintained and frozen dates instead of following port arrival', () => {
-    for (const plan of [{ plannedAt: '2026-10-28T09:30:00', version: 1, planCount: 0 }, { plannedAt: '2026-10-28T09:30:00', version: 0, planCount: 1 }]) {
-      expect(projectWarehouseArrival('2026-10-21T15:49:00', plan)).toEqual({ date: '2026-10-28', time: '09:30', isDefault: false })
-    }
-  })
-  it('does not replace inconsistent or frozen missing dates with defaults', () => {
-    for (const plan of [{ plannedAt: null, version: -1, planCount: 0 }, { plannedAt: null, version: 0, planCount: 1 }, { plannedAt: null, version: 1, planCount: 0 }]) {
-      expect(projectWarehouseArrival('2026-10-21T15:49:00', plan).date).toBeNull()
-    }
-    for (const arrival of [null, '', 'invalid', '2026-02-30T09:00:00']) expect(projectWarehouseArrival(arrival, undefined).date).toBeNull()
-  })
-})

src/modules/container-loading/warehouseArrival.ts

@@ -1,20 +0,0 @@
-export interface WarehouseArrivalPlan {
-  plannedAt: string | null
-  version: number
-  planCount: number
-}
-
-/** 默认值只有当地日期，不能作为人工维护的日期时间提交。 */
-export function projectWarehouseArrival(arrivalAt: string | null | undefined, plan: WarehouseArrivalPlan | undefined) {
-  const canDefault = !plan || plan.version === 0 && plan.planCount === 0
-  let date = plan?.plannedAt?.slice(0, 10) || null
-  if (!date && canDefault && arrivalAt) {
-    const day = arrivalAt.slice(0, 10)
-    const calendarDate = new Date(`${day}T12:00:00Z`)
-    if (/^\d{4}-\d{2}-\d{2}$/.test(day) && !Number.isNaN(calendarDate.getTime()) && calendarDate.toISOString().slice(0, 10) === day) {
-      calendarDate.setUTCDate(calendarDate.getUTCDate() + 2)
-      date = calendarDate.toISOString().slice(0, 10)
-    }
-  }
-  return { date, time: plan?.plannedAt?.slice(11, 16) || '', isDefault: !plan?.plannedAt && canDefault }
-}

src/modules/overseas-master-data/PROTOTYPE_MATRIX.md

@@ -63,16 +63,6 @@
 
 续批验证：81个文件671项定向回归首轮669项通过，出车图表两项旧颜色期望按公共主题更新后，所属1文件5项复验通过；50个修改Vue模板与局部样式编译通过。写前、写后快照核对未发现外部漂移；所有事件/表单绑定、非图表业务脚本保留，图表仅接入配色/字体/tooltip主题。未改API、日期计算、driver、权限、状态与路由。类型检查、全量测试和构建由总控统一执行；截图均待人工确认。
 
-## 自有业务列表字段补齐（2026-10-21）
-
-依据本轮用户字段截图 `codex-clipboard-9d532c45-a5f3-4f90-a8f2-f8a3cdfb8a3e.png`；用户确认派送仓库就是目的仓，最晚装车完成时间先空着。此前详情、运营登记、照片的承载与权限不变。
-
-| 页面／操作 | 截图与当前确认 | 本次调整 | 验收 |
-|---|---|---|---|
-| 自有业务列表／读取字段 | 总价、单价、预约到达、实际到达各为独立列 | 拆开原合并列；一车一行，各到达时间保留目的仓标识，金额沿服务端原值 | 8项定向检查通过；待修改后人工截图 |
-| 自有业务列表／仓库与时间 | 派送仓库等于目的仓；最晚装车完成时间暂无来源 | 派送仓库复用目的仓展示；最晚装车完成时间显示“—”，不拿计划发车替代；保留已有计划发车列 | 8项定向检查通过；待修改后人工截图 |
-| 自有业务列表／字段名称 | 图中第一处“托数”装的是仓库名称 | 保留正确的“提货仓库”和唯一“实际托数”；“阶段”列改名“状态”，取值不变 | 8项定向检查通过；待修改后人工截图 |
-
 ## 自有业务行操作样式核对（2026-10-21）
 
 依据本轮用户截图 `codex-clipboard-eb6aa95b-c8a2-4b85-9294-22f3127cf72c.png` 与 Admin 界面规范“列表”纯文字行操作规则；仅修正列表按钮外观。

src/modules/overseas-master-data/pages/OwnedBusinessView.vue

@@ -37,17 +37,11 @@ const columns: DataTableColumn[] = [
   { key: 'actions', label: '操作', width: 245, fixed: 'left', slotName: 'actions' },
   { key: 'appointments', label: '预约号', minWidth: 195, slotName: 'appointments' }, { prop: 'dispatchNo', label: '排车单号', minWidth: 300 },
   { prop: 'vehicle.plate', label: '车牌', minWidth: 130 }, { key: 'driver', label: '司机', minWidth: 150, slotName: 'driver' }, { prop: 'origin.warehouseName', label: '提货仓库', minWidth: 150 },
-  { key: 'destinations', label: '目的仓', minWidth: 150, slotName: 'destinations' },
+  { key: 'destinations', label: '目的仓 / 预约到达 / 实际到达', minWidth: 285, slotName: 'destinations' },
-  { key: 'deliveryWarehouses', label: '派送仓库', minWidth: 150, slotName: 'destinations' },
   { key: 'fuel', label: '油耗（L/100km）', minWidth: 145, slotName: 'fuel' }, { prop: 'actualPalletCount', label: '实际托数', minWidth: 105 },
-  { key: 'money', label: '总价', minWidth: 170, align: 'right', slotName: 'money' },
+  { key: 'money', label: '整车总金额 / 单价', minWidth: 170, slotName: 'money' },
-  { key: 'unitPrice', label: '单价（/托）', minWidth: 160, align: 'right', slotName: 'unitPrice' },
+  { key: 'plannedDepartureAt', label: '计划发车时间', minWidth: 180, slotName: 'plannedDeparture' }, { key: 'loadingCompletedAt', label: '实际装车完成时间', minWidth: 180, slotName: 'loaded' },
-  { key: 'plannedDepartureAt', label: '计划发车时间', minWidth: 180, slotName: 'plannedDeparture' },
+  { key: 'stage', label: '阶段', minWidth: 110, slotName: 'stage' },
-  { key: 'latestLoadingCompletedAt', label: '最晚装车完成时间', minWidth: 180, slotName: 'latestLoaded' },
-  { key: 'loadingCompletedAt', label: '实际装车完成时间', minWidth: 180, slotName: 'loaded' },
-  { key: 'scheduledArrival', label: '预约到达时间', minWidth: 190, slotName: 'scheduledArrival' },
-  { key: 'actualArrival', label: '实际到达时间', minWidth: 190, slotName: 'actualArrival' },
-  { key: 'stage', label: '状态', minWidth: 110, slotName: 'stage' },
 ]
 function time(value: string | null | undefined) { return value && dayjs(value).isValid() ? dayjs(value).format('YYYY-MM-DD HH:mm') : '—' }
 async function load() {
@@ -103,13 +97,9 @@ onBeforeUnmount(() => { active = false; generation++; openGeneration++ })
       <template #actions="{ row }"><div class="row-actions density-actions admin-text-actions"><el-button class="density-action" link @click="router.push(`/overseas-master-data/owned-business/${encodeURIComponent(row.dispatchNo)}`)">查看明细</el-button><el-button v-if="access.can(permission.ownedBusinessEdit)" class="density-action" link :disabled="opening || mutating || !row.actions.edit.allowed" @click="openAction(row as OwnedBusinessRow, 'operations')">登记运营信息</el-button><el-button class="density-action" link :disabled="opening || mutating" @click="openAction(row as OwnedBusinessRow, 'photos')">{{ access.can(permission.ownedBusinessUpload) && row.actions.upload.allowed ? '上传照片' : '查看照片' }}</el-button></div></template>
       <template #driver="{ row }">{{ text(row.driver.name) }}<br>{{ text(row.driver.phone) }}</template>
       <template #appointments="{ row }"><div v-for="destination in row.destinations" :key="destination.destinationKey" class="owned-business-destination"><strong>{{ destination.warehouseCode || destination.warehouseName || '—' }}</strong><div v-for="appointment in destination.appointments" :key="appointment.appointmentNo">{{ appointment.appointmentNo }}<small v-if="appointment.confirmationNo">确认号 {{ appointment.confirmationNo }}</small></div><span v-if="!destination.appointments.length">—</span></div></template>
-      <template #destinations="{ row }"><div v-for="destination in row.destinations" :key="destination.destinationKey" class="owned-business-destination">{{ destination.warehouseCode || destination.warehouseName || destination.address || '—' }}</div><span v-if="!row.destinations.length">—</span></template>
+      <template #destinations="{ row }"><div v-for="destination in row.destinations" :key="destination.destinationKey" class="owned-business-destination"><strong>{{ destination.warehouseCode || destination.warehouseName || destination.address || '—' }}</strong><div v-for="appointment in destination.appointments" :key="appointment.appointmentNo">预约 {{ time(appointment.scheduledAt) }}</div><div>实到 {{ time(destination.actualArrivedAt) }}</div></div></template>
-      <template #scheduledArrival="{ row }"><div v-for="destination in row.destinations" :key="destination.destinationKey" class="owned-business-destination"><strong>{{ destination.warehouseCode || destination.warehouseName || destination.address || '—' }}</strong><div v-for="appointment in destination.appointments" :key="appointment.appointmentNo">{{ time(appointment.scheduledAt) }}</div><span v-if="!destination.appointments.length">—</span></div><span v-if="!row.destinations.length">—</span></template>
-      <template #actualArrival="{ row }"><div v-for="destination in row.destinations" :key="destination.destinationKey" class="owned-business-destination"><strong>{{ destination.warehouseCode || destination.warehouseName || destination.address || '—' }}</strong><div>{{ time(destination.actualArrivedAt) }}</div></div><span v-if="!row.destinations.length">—</span></template>
       <template #fuel="{ row }">{{ row.operations.fuelConsumptionLitresPer100Km ?? '未登记' }}</template>
-      <template #money="{ row }"><template v-if="row.operations.money">{{ row.operations.money.currency }} {{ row.operations.money.amount }}</template><span v-else>未登记</span></template>
+      <template #money="{ row }"><template v-if="row.operations.money">{{ row.operations.money.currency }} {{ row.operations.money.amount }}<br>单价 {{ row.unitPrice ?? '—' }}</template><span v-else>未登记</span></template>
-      <template #unitPrice="{ row }"><template v-if="row.operations.money && row.unitPrice != null">{{ row.operations.money.currency }} {{ row.unitPrice }}</template><span v-else>{{ row.operations.money ? '—' : '未登记' }}</span></template>
-      <template #latestLoaded>—</template>
       <template #plannedDeparture="{ row }">{{ time(row.plannedDepartureAt) }}</template><template #loaded="{ row }">{{ time(row.loadingCompletedAt) }}</template><template #stage="{ row }">{{ ownedBusinessStages[row.stage as OwnedBusinessStage] }}</template>
     </DataTable></div>
     <OwnedBusinessOperationsEditor v-model="editorOpen" :detail="detail" @busy="mutating = $event" @saved="saved" />

src/modules/overseas-master-data/pages/OwnedBusinessViews.test.ts

@@ -17,7 +17,7 @@ const Button = defineComponent({ props: ['disabled'], template: '<button :disabl
 const Tabs = defineComponent({ props: ['modelValue'], emits: ['update:modelValue'], template: '<div><slot /></div>' })
 const Pane = defineComponent({ props: ['name','label'], template: '<article><slot /></article>' })
 const Query = defineComponent({ props: ['modelValue','fields'], emits: ['update:modelValue','search'], template: '<div />' })
-const Table = defineComponent({ props: ['data','columns','total','page','pageSize'], emits: ['update:page','update:pageSize'], setup(props,{slots}) { return () => h('div', [slots['toolbar-start']?.(), slots.filters?.(), slots.notices?.(), ...(props.data || []).map((row: object) => h('div', Object.entries(slots).filter(([name]) => !['toolbar-start','filters','notices'].includes(name)).map(([name,slot]) => h('section', { 'data-column': name }, slot?.({row})))))]) } })
+const Table = defineComponent({ props: ['data','columns','total','page','pageSize'], emits: ['update:page','update:pageSize'], setup(props,{slots}) { return () => h('div', [slots['toolbar-start']?.(), slots.filters?.(), slots.notices?.(), ...(props.data || []).map((row: object) => h('div', Object.entries(slots).filter(([name]) => !['toolbar-start','filters','notices'].includes(name)).map(([,slot]) => slot?.({row}))))]) } })
 const OperationsEditor = defineComponent({ name: 'OwnedBusinessOperationsEditorStub', props: ['modelValue','detail'], emits: ['update:modelValue','saved','busy'], template: '<div />' })
 const PhotosEditor = defineComponent({ name: 'OwnedBusinessPhotosEditorStub', props: ['modelValue','detail'], emits: ['update:modelValue','saved','busy'], template: '<div />' })
 const global = { stubs: { AdminPage: Surface, DetailPageLayout: Surface, DataTable: Table, QueryToolbar: Query, ElTabs: Tabs, ElTabPane: Pane, ElButton: Button, OwnedBusinessOperationsEditor: OperationsEditor, OwnedBusinessPhotosEditor: PhotosEditor, LoadErrorState: { props:['message'], template:'<div>{{message}}<slot name="details" /></div>' }, ApiErrorMeta: true }, directives: { loading: () => {} } }
@@ -30,27 +30,6 @@ beforeEach(() => {
 })
 
 describe('owned business views', () => {
-  it('keeps split prices authoritative and arrival times associated with each destination', async () => {
-    const detail = ownedBusinessFixture()
-    detail.row.operations.money = { currency: 'USD', amount: '0.00' }; detail.row.unitPrice = '0.00'
-    detail.row.destinations[0]!.appointments[0]!.scheduledAt = '2026-10-21T09:00:00Z'
-    detail.row.destinations.push({ destinationKey: 'destination-2', warehouseCode: 'FBA-2', warehouseName: null, address: null, appointments: [], actualArrivedAt: '2026-10-21T10:00:00Z' })
-    calls.list.mockResolvedValue({ records: [detail.row], page: 1, size: 20, total: 1, summary: { dispatchCount: 1, afterLoadingCount: 1, deliveringCount: 0, deliveredCount: 0 } })
-    const wrapper = mount(OwnedBusinessView, { global }); await flushPromises()
-    const columns = wrapper.findComponent(Table).props('columns') as { key?: string; label: string; slotName?: string }[]
-    expect(columns.map(column => column.label)).toEqual(expect.arrayContaining(['目的仓', '派送仓库', '总价', '单价（/托）', '最晚装车完成时间', '预约到达时间', '实际到达时间', '状态']))
-    expect(columns.find(column => column.key === 'deliveryWarehouses')!.slotName).toBe('destinations')
-    expect(wrapper.get('[data-column="money"]').text()).toBe('USD 0.00')
-    expect(wrapper.get('[data-column="unitPrice"]').text()).toBe('USD 0.00')
-    expect(wrapper.get('[data-column="latestLoaded"]').text()).toBe('—')
-    const scheduled = wrapper.findAll('[data-column="scheduledArrival"] .owned-business-destination')
-    expect(scheduled.map(cell => cell.text())).toEqual(['FBA-1' + dayjs('2026-10-21T09:00:00Z').format('YYYY-MM-DD HH:mm'), 'FBA-2—'])
-    const actual = wrapper.findAll('[data-column="actualArrival"] .owned-business-destination')
-    expect(actual.map(cell => cell.text())).toEqual(['FBA-1—', 'FBA-2' + dayjs('2026-10-21T10:00:00Z').format('YYYY-MM-DD HH:mm')])
-    expect(calls.detail).not.toHaveBeenCalled()
-    wrapper.unmount()
-  })
-
   it('keeps a non-pool external vehicle returned by the server without filtering or requiring a vehicle id', async () => {
     const detail = ownedBusinessFixture()
     detail.row.vehicle = { vehicleId: null, plate: 'EXTERNAL-NO-POOL', ownership: 'DISPATCHED' }

src/modules/overseas-warehouse/components/TransportExecutionPanel.vue

@@ -11,7 +11,7 @@ import { listVehicles, listDrivers, pickupStatusLabels, type VehicleDetail, type
 import { getTransport, assignTransport, transportOccupancy, cancelTransport, releaseTransport, commandTransport, uploadTransport, downloadTransportEvidence, transportLabels, type TransportDetail } from '../api/transportTasks'
 import { dispatchActionPermissions as permission } from '../dispatchPresentation'
 
-const props = defineProps<{ dispatchNo: string }>(), emit = defineEmits<{ saved: [] }>()
+const props = defineProps<{ dispatchNo: string; pickupApproved?: boolean }>(), emit = defineEmits<{ saved: [] }>()
 const access = useAccessPreviewStore(), detail = ref<TransportDetail | null>(null), error = ref<ApiErrorDetails | null>(null), busy = ref(false)
 const vehicles = ref<VehicleDetail[]>([]), drivers = ref<DriverDetail[]>([]), vehicleId = ref(''), driverId = ref(''), reason = ref('')
 const occupancy = ref<Record<string, boolean>>({}), candidateBusy = ref(false)
@@ -109,13 +109,13 @@ onBeforeRouteLeave(() => !locked.value || window.confirm('运输请求尚待核
         <el-button :loading="busy" :disabled="candidateBusy || !vehicleId || !driverId" @click="assign">保存车辆司机</el-button>
       </el-form>
       <div class="density-actions">
-        <el-button v-if="trip.status === 'PLANNED' && access.can(permission.DEPART)" :disabled="locked || !trip.vehicleId || !trip.driverId" @click="command('depart')">确认发车</el-button>
+        <el-button v-if="trip.status === 'PLANNED' && access.can(permission.DEPART)" :disabled="locked || !trip.vehicleId || !trip.driverId || (detail.taskType === 'PICKUP' && !props.pickupApproved)" @click="command('depart')">确认发车</el-button>
         <el-button v-if="trip.status === 'PLANNED' && access.can(permission.CANCEL)" :disabled="locked" @click="command('cancel')">取消排车</el-button>
         <el-button v-if="trip.status === 'IN_TRANSIT' && editable" :disabled="locked || (detail.taskType === 'PICKUP' ? !detail.pickups.length || detail.pickups.some(row => row.status !== 'ARRIVED') : !truckEvidence.length)" @click="command('complete')">确认运输完成</el-button>
         <template v-if="trip.status === 'COMPLETED' && editable"><el-button v-if="!trip.vehicleRelease" :disabled="locked" @click="openRelease('VEHICLE')">结束车辆任务</el-button><el-button v-if="!trip.driverRelease" :disabled="locked" @click="openRelease('DRIVER')">结束司机任务</el-button></template>
         <el-button :disabled="locked" @click="load">刷新运输进度</el-button>
       </div>
-      <p v-if="detail.taskType === 'PICKUP'">送仓后由仓库独立清点收货，取货数量保留为运输事实。</p>
+      <p v-if="detail.taskType === 'PICKUP'">{{ props.pickupApproved ? '两级审核已通过，可发车取货。' : '请维护车辆信息并提交调度审核，经调度和理货员审核通过后发车取货。' }}送仓后由仓库独立清点收货，取货数量保留为运输事实。</p>
       <el-table v-if="detail.taskType === 'PICKUP'" :data="detail.pickups"><el-table-column prop="transferNo" label="转运单号" min-width="190" /><el-table-column label="进度"><template #default="{ row }">{{ pickupStatusLabels[row.status] }}</template></el-table-column><el-table-column prop="packageCount" label="预报箱数" /><el-table-column prop="actualPackages" label="实提箱数" /><el-table-column label="凭证"><template #default="{ row }"><el-button v-for="file in row.evidence" :key="file.fileId" link @click="download(file, row as PickupTask)">{{ file.fileName }}</el-button></template></el-table-column><el-table-column label="操作" width="180"><template #default="{ row }"><template v-if="trip.status === 'IN_TRANSIT' && editable"><el-button v-if="row.status === 'ASSIGNED'" link :disabled="locked" @click="editPickup(row as PickupTask)">确认取货</el-button><el-button v-if="row.status === 'PICKED'" link :disabled="locked" @click="command('arrive', row as PickupTask)">确认送仓</el-button></template></template></el-table-column></el-table>
       <div v-if="detail.taskType === 'LOCAL_TRUCK' && trip.status === 'IN_TRANSIT' && editable"><label>运输完成凭证 <input type="file" :disabled="locked" @change="upload($event, false)" /></label><p v-for="file in truckEvidence" :key="file.fileId">{{ file.fileName }}</p></div>
       <div v-if="detail.completionEvidence?.length"><p>已确认的运输完成凭证</p><el-button v-for="file in detail.completionEvidence" :key="file.fileId" link @click="download(file)">{{ file.fileName }}</el-button></div>

src/modules/overseas-warehouse/pages/DeliveryOrdersView.test.ts

@@ -330,7 +330,7 @@ describe('DeliveryOrdersView permissions and commands', () => {
     const wrapper = mount(DeliveryOrdersView, { global: { plugins: [ElementPlus], stubs: { ...commonPhase5Stubs, DataTable: table, DeliveryDocumentsDialog: true } } })
     await flushPromises()
     expect(wrapper.text()).toContain('1/3 已上传')
-    expect(wrapper.text()).toContain('签收文件（POD签收/快递签收） · 已上传')
+    expect(wrapper.text()).not.toContain('签收文件（POD签收/快递签收）')
     expect(getDeliveryDocuments).not.toHaveBeenCalled()
     await wrapper.findAll('button').find(button => button.text().includes('管理资料'))!.trigger('click')
     const dialog = wrapper.findComponent({ name: 'DeliveryDocumentsDialog' })

src/modules/overseas-warehouse/pages/DeliveryOrdersView.vue

@@ -23,7 +23,6 @@ import { overseasWarehousePermissions as permission } from '../permissions'
 import { listReceivingOverseasWarehouses, type ReceivingOverseasWarehouseDto } from '../api/pallets'
 
 import DeliveryDocumentsDialog from '../components/DeliveryDocumentsDialog.vue'
-import { deliveryDocumentCategories } from '../api/deliveryDocuments'
 import { returnSourceKey, returnSourceReference } from '../returnSource'
 
 const documentsOpen = ref(false)
@@ -193,7 +192,7 @@ onMounted(() => { void load(); void loadWarehouses() })
         <template #filters><QueryToolbar v-model="filters" :fields="fields" :loading="loading" ariaLabel="派送单筛选" preference-key="overseas-delivery-orders-query" :search-on-reset="false" @search="search" @reset="reset" /></template>
         <template #notices><template v-if="error"><LoadErrorState title="派送单列表加载失败" :message="error.message" :loading="loading" @retry="load"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState></template></template>
 
-<template #actions="{ row }"><div class="density-actions row-actions admin-text-actions"><el-button class="density-action" data-tone="neutral" size="small" @click="open(row as DeliveryOrderRow)">详情</el-button><el-button v-if="row.outboundNo && access.can(permission.outboundList)" class="density-action" data-tone="neutral" size="small" @click="openOutbound(row as DeliveryOrderRow)">前往出库</el-button><el-button class="density-action" data-tone="neutral" v-if="access.can(permission.deliveryStatus) && availableStatuses(row as DeliveryOrderRow).length > 0" size="small" @click="openStatus(row as DeliveryOrderRow)">编辑状态</el-button><el-button class="density-action" data-tone="warning" v-if="canReturn(row as DeliveryOrderRow)" size="small" @click="openReturn(row as DeliveryOrderRow)">标记退货</el-button></div></template><template #documents="{ row }"><div class="delivery-document-summary"><div><strong>{{ row.documentSummary ? `${row.documentSummary.uploadedCategoryCount}/3 已上传` : '资料摘要暂无' }}</strong><el-button class="density-action" data-tone="neutral" v-if="access.can(permission.deliveryList)" size="small" @click="openDocuments(row as DeliveryOrderRow)">管理资料</el-button></div><div class="delivery-document-categories"><span v-for="category in deliveryDocumentCategories" :key="category.category" :class="{ uploaded: row.documentSummary?.categories.some((item: { category: string; status: string }) => item.category === category.category && item.status === 'UPLOADED') }">{{ category.label }} · {{ row.documentSummary?.categories.find((item: { category: string }) => item.category === category.category)?.status === 'UPLOADED' ? '已上传' : '未上传' }}</span></div></div></template><template #status="{ row }"><StatusBadge :status="statusLabels[String(row.status)] || String(row.status || '—')" /></template><template #pagination-left>共 {{ total }} 条派送单</template></DataTable></div></section></ListPageLayout></AdminPage><AppDialog class="admin-density-dialog admin-workbench is-dialog" v-model="statusOpen" :title="'编辑派送状态 · ' + (statusRow?.deliveryNo || '—')" width="min(520px, calc(100vw - 28px))" confirm-text="保存状态" :confirm-loading="statusSaving || statusLoading" :loading="statusLoading" :confirm-disabled="!statusForm.status || statusConflict || statusLoading || !access.can(permission.deliveryStatus)" @confirm="submitStatus">
+<template #actions="{ row }"><div class="density-actions row-actions admin-text-actions"><el-button class="density-action" data-tone="neutral" size="small" @click="open(row as DeliveryOrderRow)">详情</el-button><el-button v-if="row.outboundNo && access.can(permission.outboundList)" class="density-action" data-tone="neutral" size="small" @click="openOutbound(row as DeliveryOrderRow)">前往出库</el-button><el-button class="density-action" data-tone="neutral" v-if="access.can(permission.deliveryStatus) && availableStatuses(row as DeliveryOrderRow).length > 0" size="small" @click="openStatus(row as DeliveryOrderRow)">编辑状态</el-button><el-button class="density-action" data-tone="warning" v-if="canReturn(row as DeliveryOrderRow)" size="small" @click="openReturn(row as DeliveryOrderRow)">标记退货</el-button></div></template><template #documents="{ row }"><div class="delivery-document-summary"><div><strong>{{ row.documentSummary ? `${row.documentSummary.uploadedCategoryCount}/3 已上传` : '资料摘要暂无' }}</strong><el-button class="density-action" data-tone="neutral" v-if="access.can(permission.deliveryList)" size="small" @click="openDocuments(row as DeliveryOrderRow)">管理资料</el-button></div></div></template><template #status="{ row }"><StatusBadge :status="statusLabels[String(row.status)] || String(row.status || '—')" /></template><template #pagination-left>共 {{ total }} 条派送单</template></DataTable></div></section></ListPageLayout></AdminPage><AppDialog class="admin-density-dialog admin-workbench is-dialog" v-model="statusOpen" :title="'编辑派送状态 · ' + (statusRow?.deliveryNo || '—')" width="min(520px, calc(100vw - 28px))" confirm-text="保存状态" :confirm-loading="statusSaving || statusLoading" :loading="statusLoading" :confirm-disabled="!statusForm.status || statusConflict || statusLoading || !access.can(permission.deliveryStatus)" @confirm="submitStatus">
   <div class="density-dialog-sections">
     <el-alert title="取消派送请先解除未执行车次关联，再前往关联出库单取消出库；已出库或已发车不能直接取消。" type="warning" :closable="false" show-icon />
     <section class="density-dialog-section" data-tone="source" aria-label="派送状态依据"><h3 class="density-dialog-section__title">当前资料</h3><table class="density-table"><tbody><tr><th scope="row">当前状态</th><td>{{ statusLabels[String(statusRow?.status)] || '—' }}</td></tr><tr><th scope="row">关联出库</th><td>{{ statusRow?.outboundNo || '—' }}</td></tr></tbody></table></section>
@@ -219,4 +218,4 @@ onMounted(() => { void load(); void loadWarehouses() })
   </div>
 </AppDialog><DeliveryDocumentsDialog v-if="documentsRow" v-model="documentsOpen" :delivery-no="documentsRow.deliveryNo" :customer-id="documentsRow.customerId" @saved="load()" /></template>
 
-<style scoped>.delivery-document-summary{display:grid;gap:var(--admin-space-3);padding:var(--admin-space-2) 0}.delivery-document-summary>div:first-child{display:flex;align-items:center;justify-content:space-between;gap:var(--admin-space-5)}.delivery-document-categories{display:flex;flex-wrap:wrap;gap:var(--admin-space-2) var(--admin-space-5);font-size:var(--admin-font-caption);color:var(--workbench-muted)}.delivery-document-categories .uploaded{color:var(--el-color-success)}.delivery-return-editor { table-layout: fixed; }.delivery-return-editor td:not([colspan]) { width: 50%; }.delivery-return-sources { table-layout: fixed; }.delivery-return-select { width: 68px; }.delivery-return-quantity { width: 160px; } @media (max-width: 720px) { .delivery-return-editor, .delivery-return-editor tbody { display: block; }.delivery-return-editor tr { display: grid; grid-template-columns: 1fr; }.delivery-return-editor td:not([colspan]) { width: auto; } }</style>
+<style scoped>.delivery-document-summary{display:grid;gap:var(--admin-space-3);padding:var(--admin-space-2) 0}.delivery-document-summary>div:first-child{display:flex;align-items:center;justify-content:space-between;gap:var(--admin-space-5)}.delivery-return-editor { table-layout: fixed; }.delivery-return-editor td:not([colspan]) { width: 50%; }.delivery-return-sources { table-layout: fixed; }.delivery-return-select { width: 68px; }.delivery-return-quantity { width: 160px; } @media (max-width: 720px) { .delivery-return-editor, .delivery-return-editor tbody { display: block; }.delivery-return-editor tr { display: grid; grid-template-columns: 1fr; }.delivery-return-editor td:not([colspan]) { width: auto; } }</style>

src/modules/overseas-warehouse/pages/DispatchDetailView.vue

@@ -29,7 +29,7 @@ const rejectionError = ref<ApiErrorDetails | null>(null)
 const operation = ref<'ROUTE' | undefined>()
 const action = ref<DispatchAction>('EDIT'), actionOpen = ref(false)
 const detailActions: DispatchAction[] = ['EDIT', 'SUBMIT_REVIEW', 'DISPATCH_REVIEW', 'LOADING_REVIEW', 'RETURN_TO_REVIEW', 'LOADING_COMPLETE', 'CANCEL']
-const visibleActions = computed(() => detailActions.filter(value => canDispatchAction(detail.value?.actions, value, access.can)))
+const visibleActions = computed(() => detailActions.filter(value => !(detail.value?.taskType === 'PICKUP' && value === 'EDIT') && canDispatchAction(detail.value?.actions, value, access.can)))
 const vehicleStatus = computed(() => {
   const status = detail.value?.vehicleInfo.vehicle?.vehicleStatus
   return status && Object.hasOwn(vehicleStatusLabels, status) ? vehicleStatusLabels[status as keyof typeof vehicleStatusLabels] : '—'
@@ -84,8 +84,8 @@ onBeforeUnmount(() => { generation++ })
     <LoadErrorState v-if="rejectionError" title="排车操作未完成" :message="rejectionError.message" :show-retry="false"><template #details><ApiErrorMeta :details="rejectionError" /></template></LoadErrorState>
     <LoadErrorState v-if="loadError" title="排车详情加载失败" :message="loadError.message" :loading="loading" @retry="load"><template #details><ApiErrorMeta :details="loadError" /></template></LoadErrorState>
     <div v-else v-loading="loading" class="dispatch-detail" :aria-busy="loading">
-      <TransportExecutionPanel v-if="detail?.taskType && detail.taskType !== 'DELIVERY'" :dispatch-no="dispatchNo" @saved="load" />
+      <TransportExecutionPanel v-if="detail?.taskType && detail.taskType !== 'DELIVERY'" :dispatch-no="dispatchNo" :pickup-approved="detail.reviewState === 'APPROVED'" @saved="load" />
-      <section v-else-if="detail" class="detail-section" aria-label="排车操作"><div class="density-actions"><el-button v-for="value in visibleActions" :key="value" class="density-action" @click="openAction(value)">{{ dispatchActionLabels[value] }}</el-button><el-button v-if="canDispatchAction(detail?.actions, 'EDIT', access.can)" @click="openAction('EDIT', 'ROUTE')">调整卸货顺序</el-button></div></section>
+      <section v-if="detail" class="detail-section" aria-label="排车操作"><div class="density-actions"><el-button v-for="value in visibleActions" :key="value" class="density-action" @click="openAction(value)">{{ dispatchActionLabels[value] }}</el-button><el-button v-if="(!detail.taskType || detail.taskType === 'DELIVERY') && canDispatchAction(detail?.actions, 'EDIT', access.can)" @click="openAction('EDIT', 'ROUTE')">调整卸货顺序</el-button></div></section>
       <el-alert v-if="dispatchRejectionReason(detail?.reviews)" title="已退回客服处理（车辆信息），请核对原因后重新提交调度审核。" :description="dispatchRejectionReason(detail?.reviews)" type="warning" :closable="false" show-icon />
       <el-tabs v-if="!detail?.taskType || detail.taskType === 'DELIVERY'" v-model="activeTab" class="density-element-tabs density-contained-tabs">
         <el-tab-pane name="vehicle"><template #label><span class="density-tab-icon" aria-hidden="true">🚚</span><span>车辆信息</span></template><dl class="detail-fields density-fields"><div v-for="field in vehicleFields" :key="field[0]"><dt>{{ field[0] }}</dt><dd>{{ field[1] }}</dd></div></dl><DispatchEvidenceFiles v-for="field in dispatchReviewAttachmentFields" :key="field.key" :model-value="reviewEvidence[field.key]" :dispatch-no="dispatchNo" :kind="field.kind" :label="field.label" readonly /></el-tab-pane>

src/modules/overseas-warehouse/pages/DispatchesView.vue

@@ -22,6 +22,8 @@ import { dispatchStages, reviewLabels, stageLabel, type BeforeLoadingSection, ty
 import { canDispatchAction, dispatchActionLabels, dispatchActionPermissions, dispatchRejectionReason } from '../dispatchPresentation'
 import { formatOverseasDateTime as time } from '../lastMilePresentation'
 import TransportTaskCreateDialog from '../components/TransportTaskCreateDialog.vue'
+import AppDialog from '@/shared/components/AppDialog.vue'
+import TransportExecutionPanel from '../components/TransportExecutionPanel.vue'
 import { transportLabels, type TransportType } from '../api/transportTasks'
 import SmartDispatchDialog from '../components/SmartDispatchDialog.vue'
 import DispatchWorkflowDialog from '../components/DispatchWorkflowDialog.vue'
@@ -33,6 +35,7 @@ const rows = ref<DispatchListRow[]>([]), statistics = ref<DispatchStatistics | n
 const loading = ref(false), loadError = ref<ApiErrorDetails | null>(null), mutationError = ref<ApiErrorDetails | null>(null)
 const rejectionError = ref<ApiErrorDetails | null>(null)
 const transportOpen = ref(false), transportType = ref<TransportType>('PICKUP')
+const transportEditOpen = ref(false), transportEditNo = ref('')
 function createTransport(type: TransportType) { transportType.value = type; transportOpen.value = true }
 const page = ref(1)
 const pageSize = ref(10)
@@ -84,7 +87,7 @@ function rowActions(row: DispatchListRow): RowActionItem[] {
     const review = section.value
     return [...(canDispatchAction(row.actions, review, access.can) ? [{ key: review, label: '审核', ariaLabel: dispatchActionLabels[review], priority: 600 }] : []), { key: 'detail', label: '详情', priority: 500 }]
   }
-  if (row.taskType && row.taskType !== 'DELIVERY') return [{ key: 'detail', label: '运输操作', priority: 500 }]
+  if (row.taskType === 'LOCAL_TRUCK') return [{ key: 'detail', label: '运输操作', priority: 500 }]
   const available = rowActionOrder.filter(value => canDispatchAction(row.actions, value, access.can))
   const primaryAction = available.find(value => value === 'EDIT') ?? available[0]
   return [...available.map((value, index) => ({
@@ -93,7 +96,7 @@ function rowActions(row: DispatchListRow): RowActionItem[] {
     ariaLabel: dispatchActionLabels[value],
     priority: value === primaryAction ? 600 : 400 - index * 10,
     tone: value === 'CANCEL' ? 'danger' as const : undefined,
-  })), { key: 'detail', label: '详情', priority: 500 }, ...(canDispatchAction(row.actions, 'EDIT', access.can) ? [{ key: 'route-order', label: '调整卸货顺序', priority: 190 }] : []), { key: 'bol', label: '下载BOL', priority: 100, loading: bolLoadingNo.value === row.dispatchNo }]
+  })), { key: 'detail', label: '详情', priority: 500 }, ...(row.taskType === 'PICKUP' ? [] : [...(canDispatchAction(row.actions, 'EDIT', access.can) ? [{ key: 'route-order', label: '调整卸货顺序', priority: 190 }] : []), { key: 'bol', label: '下载BOL', priority: 100, loading: bolLoadingNo.value === row.dispatchNo }])]
 }
 function handleAction(value: string, row: DispatchListRow) {
   if (value === 'detail') return openDetail(row)
@@ -105,6 +108,7 @@ function handleAction(value: string, row: DispatchListRow) {
   if (value === 'ADD_CARGO' || value === 'REMOVE_CARGO') return
   const requested = value as DispatchAction
   if (!canDispatchAction(row.actions, requested, access.can)) return
+  if (row.taskType === 'PICKUP' && requested === 'EDIT') { transportEditNo.value = row.dispatchNo; transportEditOpen.value = true; return }
   action.value = requested; actionNo.value = row.dispatchNo; actionOpen.value = true
 }
 async function handleRejection(details: ApiErrorDetails) { rejectionError.value = details; await load() }
@@ -150,6 +154,7 @@ onBeforeUnmount(() => { sequence++ })
     </DataTable></div>
   </ListPageLayout></AdminPage>
   <TransportTaskCreateDialog v-model="transportOpen" :type="transportType" @created="load" />
+  <AppDialog v-model="transportEditOpen" title="维护取货车辆信息" width="1000px"><TransportExecutionPanel v-if="transportEditOpen" :dispatch-no="transportEditNo" :pickup-approved="rows.find(row => row.dispatchNo === transportEditNo)?.reviewState === 'APPROVED'" @saved="load" /></AppDialog>
   <SmartDispatchDialog v-model="createOpen" :orders="[]" @created="load" />
   <DispatchWorkflowDialog v-model="actionOpen" :dispatch-no="actionNo" :action="action" :operation="operation" @saved="handleSaved" @rejected="handleRejection" />
   <TransportRouteDialog v-model="routeOpen" :origin="routeOrigin" :destinations="routeDestinations" />

src/modules/overseas-warehouse/pages/InventoryCustomerName.behavior.test.ts

@@ -74,21 +74,12 @@ describe('inventory customer-name snapshots', () => {
     expect(wrapper.text()).not.toContain(balance.id)
   })
 
-  it('keeps the formal customer and carton list when piece projection fails', async () => {
+  it('keeps carton totals without the removed SKU and piece columns or their projection request', async () => {
-    vi.mocked(getInventoryPieceProjection).mockRejectedValueOnce(new Error('projection unavailable'))
     const wrapper = mount(InventoryView, { attachTo: document.body, global: { plugins: [createPinia(), ElementPlus] } })
     await flushPromises()
     expect(wrapper.text()).toContain('华远贸易')
-    expect(wrapper.text()).toContain('可用件数及箱内SKU加载失败')
+    expect(wrapper.text()).not.toContain('可用件数')
-    expect(wrapper.text()).not.toContain('库存数据加载失败')
+    expect(getInventoryPieceProjection).not.toHaveBeenCalled()
-  })
-
-  it('renders every mixed-carton SKU and real piece count alongside carton totals', async () => {
-    vi.mocked(getInventoryPieceProjection).mockResolvedValueOnce({ availablePieceCount: '12', knownAvailablePieceCount: '12', unknownCartonCount: '0', availableCartonCount: '2', availablePalletCount: '1', groups: [{ customerId, warehouseId: '200', destinationCode: null, anchorSkuCode: 'SKU-1', availablePieceCount: '12', knownAvailablePieceCount: '12', unknownCartonCount: '0', availableCartonCount: '2', availablePalletCount: '1', skuContents: [{ skuCode: 'SKU-1', quantity: '5' }, { skuCode: 'SKU-SECOND', quantity: '7' }], cartons: [] }] })
-    const wrapper = mount(InventoryView, { attachTo: document.body, global: { plugins: [createPinia(), ElementPlus] } })
-    await flushPromises()
-    expect(wrapper.text()).toContain('华远贸易')
-    expect(wrapper.text()).toContain('SKU-1 × 5 件；SKU-SECOND × 7 件')
     expect(wrapper.find('[aria-label="可用库存件箱托汇总"]').exists()).toBe(false)
     expect(wrapper.get('[aria-label="库存汇总"]').text()).toContain('可用库存（箱）10')
   })

src/modules/overseas-warehouse/pages/InventoryView.vue

@@ -13,7 +13,7 @@ import DataTable, { type DataTableColumn } from '@/shared/components/DataTable.v
 import ListPageLayout from '@/shared/components/ListPageLayout.vue'
 import LoadErrorState from '@/shared/components/LoadErrorState.vue'
 import QueryToolbar, { type QueryField, type QueryModel } from '@/shared/components/QueryToolbar.vue'
-import { getInventorySummary, getInventoryPieceProjection, listInventoryBalances, type InventoryDashboardDto, type InventoryPieceGroup } from '../api/inventory'
+import { getInventorySummary, listInventoryBalances, type InventoryDashboardDto } from '../api/inventory'
 import { ElMessage } from 'element-plus'
 import { listReceivingOverseasWarehouses, type ReceivingOverseasWarehouseDto } from '../api/pallets'
 import { toInventoryListItem } from '../inventoryPresentation'
@@ -26,8 +26,6 @@ const access = useAccessPreviewStore()
 const warehouses = ref<ReceivingOverseasWarehouseDto[]>([])
 const rows = ref<InventoryListItem[]>([])
 const summary = ref<InventoryDashboardDto | null>(null)
-const rowPieces = ref<Record<string, InventoryPieceGroup | undefined>>({})
-const pieceError = ref('')
 const loading = ref(false)
 const contextLoading = ref(false)
 const loadError = ref<ApiErrorDetails | null>(null)
@@ -53,8 +51,6 @@ const columns: DataTableColumn[] = [
   { key: 'actions', label: '操作', width: 110, fixed: 'left', slotName: 'actions' },
   { key: 'owner', prop: 'owner', label: '客户', minWidth: 160 },
   { key: 'warehouse', prop: 'warehouse', label: '海外仓', minWidth: 170 },
-  { key: 'sku', prop: 'sku', label: '箱内SKU / 可用件数', minWidth: 220, slotName: 'skuContents', singleLine: false, className: 'inventory-sku-contents' },
-  { key: 'availablePieces', label: '可用件数', minWidth: 130, slotName: 'availablePieces' },
   { key: 'productName', prop: 'productName', label: '中文品名', minWidth: 180 },
   { key: 'location', prop: 'location', label: '库位', minWidth: 140, defaultVisible: false },
   { key: 'onHand', prop: 'onHand', label: '在库总量', width: 105, align: 'right' },
@@ -79,17 +75,13 @@ function query() {
 
 async function load(model: QueryModel = filters.value) {
   Object.assign(filters.value, model)
-  loading.value = true; loadError.value = null; rowPieces.value = {}; pieceError.value = ''
+  loading.value = true; loadError.value = null
   try {
     const currentQuery = query()
     const [pageResult, summaryResult] = await Promise.all([listInventoryBalances(currentQuery), getInventorySummary(currentQuery)])
     rows.value = pageResult.records.map(toInventoryListItem); total.value = pageResult.total; summary.value = summaryResult
-    try {
-      const pieceResult = await getInventoryPieceProjection(currentQuery)
-      rowPieces.value = Object.fromEntries(pageResult.records.map(dto => [String(dto.id), pieceResult.groups.find(group => String(group.customerId) === String(dto.customerId) && String(group.warehouseId) === String(dto.overseasWarehouseId) && (group.destinationCode ?? '') === (dto.destinationWarehouseCode ?? '') && (group.anchorSkuCode ?? '') === (dto.skuCode ?? ''))]))
-    } catch { pieceError.value = '可用件数及箱内SKU加载失败，请重新查询；箱数列表仍可查看。' }
   }
-  catch (error) { rows.value = []; total.value = 0; summary.value = null; rowPieces.value = {}; loadError.value = getApiErrorDetails(error, '库存数据加载失败，请重试') }
+  catch (error) { rows.value = []; total.value = 0; summary.value = null; loadError.value = getApiErrorDetails(error, '库存数据加载失败，请重试') }
   finally { loading.value = false }
 }
 
@@ -107,20 +99,17 @@ onMounted(() => { void loadWarehouses(); void load() })
     <section><div class="workbench-table is-page-surface"><DataTable appearance="integrated" column-settings-mode="show" :results-visible="!loadError" v-model:page="page" v-model:page-size="pageSize" :data="rows" :columns="columns" :loading="loading" :total="total" preference-key="overseas-inventory" row-key="id" empty-text="暂无库存记录" @update:page="load()" @update:page-size="page = 1; load()">
         <template #toolbar-start><h1>库存管理</h1></template>
         <template #filters><QueryToolbar v-model="filters" :fields="fields" :loading="loading || contextLoading" ariaLabel="库存筛选" preference-key="overseas-inventory-query" @search="search" @reset="page = 1; rows = []; total = 0; summary = null" /></template>
-        <template #notices><template v-if="loadError"><LoadErrorState title="库存数据加载失败" :message="loadError.message" :loading="loading || contextLoading" @retry="load"><template #details><ApiErrorMeta :details="loadError" /></template></LoadErrorState></template><p v-if="pieceError" role="alert">{{ pieceError }}</p></template>
+        <template #notices><template v-if="loadError"><LoadErrorState title="库存数据加载失败" :message="loadError.message" :loading="loading || contextLoading" @retry="load"><template #details><ApiErrorMeta :details="loadError" /></template></LoadErrorState></template></template>
         <template #before-results><section class="inventory-metrics workbench-panel is-flush" aria-label="库存汇总"><div v-for="metric in metrics" :key="metric[0]" class="inventory-metric" :class="`is-${metric[2]}`"><span>{{ metric[0] }}（箱）</span><strong>{{ metric[1] }}</strong></div></section></template>
 
       <template #toolbar-actions><el-button v-if="access.can(overseasWarehousePermissions.inventoryExport) && access.can('platform:download:list')" plain :loading="exportLoading" @click="exportBalances"><Download :size="16" />导出库存</el-button><el-button @click="router.push({ name: 'overseas-inventory-transactions' })"><BookOpen :size="16" />进销存记录</el-button></template>
       <template #actions="{ row }"><div class="density-actions row-actions admin-text-actions"><el-button class="density-action" data-tone="neutral" size="small" @click="openDetail(row)">查看</el-button></div></template>
-      <template #skuContents="{ row }"><span v-if="rowPieces[row.id]?.skuContents.length">{{ rowPieces[row.id]!.skuContents.map(sku => `${sku.skuCode} × ${sku.quantity} 件`).join('；') }}<template v-if="Number(rowPieces[row.id]!.unknownCartonCount) > 0">；另有 {{ rowPieces[row.id]!.unknownCartonCount }} 箱内容未知</template></span><span v-else>记账SKU：{{ row.sku }}；箱内件数未记录</span></template>
-      <template #availablePieces="{ row }">{{ rowPieces[row.id]?.availablePieceCount ?? (row.available === 0 ? 0 : '未记录') }}</template>
       <template #pagination-left>共 {{ total }} 条库存记录</template>
     </DataTable></div></section>
   </ListPageLayout></AdminPage>
 </template>
 
 <style scoped>
-.admin-density :deep(.inventory-sku-contents .cell) { white-space: normal; overflow-wrap: anywhere; }
 .inventory-metrics { display: grid; grid-template-columns: repeat(6, minmax(130px, 1fr)); overflow: hidden; }
 .inventory-metric:last-child { border-right: 0; }
 .inventory-metric span { color: #64748b; font-size: var(--admin-font-caption); }

src/modules/overseas-warehouse/pages/prototypeContract.test.ts

@@ -383,7 +383,7 @@ describe('overseas warehouse first-batch prototype contract', () => {
       'pallets', 'assigned', 'mergeAllowed', 'urgent', 'status', 'appointmentStatus', 'dispatchStatus', 'createdAt',
     ])
     expect(columnKeys('InventoryView.vue')).toEqual([
-      'actions', 'owner', 'warehouse', 'sku', 'availablePieces', 'productName', 'location', 'onHand', 'available', 'held', 'looseboard',
+      'actions', 'owner', 'warehouse', 'productName', 'location', 'onHand', 'available', 'held', 'looseboard',
       'inTransit', 'updatedAt',
     ])
     expect(columnKeys('RelabelOrdersView.vue')).toEqual([