修改提交

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

@@ -234,8 +234,8 @@ const columns: DataTableColumn[] = [
   { key: 'dispatchStatus', prop: 'dispatchStatus', label: '排车状态', width: 110 },
   { key: 'outboundOrderNo', prop: 'outboundOrderNo', label: '出库单号', minWidth: 150 },
   { key: 'dispatchOrderNo', prop: 'dispatchOrderNo', label: '派送单号', minWidth: 150 },
-  { key: 'relabelOrderNo', prop: 'relabelOrderNo', label: '换标单号', minWidth: 150 },
-  { key: 'relabelStatus', prop: 'relabelStatus', label: '换标状态', width: 110 },
+  { key: 'relabelOrderNo', slotName: 'relabelOrderNo', label: '换标单号', minWidth: 220 },
+  { key: 'relabelStatus', slotName: 'relabelStatus', label: '换标子状态', minWidth: 180 },
   { key: 'status', prop: 'status', label: '当前状态', width: 110 },
   { key: 'createdAt', prop: 'createdAt', label: '创建时间', minWidth: 170 },
   { key: 'internalRemark', prop: 'internalRemark', label: '备注(仅自己)', minWidth: 160 },
@@ -926,6 +926,8 @@ onMounted(() => { void load() })
     </section>
     <section v-else-if="!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="暂无尾程订单" @selection-change="onSelectionChange" @update:page="load()" @update:page-size="page = 1; load()">
       <template #toolbar-actions><el-button v-if="access.can(permission.lastMileOrderExport)" plain :loading="exportLoading" @click="exportOrders"><Download :size="16" />导出订单</el-button><el-button v-if="access.can(permission.lastMileOrderTransfer)" plain :disabled="!selectedRows.length || hasSelectedRejectedReturn() || actionLoading" @click="openTransfer">转仓</el-button><el-button v-if="access.can(permission.inboundOrderCreate)" type="primary" plain :disabled="selectedRows.length !== 1 || hasSelectedRejectedReturn() || actionLoading" @click="openInboundPlan()">生成入库计划</el-button><el-button v-if="statusTab === '待分配' && access.can(permission.inboundOrderCreate)" type="primary" :disabled="actionLoading" @click="openContainerConversion">按柜批量生成</el-button></template>
+      <template #relabelOrderNo="{ row }"><div v-for="application in row.relabelApplications" :key="application.relabelNo" class="relabel-suborder">{{ application.relabelNo }}</div><span v-if="!row.relabelApplications?.length">{{ row.relabelOrderNo }}</span></template>
+      <template #relabelStatus="{ row }"><div v-for="application in row.relabelApplications" :key="application.relabelNo" class="relabel-suborder">{{ application.statusLabel }} · {{ application.quantity }} 件</div><span v-if="!row.relabelApplications?.length">{{ row.relabelStatus }}</span></template>
       <template #actions="{ row }"><RowActions :actions="lastMileRowActions(row as LastMileOrderListItem)" :more-label="`更多尾程订单操作 · ${(row as LastMileOrderListItem).orderNo || '当前记录'}`" @action="handleLastMileRowAction($event, row as LastMileOrderListItem)" /></template>
       <template #orderNo="{ row }"><OrderReferenceText :value="String(row.orderNo || '')" copyable /></template>
       <template #cartonDifference="{ row }"><span :class="{ 'package-difference--nonzero': typeof row.cartonDifference === 'number' && row.cartonDifference !== 0 }">{{ packageDifferenceText(row.cartonDifference) }}</span></template>
@@ -1066,6 +1068,7 @@ onMounted(() => { void load() })
 </template>
 
 <style scoped>
+.relabel-suborder { min-height: 30px; line-height: 30px; white-space: nowrap; }
 .last-mile-toolbar { padding: var(--admin-space-5) var(--admin-space-5) 0; }
 .row-actions { white-space: nowrap; }
 .command-form { margin-top: var(--admin-space-5); }