优化样式

src/modules/overseas-warehouse/api/lastMileOrders.ts

@@ -358,7 +358,7 @@ export interface LastMileOrderDetailDto {
   returnReceipt?: {
     order: { returnNo: string; status?: string; receivedQuantity: number; expectedQuantity: number }
     items?: Array<{ skuCode: string; productNameZh?: string; expectedQuantity: number; receivedQuantity: number }>
-    receipts: Array<{ receiptNo: string; unitType: string; unitCode?: string; palletCode?: string; receivedQuantity: number; boxCount: number; signedAt: string }>
+    receipts: Array<{ receiptNo: string; unitType: string; unitCode?: string; palletCode?: string; receivedQuantity: number; boxCount: number; signedAt: string; length?: number | null; width?: number | null; height?: number | null; weight?: number | null }>
     cartons?: Array<{ receiptNo: string; palletCode?: string; cartonMark: string; countStatus: string; countedAt?: string; items: Array<{ skuCode: string; productNameZh?: string; quantity: number }>; length?: number | null; width?: number | null; height?: number | null; weight?: number | null }>
   } | null
   order: LastMileOrderDto

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

@@ -58,6 +58,15 @@ function isSingleLineBusinessField(field: DetailField) { return field.label ===
 const referenceValue = computed(() => lastMileOrderReference(detail.value?.order.orderNo, '订单编码待补充'))
 const isReturnOrder = computed(() => detail.value?.order.orderType === 'RETURN_RELABEL')
 const returnReceiptUnitLabel = computed(() => detail.value?.returnReceipt?.receipts.some(receipt => receipt.unitType === 'PARCEL') ? '包裹' : '箱')
+const signedReturnCartons = computed(() => (detail.value?.returnReceipt?.cartons || []).map(box => {
+  const parcel = detail.value?.returnReceipt?.receipts.find(receipt => receipt.receiptNo === box.receiptNo && receipt.unitType === 'PARCEL')
+  return { ...box, length: box.length ?? parcel?.length, width: box.width ?? parcel?.width, height: box.height ?? parcel?.height, weight: box.weight ?? parcel?.weight }
+}))
+function returnCartonVolume(box: { length?: number | null; width?: number | null; height?: number | null }) {
+  if (box.length == null || box.width == null || box.height == null) return '—'
+  const volume = box.length * box.width * box.height / 1_000_000
+  return Number.isFinite(volume) && volume >= 0 ? volume.toFixed(6).replace(/\.?0+$/, '') : '—'
+}
 const showReturnForecast = computed(() => isReturnOrder.value && (detail.value?.returnReceipt?.order.status
   ? detail.value.returnReceipt.order.status !== 'COMPLETED'
   : ['PENDING_REVIEW', 'PENDING_RECEIPT', 'PARTIALLY_RECEIVED', 'REJECTED', 'CANCELLED'].includes(detail.value?.order.currentStatus || '')))
@@ -252,8 +261,8 @@ onMounted(load)
             </el-table>
             <h3>签收{{ returnReceiptUnitLabel }}明细（{{ detail.returnReceipt.cartons?.length || 0 }} {{ returnReceiptUnitLabel }}）</h3>
             <el-collapse v-if="detail.returnReceipt.cartons?.length">
-              <el-collapse-item v-for="box in detail.returnReceipt.cartons" :key="box.cartonMark" :name="box.cartonMark">
+              <el-collapse-item v-for="box in signedReturnCartons" :key="box.cartonMark" :name="box.cartonMark">
-                <template #title>{{ box.cartonMark }} · {{ box.countStatus === 'CONFIRMED' ? `已确认 · ${box.items.length} 种 SKU · ${box.items.reduce((sum, item) => sum + Number(item.quantity), 0)} 件` : box.countStatus === 'PENDING' ? '待清点' : '未留存箱内签收明细' }}</template>
+                <template #title><span class="return-carton-title"><span>{{ box.cartonMark }} · {{ box.countStatus === 'CONFIRMED' ? `已确认 · ${box.items.length} 种 SKU · ${box.items.reduce((sum, item) => sum + Number(item.quantity), 0)} 件` : box.countStatus === 'PENDING' ? '待清点' : '未留存箱内签收明细' }}</span><span class="return-carton-measurements">长 {{ box.length ?? '—' }} cm · 宽 {{ box.width ?? '—' }} cm · 高 {{ box.height ?? '—' }} cm · 体积 {{ returnCartonVolume(box) }} m³ · 重量 {{ box.weight ?? '—' }} kg</span></span></template>
                 <p>签收单 {{ box.receiptNo }}<template v-if="box.palletCode"> · 托盘 {{ box.palletCode }}</template><template v-if="box.countedAt"> · 确认时间 {{ formatOverseasDateTime(box.countedAt) }}</template></p>
                 <p v-if="box.length != null || box.width != null || box.height != null || box.weight != null">测量：{{ box.length ?? '—' }} × {{ box.width ?? '—' }} × {{ box.height ?? '—' }} cm · 重量 {{ box.weight ?? '—' }} kg</p>
                 <el-table v-if="box.countStatus === 'CONFIRMED'" :data="box.items" size="small" border>
@@ -294,6 +303,8 @@ onMounted(load)
 
 <style scoped>
 .source-heading { margin: 0; padding: var(--admin-space-3); font-size: var(--admin-font-section); font-weight: 600; }
+.return-carton-title { display:flex; align-items:center; flex-wrap:wrap; gap:8px 16px; padding:4px 0; line-height:1.5; }
+.return-carton-measurements { color:var(--cc-text-secondary); font-weight:400; }
 .detail-fields > div.wide { grid-column: span 2; }
 .detail-field-value--business { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
 .package-difference--nonzero { color: var(--el-color-danger); font-weight: 600; }