修改提交

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

@@ -13,14 +13,14 @@ import DataTable, { type DataTableColumn } from '@/shared/components/DataTable.v
 import LoadErrorState from '@/shared/components/LoadErrorState.vue'
 import OperationErrorToast from '@/shared/components/OperationErrorToast.vue'
 import { createLastMileOrderFee, getLastMileOrder, type LastMileOrderDetailDto } from '../api/lastMileOrders'
-import { formatOverseasDateTime, lastMileOrderReference, lastMileOrderTypeLabel, lastMileStatusLabel, packageDifferenceText } from '../lastMilePresentation'
+import { relabelApplicationStatusLabel, formatOverseasDateTime, lastMileOrderReference, lastMileOrderTypeLabel, lastMileStatusLabel, packageDifferenceText } from '../lastMilePresentation'
 import { overseasWarehousePermissions as permission } from '../permissions'
 import OverseasDetailShell from '../components/OverseasDetailShell.vue'
 import OrderReferenceText from '../components/OrderReferenceText.vue'
 
 interface DetailField { label: string; value: string | number; wide?: boolean }
 interface CargoRow { id: string; sku: string; productName: string; pallets: number; cartons: number; quantity: number; weight: number; volume: number }
-interface DocumentRow { type: string; number: string; createdAt: string; quote: string }
+interface DocumentRow { status?: string; quantity?: number; type: string; number: string; createdAt: string; quote: string }
 interface FeeRow { id: string; item: string; currency: string; amount: string; status: string; description: string }
 interface LogRow { id: string; occurredAt: string; node: string; operator: string; result: string; sortAt: string }
 
@@ -117,14 +117,15 @@ const planFields = computed<DetailField[]>(() => {
     { label: '合托批次', value: text(order?.palletMergeFlag) },
     { label: '计划托数', value: Number(order?.palletCount || 0) },
     { label: '入库单号', value: text(order?.inboundOrderNo) },
-    { label: '换标状态', value: lastMileStatusLabel(order?.relabelStatus) },
+    { label: '换标子单', value: order?.relabelApplications?.length ? `${order.relabelApplications.length} 张（详见关联单据）` : lastMileStatusLabel(order?.relabelStatus) },
   ]
 })
 const documents = computed<DocumentRow[]>(() => {
   const order = detail.value?.order
   if (!order) return []
-  return [['入库单', order.inboundOrderNo], ['出库单（只读关联）', order.outboundOrderNo], ['派送单（只读关联）', order.deliveryOrderNo], ['换标单', order.relabelOrderNo]]
-    .filter((item) => item[1]).map(([type, number]) => ({ type: String(type), number: String(number), createdAt: '—', quote: '—' }))
+  return [['入库单', order.inboundOrderNo], ['出库单（只读关联）', order.outboundOrderNo], ['派送单（只读关联）', order.deliveryOrderNo], ['换标单', order.relabelApplications?.length ? undefined : order.relabelOrderNo]]
+    .filter((item) => item[1]).map(([type, number]) => ({ type: String(type), number: String(number), createdAt: '—', quote: '—' } as DocumentRow))
+    .concat((order.relabelApplications || []).map(application => ({ type: '换标单', number: application.relabelNo, createdAt: formatOverseasDateTime(application.createdAt), quote: '—', status: relabelApplicationStatusLabel(application.status), quantity: application.quantity })))
 })
 const cargo = computed<CargoRow[]>(() => (detail.value?.cargo || []).map((item) => ({
   id: String(item.id), sku: text(item.skuCode), productName: text(item.productNameZh), pallets: Number(item.palletCount || 0),
@@ -152,6 +153,7 @@ const cargoColumns: DataTableColumn[] = [
   { key: 'volume', prop: 'volume', label: '体积(m³)', width: 120, align: 'right' },
 ]
 const documentColumns: DataTableColumn[] = [
+  { key: 'status', prop: 'status', label: '状态', minWidth: 130 }, { key: 'quantity', prop: 'quantity', label: '换标数量（件）', minWidth: 130 },
   { key: 'type', prop: 'type', label: '单据类型', minWidth: 150 }, { key: 'number', prop: 'number', label: '单据编号', minWidth: 200 },
   { key: 'createdAt', prop: 'createdAt', label: '生成时间', minWidth: 170 }, { key: 'quote', prop: 'quote', label: '报价', minWidth: 150 },
 ]