优化

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

@@ -14,11 +14,13 @@ 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 TransferQuantitySummary from '../components/TransferQuantitySummary.vue'
 import OperationErrorToast from '@/shared/components/OperationErrorToast.vue'
 import QueryToolbar, { type QueryField, type QueryModel } from '@/shared/components/QueryToolbar.vue'
 import RowActions, { type RowActionItem } from '@/shared/components/RowActions.vue'
 import { changeContainerReceivingWarehouse, convertLastMileContainerToInboundPlans, createManualInboundPlan, getContainerInboundPlanPreview, getContainerPlanProgress, getLastMileOrderManualNodes, listContainerPlanProgress, listLastMileOrders, reviewDirectRelabelOrder, reviewReturnOrder, transferLastMileOrders, updateLastMileOrderPalletMerge, updateLastMileOrderHold, updateLastMileOrderManualNodes, type ContainerInboundPlanPreviewDto, type ContainerInboundPlanPreviewGroupDto, type ContainerInboundPlanPreviewOrderDto, type ContainerPlanProgressDetailDto, type ContainerPlanProgressSummaryDto, type ManualNodeCode, type LastMileOrderQuery } from '../api/lastMileOrders'
 import { businessOrderLink } from '../businessOrderLink'
+import { getReturnOrderStatistics, type ReturnOrderStatistics } from '../api/lastMileOrders'
 import OrderReferenceText from '../components/OrderReferenceText.vue'
 import { reviewCargoDiscard } from '../api/lastMileOrders'
 import WarehouseTransferReviewDialog from '../components/WarehouseTransferReviewDialog.vue'
@@ -51,6 +53,11 @@ const transferReviewOpen = ref(false)
 const transferReviewTarget = ref<LastMileOrderListItem | null>(null)
 const selectedRows = ref<LastMileOrderListItem[]>([])
 const selectedReturnRows = computed(() => selectedRows.value.filter((row) => row.orderTypeCode === 'RETURN_RELABEL' && ['INBOUND_COMPLETED', 'COMPLETED', 'RECEIVED', 'IN_WAREHOUSE', '已完成入库'].includes(String(row.currentStatusCode || row.status || ''))))
+const returnStatistics = ref<ReturnOrderStatistics>()
+let orderLoadRequest = 0
+function returnDimension(row: { id?: unknown; orderTypeCode?: unknown }) {
+  return row.orderTypeCode === 'RETURN_RELABEL' ? returnStatistics.value?.pageDimensions.find(item => String(item.lastlegOrderId) === String(row.id)) : undefined
+}
 function openReturnPackingPlan() {
   const selected = selectedReturnRows.value
   if (!selected.length) { ElMessage.warning('请勾选已入库的退货订单'); return }
@@ -290,11 +297,17 @@ const columns: DataTableColumn[] = [
   { key: 'containerNo', prop: 'containerNo', label: '集装箱号', minWidth: 150 },
   { key: 'abnormal', prop: 'abnormal', label: '是否异常', width: 100 },
   { key: 'held', prop: 'held', label: '是否暂扣', width: 100 },
-  { key: 'pallets', prop: 'pallets', label: '托数', width: 80, align: 'right' },
-  { key: 'cartons', prop: 'cartons', label: '箱数', width: 80, align: 'right' },
+  { key: 'pallets', prop: 'pallets', label: '托数(退货实收)', width: 130, align: 'right', slotName: 'receiptPallets' },
+  { key: 'cartons', prop: 'cartons', label: '箱数(退货实收)', width: 130, align: 'right', slotName: 'receiptBoxes' },
+  { key: 'returnParcels', label: '退货实收包裹', width: 120, align: 'right', slotName: 'returnParcels' },
+  { key: 'returnExpected', label: '退货预报(件)', width: 120, align: 'right', slotName: 'returnExpected' },
+  { key: 'returnReceived', label: '退货实收(件)', width: 120, align: 'right', slotName: 'returnReceived' },
+  { key: 'returnRemaining', label: '退货待收(件)', width: 120, align: 'right', slotName: 'returnRemaining' },
   { key: 'cartonDifference', prop: 'cartonDifference', label: '差异(箱)', width: 100, align: 'right', slotName: 'cartonDifference' },
   { key: 'volume', prop: 'volume', label: '体积(m³)', width: 100, align: 'right' },
-  { key: 'quantity', prop: 'quantity', label: '数量', width: 80, align: 'right' },
+  { key: 'quantity', prop: 'quantity', label: '数量(非退货)', width: 110, align: 'right', slotName: 'nonReturnQuantity' },
+  { key: 'declaredPieces', prop: 'declaredPieces', label: '转运预报件数', width: 120, align: 'right' },
+  { key: 'receivedPieces', prop: 'receivedPieces', label: '转运实收件数', width: 120, align: 'right' },
   { key: 'volumeWeight', prop: 'volumeWeight', label: '体积重量', width: 100, align: 'right' },
   { key: 'portEta', prop: 'portEta', label: '预计到港时间', minWidth: 150 },
   { key: 'portAta', prop: 'portAta', label: '实际到港时间', minWidth: 150 },
@@ -391,6 +404,8 @@ function orderQuery(): LastMileOrderQuery {
   }
 }
 async function load(model: QueryModel = filters.value) {
+  const request = ++orderLoadRequest
+  returnStatistics.value = undefined
   Object.assign(filters.value, model)
   loading.value = true
   loadError.value = null
@@ -416,17 +431,21 @@ async function load(model: QueryModel = filters.value) {
     return
   }
   try {
-    const result = await listLastMileOrders(orderQuery())
+    const query = orderQuery()
+    const [result, summary] = await Promise.all([listLastMileOrders(query), getReturnOrderStatistics(query)])
+    if (request !== orderLoadRequest) return
     rows.value = result.records.map(toLastMileOrderListItem)
     total.value = result.total
+    returnStatistics.value = summary
   } catch (error) {
+    if (request !== orderLoadRequest) return
     rows.value = []
     total.value = 0
     loadError.value = error instanceof Error && error.message === '当前环境未签发海外访问令牌'
       ? { message: error.message }
       : getApiErrorDetails(error, '尾程订单加载失败，请重试')
   } finally {
-    loading.value = false
+    if (request === orderLoadRequest) loading.value = false
   }
 }
 
@@ -1090,6 +1109,10 @@ onMounted(() => { void load() })
             </el-button>
           </template>
         </QueryToolbar>
+        <TransferQuantitySummary v-if="!loading && statusTab !== '柜子'" :query="orderQuery()" />
+        <div v-if="returnStatistics && !loading" class="return-filter-summary" role="status" aria-label="退货全筛选汇总">
+          当前筛选中的退货：{{ returnStatistics.totals.orderCount }} 票 · {{ returnStatistics.totals.skuTypes }} 种 SKU · 预报 {{ returnStatistics.totals.expectedQuantity }} 件 · 实收 {{ returnStatistics.totals.receivedQuantity }} 件 · 待收 {{ returnStatistics.totals.remainingQuantity }} 件 · 签收 {{ returnStatistics.totals.receivedBoxCount }} 箱 / {{ returnStatistics.totals.receivedParcelCount }} 包裹 / {{ returnStatistics.totals.receivedPalletCount }} 托 · 预报载体数未提供
+        </div>
       </section>
     </template>
       <template #notices><template v-if="loadError">
@@ -1142,7 +1165,14 @@ onMounted(() => { void load() })
       <template #actions="{ row }"><RowActions text-actions :actions="lastMileRowActions(row as LastMileOrderListItem)" :more-label="`更多尾程订单操作 · ${(row as LastMileOrderListItem).orderNo || '当前记录'}`" @action="handleLastMileRowAction($event, row as LastMileOrderListItem)" /></template>
       <template #businessOrderNo="{ row }"><el-button v-if="businessOrderLink(row.businessType, row.businessOrderNo, access.can)" link type="primary" @click="router.push(businessOrderLink(row.businessType, row.businessOrderNo, access.can)!)">{{ row.businessOrderNo }}</el-button><span v-else>{{ row.businessOrderNo }}</span></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>
+      <template #cartonDifference="{ row }"><span :class="{ 'package-difference--nonzero': row.orderTypeCode !== 'RETURN_RELABEL' && typeof row.cartonDifference === 'number' && row.cartonDifference !== 0 }">{{ row.orderTypeCode === 'RETURN_RELABEL' ? '—' : packageDifferenceText(row.cartonDifference) }}</span></template>
+      <template #receiptPallets="{ row }">{{ row.orderTypeCode === 'RETURN_RELABEL' ? returnDimension(row)?.receivedPalletCount ?? '—' : row.pallets }}</template>
+      <template #receiptBoxes="{ row }">{{ row.orderTypeCode === 'RETURN_RELABEL' ? returnDimension(row)?.receivedBoxCount ?? '—' : row.cartons }}</template>
+      <template #returnParcels="{ row }">{{ returnDimension(row)?.receivedParcelCount ?? '—' }}</template>
+      <template #returnExpected="{ row }">{{ returnDimension(row)?.expectedQuantity ?? '—' }}</template>
+      <template #returnReceived="{ row }">{{ returnDimension(row)?.receivedQuantity ?? '—' }}</template>
+      <template #returnRemaining="{ row }">{{ returnDimension(row)?.remainingQuantity ?? '—' }}</template>
+      <template #nonReturnQuantity="{ row }">{{ row.orderTypeCode === 'RETURN_RELABEL' ? '—' : row.quantity }}</template>
       <template #pagination-left>共 {{ total }} 条尾程订单 · 已选 {{ selectedRows.length }} 条</template>
     </DataTable>
   </ListPageLayout></AdminPage>
@@ -1281,6 +1311,8 @@ onMounted(() => { void load() })
 </template>
 
 <style scoped>
+.return-filter-summary { display: flex; flex-wrap: wrap; gap: var(--admin-space-3); padding: var(--admin-space-3) var(--admin-space-5); border: 1px solid var(--cc-border); border-radius: var(--admin-radius); color: var(--cc-text); background: var(--cc-surface); font-size: var(--admin-font-body); }
+.return-filter-summary > span { color: var(--cc-muted); }
 .last-mile-dialog-facts, .last-mile-command-table, .manual-nodes-editor { table-layout: fixed; }
 .last-mile-dialog-facts th { width: var(--admin-label-width); }
 .last-mile-command-table td:not([colspan]) { width: 50%; }