优化

src/modules/unified-orders/pages/UnifiedOrdersView.vue

@@ -260,8 +260,7 @@ const columns = computed<DataTableColumn[]>(() => [
     key: 'selection', type: 'selection', width: 48, fixed: 'left',
     selectable: () => !batchApprovalSaving.value && !coLoadSaving.value,
   } satisfies DataTableColumn] : []),
-  { key: 'orderNo', prop: 'orderNo', label: '订单号', minWidth: 230, slotName: 'orderNo' },
-  { key: 'inboundCode', prop: 'inboundCode', label: '入仓码', minWidth: 190, slotName: 'inboundCode' },
+  { key: 'inboundCode', prop: 'inboundCode', label: '入仓码', minWidth: 260, slotName: 'inboundCode' },
   { key: 'mainStatus', prop: 'mainStatus', label: '订单主状态', minWidth: 130, slotName: 'mainStatus' },
   { key: 'customerName', prop: 'customerName', label: '客户', minWidth: 150, slotName: 'field' },
   { key: 'receivingWarehouseName', prop: 'receivingWarehouseName', label: '平台收货仓', minWidth: 150, slotName: 'field' },
@@ -816,18 +815,16 @@ function coLoadGroupStatusLabel(group: CoLoadGroup) {
   return group.status === 'ACTIVE' ? '未锁定' : group.status === 'LOCKED' ? '已锁定' : group.status === 'CONSUMED' ? '已消费' : '已取消'
 }
 
+function coLoadGroupSummary(group: CoLoadGroup) {
+  return `同柜组 · ${coLoadGroupOrderCount(group)} 票 · ${coLoadGroupStatusLabel(group)}`
+}
+
+const coLoadDetailMembers = computed(() => coLoadDetailGroup.value?.members.filter((member) => member.inboundCode.trim()) || [])
+
 function openCoLoadDetail(group: CoLoadGroup) {
   coLoadDetailGroup.value = group
 }
 
-function visibleOrderNo(orderId: string) {
-  return records.value.find((row) => String(row.orderId) === orderId)?.orderNo || ''
-}
-
-function visibleInboundCode(inboundId: string) {
-  return records.value.find((row) => String(row.inboundId || '') === inboundId)?.inboundCode || ''
-}
-
 function openCoLoadCreate() {
   if (selectedOrders.value.length < 2) return
   coLoadError.value = null
@@ -841,7 +838,7 @@ async function createCoLoadGroup() {
   try {
     const group = await createPlatformCoLoadGroup(selectedOrders.value.map((row) => String(row.orderId)))
     coLoadCreateOpen.value = false
-    ElMessage.success(`已创建同柜不可拆组 ${group.groupNo}，共 ${coLoadGroupMemberLabel(group)}`)
+    ElMessage.success(`已创建同柜不可拆组，共 ${coLoadGroupMemberLabel(group)}`)
     await loadOrders()
   } catch (error) {
     coLoadError.value = getApiErrorDetails(error, '创建同柜不可拆组失败')
@@ -856,7 +853,7 @@ async function cancelCoLoadGroup(row: UnifiedOrderResource) {
   let reason = ''
   try {
     const result = await ElMessageBox.prompt(
-      `将整组取消 ${group.groupNo}（${coLoadGroupMemberLabel(group)}）。不支持单独移除成员；如需调整，请取消后重新建组。`,
+      `将整组取消（${coLoadGroupMemberLabel(group)}）。不支持单独移除成员；如需调整，请取消后重新建组。`,
       '取消同柜不可拆组',
       { confirmButtonText: '确认整组取消', cancelButtonText: '返回', inputPlaceholder: '取消原因（选填）', inputType: 'textarea' },
     )
@@ -866,7 +863,7 @@ async function cancelCoLoadGroup(row: UnifiedOrderResource) {
   coLoadError.value = null
   try {
     await cancelPlatformCoLoadGroup(group.groupId, group.version, reason)
-    ElMessage.success(`同柜不可拆组 ${group.groupNo} 已整组取消`)
+    ElMessage.success('同柜不可拆组已整组取消')
     await loadOrders()
   } catch (error) {
     coLoadError.value = getApiErrorDetails(error, '取消同柜不可拆组失败')
@@ -1362,8 +1359,9 @@ onBeforeUnmount(() => {
           </div>
         </template>
         <template #inboundCode="{ row }">
-          <div class="inbound-relation-cell">
-            <span>{{ (row as UnifiedOrderResource).inboundCode || '—' }}</span>
+          <div class="inbound-relation-cell order-code-cell">
+            <strong class="inbound-code-value" :title="(row as UnifiedOrderResource).inboundCode || '待生成入仓码'">{{ (row as UnifiedOrderResource).inboundCode || '待生成入仓码' }}</strong>
+            <button v-if="coLoadGroup(row as UnifiedOrderResource)" type="button" class="coload-tag-trigger" :aria-label="`查看${coLoadGroupSummary(coLoadGroup(row as UnifiedOrderResource)!)}成员`" @click.stop="openCoLoadDetail(coLoadGroup(row as UnifiedOrderResource)!)"><el-tag size="small" :type="coLoadGroup(row as UnifiedOrderResource)?.status === 'ACTIVE' ? 'warning' : 'info'">{{ coLoadGroupSummary(coLoadGroup(row as UnifiedOrderResource)!) }}</el-tag></button>
             <el-button v-if="(row as UnifiedOrderResource).inboundCode" class="order-relation-link" link type="primary" aria-label="查看入仓码关联数据" @click="openInboundRelationship(row as UnifiedOrderResource)"><Link2 :size="14" />关联数据</el-button>
             <el-button
               v-if="(row as UnifiedOrderResource).relation"
@@ -1375,7 +1373,6 @@ onBeforeUnmount(() => {
             ><GitBranch :size="14" />{{ orderRelationLabel(row as UnifiedOrderResource) }}</el-button>
           </div>
         </template>
-        <template #orderNo="{ row }"><div class="order-code-cell"><strong>{{ (row as UnifiedOrderResource).orderNo || '订单编码待补充' }}</strong><button v-if="coLoadGroup(row as UnifiedOrderResource)" type="button" class="coload-tag-trigger" :aria-label="`查看同柜组 ${coLoadGroup(row as UnifiedOrderResource)?.groupNo} 详情`" @click.stop="openCoLoadDetail(coLoadGroup(row as UnifiedOrderResource)!)"><el-tag size="small" :type="coLoadGroup(row as UnifiedOrderResource)?.status === 'ACTIVE' ? 'warning' : 'info'">{{ coLoadGroup(row as UnifiedOrderResource)?.groupNo }} · {{ coLoadGroupOrderCount(coLoadGroup(row as UnifiedOrderResource)!) }} 票 · {{ coLoadGroupStatusLabel(coLoadGroup(row as UnifiedOrderResource)!) }}</el-tag></button></div></template>
         <template #orderStatus="{ row }"><StatusBadge :status="orderStatusLabel((row as UnifiedOrderResource).internalOrderStatus || (row as UnifiedOrderResource).mainStatus)" /></template>
         <template #measurementReviewStatus="{ row }"><StatusBadge :status="measurementStatusLabel((row as UnifiedOrderResource).measurement?.reviewStatus)" /></template>
         <template #field="{ row, column }"><LineClampText v-if="['customerRemark', 'latestInternalNote'].includes(String(column.property))" :content="displayField(row as UnifiedOrderResource, column.property)" :lines="2" /><template v-else>{{ displayField(row as UnifiedOrderResource, column.property) }}</template></template>
@@ -1395,18 +1392,19 @@ onBeforeUnmount(() => {
     <SmartLoadingDialog v-model="smartLoadingOpen" />
     <AppDialog v-model="coLoadCreateOpen" title="设为同柜不可拆组" confirm-text="确认建组" :confirm-loading="coLoadSaving" :confirm-disabled="selectedOrders.length < 2" @confirm="createCoLoadGroup">
       <el-alert type="warning" :closable="false" show-icon :title="`所选 ${selectedOrders.length} 票须属于同一国内仓、同一渠道，并全量进入同一柜；目的仓或目的港可以不同。资格由服务端按完整入仓片段校验。`" />
-      <div class="coload-selection"><span v-for="row in selectedOrders" :key="String(row.orderId)">{{ row.orderNo || row.inboundCode || '业务编码待补充' }}</span></div>
+      <div class="coload-selection"><span v-for="row in selectedOrders" :key="String(row.orderId)">{{ row.inboundCode || '待生成入仓码' }}</span></div>
       <div v-if="coLoadError" class="coload-error" role="alert"><span>{{ coLoadError.message }}</span><ApiErrorMeta :details="coLoadError" /></div>
     </AppDialog>
-    <AppDialog :model-value="Boolean(coLoadDetailGroup)" :title="coLoadDetailGroup ? `同柜组 ${coLoadDetailGroup.groupNo}` : '同柜组详情'" :show-confirm="false" cancel-text="关闭" width="min(760px, calc(100vw - 32px))" @update:model-value="coLoadDetailGroup = null">
+    <AppDialog :model-value="Boolean(coLoadDetailGroup)" title="同柜组成员" :show-confirm="false" cancel-text="关闭" width="min(720px, 94vw)" @update:model-value="coLoadDetailGroup = null">
       <template v-if="coLoadDetailGroup">
-        <div class="coload-detail-summary"><el-tag size="small" :type="coLoadDetailGroup.status === 'ACTIVE' ? 'warning' : 'info'">{{ coLoadGroupOrderCount(coLoadDetailGroup) }} 票 · {{ coLoadDetailGroup.members.length }} 个入仓片段 · {{ coLoadGroupStatusLabel(coLoadDetailGroup) }}</el-tag><span>共 {{ coLoadDetailGroup.fullPackageCount }} 箱</span></div>
-        <div class="coload-detail-scroll">
+        <div class="coload-detail-summary"><el-tag size="small" :type="coLoadDetailGroup.status === 'ACTIVE' ? 'warning' : 'info'">{{ coLoadGroupSummary(coLoadDetailGroup) }}</el-tag><span>{{ coLoadDetailMembers.length }} 个入仓码 · 共 {{ coLoadDetailGroup.fullPackageCount }} 箱</span></div>
+        <div v-if="coLoadDetailMembers.length" class="coload-detail-scroll">
           <table class="coload-detail-table">
-            <thead><tr><th>入仓码</th><th>订单编码</th><th>箱数</th></tr></thead>
-            <tbody><tr v-for="member in coLoadDetailGroup.members" :key="`${member.orderId}:${member.inboundId}`"><td><strong>{{ visibleInboundCode(member.inboundId) || '入仓码待补充' }}</strong></td><td><strong>{{ visibleOrderNo(member.orderId) || '订单编码待补充' }}</strong></td><td>{{ member.fullPackageCount }} 箱</td></tr></tbody>
+            <thead><tr><th>入仓码</th><th>箱数</th></tr></thead>
+            <tbody><tr v-for="member in coLoadDetailMembers" :key="member.inboundId"><td><strong :title="member.inboundCode">{{ member.inboundCode }}</strong></td><td>{{ member.fullPackageCount }} 箱</td></tr></tbody>
           </table>
         </div>
+        <el-empty v-else description="暂无有效入仓码" :image-size="56" />
       </template>
     </AppDialog>
     </template>
@@ -1501,7 +1499,7 @@ onBeforeUnmount(() => {
 .row-actions { display: flex; align-items: center; gap: 4px; white-space: nowrap; }
 .row-actions :deep(.el-button) { margin-left: 0; }
 .inbound-relation-cell { display: grid; min-width: 0; gap: 5px; }
-.inbound-relation-cell > span { overflow-wrap: anywhere; }
+.inbound-code-value { display: block; max-width: 100%; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
 .order-relation-link { width: fit-content; max-width: 100%; height: auto; justify-content: flex-start; padding: 0; font-size: 12px; }
 .order-relation-link :deep(span) { min-width: 0; white-space: normal; text-align: left; }
 .primary-cell { display: grid; min-width: 0; gap: 4px; }