优化

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

@@ -1,76 +1,146 @@
 <script setup lang="ts">
-import { computed } from 'vue'
+import { computed, onMounted, ref } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
+import { getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
+import ApiErrorMeta from '@/shared/components/ApiErrorMeta.vue'
 import DataTable, { type DataTableColumn } from '@/shared/components/DataTable.vue'
+import LoadErrorState from '@/shared/components/LoadErrorState.vue'
+import { getLastMileOrder, type LastMileOrderDetailDto } from '../api/lastMileOrders'
+import { formatOverseasDateTime, lastMileOrderTypeLabel, lastMileStatusLabel } from '../lastMilePresentation'
 import OverseasDetailShell from '../components/OverseasDetailShell.vue'
 
+interface DetailField { label: string; value: string | number }
+interface DocumentRow { type: string; number: string; createdAt: string; quote: string }
+interface CargoRow { id: string; sku: string; productName: string; pallets: number; cartons: number; quantity: number; weight: number; volume: number }
+interface LogRow { id: string; occurredAt: string; node: string; operator: string; result: string }
+
 const route = useRoute()
 const router = useRouter()
-const orderId = computed(() => String(route.params.orderId || '—'))
+const orderId = computed(() => String(route.params.orderId || ''))
+const customerId = computed(() => String(route.query.customerId || ''))
+const detail = ref<LastMileOrderDetailDto | null>(null)
+const loading = ref(false)
+const loadError = ref<ApiErrorDetails | null>(null)
+
+function text(value: unknown) { return String(value ?? '').trim() || '—' }
+function yesNo(value: boolean | null | undefined) { return value == null ? '—' : value ? '是' : '否' }
+
+const referenceValue = computed(() => text(detail.value?.order.orderNo || orderId.value))
+const orderFields = computed<DetailField[]>(() => {
+  const order = detail.value?.order
+  return [
+    { label: '订单类型', value: lastMileOrderTypeLabel(order?.orderType) },
+    { label: '拒收时间', value: '—' },
+    { label: '实际入库时间', value: '—' },
+    { label: '头程单号', value: text(order?.sourceOrderNo) },
+    { label: '货主', value: text(order?.customerName) },
+    { label: '海外仓', value: text(order?.overseasWarehouseName) },
+    { label: '转仓目的仓', value: text(order?.transferWarehouseName) },
+    { label: 'FBA仓库', value: text(order?.fbaWarehouseCode) },
+    { label: '集装箱号', value: text(order?.containerNo) },
+    { label: '货柜异常', value: yesNo(order?.abnormal) },
+    { label: '异常原因', value: order?.abnormal ? text(order.subOrderStatus) : '—' },
+    { label: '运输方式', value: '—' },
+    { label: '预计到仓', value: formatOverseasDateTime(order?.estimatedWarehouseAt) },
+    { label: '清关状态', value: text(order?.containerStatus) },
+  ]
+})
+const detailFields = computed<DetailField[]>(() => {
+  const order = detail.value?.order
+  return [
+    { label: '订单类型', value: lastMileOrderTypeLabel(order?.orderType) },
+    { label: '入仓码', value: text(order?.inboundCode) },
+    { label: '目的仓', value: text(order?.transferWarehouseName) },
+    { label: '托数', value: Number(order?.palletCount || 0) },
+    { label: '箱数', value: Number(order?.packageCount || 0) },
+    { label: '数量', value: Number(order?.productQuantity || 0) },
+    { label: '体积重量', value: Number(order?.volumeWeightKg || 0) },
+    { label: '预计到港时间', value: formatOverseasDateTime(order?.estimatedArrivalAt) },
+    { label: '实际到港时间', value: formatOverseasDateTime(order?.actualArrivalAt) },
+    { label: '预计到仓', value: formatOverseasDateTime(order?.estimatedWarehouseAt) },
+    { label: '是否暂扣', value: yesNo(order?.detained) },
+    { label: '备注(仅自己)', value: text(order?.privateRemark) },
+    { label: '备注(客户)', value: text(order?.customerRemark) },
+    { label: '备注(仓库)', value: text(order?.warehouseRemark) },
+  ]
+})
+const planFields = computed<DetailField[]>(() => {
+  const order = detail.value?.order
+  return [
+    { label: '入仓码', value: text(order?.inboundCode) },
+    { label: '计划入库仓', value: text(order?.transferWarehouseName || order?.overseasWarehouseName) },
+    { label: '合托批次', value: text(order?.palletMergeFlag) },
+    { label: '合托后托数', value: Number(order?.palletCount || 0) },
+    { label: 'FBA预约号', value: '—' },
+    { label: '预约状态', value: '—' },
+    { label: '换标状态', value: 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: '—' }))
+})
+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),
+  cartons: Number(item.packageCount || 0), quantity: Number(item.productQuantity || 0), weight: Number(item.grossWeightKg || 0), volume: Number(item.volumeCbm || 0),
+})))
+const logs = computed<LogRow[]>(() => (detail.value?.statusHistory || []).map((item) => ({
+  id: String(item.id), occurredAt: formatOverseasDateTime(item.createdAt), node: lastMileStatusLabel(item.toStatus), operator: '—',
+  result: text(item.remark || `${lastMileStatusLabel(item.fromStatus)} → ${lastMileStatusLabel(item.toStatus)}`),
+})))
 
-const orderFields = ['订单类型', '拒收时间', '实际入库时间', '头程单号', '货主', '海外仓', '转仓目的仓', 'FBA仓库', '集装箱号', '货柜异常', '异常原因', '运输方式', '预计到仓', '清关状态']
-const detailFields = ['订单类型', '入仓码', '目的仓', '托数', '箱数', '数量', '体积重量', '预计到港时间', '实际到港时间', '预计到仓', '是否暂扣', '备注(仅自己)', '备注(客户)', '备注(仓库)']
-const planFields = ['入仓码', '计划入库仓', '合托批次', '合托后托数', 'FBA预约号', '预约状态', '换标状态']
 const documentColumns: DataTableColumn[] = [
-  { key: 'type', label: '单据类型', minWidth: 120 },
-  { key: 'number', label: '单据编号', minWidth: 180 },
-  { key: 'createdAt', label: '生成时间', minWidth: 160 },
-  { key: 'quote', label: '报价', minWidth: 140 },
+  { key: 'type', prop: 'type', label: '单据类型', minWidth: 120 }, { key: 'number', prop: 'number', label: '单据编号', minWidth: 180 },
+  { key: 'createdAt', prop: 'createdAt', label: '生成时间', minWidth: 160 }, { key: 'quote', prop: 'quote', label: '报价', minWidth: 140 },
 ]
 const cargoColumns: DataTableColumn[] = [
-  { key: 'sku', label: 'SKU', minWidth: 150 },
-  { key: 'productName', label: '中文品名', minWidth: 180 },
-  { key: 'pallets', label: '托数', width: 90, align: 'right' },
-  { key: 'cartons', label: '箱数', width: 90, align: 'right' },
-  { key: 'quantity', label: '件数', width: 90, align: 'right' },
-  { key: 'weight', label: '重量(kg)', width: 110, align: 'right' },
-  { key: 'volume', label: '体积(m³)', width: 110, align: 'right' },
+  { key: 'sku', prop: 'sku', label: 'SKU', minWidth: 150 }, { key: 'productName', prop: 'productName', label: '中文品名', minWidth: 180 },
+  { key: 'pallets', prop: 'pallets', label: '托数', width: 90, align: 'right' }, { key: 'cartons', prop: 'cartons', label: '箱数', width: 90, align: 'right' },
+  { key: 'quantity', prop: 'quantity', label: '件数', width: 90, align: 'right' }, { key: 'weight', prop: 'weight', label: '重量(kg)', width: 110, align: 'right' },
+  { key: 'volume', prop: 'volume', label: '体积(m³)', width: 110, align: 'right' },
 ]
 const logColumns: DataTableColumn[] = [
-  { key: 'occurredAt', label: '时间', minWidth: 160 },
-  { key: 'node', label: '操作节点', minWidth: 140 },
-  { key: 'operator', label: '操作人', minWidth: 130 },
-  { key: 'result', label: '处理结果', minWidth: 220 },
+  { key: 'occurredAt', prop: 'occurredAt', label: '时间', minWidth: 160 }, { key: 'node', prop: 'node', label: '操作节点', minWidth: 140 },
+  { key: 'operator', prop: 'operator', label: '操作人', minWidth: 130 }, { key: 'result', prop: 'result', label: '处理结果', minWidth: 220 },
 ]
 
-function back() {
-  void router.push({ name: 'overseas-last-mile-orders' })
+async function load() {
+  if (!orderId.value || !customerId.value) {
+    loadError.value = { message: '详情缺少客户范围，请从尾程订单列表重新进入' }
+    return
+  }
+  loading.value = true
+  loadError.value = null
+  try { detail.value = await getLastMileOrder(orderId.value, customerId.value) }
+  catch (error) { loadError.value = getApiErrorDetails(error, '尾程订单详情加载失败，请重试') }
+  finally { loading.value = false }
 }
+function back() { void router.push({ name: 'overseas-last-mile-orders' }) }
+onMounted(load)
 </script>
 
 <template>
-  <OverseasDetailShell title="尾程订单详情" reference-label="尾程单号" :reference-value="orderId" back-label="返回尾程订单" domain="尾程订单详情" @back="back">
-    <div class="detail-grid">
-      <section class="detail-section" aria-labelledby="last-mile-order-heading">
-        <h2 id="last-mile-order-heading">订单信息</h2>
-        <dl class="detail-fields"><div v-for="label in orderFields" :key="label"><dt>{{ label }}</dt><dd>—</dd></div></dl>
-      </section>
-      <section class="detail-section" aria-labelledby="last-mile-lines-heading">
-        <h2 id="last-mile-lines-heading">订单明细</h2>
-        <dl class="detail-fields"><div v-for="label in detailFields" :key="label"><dt>{{ label }}</dt><dd>—</dd></div></dl>
-      </section>
-      <section class="detail-section" aria-labelledby="last-mile-plan-heading">
-        <h2 id="last-mile-plan-heading">计划信息</h2>
-        <dl class="detail-fields"><div v-for="label in planFields" :key="label"><dt>{{ label }}</dt><dd>—</dd></div></dl>
-      </section>
-      <section class="detail-section table-section" aria-labelledby="last-mile-documents-heading">
-        <h2 id="last-mile-documents-heading">关联单据</h2>
-        <DataTable :data="[]" :columns="documentColumns" column-settings-mode="hide" empty-text="海外区域关联单据契约待接入" />
-      </section>
-      <section class="detail-section table-section is-wide" aria-labelledby="last-mile-cargo-heading">
-        <h2 id="last-mile-cargo-heading">货物信息</h2>
-        <DataTable :data="[]" :columns="cargoColumns" column-settings-mode="hide" empty-text="海外区域货物明细契约待接入" />
-      </section>
-      <section class="detail-section table-section" aria-labelledby="last-mile-logs-heading">
-        <h2 id="last-mile-logs-heading">操作记录</h2>
-        <DataTable :data="[]" :columns="logColumns" column-settings-mode="hide" empty-text="海外区域操作记录契约待接入" />
-      </section>
+  <OverseasDetailShell title="尾程订单详情" reference-label="尾程单号" :reference-value="referenceValue" back-label="返回尾程订单" domain="尾程订单详情" :pending="false" :status-text="detail ? lastMileStatusLabel(detail.order.currentStatus) : '加载中'" @back="back">
+    <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="detail-grid" :aria-busy="loading">
+      <section class="detail-section" aria-labelledby="last-mile-order-heading"><h2 id="last-mile-order-heading">订单信息</h2><dl class="detail-fields"><div v-for="field in orderFields" :key="field.label"><dt>{{ field.label }}</dt><dd>{{ field.value }}</dd></div></dl></section>
+      <section class="detail-section" aria-labelledby="last-mile-lines-heading"><h2 id="last-mile-lines-heading">订单明细</h2><dl class="detail-fields"><div v-for="field in detailFields" :key="field.label"><dt>{{ field.label }}</dt><dd>{{ field.value }}</dd></div></dl></section>
+      <section class="detail-section" aria-labelledby="last-mile-plan-heading"><h2 id="last-mile-plan-heading">计划信息</h2><dl class="detail-fields"><div v-for="field in planFields" :key="field.label"><dt>{{ field.label }}</dt><dd>{{ field.value }}</dd></div></dl></section>
+      <section class="detail-section table-section" aria-labelledby="last-mile-documents-heading"><h2 id="last-mile-documents-heading">关联单据</h2><DataTable :data="documents" :columns="documentColumns" column-settings-mode="hide" empty-text="暂无关联单据" /></section>
+      <section class="detail-section table-section is-wide" aria-labelledby="last-mile-cargo-heading"><h2 id="last-mile-cargo-heading">货物信息</h2><DataTable :data="cargo" :columns="cargoColumns" column-settings-mode="hide" row-key="id" empty-text="暂无货物明细" /></section>
+      <section class="detail-section table-section" aria-labelledby="last-mile-logs-heading"><h2 id="last-mile-logs-heading">操作记录</h2><DataTable :data="logs" :columns="logColumns" column-settings-mode="hide" row-key="id" empty-text="暂无操作记录" /></section>
     </div>
   </OverseasDetailShell>
 </template>
 
 <style scoped>
-.detail-grid { display: grid; min-width: 0; grid-template-columns: repeat(2, minmax(0, 1fr)); border: 1px solid var(--cc-border); background: #fff; }
+.detail-grid { display: grid; min-width: 0; min-height: 240px; grid-template-columns: repeat(2, minmax(0, 1fr)); border: 1px solid var(--cc-border); background: #fff; }
 .detail-section { min-width: 0; padding: 16px 18px 18px; border-right: 1px solid var(--cc-border); border-bottom: 1px solid var(--cc-border); }
 .detail-section:nth-child(even) { border-right: 0; }
 .detail-section.is-wide { grid-column: 1 / -1; border-right: 0; }

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

@@ -1,32 +1,48 @@
 <script setup lang="ts">
-import { ref } from 'vue'
+import { computed, onMounted, ref } from 'vue'
 import { Eye } from '@lucide/vue'
 import { useRouter } from 'vue-router'
+import { listPlatformTenants, type PlatformTenantResource } from '@/modules/iam'
+import { getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
 import AdminPage from '@/shared/components/AdminPage.vue'
+import ApiErrorMeta from '@/shared/components/ApiErrorMeta.vue'
 import DataTable, { type DataTableColumn } from '@/shared/components/DataTable.vue'
 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 ContractPendingNotice from '../components/ContractPendingNotice.vue'
+import { listLastMileOrders } from '../api/lastMileOrders'
+import { toLastMileOrderListItem } from '../lastMilePresentation'
 import type { LastMileOrderListItem } from '../types'
 
 const rows = ref<LastMileOrderListItem[]>([])
+const customers = ref<PlatformTenantResource[]>([])
+const loading = ref(false)
+const customersLoading = ref(false)
+const loadError = ref<ApiErrorDetails | null>(null)
+const customersError = ref<ApiErrorDetails | null>(null)
 const router = useRouter()
 const page = ref(1)
 const pageSize = ref(20)
+const total = ref(0)
 const statusTab = ref<'全部' | '待分配'>('全部')
-const filters = ref<QueryModel>({ orderNo: '', inboundCode: '', warehouse: '', fbaWarehouse: '', orderType: '', owner: '', containerNo: '', status: '', consolidated: '', portEta: [] })
-const fields: QueryField[] = [
+const filters = ref<QueryModel>({ customerId: '', orderNo: '', inboundCode: '', warehouse: '', fbaWarehouse: '', orderType: '', owner: '', containerNo: '', status: '', consolidated: '', portEta: [] })
+const fields = computed<QueryField[]>(() => [
+  { key: 'customerId', type: 'select', label: '客户名称', width: 240, placeholder: '请选择客户', props: { filterable: true, clearable: true, loading: customersLoading.value }, options: customers.value.map((item) => ({ label: item.tenantName, value: String(item.id) })) },
   { key: 'orderNo', type: 'input', label: '尾程单号', placeholder: '请输入尾程单号' },
   { key: 'inboundCode', type: 'input', label: '入仓码', placeholder: '请输入入仓码' },
-  { key: 'warehouse', type: 'select', label: '海外仓', placeholder: '全部海外仓', options: [] },
-  { key: 'fbaWarehouse', type: 'select', label: 'FBA仓库', placeholder: '全部FBA仓库', options: [] },
-  { key: 'orderType', type: 'select', label: '订单类型', placeholder: '全部订单类型', options: ['一件代发', '头程', '拒收订单', '快递订单'].map((value) => ({ label: value, value })) },
-  { key: 'owner', type: 'input', label: '货主', placeholder: '请输入货主' },
+  { key: 'warehouse', type: 'select', label: '海外仓', placeholder: '接口暂不支持', options: [], props: { disabled: true } },
+  { key: 'fbaWarehouse', type: 'select', label: 'FBA仓库', placeholder: '接口暂不支持', options: [], props: { disabled: true } },
+  { key: 'orderType', type: 'select', label: '订单类型', placeholder: '接口暂不支持', options: ['一件代发', '头程', '拒收订单', '快递订单'].map((value) => ({ label: value, value, disabled: true })), props: { disabled: true } },
+  { key: 'owner', type: 'input', label: '货主', placeholder: '请通过客户名称选择', props: { disabled: true } },
   { key: 'containerNo', type: 'input', label: '集装箱号', placeholder: '请输入集装箱号' },
-  { key: 'status', type: 'select', label: '当前状态', placeholder: '全部状态', options: ['待入库计划', '待清关', '清关完成', '已合托', '待预约', '预约中', '预约成功'].map((value) => ({ label: value, value })) },
-  { key: 'consolidated', type: 'select', label: '是否合托', placeholder: '全部', options: [{ label: '是', value: 'yes' }, { label: '否', value: 'no' }] },
-  { key: 'portEta', type: 'daterange', label: '预计到港时间' },
-]
+  { key: 'status', type: 'select', label: '当前状态', placeholder: '全部状态', options: [
+    { label: '待分配', value: 'PENDING_ASSIGNMENT' },
+    { label: '已分配目的仓', value: 'DESTINATION_ASSIGNED' },
+    { label: '已生成入库计划', value: 'INBOUND_PLANNED' },
+  ] },
+  { key: 'consolidated', type: 'select', label: '是否合托', placeholder: '接口暂不支持', options: [{ label: '是', value: 'yes', disabled: true }, { label: '否', value: 'no', disabled: true }], props: { disabled: true } },
+  { key: 'portEta', type: 'daterange', label: '预计到港时间', props: { disabled: true, startPlaceholder: '接口暂不支持', endPlaceholder: '接口暂不支持' } },
+])
 const columns: DataTableColumn[] = [
   { key: 'actions', label: '操作', width: 110, fixed: 'left', slotName: 'actions' },
   { key: 'orderNo', prop: 'orderNo', label: '尾程单号', minWidth: 170 },
@@ -62,27 +78,90 @@ const columns: DataTableColumn[] = [
   { key: 'warehouseRemark', prop: 'warehouseRemark', label: '备注(仓库)', minWidth: 160 },
 ]
 
+async function loadCustomers() {
+  customersLoading.value = true
+  customersError.value = null
+  try {
+    const records: PlatformTenantResource[] = []
+    let currentPage = 1
+    let pages = 1
+    do {
+      const result = await listPlatformTenants({ page: currentPage, size: 200, status: 'ACTIVE' })
+      records.push(...result.records)
+      pages = Math.max(1, result.pages)
+      currentPage += 1
+    } while (currentPage <= pages)
+    customers.value = records
+  } catch (error) {
+    customersError.value = getApiErrorDetails(error, '客户列表加载失败，请重试')
+  } finally {
+    customersLoading.value = false
+  }
+}
+
+async function load(model: QueryModel = filters.value) {
+  Object.assign(filters.value, model)
+  const customerId = String(filters.value.customerId || '').trim()
+  if (!customerId) {
+    rows.value = []
+    total.value = 0
+    loadError.value = null
+    return
+  }
+  loading.value = true
+  loadError.value = null
+  try {
+    const result = await listLastMileOrders({
+      customerId,
+      page: page.value,
+      size: pageSize.value,
+      orderNo: String(filters.value.orderNo || '').trim() || undefined,
+      inboundCode: String(filters.value.inboundCode || '').trim() || undefined,
+      containerNo: String(filters.value.containerNo || '').trim() || undefined,
+      status: statusTab.value === '待分配' ? 'PENDING_ASSIGNMENT' : String(filters.value.status || '').trim() || undefined,
+    })
+    rows.value = result.records.map((item) => toLastMileOrderListItem(item, customerId))
+    total.value = result.total
+  } catch (error) {
+    rows.value = []
+    total.value = 0
+    loadError.value = getApiErrorDetails(error, '尾程订单加载失败，请重试')
+  } finally {
+    loading.value = false
+  }
+}
+
+function search(model: QueryModel) { page.value = 1; void load(model) }
+function reset(model: QueryModel) { page.value = 1; void load(model) }
+function changeStatusTab() { page.value = 1; void load() }
+
 function openDetail(source: object) {
   const row = source as LastMileOrderListItem
-  void router.push({ name: 'overseas-last-mile-order-detail', params: { orderId: row.orderNo } })
+  void router.push({ name: 'overseas-last-mile-order-detail', params: { orderId: row.id }, query: { customerId: row.customerId } })
 }
+
+onMounted(loadCustomers)
 </script>
 
 <template>
   <AdminPage><ListPageLayout aria-label="尾程订单列表">
     <template #toolbar>
       <section class="surface-panel last-mile-toolbar" aria-label="尾程订单状态与筛选">
-        <el-radio-group v-model="statusTab" aria-label="尾程订单状态" @change="page = 1">
+        <el-radio-group v-model="statusTab" aria-label="尾程订单状态" @change="changeStatusTab">
           <el-radio-button value="全部">全部</el-radio-button>
           <el-radio-button value="待分配">待分配</el-radio-button>
         </el-radio-group>
-        <QueryToolbar v-model="filters" :fields="fields" ariaLabel="尾程订单筛选" preference-key="overseas-last-mile-orders-query" @search="page = 1" />
+        <QueryToolbar v-model="filters" :fields="fields" :loading="loading" ariaLabel="尾程订单筛选" preference-key="overseas-last-mile-orders-query" @search="search" @reset="reset" />
       </section>
     </template>
-    <template #state><ContractPendingNotice domain="尾程订单" /></template>
-    <section class="surface-panel table-panel"><DataTable v-model:page="page" v-model:page-size="pageSize" :data="rows" :columns="columns" :total="0" preference-key="overseas-last-mile-orders" row-key="orderNo" empty-text="海外区域尾程订单查询契约待接入">
+    <template v-if="customersError || loadError" #state>
+      <LoadErrorState title="尾程订单加载失败" :message="(customersError || loadError)?.message" :loading="customersLoading || loading" @retry="customersError ? loadCustomers() : load()">
+        <template #details><ApiErrorMeta :details="(customersError || loadError)!" /></template>
+      </LoadErrorState>
+    </template>
+    <section v-if="!customersError && !loadError" class="surface-panel table-panel"><DataTable v-model:page="page" v-model:page-size="pageSize" :data="rows" :columns="columns" :loading="loading" :total="total" preference-key="overseas-last-mile-orders" row-key="id" :empty-text="filters.customerId ? '暂无尾程订单' : '请先选择客户后查询'" @update:page="load()" @update:page-size="page = 1; load()">
       <template #actions="{ row }"><el-button size="small" plain type="primary" @click="openDetail(row)"><Eye :size="15" />查看</el-button></template>
-      <template #pagination-left>共 0 条尾程订单</template>
+      <template #pagination-left>共 {{ total }} 条尾程订单</template>
     </DataTable></section>
   </ListPageLayout></AdminPage>
 </template>

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

@@ -1,18 +1,60 @@
 <script setup lang="ts">
-import { computed } from 'vue'
+import { computed, onMounted, ref } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
+import { getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
+import ApiErrorMeta from '@/shared/components/ApiErrorMeta.vue'
+import LoadErrorState from '@/shared/components/LoadErrorState.vue'
+import { getRelabelOrder, type RelabelDetailDto } from '../api/relabelOrders'
+import { formatOverseasDateTime } from '../lastMilePresentation'
 import OverseasReadOnlyDetail from '../components/OverseasReadOnlyDetail.vue'
 
 const route = useRoute()
 const router = useRouter()
-const orderId = computed(() => String(route.params.orderId || '—'))
+const orderId = computed(() => String(route.params.orderId || ''))
+const customerId = computed(() => String(route.query.customerId || ''))
+const detail = ref<RelabelDetailDto | null>(null)
+const loading = ref(false)
+const loadError = ref<ApiErrorDetails | null>(null)
 const groups = [
   { title: '单据信息', fields: ['换标单号', '关联订单', '状态', '创建时间', '更新时间'] },
   { title: '商品信息', fields: ['商品SKU', '中文品名', '箱数', '预算总价'] },
   { title: '作业要求', fields: ['贴标要求', '上传文件', '备注'] },
   { title: '费用明细', fields: ['开箱费', '挑货费', '换标费', '换箱唛标费', '换标费总计'] },
 ]
+function text(value: unknown) { return String(value ?? '').trim() || '—' }
+function status(value: unknown) {
+  const labels: Record<string, string> = { PENDING_PROCESSING: '待处理', PROCESSING: '处理中', COMPLETED: '已完成', REJECTED: '已驳回', CANCELLED: '已取消' }
+  return labels[String(value || '')] || text(value)
+}
+const referenceValue = computed(() => text(detail.value?.application.relabelNo || orderId.value))
+const fieldValues = computed<Record<string, string | number>>(() => {
+  const value = detail.value
+  const items = value?.items || []
+  return {
+    换标单号: text(value?.application.relabelNo),
+    关联订单: text(value?.application.lastlegOrderNo || value?.application.customerOrderNo),
+    状态: status(value?.application.status),
+    创建时间: formatOverseasDateTime(value?.application.createdAt),
+    更新时间: value?.history.length ? formatOverseasDateTime(value.history[value.history.length - 1]?.createdAt) : '—',
+    商品SKU: items.map((item) => text(item.skuCode)).join('、') || '—',
+    中文品名: items.map((item) => text(item.productNameZh)).join('、') || '—',
+    箱数: Number(value?.application.totalPackageCount || 0),
+    预算总价: '—',
+    贴标要求: items.map((item) => text(item.labelRequirement)).join('；') || '—',
+    上传文件: items.map((item) => text(item.relabelFileName)).filter((item) => item !== '—').join('、') || '—',
+    备注: text(value?.remark),
+    开箱费: '—', 挑货费: '—', 换标费: '—', 换箱唛标费: '—', 换标费总计: '—',
+  }
+})
+async function load() {
+  if (!orderId.value || !customerId.value) { loadError.value = { message: '详情缺少客户范围，请从换标单列表重新进入' }; return }
+  loading.value = true; loadError.value = null
+  try { detail.value = await getRelabelOrder(orderId.value, customerId.value) }
+  catch (error) { loadError.value = getApiErrorDetails(error, '换标单详情加载失败，请重试') }
+  finally { loading.value = false }
+}
 function back() { void router.push({ name: 'overseas-relabel-orders' }) }
+onMounted(load)
 </script>
 
-<template><OverseasReadOnlyDetail title="换标单详情" reference-label="换标单号" :reference-value="orderId" back-label="返回换标单" domain="换标单详情" :groups="groups" @back="back" /></template>
+<template><OverseasReadOnlyDetail title="换标单详情" reference-label="换标单号" :reference-value="referenceValue" back-label="返回换标单" domain="换标单详情" :groups="groups" :field-values="fieldValues" :pending="false" :status-text="detail ? status(detail.application.status) : '加载中'" :loading="loading" :show-content="!loadError" @back="back"><template #state><LoadErrorState v-if="loadError" title="换标单详情加载失败" :message="loadError.message" :loading="loading" @retry="load"><template #details><ApiErrorMeta :details="loadError" /></template></LoadErrorState></template></OverseasReadOnlyDetail></template>

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

@@ -1,27 +1,38 @@
 <script setup lang="ts">
-import { reactive, ref } from 'vue'
+import { computed, onMounted, reactive, ref } from 'vue'
 import { Eye, Pencil, Plus, Upload } from '@lucide/vue'
 import { useRouter } from 'vue-router'
 import { useAccessPreviewStore } from '@/core/access/accessPreview'
+import { listPlatformTenants, type PlatformTenantResource } from '@/modules/iam'
+import { getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
 import AdminPage from '@/shared/components/AdminPage.vue'
+import ApiErrorMeta from '@/shared/components/ApiErrorMeta.vue'
 import DataTable, { type DataTableColumn } from '@/shared/components/DataTable.vue'
 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 ContractPendingNotice from '../components/ContractPendingNotice.vue'
 import ContractPendingFormDialog from '../components/ContractPendingFormDialog.vue'
+import { listRelabelOrders } from '../api/relabelOrders'
 import { overseasWarehousePermissions as permission } from '../permissions'
 import type { RelabelOrderListItem } from '../types'
 
 const access = useAccessPreviewStore()
 const router = useRouter()
 const rows = ref<RelabelOrderListItem[]>([])
+const customers = ref<PlatformTenantResource[]>([])
+const loading = ref(false)
+const customersLoading = ref(false)
+const loadError = ref<ApiErrorDetails | null>(null)
+const customersError = ref<ApiErrorDetails | null>(null)
 const page = ref(1)
 const pageSize = ref(20)
-const filters = ref<QueryModel>({ sku: '', status: '' })
-const fields: QueryField[] = [
+const total = ref(0)
+const filters = ref<QueryModel>({ customerId: '', sku: '', status: '' })
+const fields = computed<QueryField[]>(() => [
+  { key: 'customerId', type: 'select', label: '客户名称', placeholder: '请选择客户', width: 240, props: { filterable: true, clearable: true, loading: customersLoading.value }, options: customers.value.map((item) => ({ label: item.tenantName, value: String(item.id) })) },
   { key: 'sku', type: 'input', label: '商品SKU', placeholder: '请输入商品SKU', width: 180 },
-  { key: 'status', type: 'select', label: '状态', placeholder: '全部状态', width: 160, options: ['待处理', '处理中', '已完成'].map((value) => ({ label: value, value })) },
-]
+  { key: 'status', type: 'select', label: '状态', placeholder: '全部状态', width: 160, options: [{ label: '待处理', value: 'PENDING_PROCESSING' }, { label: '处理中', value: 'PROCESSING' }, { label: '已完成', value: 'COMPLETED' }, { label: '已驳回', value: 'REJECTED' }, { label: '已取消', value: 'CANCELLED' }] },
+])
 const columns: DataTableColumn[] = [
   { key: 'actions', label: '操作', width: 190, fixed: 'left', slotName: 'actions' },
   { key: 'orderNo', label: '换标单号', minWidth: 170 },
@@ -48,18 +59,50 @@ function openForm(mode: 'create' | 'edit', source?: object) {
 
 function openDetail(source: object) {
   const row = source as RelabelOrderListItem
-  void router.push({ name: 'overseas-relabel-order-detail', params: { orderId: String(row.orderNo) } })
+  void router.push({ name: 'overseas-relabel-order-detail', params: { orderId: String(row.orderNo) }, query: { customerId: row.customerId } })
 }
+
+function relabelStatus(value: unknown) {
+  const labels: Record<string, string> = { PENDING_PROCESSING: '待处理', PROCESSING: '处理中', COMPLETED: '已完成', REJECTED: '已驳回', CANCELLED: '已取消' }
+  return labels[String(value || '')] || String(value || '—')
+}
+async function loadCustomers() {
+  customersLoading.value = true; customersError.value = null
+  try {
+    const records: PlatformTenantResource[] = []; let currentPage = 1; let pages = 1
+    do { const result = await listPlatformTenants({ page: currentPage, size: 200, status: 'ACTIVE' }); records.push(...result.records); pages = Math.max(1, result.pages); currentPage += 1 } while (currentPage <= pages)
+    customers.value = records
+  } catch (error) { customersError.value = getApiErrorDetails(error, '客户列表加载失败，请重试') }
+  finally { customersLoading.value = false }
+}
+async function load(model: QueryModel = filters.value) {
+  Object.assign(filters.value, model)
+  const customerId = String(filters.value.customerId || '').trim()
+  if (!customerId) { rows.value = []; total.value = 0; loadError.value = null; return }
+  loading.value = true; loadError.value = null
+  try {
+    const result = await listRelabelOrders({ customerId, page: page.value, size: pageSize.value, skuCode: String(filters.value.sku || '').trim() || undefined, status: String(filters.value.status || '').trim() || undefined })
+    rows.value = result.records.map((item) => ({
+      customerId, orderNo: String(item.relabelNo), relatedOrderNo: String(item.lastlegOrderNo || item.customerOrderNo || '—'), sku: String(item.skuCodes || '—'),
+      productName: '—', cartons: Number(item.totalPackageCount || 0), budgetTotal: null, labelRequirement: '—', fileName: '—', status: relabelStatus(item.status), remark: '',
+    }))
+    total.value = result.total
+  } catch (error) { rows.value = []; total.value = 0; loadError.value = getApiErrorDetails(error, '换标单加载失败，请重试') }
+  finally { loading.value = false }
+}
+function search(model: QueryModel) { page.value = 1; void load(model) }
+function reset(model: QueryModel) { page.value = 1; void load(model) }
+onMounted(loadCustomers)
 </script>
 
 <template>
   <AdminPage><ListPageLayout aria-label="换标单列表">
-    <template #toolbar><QueryToolbar v-model="filters" class="surface-panel" :fields="fields" ariaLabel="换标单筛选" preference-key="overseas-relabel-orders-query" @search="page = 1" /></template>
-    <template #state><ContractPendingNotice domain="换标单" /></template>
-    <section class="surface-panel table-panel"><DataTable v-model:page="page" v-model:page-size="pageSize" :data="rows" :columns="columns" :total="0" preference-key="overseas-relabel-orders" row-key="orderNo" empty-text="海外区域换标单查询契约待接入">
+    <template #toolbar><QueryToolbar v-model="filters" class="surface-panel" :fields="fields" :loading="loading" ariaLabel="换标单筛选" preference-key="overseas-relabel-orders-query" @search="search" @reset="reset" /></template>
+    <template v-if="customersError || loadError" #state><LoadErrorState title="换标单加载失败" :message="(customersError || loadError)?.message" :loading="customersLoading || loading" @retry="customersError ? loadCustomers() : load()"><template #details><ApiErrorMeta :details="(customersError || loadError)!" /></template></LoadErrorState></template>
+    <section v-if="!customersError && !loadError" class="surface-panel table-panel"><DataTable v-model:page="page" v-model:page-size="pageSize" :data="rows" :columns="columns" :loading="loading" :total="total" preference-key="overseas-relabel-orders" row-key="orderNo" :empty-text="filters.customerId ? '暂无换标单' : '请先选择客户后查询'" @update:page="load()" @update:page-size="page = 1; load()">
       <template #toolbar-actions><el-button v-if="access.can(permission.relabelOrderCreate)" type="primary" @click="openForm('create')"><Plus :size="16" />新增换标单</el-button></template>
       <template #actions="{ row }"><el-button size="small" plain type="primary" @click="openDetail(row)"><Eye :size="15" />查看</el-button><el-button v-if="access.can(permission.relabelOrderEdit)" size="small" plain @click="openForm('edit', row)"><Pencil :size="15" />审核</el-button></template>
-      <template #pagination-left>共 0 条换标单</template>
+      <template #pagination-left>共 {{ total }} 条换标单</template>
     </DataTable></section>
   </ListPageLayout>
   <ContractPendingFormDialog v-model="dialogOpen" :title="dialogMode === 'create' ? '新增换标单' : '审核换标单'" width="min(760px, calc(100vw - 28px))" domain="换标单" :confirm-text="dialogMode === 'create' ? '保存换标单' : '提交审核'">

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

@@ -104,8 +104,13 @@ describe('overseas warehouse first-batch prototype contract', () => {
     expect(value).not.toContain('海外派送')
   })
 
-  it('shows contract-pending empty states instead of demo data or fake success actions', () => {
-    for (const fileName of ['LastMileOrderDetailView.vue', 'InboundOrderDetailView.vue', 'InventoryDetailView.vue']) {
+  it('connects the tail-leg detail to the real overseas API and keeps missing contracts pending', () => {
+    const tailLeg = source('LastMileOrderDetailView.vue')
+    expect(tailLeg).toContain('getLastMileOrder')
+    expect(tailLeg).toContain(':data="cargo"')
+    expect(tailLeg).toContain('<LoadErrorState')
+    expect(tailLeg).not.toContain('ElMessage.success')
+    for (const fileName of ['InboundOrderDetailView.vue', 'InventoryDetailView.vue']) {
       const value = source(fileName)
       expect(value).toContain(':data="[]"')
       expect(value).toContain('契约待接入')