优化

src/modules/trucking/api/platformTrucking.ts

@@ -32,11 +32,12 @@ function normalizePage(payload: PagePayload): TruckAppointmentPage {
 }
 
 function normalizeResource(resource: TruckAppointmentResource): TruckAppointmentResource {
-  const idKeys = ['id', 'outboundOrderId', 'oceanBookingId', 'containerBookingId', 'loadingPlanId', 'warehouseId', 'customerId', 'carrierId']
+  const idKeys = ['id', 'outboundOrderId', 'oceanBookingId', 'containerBookingId', 'loadingPlanId', 'warehouseId', 'customerId', 'shippingCompanyId', 'bookingAgentId', 'carrierId']
   const normalized = { ...resource } as Record<string, unknown>
   for (const key of idKeys) {
     if (normalized[key] !== null && normalized[key] !== undefined) normalized[key] = String(normalized[key])
   }
+  normalized.attachmentCount = Number(normalized.attachmentCount ?? 0)
   return normalized as unknown as TruckAppointmentResource
 }
 

src/modules/trucking/pages/TruckAppointmentsView.vue

@@ -30,8 +30,13 @@ const fields = computed<QueryField[]>(() => [
 const columns: DataTableColumn[] = [
   { key: 'actions', label: '操作', width: 150, fixed: 'left', slotName: 'actions' },
   { key: 'appointmentNo', prop: 'appointmentNo', label: '派车单号', minWidth: 170 },
-  { key: 'containerNo', prop: 'containerNo', label: '集装箱号', minWidth: 145, formatter: (row: TruckAppointmentResource) => row.containerNo || (row.containerBookingId ? '已关联柜次' : '—') },
+  { 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: 'customerName', prop: 'customerName', label: '客户', minWidth: 150, formatter: (row: TruckAppointmentResource) => row.customerName || '客户信息缺失' },
+  { 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 || '—' },
   { key: 'company', label: '运输公司', minWidth: 160, slotName: 'company' },
   { key: 'driver', label: '司机', minWidth: 130, slotName: 'driver' },
   { key: 'vehicleNo', prop: 'vehicleNo', label: '车头号', minWidth: 120, formatter: (row: TruckAppointmentResource) => row.vehicleNo || '—' },
@@ -40,7 +45,7 @@ const columns: DataTableColumn[] = [
   { 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: 'attachments', label: '附件', width: 90, formatter: (row: TruckAppointmentResource) => String(row.attachments?.length || 0) },
+  { key: 'attachmentCount', label: '附件', width: 90, align: 'right', formatter: (row: TruckAppointmentResource) => String(Number(row.attachmentCount ?? 0)) },
   { key: 'updatedAt', label: '更新时间', minWidth: 160, formatter: (row: TruckAppointmentResource) => formatDateTime(row.updatedAt) },
 ]
 function formatDateTime(value?: string | null) { return value ? value.replace('T', ' ').slice(0, 16) : '—' }

src/modules/trucking/types.ts

@@ -86,11 +86,18 @@ export interface TruckAppointmentResource {
   revision?: number | null
   outboundOrderId?: string | null
   oceanBookingId?: string | null
+  oceanBookingNo?: string | null
   containerBookingId?: string | null
+  cabinetNo?: string | null
   loadingPlanId?: string | null
   warehouseId?: string | null
+  warehouseName?: string | null
   customerId?: string | null
   customerName?: string | null
+  shippingCompanyId?: string | null
+  shippingCompanyName?: string | null
+  bookingAgentId?: string | null
+  bookingAgentName?: string | null
   carrierId?: string | null
   carrierName?: string | null
   fleetContact?: string | null
@@ -123,6 +130,7 @@ export interface TruckAppointmentResource {
   relatedContainerType?: string | null
   entrustingPartyName?: string | null
   attachments?: TruckAttachmentReference[] | null
+  attachmentCount?: number | string | null
   statusHistory?: TruckAppointmentStatusHistory[] | null
   createdAt?: string | null
   updatedAt?: string | null