Merge remote-tracking branch 'origin/release/test' into dev

src/modules/trucking/pages/TruckAppointmentCreateView.behavior.test.ts

@@ -0,0 +1,118 @@
+import ElementPlus from 'element-plus'
+import { flushPromises, mount } from '@vue/test-utils'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { ApiResponseError } from '@/shared/api/http'
+import TruckAppointmentCreateView from './TruckAppointmentCreateView.vue'
+import { createTruckAppointment, listTruckAppointments } from '../api/platformTrucking'
+import type { SaveTruckAppointmentRequest, TruckAppointmentResource } from '../types'
+
+const routing = vi.hoisted(() => ({ query: {} as Record<string, string>, replace: vi.fn(), push: vi.fn() }))
+vi.mock('vue-router', () => ({ useRoute: () => ({ query: routing.query }), useRouter: () => ({ replace: routing.replace, push: routing.push }) }))
+vi.mock('../api/platformTrucking', () => ({ createTruckAppointment: vi.fn(), listTruckAppointments: vi.fn() }))
+
+const existing = (status: TruckAppointmentResource['status']): TruckAppointmentResource => ({
+  id: 'appointment-1', appointmentNo: 'TA-260901-0003', status, oceanBookingId: 'booking-1', attachments: [],
+})
+const page = (records: TruckAppointmentResource[]) => ({ records, page: 1, size: 20, total: records.length, pages: 1 })
+const formStub = {
+  name: 'TruckAppointmentForm',
+  props: ['modelValue', 'submitting', 'submitBlocked'],
+  emits: ['update:modelValue', 'submit', 'attachments'],
+  template: '<div data-form :data-blocked="String(submitBlocked)"><button data-submit @click="$emit(\'submit\')">保存</button></div>',
+}
+type ViewModel = {
+  form: SaveTruckAppointmentRequest
+  submit: () => Promise<void>
+  lookupExistingAppointment: (id: string, autoNavigate?: boolean) => Promise<void>
+  existingAppointment: TruckAppointmentResource | null
+  existingLookupError: { message: string } | null
+  checkedOceanBookingId: string
+}
+
+function mountView() {
+  return mount(TruckAppointmentCreateView, { global: { plugins: [ElementPlus], stubs: { TruckAppointmentForm: formStub, TruckAttachmentDialog: true } } })
+}
+
+describe('TruckAppointmentCreateView existing appointment reuse', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    for (const key of Object.keys(routing.query)) delete routing.query[key]
+    routing.replace.mockResolvedValue(undefined)
+    routing.push.mockResolvedValue(undefined)
+    vi.mocked(listTruckAppointments).mockResolvedValue(page([]))
+    vi.mocked(createTruckAppointment).mockResolvedValue(existing('DRAFT'))
+  })
+
+  it('automatically reuses a DRAFT appointment for a query-prefilled booking', async () => {
+    Object.assign(routing.query, { oceanBookingId: 'booking-1' })
+    vi.mocked(listTruckAppointments).mockResolvedValue(page([existing('DRAFT')]))
+    const wrapper = mountView()
+    await flushPromises()
+    expect(listTruckAppointments).toHaveBeenCalledWith({ oceanBookingId: 'booking-1', page: 1, size: 20 })
+    expect(routing.replace).toHaveBeenCalledWith({ name: 'trucking-detail', params: { id: 'appointment-1' }, query: { edit: '1' } })
+    expect(createTruckAppointment).not.toHaveBeenCalled()
+    wrapper.unmount()
+  })
+
+  it.each(['COMPLETED', 'CANCELLED', 'EXCEPTION'] as const)('allows a new appointment after terminal status %s', async (status) => {
+    Object.assign(routing.query, { oceanBookingId: 'booking-1' })
+    vi.mocked(listTruckAppointments).mockResolvedValue(page([existing(status)]))
+    const wrapper = mountView()
+    await flushPromises()
+    await (wrapper.vm as unknown as ViewModel).submit()
+    expect(createTruckAppointment).toHaveBeenCalledTimes(1)
+    wrapper.unmount()
+  })
+
+  it('keeps request evidence and retry state when existing-appointment lookup fails', async () => {
+    Object.assign(routing.query, { oceanBookingId: 'booking-1' })
+    vi.mocked(listTruckAppointments).mockRejectedValue(new ApiResponseError('预约查询失败', 'A0500', 500, undefined, 'req-existing', 'trace-existing'))
+    const wrapper = mountView()
+    await flushPromises()
+    expect(wrapper.text()).toContain('预约查询失败')
+    expect(wrapper.text()).toContain('req-existing')
+    expect(wrapper.text()).toContain('trace-existing')
+    await (wrapper.vm as unknown as ViewModel).submit()
+    expect(createTruckAppointment).not.toHaveBeenCalled()
+    wrapper.unmount()
+  })
+
+  it('ignores a stale lookup response after the selected booking changes', async () => {
+    let resolveFirst!: (value: ReturnType<typeof page>) => void
+    let resolveSecond!: (value: ReturnType<typeof page>) => void
+    vi.mocked(listTruckAppointments).mockImplementation((query = {}) => new Promise((resolve) => {
+      const { oceanBookingId } = query
+      if (oceanBookingId === 'booking-1') resolveFirst = resolve
+      else resolveSecond = resolve
+    }))
+    const wrapper = mountView()
+    const vm = wrapper.vm as unknown as ViewModel
+    vm.form.oceanBookingId = 'booking-1'
+    await wrapper.vm.$nextTick()
+    vm.form.oceanBookingId = 'booking-2'
+    await wrapper.vm.$nextTick()
+    resolveSecond(page([]))
+    await flushPromises()
+    resolveFirst(page([existing('DRAFT')]))
+    await flushPromises()
+    expect(vm.checkedOceanBookingId).toBe('booking-2')
+    expect(vm.existingAppointment).toBeNull()
+    expect(routing.replace).not.toHaveBeenCalled()
+    wrapper.unmount()
+  })
+
+  it('suppresses duplicate create clicks while the first request is pending', async () => {
+    Object.assign(routing.query, { oceanBookingId: 'booking-1' })
+    let resolveCreate!: (value: TruckAppointmentResource) => void
+    vi.mocked(createTruckAppointment).mockImplementation(() => new Promise((resolve) => { resolveCreate = resolve }))
+    const wrapper = mountView()
+    await flushPromises()
+    const vm = wrapper.vm as unknown as ViewModel
+    const first = vm.submit()
+    const second = vm.submit()
+    expect(createTruckAppointment).toHaveBeenCalledTimes(1)
+    resolveCreate(existing('DRAFT'))
+    await Promise.all([first, second])
+    wrapper.unmount()
+  })
+})

src/modules/trucking/pages/TruckAppointmentCreateView.test.ts

@@ -5,22 +5,36 @@ import { resolve } from 'node:path'
 const source = readFileSync(resolve(process.cwd(), 'src/modules/trucking/pages/TruckAppointmentCreateView.vue'), 'utf8')
 
 describe('TruckAppointmentCreateView booking-bound creation contract', () => {
-  it('starts with required booking and container choices empty until the user selects them', () => {
+  it('starts with only the required booking choice empty until the user selects it', () => {
     expect(source).toContain('carrierId: null')
     expect(source).not.toContain('customerId')
-    expect(source).toContain('oceanBookingId: null, containerBookingId: null, loadingPlanId: null')
+    expect(source).toContain('oceanBookingId: initialOceanBookingId || null, plannedLoadingAt: null')
+    expect(source).not.toContain('initialContainerBookingId')
     expect(source).toContain('plannedLoadingAt: null')
+    expect(source).toContain("payableAmount: '0.00', currency: 'RMB'")
+    expect(source).not.toContain('receivableAmount')
     expect(source).toContain('createTruckAppointment({ ...form })')
   })
 
   it('keeps the form visible and exposes the real backend error details', () => {
     expect(source).toContain("getApiErrorDetails(err, '创建失败，请稍后重试')")
     expect(source).toContain('<ApiErrorMeta :details="error" />')
-    expect(source).toContain('<TruckAppointmentForm v-model="form"')
+    expect(source).toContain('<TruckAppointmentForm :model-value="form"')
+    expect(source).toContain('@update:model-value="updateForm"')
   })
 
   it('suppresses duplicate submits while the first create request is pending', () => {
-    expect(source).toContain('if (saving.value) return')
+    expect(source).toContain('if (saving.value || existingLookupLoading.value) return')
+  })
+
+  it('reuses non-terminal appointments by booking and separates lookup failures from booking-file errors', () => {
+    expect(source).toContain("listTruckAppointments({ oceanBookingId: normalizedId, page: 1, size: 20 })")
+    expect(source).toContain("new Set(['COMPLETED', 'CANCELLED', 'EXCEPTION'])")
+    expect(source).toContain('该订舱已有拖车单')
+    expect(source).toContain("getApiErrorDetails(cause, '已有拖车预约查询失败，请稍后重试')")
+    expect(source).toContain('<ApiErrorMeta :details="existingLookupError" />')
+    expect(source).toContain("router.replace({ name: 'trucking-detail'")
+    expect(source).toContain('serial !== lookupSerial')
   })
 
   it('places the return action beside the relation note instead of in a separate header row', () => {

src/modules/trucking/pages/TruckAppointmentCreateView.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts">
-import { reactive, ref } from 'vue'
-import { useRouter } from 'vue-router'
+import { computed, reactive, ref, watch } from 'vue'
+import { useRoute, useRouter } from 'vue-router'
 import { ElMessage } from 'element-plus'
 import { ArrowLeft } from '@lucide/vue'
 import ApiErrorMeta from '@/shared/components/ApiErrorMeta.vue'
@@ -10,17 +10,70 @@ import LoadErrorState from '@/shared/components/LoadErrorState.vue'
 import { getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
 import TruckAppointmentForm from '../components/TruckAppointmentForm.vue'
 import TruckAttachmentDialog from '../components/TruckAttachmentDialog.vue'
-import { createTruckAppointment } from '../api/platformTrucking'
-import type { SaveTruckAppointmentRequest } from '../types'
-const router = useRouter(); const saving = ref(false); const attachmentOpen = ref(false); const error = ref<ApiErrorDetails | null>(null)
-const form = reactive<SaveTruckAppointmentRequest>({ expectedVersion: 0, carrierId: null, oceanBookingId: null, containerBookingId: null, loadingPlanId: null, plannedLoadingAt: null, payableAmount: '0.00', receivableAmount: '0.00', currency: 'RMB' })
-async function submit() { if (saving.value) return; saving.value = true; error.value = null; try { await createTruckAppointment({ ...form }); ElMessage.success('拖车预约已创建'); router.push({ name: 'trucking' }) } catch (err) { error.value = getApiErrorDetails(err, '创建失败，请稍后重试') } finally { saving.value = false } }
+import { createTruckAppointment, listTruckAppointments } from '../api/platformTrucking'
+import { truckAppointmentStatusLabel, type SaveTruckAppointmentRequest, type TruckAppointmentResource } from '../types'
+const route = useRoute(); const router = useRouter(); const saving = ref(false); const attachmentOpen = ref(false); const error = ref<ApiErrorDetails | null>(null)
+const initialOceanBookingId = String(route.query.oceanBookingId || '').trim()
+const form = reactive<SaveTruckAppointmentRequest>({ expectedVersion: 0, carrierId: null, oceanBookingId: initialOceanBookingId || null, plannedLoadingAt: null, payableAmount: '0.00', currency: 'RMB' })
+const existingAppointment = ref<TruckAppointmentResource | null>(null)
+const existingLookupLoading = ref(false)
+const existingLookupError = ref<ApiErrorDetails | null>(null)
+const checkedOceanBookingId = ref('')
+const navigatingToExisting = ref(false)
+let lookupSerial = 0
+const terminalStatuses = new Set(['COMPLETED', 'CANCELLED', 'EXCEPTION'])
+const existingCanEdit = computed(() => ['DRAFT', 'PENDING_DISPATCH', 'RESCHEDULED'].includes(existingAppointment.value?.status || ''))
+const submitBlocked = computed(() => existingLookupLoading.value || Boolean(existingLookupError.value) || Boolean(existingAppointment.value))
+function updateForm(value: SaveTruckAppointmentRequest) { Object.assign(form, value) }
+
+async function openExisting() {
+  if (!existingAppointment.value || navigatingToExisting.value) return
+  navigatingToExisting.value = true
+  try { await router.replace({ name: 'trucking-detail', params: { id: existingAppointment.value.id }, query: existingCanEdit.value ? { edit: '1' } : undefined }) }
+  finally { navigatingToExisting.value = false }
+}
+async function lookupExistingAppointment(oceanBookingId: string, autoNavigate = false) {
+  const normalizedId = oceanBookingId.trim()
+  const serial = ++lookupSerial
+  existingAppointment.value = null
+  existingLookupError.value = null
+  checkedOceanBookingId.value = ''
+  if (!normalizedId) { existingLookupLoading.value = false; return }
+  existingLookupLoading.value = true
+  try {
+    const result = await listTruckAppointments({ oceanBookingId: normalizedId, page: 1, size: 20 })
+    if (serial !== lookupSerial || String(form.oceanBookingId || '') !== normalizedId) return
+    checkedOceanBookingId.value = normalizedId
+    existingAppointment.value = result.records.find((item) => !terminalStatuses.has(item.status)) || null
+    if (autoNavigate && existingAppointment.value) await openExisting()
+  } catch (cause) {
+    if (serial !== lookupSerial || String(form.oceanBookingId || '') !== normalizedId) return
+    checkedOceanBookingId.value = normalizedId
+    existingLookupError.value = getApiErrorDetails(cause, '已有拖车预约查询失败，请稍后重试')
+  } finally {
+    if (serial === lookupSerial) existingLookupLoading.value = false
+  }
+}
+async function submit() {
+  if (saving.value || existingLookupLoading.value) return
+  const oceanBookingId = String(form.oceanBookingId || '')
+  if (oceanBookingId && checkedOceanBookingId.value !== oceanBookingId) await lookupExistingAppointment(oceanBookingId)
+  if (String(form.oceanBookingId || '') !== oceanBookingId || existingLookupLoading.value || existingAppointment.value || existingLookupError.value) return
+  saving.value = true; error.value = null
+  try { await createTruckAppointment({ ...form }); ElMessage.success('拖车预约已创建'); router.push({ name: 'trucking' }) }
+  catch (err) { error.value = getApiErrorDetails(err, '创建失败，请稍后重试') }
+  finally { saving.value = false }
+}
+watch(() => form.oceanBookingId, (value) => { void lookupExistingAppointment(String(value || ''), Boolean(initialOceanBookingId && String(value || '') === initialOceanBookingId)) }, { immediate: true })
+defineExpose({ form, submit, lookupExistingAppointment, existingAppointment, existingLookupError, checkedOceanBookingId })
 </script>
 <template>
   <AdminPage as="div" class="truck-editor-page">
     <DetailPageLayout aria-label="新增拖车预约">
       <LoadErrorState v-if="error" title="拖车预约创建失败" :message="error.message" :show-retry="false"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState>
-      <section class="surface-panel form-panel"><TruckAppointmentForm v-model="form" :submitting="saving" @submit="submit" @attachments="attachmentOpen = true"><template #relation-note-actions><el-button @click="router.push({ name: 'trucking' })"><ArrowLeft :size="16" />返回列表</el-button></template></TruckAppointmentForm></section>
+      <el-alert v-if="existingAppointment" type="warning" :closable="false" show-icon><template #title>该订舱已有拖车单 {{ existingAppointment.appointmentNo || existingAppointment.id }}（{{ truckAppointmentStatusLabel(existingAppointment.status) }}）</template><el-button type="primary" link :loading="navigatingToExisting" @click="openExisting">{{ existingCanEdit ? '继续编辑' : '查看拖车单' }}</el-button></el-alert>
+      <LoadErrorState v-if="existingLookupError" title="已有拖车单查询失败" :message="existingLookupError.message" compact @retry="lookupExistingAppointment(String(form.oceanBookingId || ''))"><template #details><ApiErrorMeta :details="existingLookupError" /></template></LoadErrorState>
+      <section class="surface-panel form-panel"><TruckAppointmentForm :model-value="form" :submitting="saving" :submit-blocked="submitBlocked" @update:model-value="updateForm" @submit="submit" @attachments="attachmentOpen = true"><template #relation-note-actions><el-button @click="router.push({ name: 'trucking' })"><ArrowLeft :size="16" />返回列表</el-button></template></TruckAppointmentForm></section>
       <TruckAttachmentDialog v-model="attachmentOpen" :attachments="[]" />
     </DetailPageLayout>
   </AdminPage>

src/modules/trucking/pages/TruckAppointmentDetailView.test.ts

@@ -32,18 +32,19 @@ describe('TruckAppointmentDetailView status contract', () => {
     expect(source).toContain("statuses.indexOf(status) === index")
   })
 
-  it('initializes the required booking and container associations explicitly', () => {
-    expect(source).toContain("carrierId: null, oceanBookingId: null, containerBookingId: null, plannedLoadingAt: null")
+  it('initializes the required booking association explicitly', () => {
+    expect(source).toContain("carrierId: null, oceanBookingId: null, plannedLoadingAt: null")
+    expect(source).not.toContain('containerBookingId')
     expect(source).not.toContain('customerId')
     expect(source).toContain('TRUCK_APPOINTMENT_SAVE_FIELDS.map')
+    expect(source).toContain('normalizeTruckAppointmentCurrency(result.currency)')
     expect(source).not.toContain('Object.assign(form, { ...result')
     expect(source).toContain("error.value = getApiErrorDetails(err, '保存失败，请稍后重试')")
   })
 
-  it('blocks dispatch until the released booking, allocated real container and frozen bill number are present', () => {
+  it('blocks dispatch until the released booking and frozen documents are present', () => {
     expect(source).toContain("return '确认派车前必须关联已放舱订舱'")
-    expect(source).toContain("return '确认派车前必须关联该订舱下的柜次'")
-    expect(source).toContain("return '确认派车前关联柜次必须录入真实 ISO 集装箱号'")
+    expect(source).not.toContain('关联柜次')
     expect(source).toContain("return '确认派车前所选订舱必须填写提单号'")
     expect(source).toContain("return '确认派车前所选订舱必须上传有效的订舱确认文件或提单文件'")
     expect(source).toContain('getOceanBooking(resource.value.oceanBookingId)')
@@ -51,6 +52,13 @@ describe('TruckAppointmentDetailView status contract', () => {
     expect(source).not.toContain("item.attachmentType === 'BILL_OF_LADING'")
   })
 
+  it('keeps pickup booking-scoped and leaves real container maintenance to container/preload flows', () => {
+    expect(source).not.toContain('ElMessageBox.prompt')
+    expect(source).not.toContain('normalizeIso6346ContainerNumber')
+    expect(source).toContain('performTruckAppointmentAction(id.value, action, { expectedVersion: form.expectedVersion || 0 })')
+    expect(source).toContain('await ElMessageBox.confirm(`确认将状态改为“${truckAppointmentStatusLabels[status]}”？`')
+  })
+
   it('keeps the main detail available when attachments or history fail', () => {
     expect(source).toContain('Promise.allSettled([')
     expect(source).toContain("attachments.status === 'fulfilled'")
@@ -59,6 +67,14 @@ describe('TruckAppointmentDetailView status contract', () => {
     expect(source).toContain('v-if="relatedError"')
   })
 
+  it('never exposes container identity or operator database ids', () => {
+    expect(source).not.toContain('cabinetNo')
+    expect(source).not.toContain('containerNo')
+    expect(source).not.toContain('containerBookingId')
+    expect(source).not.toContain('loadingPlanId')
+    expect(source).not.toContain('item.operatorId')
+  })
+
   it('reloads a cached detail after an error without showing stale resource data', () => {
     expect(source).toContain("resource.value = null; bookingReadiness.value = null; history.value = []; relatedError.value = ''")
     expect(source).toContain('onActivated(() => {')

src/modules/trucking/pages/TruckAppointmentDetailView.vue

@@ -13,15 +13,14 @@ import { getOceanBooking, type OceanBookingDetail } from '@/modules/ocean-bookin
 import { getTruckAppointment, listTruckAppointmentAttachments, listTruckAppointmentHistory, performTruckAppointmentAction, rescheduleTruckAppointment, updateTruckAppointment, type TruckAppointmentAction } from '../api/platformTrucking'
 import TruckAppointmentForm from '../components/TruckAppointmentForm.vue'
 import TruckAttachmentDialog from '../components/TruckAttachmentDialog.vue'
-import { TRUCK_APPOINTMENT_SAVE_FIELDS, truckAppointmentActionLabel, truckAppointmentStatusLabel, truckAppointmentStatusLabels, type SaveTruckAppointmentRequest, type TruckAppointmentResource, type TruckAppointmentStatus, type TruckAppointmentStatusHistory } from '../types'
-import { isIso6346ContainerNumber } from '../iso6346'
-const route = useRoute(); const router = useRouter(); const loading = ref(false); const saving = ref(false); const statusSaving = ref(false); const attachmentOpen = ref(false); const resource = ref<TruckAppointmentResource | null>(null); const error = ref<ApiErrorDetails | null>(null); const form = reactive<SaveTruckAppointmentRequest>({ expectedVersion: 0, carrierId: null, oceanBookingId: null, containerBookingId: null, plannedLoadingAt: null })
+import { TRUCK_APPOINTMENT_SAVE_FIELDS, normalizeTruckAppointmentCurrency, truckAppointmentActionLabel, truckAppointmentStatusLabel, truckAppointmentStatusLabels, type SaveTruckAppointmentRequest, type TruckAppointmentResource, type TruckAppointmentStatus, type TruckAppointmentStatusHistory } from '../types'
+const route = useRoute(); const router = useRouter(); const loading = ref(false); const saving = ref(false); const statusSaving = ref(false); const attachmentOpen = ref(false); const resource = ref<TruckAppointmentResource | null>(null); const error = ref<ApiErrorDetails | null>(null); const form = reactive<SaveTruckAppointmentRequest>({ expectedVersion: 0, carrierId: null, oceanBookingId: null, plannedLoadingAt: null })
 const history = ref<TruckAppointmentStatusHistory[]>([])
 const bookingReadiness = ref<OceanBookingDetail | null>(null)
 const relatedError = ref('')
 let activatedOnce = false
 const access = useAccessPreviewStore(); const editing = computed(() => route.query.edit === '1'); const id = computed(() => String(route.params.id)); const canEdit = computed(() => access.can('platform:firstleg:truck-appointment:edit') && ['DRAFT', 'PENDING_DISPATCH', 'RESCHEDULED'].includes(resource.value?.status || '') && editing.value); const canChangeStatus = computed(() => access.can('platform:firstleg:truck-appointment:operate')); const canManageAttachments = computed(() => access.can('platform:firstleg:truck-appointment:edit'))
-const relationSnapshot = computed(() => resource.value ? [resource.value.oceanBookingNo, resource.value.cabinetNo, resource.value.containerNo, resource.value.warehouseName].filter(Boolean).join(' / ') || '无历史关联' : '')
+const relationSnapshot = computed(() => resource.value ? [resource.value.oceanBookingNo, resource.value.billOfLadingNo, resource.value.warehouseName].filter(Boolean).join(' / ') || '无订舱关联' : '')
 async function loadRelated() {
   if (!resource.value) return
   relatedError.value = ''
@@ -35,7 +34,7 @@ async function loadRelated() {
   if (booking.status === 'fulfilled') bookingReadiness.value = booking.value
   if (attachments.status === 'rejected' || histories.status === 'rejected' || booking.status === 'rejected') relatedError.value = '附件、状态历史或订舱资料状态暂时未能加载，主详情数据不受影响；派车时仍由服务端最终校验。'
 }
-async function load() { loading.value = true; error.value = null; resource.value = null; bookingReadiness.value = null; history.value = []; relatedError.value = ''; try { const result = await getTruckAppointment(id.value); resource.value = result; const draft = Object.fromEntries(TRUCK_APPOINTMENT_SAVE_FIELDS.map((key) => [key, key === 'expectedVersion' ? result.version ?? 0 : result[key as keyof TruckAppointmentResource]])); Object.assign(form, draft); await loadRelated() } catch (err) { error.value = getApiErrorDetails(err, '详情加载失败，请稍后重试') } finally { loading.value = false } }
+async function load() { loading.value = true; error.value = null; resource.value = null; bookingReadiness.value = null; history.value = []; relatedError.value = ''; try { const result = await getTruckAppointment(id.value); resource.value = result; const draft = Object.fromEntries(TRUCK_APPOINTMENT_SAVE_FIELDS.map((key) => [key, key === 'expectedVersion' ? result.version ?? 0 : key === 'currency' ? normalizeTruckAppointmentCurrency(result.currency) : result[key as keyof TruckAppointmentResource]])); Object.assign(form, draft); await loadRelated() } catch (err) { error.value = getApiErrorDetails(err, '详情加载失败，请稍后重试') } finally { loading.value = false } }
 async function submit() { if (saving.value) return; saving.value = true; error.value = null; try { await updateTruckAppointment(id.value, form); ElMessage.success('拖车预约已保存'); await load() } catch (err) { error.value = getApiErrorDetails(err, '保存失败，请稍后重试') } finally { saving.value = false } }
 const actionByTarget: Partial<Record<TruckAppointmentStatus, TruckAppointmentAction>> = { PENDING_DISPATCH: 'SUBMIT', DISPATCHED: 'DISPATCH', PICKUP_IN_PROGRESS: 'PICKUP', ARRIVED_WAREHOUSE: 'ARRIVE', LOADING: 'LOAD', DEPARTED: 'DEPART', COMPLETED: 'COMPLETE', EXCEPTION: 'EXCEPTION', CANCELLED: 'CANCEL' }
 const primaryTargetByStatus: Partial<Record<TruckAppointmentStatus, TruckAppointmentStatus>> = { DRAFT: 'PENDING_DISPATCH', PENDING_DISPATCH: 'DISPATCHED', RESCHEDULED: 'DISPATCHED', DISPATCHED: 'PICKUP_IN_PROGRESS', PICKUP_IN_PROGRESS: 'ARRIVED_WAREHOUSE', ARRIVED_WAREHOUSE: 'LOADING', LOADING: 'DEPARTED', DEPARTED: 'COMPLETED' }
@@ -50,16 +49,17 @@ const dispatchBlockReason = computed(() => {
   if (!resource.value || !['PENDING_DISPATCH', 'RESCHEDULED'].includes(resource.value.status)) return ''
   if (!form.oceanBookingId) return '确认派车前必须关联已放舱订舱'
   if (bookingReadiness.value && bookingReadiness.value.status !== 'RELEASED') return '确认派车前必须关联已放舱订舱'
-  if (!form.containerBookingId) return '确认派车前必须关联该订舱下的柜次'
-  if (!isIso6346ContainerNumber(resource.value.containerNo)) return '确认派车前关联柜次必须录入真实 ISO 集装箱号'
   if (!form.billOfLadingNo?.trim()) return '确认派车前所选订舱必须填写提单号'
   if (bookingReadiness.value && !bookingReadiness.value.documents.some((document) => document.valid && ['BOOKING_CONFIRMATION', 'BILL_OF_LADING'].includes(document.documentType))) return '确认派车前所选订舱必须上传有效的订舱确认文件或提单文件'
   return ''
 })
+async function confirmStatusChange(status: TruckAppointmentStatus) {
+  await ElMessageBox.confirm(`确认将状态改为“${truckAppointmentStatusLabels[status]}”？`, '状态变更确认', { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' })
+}
 async function changeStatus(status: TruckAppointmentStatus) {
   if (!resource.value || status === resource.value.status || statusSaving.value) return
   if (status === 'DISPATCHED' && dispatchBlockReason.value) { error.value = { message: dispatchBlockReason.value }; return }
-  try { await ElMessageBox.confirm(`确认将状态改为“${truckAppointmentStatusLabels[status]}”？`, '状态变更确认', { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' }); statusSaving.value = true; if (status === 'RESCHEDULED') { await rescheduleTruckAppointment(id.value, form.plannedLoadingAt || '', form.expectedVersion || 0, '后台改约') } else { const action = actionByTarget[status]; if (!action) throw new Error('当前状态没有可用动作'); await performTruckAppointmentAction(id.value, action, form.expectedVersion || 0) } ElMessage.success('状态已更新'); await load() } catch (err) { if (err !== 'cancel' && !(err instanceof Error && err.message === 'cancel')) error.value = getApiErrorDetails(err, '状态更新失败，请稍后重试') } finally { statusSaving.value = false }
+  try { await confirmStatusChange(status); statusSaving.value = true; if (status === 'RESCHEDULED') { await rescheduleTruckAppointment(id.value, form.plannedLoadingAt || '', form.expectedVersion || 0, '后台改约') } else { const action = actionByTarget[status]; if (!action) throw new Error('当前状态没有可用动作'); await performTruckAppointmentAction(id.value, action, { expectedVersion: form.expectedVersion || 0 }) } ElMessage.success('状态已更新'); await load() } catch (err) { if (err !== 'cancel' && !(err instanceof Error && err.message === 'cancel')) error.value = getApiErrorDetails(err, '状态更新失败，请稍后重试') } finally { statusSaving.value = false }
 }
 onMounted(load)
 onActivated(() => {
@@ -77,7 +77,7 @@ onActivated(() => {
         <section class="truck-overview surface-panel" aria-label="拖车预约概览">
           <div class="truck-overview__heading">
             <el-button link type="primary" @click="router.push({ name: 'trucking' })"><ArrowLeft :size="16" />返回列表</el-button>
-            <div class="truck-overview__identity"><h1>{{ resource?.appointmentNo || '拖车预约详情' }}</h1><p>{{ resource ? [resource.oceanBookingNo, resource.containerNo, resource.orderNo].filter(Boolean).join(' · ') || '订舱与柜次信息缺失' : '查看拖车预约详情' }}</p></div>
+            <div class="truck-overview__identity"><h1>{{ resource?.appointmentNo || '拖车预约详情' }}</h1><p>{{ resource ? [resource.oceanBookingNo, resource.billOfLadingNo, resource.orderNo].filter(Boolean).join(' · ') || '订舱信息缺失' : '查看拖车预约详情' }}</p></div>
             <span v-if="resource" class="truck-overview__status">当前状态：<strong>{{ truckAppointmentStatusLabel(resource.status) }}</strong></span>
             <div v-if="resource && canChangeStatus" class="status-actions"><el-button v-for="status in availableTargets" :key="status" size="small" :type="status === 'CANCELLED' ? 'danger' : status === 'EXCEPTION' ? 'warning' : 'primary'" plain :loading="statusSaving" @click="changeStatus(status)">{{ truckAppointmentStatusLabels[status] }}</el-button></div>
           </div>
@@ -92,7 +92,7 @@ onActivated(() => {
       <LoadErrorState v-if="error && !resource" title="详情加载失败" :message="error.message" :loading="loading" @retry="load"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState>
       <template v-else-if="resource">
         <section class="surface-panel form-panel"><TruckAppointmentForm v-model="form" :resource="resource" :readonly="!canEdit" :submitting="saving" @submit="submit" @attachments="attachmentOpen = true" /></section>
-        <section class="surface-panel history-section"><h3>状态历史</h3><el-empty v-if="!history.length" description="暂无状态历史" :image-size="48" /><ol v-else><li v-for="(item, index) in history" :key="item.id || `${item.createdAt}-${index}`"><strong>{{ truckAppointmentActionLabel(item.action) }}</strong><span>{{ truckAppointmentStatusLabel(item.fromStatus) }} → {{ truckAppointmentStatusLabel(item.toStatus) }}</span><small>{{ item.operatorName || item.operatorId || '系统' }} · {{ item.createdAt || item.occurredAt || '—' }}<template v-if="item.reason"> · {{ item.reason }}</template></small></li></ol></section>
+        <section class="surface-panel history-section"><h3>状态历史</h3><el-empty v-if="!history.length" description="暂无状态历史" :image-size="48" /><ol v-else><li v-for="(item, index) in history" :key="item.id || `${item.createdAt}-${index}`"><strong>{{ truckAppointmentActionLabel(item.action) }}</strong><span>{{ truckAppointmentStatusLabel(item.fromStatus) }} → {{ truckAppointmentStatusLabel(item.toStatus) }}</span><small>{{ item.operatorName || '系统' }} · {{ item.createdAt || item.occurredAt || '—' }}<template v-if="item.reason"> · {{ item.reason }}</template></small></li></ol></section>
         <TruckAttachmentDialog v-model="attachmentOpen" :appointment-id="id" :attachments="resource.attachments || []" :can-manage="canManageAttachments" @changed="loadRelated" />
       </template>
     </DetailPageLayout>

src/modules/trucking/pages/TruckAppointmentsView.test.ts

@@ -2,6 +2,7 @@ import ElementPlus from 'element-plus'
 import { createPinia, setActivePinia } from 'pinia'
 import { flushPromises, mount } from '@vue/test-utils'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { ApiResponseError } from '@/shared/api/http'
 import TruckAppointmentsView from './TruckAppointmentsView.vue'
 import { listTruckAppointments } from '../api/platformTrucking'
 import type { TruckAppointmentResource } from '../types'
@@ -19,9 +20,9 @@ vi.mock('@/modules/iam', () => ({
 }))
 
 const row: TruckAppointmentResource = {
-  id: '9001', appointmentNo: 'TA-9001', status: 'DISPATCHED', orderNo: 'ORD-1', oceanBookingNo: 'OB-1', containerBookingId: '77', cabinetNo: 'CAB-1',
-  containerNo: 'CONT-1', warehouseName: '义乌仓', shippingCompanyName: '船公司A', bookingAgentName: '代理A', carrierName: '宁波运输', driverName: '王强', vehicleNo: '浙B12345',
-  plannedLoadingAt: '2026-08-10T10:00:00', payableAmount: '3200.00', receivableAmount: '3800.00', attachmentCount: 2, attachments: [],
+  id: '9001', appointmentNo: 'TA-9001', status: 'DISPATCHED', orderNo: 'ORD-1', oceanBookingNo: 'OB-1', billOfLadingNo: 'BL-1',
+  warehouseName: '义乌仓', shippingCompanyName: '船公司A', bookingAgentName: '代理A', carrierName: '宁波运输', driverName: '王强', vehicleNo: '浙B12345',
+  plannedLoadingAt: '2026-08-10T10:00:00', payableAmount: '3200.00', currency: 'RMB', attachmentCount: 2, attachments: [],
 }
 
 describe('TruckAppointmentsView', () => {
@@ -37,15 +38,13 @@ describe('TruckAppointmentsView', () => {
   it('loads the real list and renders relationship snapshots', async () => {
     const wrapper = mount(TruckAppointmentsView, { global: { plugins: [ElementPlus] } })
     await flushPromises()
-    expect(listTruckAppointments).toHaveBeenCalledWith({ page: 1, size: 20, keyword: '', status: '', containerBookingId: '', containerType: '' })
+    expect(listTruckAppointments).toHaveBeenCalledWith({ page: 1, size: 20, keyword: '', status: '' })
     expect(wrapper.text()).toContain('TA-9001')
-    expect(wrapper.text()).toContain('CONT-1')
-    expect(wrapper.text()).toContain('CAB-1')
     expect(wrapper.text()).toContain('OB-1')
+    expect(wrapper.text()).toContain('BL-1')
     expect(wrapper.text()).toContain('义乌仓')
     expect(wrapper.text()).toContain('船公司A')
     expect(wrapper.text()).toContain('代理A')
-    expect(wrapper.text()).not.toContain('77')
     expect(wrapper.text()).toContain('宁波运输')
     expect(wrapper.find('button[aria-label="查看 TA-9001"]').exists()).toBe(true)
   })
@@ -64,10 +63,10 @@ describe('TruckAppointmentsView', () => {
     const wrapper = mount(TruckAppointmentsView, { global: { plugins: [ElementPlus] } })
     await flushPromises()
 
-    expect(wrapper.find('button[aria-label="查看 9002"]').exists()).toBe(true)
     expect(wrapper.find('button[aria-label="查看拖车预约详情"]').exists()).toBe(true)
     const labels = wrapper.findAll('button[aria-label]').map((button) => button.attributes('aria-label'))
     expect(labels.every((label) => Boolean(label) && !/undefined|null/.test(label ?? ''))).toBe(true)
+    expect(labels.every((label) => !label?.includes('9002'))).toBe(true)
     expect(source).toContain("appointmentActionLabel('编辑', row as TruckAppointmentResource)")
   })
 
@@ -93,6 +92,48 @@ describe('TruckAppointmentsView', () => {
     expect(source.match(/empty-text=/g)).toHaveLength(1)
   })
 
+  it('renders the server empty state', async () => {
+    vi.mocked(listTruckAppointments).mockResolvedValue({ records: [], page: 1, size: 20, total: 0, pages: 1 })
+    const wrapper = mount(TruckAppointmentsView, { global: { plugins: [ElementPlus] } })
+    await flushPromises()
+    expect(wrapper.text()).toContain('暂无符合筛选条件的拖车预约')
+  })
+
+  it('marks the table busy while the list request is pending', async () => {
+    let resolveLoad!: (value: Awaited<ReturnType<typeof listTruckAppointments>>) => void
+    vi.mocked(listTruckAppointments).mockImplementationOnce(() => new Promise((resolve) => { resolveLoad = resolve }))
+    const wrapper = mount(TruckAppointmentsView, { global: { plugins: [ElementPlus] } })
+    await flushPromises()
+    expect(wrapper.find('section[aria-busy="true"]').exists()).toBe(true)
+    resolveLoad({ records: [row], page: 1, size: 20, total: 1, pages: 1 })
+    await flushPromises()
+    expect(wrapper.find('section[aria-busy="false"]').exists()).toBe(true)
+  })
+
+  it('keeps a recoverable load error and retries without losing the page', async () => {
+    vi.mocked(listTruckAppointments).mockRejectedValueOnce(new ApiResponseError('候选服务暂不可用', 'A0503', 503, undefined, 'req-truck', 'trace-truck'))
+    const wrapper = mount(TruckAppointmentsView, { global: { plugins: [ElementPlus] } })
+    await flushPromises()
+    expect(wrapper.text()).toContain('候选服务暂不可用')
+    expect(wrapper.text()).toContain('req-truck')
+    vi.mocked(listTruckAppointments).mockResolvedValueOnce({ records: [row], page: 1, size: 20, total: 1, pages: 1 })
+    await wrapper.get('button').trigger('click')
+    await flushPromises()
+    expect(listTruckAppointments).toHaveBeenCalledTimes(2)
+    expect(wrapper.text()).toContain('TA-9001')
+  })
+
+  it('shows create only with the independent create permission', async () => {
+    let wrapper = mount(TruckAppointmentsView, { global: { plugins: [ElementPlus] } })
+    await flushPromises()
+    expect(wrapper.text()).not.toContain('新增拖车')
+    wrapper.unmount()
+    useAuthStore().permissions = ['platform:firstleg:truck-appointment:list', 'platform:firstleg:truck-appointment:create']
+    wrapper = mount(TruckAppointmentsView, { global: { plugins: [ElementPlus] } })
+    await flushPromises()
+    expect(wrapper.text()).toContain('新增拖车')
+  })
+
   it('shows the two frequent row actions directly without a more menu', () => {
     expect(source).not.toContain('platform:firstleg:truck-appointment:view')
     expect(source).toContain("access.can('platform:firstleg:truck-appointment:edit') && ['DRAFT', 'PENDING_DISPATCH', 'RESCHEDULED'].includes(row.status)")
@@ -125,10 +166,12 @@ describe('TruckAppointmentsView', () => {
     expect(source).not.toContain("key: 'customerName'")
     expect(source).toContain("key: 'updatedAt'")
     expect(source).toContain("key: 'payableAmount', label: '应付拖车费'")
-    expect(source).toContain("key: 'receivableAmount', label: '应收拖车费'")
     expect(source.indexOf("key: 'store'")).toBeLessThan(source.indexOf("key: 'payableAmount'"))
-    expect(source.indexOf("key: 'payableAmount'")).toBeLessThan(source.indexOf("key: 'receivableAmount'"))
-    expect(source.indexOf("key: 'receivableAmount'")).toBeLessThan(source.indexOf("key: 'plannedLoadingAt'"))
+    expect(source.indexOf("key: 'payableAmount'")).toBeLessThan(source.indexOf("key: 'plannedLoadingAt'"))
+    expect(source).not.toContain('receivableAmount')
+    expect(source).not.toContain('应收拖车费')
+    expect(source).not.toContain("key: 'containerNo'")
+    expect(source).not.toContain("key: 'cabinetNo'")
     expect(source).toContain("toLocaleString('zh-CN', { minimumFractionDigits: 2, maximumFractionDigits: 2 })")
     expect(source).toContain("key: 'attachmentCount'")
   })

src/modules/trucking/pages/TruckAppointmentsView.vue

@@ -16,7 +16,7 @@ import { TRUCK_APPOINTMENT_STATUSES, truckAppointmentStatusLabel, truckAppointme
 
 const router = useRouter(); const rows = ref<TruckAppointmentResource[]>([]); const loading = ref(false); const page = ref(1); const pageSize = ref(20); const total = ref(0); const loadError = ref<ApiErrorDetails | null>(null)
 const access = useAccessPreviewStore()
-const filters = ref({ keyword: '', status: '' as TruckAppointmentStatus | '', containerBookingId: '', containerType: '' }); const applied = ref({ ...filters.value })
+const filters = ref({ keyword: '', status: '' as TruckAppointmentStatus | '' }); const applied = ref({ ...filters.value })
 const fields = computed<QueryField[]>(() => [
   { key: 'keyword', type: 'input', label: '关键词', placeholder: '派车单号、车牌号、运输公司', width: 280 },
   { key: 'status', type: 'select', label: '状态', placeholder: '全部状态', width: 160, options: TRUCK_APPOINTMENT_STATUSES.map((value) => ({ value, label: truckAppointmentStatusLabels[value] })) },
@@ -28,8 +28,7 @@ const columns: DataTableColumn[] = [
   { key: 'actions', label: '操作', width: 150, fixed: 'left', slotName: 'actions' },
   { key: 'appointmentNo', prop: 'appointmentNo', label: '派车单号', minWidth: 170 },
   { key: 'oceanBookingNo', prop: 'oceanBookingNo', label: '订舱号', minWidth: 150, formatter: (row: TruckAppointmentResource) => row.oceanBookingNo || '—' },
-  { key: 'cabinetNo', prop: 'cabinetNo', label: '柜次号', minWidth: 150, formatter: (row: TruckAppointmentResource) => row.cabinetNo || '—' },
-  { key: 'containerNo', prop: 'containerNo', label: '集装箱号', minWidth: 145, formatter: (row: TruckAppointmentResource) => row.containerNo || '—' },
+  { key: 'billOfLadingNo', prop: 'billOfLadingNo', label: '提单号', minWidth: 160, formatter: (row: TruckAppointmentResource) => row.billOfLadingNo || '—' },
   { key: 'warehouseName', prop: 'warehouseName', label: '装柜仓库', minWidth: 150, formatter: (row: TruckAppointmentResource) => row.warehouseName || '—' },
   { key: 'shippingCompanyName', prop: 'shippingCompanyName', label: '船公司', minWidth: 150, formatter: (row: TruckAppointmentResource) => row.shippingCompanyName || '—' },
   { key: 'bookingAgentName', prop: 'bookingAgentName', label: '订舱代理', minWidth: 150, formatter: (row: TruckAppointmentResource) => row.bookingAgentName || '—' },
@@ -38,7 +37,6 @@ const columns: DataTableColumn[] = [
   { key: 'vehicleNo', prop: 'vehicleNo', label: '车头号', minWidth: 120, formatter: (row: TruckAppointmentResource) => row.vehicleNo || '—' },
   { key: 'store', label: '门店', minWidth: 140, slotName: 'store' },
   { key: 'payableAmount', label: '应付拖车费', minWidth: 130, align: 'right', formatter: (row: TruckAppointmentResource) => formatAmount(row.payableAmount, row.currency) },
-  { key: 'receivableAmount', label: '应收拖车费', minWidth: 130, align: 'right', formatter: (row: TruckAppointmentResource) => formatAmount(row.receivableAmount, row.currency) },
   { key: 'plannedLoadingAt', label: '预计装箱日期', minWidth: 170, formatter: (row: TruckAppointmentResource) => formatDateTime(row.plannedLoadingAt) },
   { key: 'status', label: '状态', width: 130, slotName: 'status' },
   { key: 'attachmentCount', label: '附件', width: 90, align: 'right', formatter: (row: TruckAppointmentResource) => String(Number(row.attachmentCount ?? 0)) },
@@ -52,16 +50,14 @@ function formatAmount(value?: string | null, currency?: string | null) {
   return currency ? `${display} ${currency}` : display
 }
 function appointmentActionLabel(action: '查看' | '编辑', row: TruckAppointmentResource) {
-  const identifier = [row.appointmentNo, row.id]
-    .map((value) => String(value ?? '').trim())
-    .find(Boolean)
+  const identifier = String(row.appointmentNo ?? '').trim()
   return identifier ? `${action} ${identifier}` : `${action}拖车预约详情`
 }
 function statusLabel(value: unknown) {
   return truckAppointmentStatusLabel(typeof value === 'string' ? value : null)
 }
 async function load() { loading.value = true; loadError.value = null; try { const result = await listTruckAppointments({ page: page.value, size: pageSize.value, ...applied.value } as TruckAppointmentQuery); rows.value = result.records; total.value = result.total } catch (error) { rows.value = []; total.value = 0; loadError.value = getApiErrorDetails(error, '拖车预约加载失败，请稍后重试') } finally { loading.value = false } }
-function search(model: QueryModel) { applied.value = { keyword: String(model.keyword || ''), status: (model.status || '') as TruckAppointmentStatus | '', containerBookingId: '', containerType: String(model.containerType || '') }; if (page.value === 1) void load(); else page.value = 1 }
+function search(model: QueryModel) { applied.value = { keyword: String(model.keyword || ''), status: (model.status || '') as TruckAppointmentStatus | '' }; if (page.value === 1) void load(); else page.value = 1 }
 onMounted(() => { void load() })
 function openDetail(row: TruckAppointmentResource, edit = false) { router.push({ name: 'trucking-detail', params: { id: String(row.id) }, query: edit ? { edit: '1' } : undefined }) }
 </script>