优化

src/modules/inbounds/components/InboundTaskList.vue

@@ -33,6 +33,7 @@ type FilterModel = QueryModel & {
 }
 
 const props = defineProps<{ mode: InboundTaskMode; title?: string }>()
+const emit = defineEmits<{ changed: [] }>()
 const router = useRouter()
 const access = useAccessPreviewStore()
 const page = ref(1)
@@ -216,6 +217,7 @@ function openDetail(row: InboundOrderSummary) {
 }
 
 async function handleTaskChanged() {
+  emit('changed')
   const target = selectedInbound.value
   if (!isReview.value) {
     reviewDialogOpen.value = false
@@ -295,6 +297,7 @@ async function batchApproveMeasurements() {
       }
     }
     await loadTasks()
+    if (successCount) emit('changed')
     const reason = [...new Set(failures.filter(Boolean))].slice(0, 3).join('；')
     const pricingReason = [...new Set(pricingWarnings.filter(Boolean))].slice(0, 3).join('；')
     if (!failureCount && !pricingWarnings.length) ElMessage.success(`已批量审核通过 ${successCount} 条测量数据，费用初算已生成`)

src/modules/overseas-business/CONTRACT_GAPS.md

@@ -6,14 +6,16 @@
 
 - 海外采购：客户候选、采购仓候选、列表、详情操作流水及 `PATCH` 三态编辑；缺失字段不修改，显式 `null` 清空。
 - 采购审核 `review`：采购详情页只对待审核订单和独立审核权限开放，提交订单版本、通过/拒绝决定、稳定幂等键和可选备注。
-- 本土卡车：平台列表、详情、创建和仅待审核状态允许的普通编辑。
+- 本土卡车：平台列表、独立详情页、创建和仅待审核状态允许的普通编辑；详情页使用 `truck:status` 权限接入订单审核、累计实收、超托审核、托盘分配、待派车、已派车、发运、完成及取消。全部命令提交当前版本和稳定幂等键，结果不明时保留原请求供重试；失败保留表单与错误关联信息。
+- 本土卡车拼车来源订单保持承运安排只读，状态随既有来货、排车和签收事实推进；不展示独立单审核或状态命令。
 - 本土散板：独立稳定子域的列表、详情数据承载、创建和仅待接单状态允许的编辑；详情只用于既有编辑页预填，不新增详情路由。
 - canonical 权限统一为 `platform:overseas-business:*`；长整型 ID 与 decimal 字段在适配层归一化。
 
 明确不接入：
 
 - 采购出库不提供独立 `/outbounds` 端点；采购编辑通过出库明细维护出库量并派生待出库、部分出库、全部出库状态，不直接操作海外仓 PDA 可用库存。
-- 卡车状态推进、收托盘和散板状态推进：后端存在，但当前原型没有对应操作承载方式。
+- 散板独立单状态推进：后端存在，但当前原型没有对应操作承载方式。
+- 独立卡车履约记录使用现有卡车接口，不自动生成 WMS 库存、海外仓排车单、出库单或派送单；派车、发运和完成按实际发生情况由平台确认。
 - 海外出库、海外派送和 Merchant API。
 
 剩余验收项仅为真实 Gateway/Token 环境 HTTP 验收及 `1920×1080`、浏览器缩放 `100%` 的人工页面操作和截图确认。

src/modules/overseas-business/PROTOTYPE_MATRIX.md

@@ -29,7 +29,7 @@
 | 本土卡车 | 列表 | `page-overseas-truck` 58–80 行；`renderTruckOrderList()` 13550–13566 行 | 独立列表页 | 正式列表；操作列按根规则移到第一列 |
 | 本土卡车 | 新增 | `page-overseas-truck-add` 83–130 行；`saveTruckOrder()` 13567–13579 行 | 独立页面 | 建立正式新增路由；使用平台创建接口真实提交并显式选择客户 |
 | 本土卡车 | 编辑 | `page-overseas-truck-edit` 313–362 行；`editTruckOrder()`、`saveTruckOrderEdit()` 13630–13674 行 | 独立页面 | 建立正式编辑路由；仅 `PENDING_REVIEW` 可真实提交 |
-| 本土卡车 | 详情 | 列表渲染函数 13563 行仅提示“详情开发中” | 原型未定义 | 不建立详情路由 |
+| 本土卡车 | 详情、审核与后续履约 | 原型未定义；2026-10-20 用户明确要求补齐流程并加审核 | 独立详情页 + 居中操作确认弹框 | 列表待审核单显示审核入口，其他状态可查看详情；独立单使用既有具名命令，按状态与 truck:status 权限展示审核、实收、超托审核、分配、待派车、派车、发运、完成与取消。展示资料、托盘和审核操作历史；拼车来源沿承运安排只读。待人工 1920×1080、100% 截图确认 |
 | 本土散板 | 列表 | `page-overseas-looseboard` 222–244 行；`renderLooseboardList()` 13589–13605 行 | 独立列表页 | 正式列表；操作列按根规则移到第一列 |
 | 本土散板 | 新增 | `page-overseas-looseboard-add` 247–310 行；`saveLooseboardOrder()` 13606–13622 行 | 独立页面 | 建立正式新增路由；使用独立稳定子域真实提交并显式选择客户 |
 | 本土散板 | 编辑 | `page-overseas-looseboard-edit` 365–430 行；`editLooseboardOrder()`、`saveLooseboardOrderEdit()` 13676–13726 行 | 独立页面 | 建立正式编辑路由；仅 `PENDING_ACCEPTANCE` 可真实提交 |

src/modules/overseas-business/api/platformOverseasBusiness.test.ts

@@ -7,10 +7,11 @@ import {
   createLocalLooseboardOrder, createUsTruckOrder, getLocalLooseboardOrder, getOverseasPurchase, getOverseasPurchaseEditor, getUsTruckOrder,
   listLocalLooseboardOrders, listOverseasPurchaseCustomerOptions, listOverseasPurchases,
   listOverseasPurchaseWarehouseOptions, listUsTruckOrders, updateLocalLooseboardOrder, updateOverseasPurchase,
-  updateUsTruckOrder,
+  updateUsTruckOrder, executeUsTruckCommand,
 } from './platformOverseasBusiness'
 import type { UpdateLocalTransportOrderRequest } from '../types'
 import { readPendingProcurement } from '../procurementPending'
+import type { TruckOperation } from '../truckWorkflow'
 
 const envelope = <T>(data: T) => ({ code: '200', message: 'success', data })
 const purchaseSummary = {
@@ -92,7 +93,7 @@ describe('platform overseas business API adapter', () => {
     expect(overseas.patch).toHaveBeenCalledWith('/platform/v1/last-leg/overseas-procurements/OP%2F1', { version: 4, remark: '内部' }, { params: { customerId: '10001' } })
   })
 
-  it('supports platform truck list/detail/create/update without status endpoints', async () => {
+  it('supports platform truck list/detail/create/update', async () => {
     const detail = { summary: truckSummary, pallets: [{ id: '9007199254741001', warehousePalletId: '9007199254741003', palletNo: 'P-1' }], histories: [] }
     overseas.get.mockResolvedValueOnce(envelope({ records: [truckSummary], page: '1', size: '20', total: '1', pages: '1' })).mockResolvedValueOnce(envelope(detail))
     expect((await listUsTruckOrders({ routeKeyword: ' LA ' })).records[0]?.totalWeightKg).toBe('123.45')
@@ -106,6 +107,32 @@ describe('platform overseas business API adapter', () => {
     expect(overseas.patch).toHaveBeenCalledWith('/platform/v1/last-leg/us-truck-orders/TR-1', update, { params: { customerId: '9007199254741999' } })
   })
 
+  it.each<TruckOperation>([
+    { command: 'review', payload: { version: 2, idempotencyKey: 'review-key', decision: 'APPROVE' } },
+    { command: 'review', payload: { version: 2, idempotencyKey: 'reject-key', decision: 'REJECT', remark: '资料不全' } },
+    { command: 'receive-pallets', payload: { version: 2, idempotencyKey: 'receive-key', actualPalletCount: 3, packageCount: 10 } },
+    { command: 'review-pallet-overage', payload: { version: 2, idempotencyKey: 'overage-key', decision: 'APPROVE' } },
+    { command: 'allocate-pallets', payload: { version: 2, idempotencyKey: 'allocate-key', palletIds: ['9007199254741001'] } },
+    ...(['prepare-dispatch', 'dispatch', 'start-transit', 'complete'] as const).map(command => ({ command, payload: { version: 2, idempotencyKey: command } })),
+    { command: 'cancel', payload: { version: 2, idempotencyKey: 'cancel-key', status: 'CANCELLED', remark: '客户取消' } },
+  ])('sends the scoped named truck command $command with version and unchanged replay key', async operation => {
+    const response = envelope({ summary: { ...truckSummary, version: '3', palletCount: '2', packageCount: '10', receivedPalletCount: '1', allocatedPalletCount: '0' }, pallets: [{ id: '9007199254741001', warehousePalletId: null }], histories: [] })
+    overseas.post.mockResolvedValue(response); overseas.patch.mockResolvedValue(response)
+    const result = await executeUsTruckCommand('TR/1', '9007199254741999', operation)
+    const mutation = operation.command === 'cancel' ? overseas.patch : overseas.post
+    expect(mutation).toHaveBeenCalledWith(`/platform/v1/last-leg/us-truck-orders/TR%2F1/${operation.command === 'cancel' ? 'status' : operation.command}`, operation.payload, { params: { customerId: '9007199254741999' } })
+    expect(result).toMatchObject({ version: 3, palletCount: 2, receivedPalletCount: 1, allocatedPalletCount: 0 })
+    expect(result.pallets[0].id).toBe('9007199254741001')
+    expect(operation.command === 'cancel' ? overseas.post : overseas.patch).not.toHaveBeenCalled()
+  })
+
+  it('propagates a truck command version conflict without fallback status writes', async () => {
+    overseas.post.mockResolvedValue({ code: 'A0409', message: '版本冲突', data: null, requestId: 'TRUCK-409' })
+    await expect(executeUsTruckCommand('TR-1', '10002', { command: 'complete', payload: { version: 2, idempotencyKey: 'original' } })).rejects.toMatchObject({ code: 'A0409', requestId: 'TRUCK-409' })
+    expect(overseas.post).toHaveBeenCalledTimes(1)
+    expect(overseas.patch).not.toHaveBeenCalled()
+  })
+
   it('supports looseboard list/detail/create and PUT update', async () => {
     const detail = { summary: looseboardSummary, originAddress: null, destinationAddress: null, remark: null, createdBy: '7', histories: [] }
     overseas.get.mockResolvedValueOnce(envelope({ records: [looseboardSummary], page: 1, size: 20, total: 1, pages: 1 })).mockResolvedValueOnce(envelope(detail))

src/modules/overseas-business/api/platformOverseasBusiness.ts

@@ -1,4 +1,5 @@
 import type { PlatformProcurement } from '../procurementTypes'
+import type { TruckOperation } from '../truckWorkflow'
 import { http, unwrapApiResponse, type ApiEnvelope } from '@/shared/api/http'
 
 import type {
@@ -32,15 +33,15 @@ interface LooseboardDetailPayload {
 function normalizePage<TPayload, TResult>(payload: PagePayload<TPayload>, normalize: (value: TPayload) => TResult): OverseasBusinessPage<TResult> {
   return { records: (payload.records || []).map(normalize), page: Number(payload.page), size: Number(payload.size), total: Number(payload.total), pages: Number(payload.pages) }
 }
-function procurementInteger(value: unknown): number {
+function procurementInteger(value: unknown, business = '采购'): number {
-  if ((typeof value !== 'number' && typeof value !== 'string') || !/^\d+$/.test(String(value)) || !Number.isSafeInteger(Number(value))) throw new Error('采购数据中的数量或版本无效，请刷新后重试')
+  if ((typeof value !== 'number' && typeof value !== 'string') || !/^\d+$/.test(String(value)) || !Number.isSafeInteger(Number(value))) throw new Error(`${business}数据中的数量或版本无效，请刷新后重试`)
   return Number(value)
 }
 function procurementSummary(value: ProcurementSummaryPayload): OverseasPurchaseSummary {
   return { ...value, version: procurementInteger(value.version), purchaseQuantity: procurementInteger(value.purchaseQuantity), id: String(value.id), purchaseWarehouseId: value.purchaseWarehouseId == null ? null : String(value.purchaseWarehouseId), budgetUnitPrice: value.budgetUnitPrice == null ? null : String(value.budgetUnitPrice) }
 }
 function truckSummary(value: TruckSummaryPayload): LocalTransportOrder {
-  return { ...value, id: String(value.id), totalWeightKg: String(value.totalWeightKg), totalVolumeCbm: String(value.totalVolumeCbm), budgetAmount: value.budgetAmount == null ? null : String(value.budgetAmount) }
+  return { ...value, id: String(value.id), customerId: String(value.customerId), version: procurementInteger(value.version, '卡车'), palletCount: procurementInteger(value.palletCount, '卡车'), packageCount: procurementInteger(value.packageCount, '卡车'), receivedPalletCount: procurementInteger(value.receivedPalletCount, '卡车'), allocatedPalletCount: procurementInteger(value.allocatedPalletCount, '卡车'), totalWeightKg: String(value.totalWeightKg), totalVolumeCbm: String(value.totalVolumeCbm), budgetAmount: value.budgetAmount == null ? null : String(value.budgetAmount) }
 }
 function truckDetail(value: TruckDetailPayload): LocalTransportDetail {
   return { ...truckSummary(value.summary), originAddress: value.originAddress || null, destinationAddress: value.destinationAddress || null, remark: value.remark || null, createdBy: value.createdBy || null, pallets: (value.pallets || []).map((item) => ({ ...item, id: String(item.id), warehousePalletId: item.warehousePalletId == null ? null : String(item.warehousePalletId) })), histories: value.histories || [] }
@@ -130,6 +131,14 @@ export async function updateUsTruckOrder(orderNo: string, customerId: string, pa
   const response = await http.patch<ApiEnvelope<TruckDetailPayload>, ApiEnvelope<TruckDetailPayload>>(`${truckBasePath}/${encodeURIComponent(orderNo)}`, payload, { params: { customerId } })
   return truckDetail(unwrapApiResponse(response))
 }
+/** 正向履约使用具名命令，通用状态接口仅用于取消。 */
+export async function executeUsTruckCommand(orderNo: string, customerId: string, operation: TruckOperation) {
+  const path = `${truckBasePath}/${encodeURIComponent(orderNo)}/${operation.command === 'cancel' ? 'status' : operation.command}`
+  const response = operation.command === 'cancel'
+    ? await http.patch<ApiEnvelope<TruckDetailPayload>, ApiEnvelope<TruckDetailPayload>>(path, operation.payload, { params: { customerId } })
+    : await http.post<ApiEnvelope<TruckDetailPayload>, ApiEnvelope<TruckDetailPayload>>(path, operation.payload, { params: { customerId } })
+  return truckDetail(unwrapApiResponse(response))
+}
 export async function listLocalLooseboardOrders(query: LocalLooseboardQuery = {}) {
   const response = await http.get<ApiEnvelope<PagePayload<LooseboardSummaryPayload>>, ApiEnvelope<PagePayload<LooseboardSummaryPayload>>>(looseboardBasePath, { params: { ...query, customerId: query.customerId || undefined, orderNo: query.orderNo?.trim() || undefined, routeKeyword: query.routeKeyword?.trim() || undefined, status: query.status || undefined } })
   return normalizePage(unwrapApiResponse(response), looseboardSummary)

src/modules/overseas-business/components/TruckOrderActions.vue

@@ -0,0 +1,117 @@
+<script setup lang="ts">
+import { computed, reactive, ref, watch } from 'vue'
+import { ElMessage } from 'element-plus'
+import AppDialog from '@/shared/components/AppDialog.vue'
+import ApiErrorMeta from '@/shared/components/ApiErrorMeta.vue'
+import { useAccessPreviewStore } from '@/core/access/accessPreview'
+import { useUnsavedWorkRegistration } from '@/core/unsaved-work/useUnsavedWorkRegistration'
+import { getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
+import { executeUsTruckCommand } from '../api/platformOverseasBusiness'
+import { overseasBusinessPermissions } from '../permissions'
+import { availableTruckCommands, truckCommandHints, truckCommandLabels, type TruckCommand, type TruckOperation } from '../truckWorkflow'
+import type { LocalTransportDetail } from '../types'
+
+const props = defineProps<{ detail: LocalTransportDetail }>()
+const emit = defineEmits<{ updated: [detail: LocalTransportDetail] }>()
+const access = useAccessPreviewStore()
+const commands = computed(() => access.can(overseasBusinessPermissions.truckStatus) ? availableTruckCommands(props.detail) : [])
+const open = ref(false), saving = ref(false)
+const active = ref<TruckCommand | null>(null)
+const error = ref<ApiErrorDetails | null>(null), validationError = ref('')
+// 响应丢失时保留原命令、版本和幂等键，重试不得变更请求内容。
+const pending = ref<TruckOperation | null>(null)
+const form = reactive({ decision: 'APPROVE' as 'APPROVE' | 'REJECT', actualPalletCount: 1, packageCount: undefined as number | undefined, palletIds: [] as string[], remark: '' })
+const selectablePallets = computed(() => props.detail.pallets.filter(pallet => pallet.status === 'RECEIVED'))
+const review = computed(() => active.value === 'review' || active.value === 'review-pallet-overage')
+const { captureBaseline } = useUnsavedWorkRegistration({ key: 'truck-order-command', label: computed(() => active.value ? truckCommandLabels[active.value] : '卡车单据操作'), isOpen: open, model: form, requiredPermission: computed(() => overseasBusinessPermissions.truckStatus) })
+
+watch(() => [props.detail.customerId, props.detail.orderNo, props.detail.version], () => {
+  pending.value = null; open.value = false; active.value = null; error.value = null
+})
+
+function start(command: TruckCommand) {
+  if (saving.value || !commands.value.includes(command)) return
+  if (pending.value) {
+    active.value = pending.value.command; open.value = true
+    return
+  }
+  active.value = command; error.value = null; validationError.value = ''
+  Object.assign(form, { decision: 'APPROVE', actualPalletCount: Math.max(1, props.detail.receivedPalletCount), packageCount: undefined, palletIds: [], remark: '' })
+  open.value = true; captureBaseline()
+}
+
+function buildOperation(): TruckOperation | null {
+  if (!active.value) return null
+  const base = { version: props.detail.version, idempotencyKey: crypto.randomUUID(), remark: form.remark.trim() || undefined }
+  if ((active.value === 'cancel' || (review.value && form.decision === 'REJECT')) && !base.remark) {
+    validationError.value = '请填写拒绝或取消原因'; return null
+  }
+  switch (active.value) {
+    case 'review': case 'review-pallet-overage': return { command: active.value, payload: { ...base, decision: form.decision } }
+    case 'receive-pallets':
+      if (!Number.isSafeInteger(form.actualPalletCount) || form.actualPalletCount < Math.max(1, props.detail.receivedPalletCount)) {
+        validationError.value = '累计实收托数须为正整数，且不能少于已实收托数'; return null
+      }
+      if (form.packageCount != null && (!Number.isSafeInteger(form.packageCount) || form.packageCount < 0)) {
+        validationError.value = '实收件数须为非负整数'; return null
+      }
+      return { command: active.value, payload: { ...base, actualPalletCount: form.actualPalletCount, ...(form.packageCount == null ? {} : { packageCount: form.packageCount }) } }
+    case 'allocate-pallets':
+      if (!form.palletIds.length || form.palletIds.some(id => !selectablePallets.value.some(pallet => pallet.id === id))) {
+        validationError.value = '请至少选择一个已实收且未分配的托盘'; return null
+      }
+      return { command: active.value, payload: { ...base, palletIds: [...form.palletIds] } }
+    case 'cancel': return { command: active.value, payload: { ...base, status: 'CANCELLED' } }
+    default: return { command: active.value, payload: base }
+  }
+}
+
+async function submit() {
+  if (saving.value || !active.value || !commands.value.includes(active.value)) return
+  validationError.value = ''; error.value = null
+  const operation = pending.value ?? buildOperation()
+  if (!operation) return
+  pending.value = operation; saving.value = true
+  const customerId = props.detail.customerId, orderNo = props.detail.orderNo
+  try {
+    const updated = await executeUsTruckCommand(orderNo, customerId, operation)
+    if (props.detail.customerId !== customerId || props.detail.orderNo !== orderNo) return
+    pending.value = null; open.value = false; captureBaseline()
+    ElMessage.success(`${truckCommandLabels[operation.command]}成功`)
+    emit('updated', updated)
+  } catch (cause) {
+    if (props.detail.customerId === customerId && props.detail.orderNo === orderNo) error.value = getApiErrorDetails(cause, '操作未确认成功，请重试或刷新订单核对最新记录')
+  } finally { saving.value = false }
+}
+</script>
+
+<template>
+  <div v-if="commands.length" class="truck-order-actions">
+    <el-button v-for="command in commands" :key="command" :type="command === 'cancel' ? 'danger' : 'primary'" :plain="command === 'cancel'" :disabled="saving" @click="start(command)">{{ truckCommandLabels[command] }}</el-button>
+    <p v-if="pending && !open" role="status">上次操作尚未确认结果，请重新打开重试，或刷新订单核对最新记录。</p>
+  </div>
+  <AppDialog v-model="open" class="admin-density-dialog" :title="active ? truckCommandLabels[active] : '单据操作'" width="680px" :confirm-text="pending ? '重试原操作' : '确认提交'" :confirm-type="active === 'cancel' || (review && form.decision === 'REJECT') ? 'danger' : 'primary'" :confirm-loading="saving" :confirm-disabled="!active || !commands.includes(active)" @confirm="submit">
+    <template v-if="active">
+      <p>{{ detail.orderNo }} · {{ truckCommandHints[active] }}</p>
+      <el-alert v-if="validationError" :title="validationError" type="warning" :closable="false" role="alert" />
+      <div v-if="error" role="alert"><el-alert :title="error.message" type="error" :closable="false" /><ApiErrorMeta :details="error" /><p>可重试原操作；如提示版本冲突，请关闭弹框并刷新订单，核对最新状态及操作记录。</p></div>
+      <el-form :model="form" label-width="130px" :disabled="saving || !!pending" @submit.prevent="submit">
+        <el-form-item v-if="review" label="审核结果"><el-radio-group v-model="form.decision"><el-radio value="APPROVE">通过</el-radio><el-radio value="REJECT">拒绝</el-radio></el-radio-group></el-form-item>
+        <template v-if="active === 'receive-pallets'">
+          <el-form-item label="累计实收托数" required><el-input-number v-model="form.actualPalletCount" :min="Math.max(1, detail.receivedPalletCount)" :precision="0" /></el-form-item>
+          <el-form-item label="实收件数"><el-input-number v-model="form.packageCount" :min="0" :precision="0" placeholder="选填" /></el-form-item>
+        </template>
+        <el-form-item v-if="active === 'allocate-pallets'" label="分配托盘" required>
+          <el-checkbox-group v-model="form.palletIds"><el-checkbox v-for="pallet in selectablePallets" :key="pallet.id" :value="pallet.id">{{ pallet.palletNo }}（{{ pallet.packageCount ?? '未登记' }} 件）</el-checkbox></el-checkbox-group>
+          <p v-if="!selectablePallets.length">暂无可分配托盘，请刷新核对实收记录。</p>
+        </el-form-item>
+        <el-form-item :label="review ? '审核意见' : '操作说明'" :required="active === 'cancel' || (review && form.decision === 'REJECT')"><el-input v-model="form.remark" type="textarea" :rows="3" maxlength="1000" show-word-limit /></el-form-item>
+      </el-form>
+    </template>
+  </AppDialog>
+</template>
+
+<style scoped>
+.truck-order-actions { display: flex; align-items: center; flex-wrap: wrap; gap: 8px; }
+.truck-order-actions p { flex-basis: 100%; margin: 0; color: var(--cc-muted); }
+</style>

src/modules/overseas-business/pages/TransportOrdersView.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import '@/styles/adminDensity.css'
 import { inquiryReturnTarget, TransportRouteDialog, routeLocation, type RouteLocation } from '@/modules/overseas-master-data'
-import { computed, onMounted, ref, watch } from 'vue'
+import { computed, onActivated, onMounted, ref, watch } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import { Plus } from '@lucide/vue'
 import AdminPage from '@/shared/components/AdminPage.vue'
@@ -11,6 +11,8 @@ 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 AppDialog from '@/shared/components/AppDialog.vue'
+import RowActions, { type RowActionItem } from '@/shared/components/RowActions.vue'
+import { truckStatusLabels } from '../truckWorkflow'
 import FleetArrangementSummary from '../components/FleetArrangementSummary.vue'
 import { poolOrderStatusLabels, type FleetArrangement } from '../fleetArrangement'
 import { getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
@@ -37,7 +39,6 @@ const page = ref(1); const pageSize = ref(20); const total = ref(0)
 const arrangementOpen = ref(false), arrangement = ref<FleetArrangement | null>(null)
 function showArrangement(row: LocalTransportOrder | LocalLooseboardOrder) { arrangement.value = row.fleetArrangement; arrangementOpen.value = true }
 const filters = ref<QueryModel>({ orderNo: String(route.query.orderNo || ''), status: '', routeKeyword: '' }); const applied = ref({ ...filters.value })
-const truckStatusLabels: Record<LocalTransportStatus, string> = { PENDING_REVIEW: '待审核', WAITING_INBOUND: '待入仓', RECEIVING: '收货中', WAITING_CONSOLIDATION: '待合托', PALLET_OVERAGE_REVIEW: '超托待审', PARTIALLY_ALLOCATED: '部分分配', ALLOCATED: '已分配', PENDING_DISPATCH: '待派车', DISPATCHED: '已派车', IN_TRANSIT: '运输中', COMPLETED: '已完成', REJECTED: '已拒绝', CANCELLED: '已取消' }
 const looseboardStatusLabels: Record<LocalLooseboardStatus, string> = { PENDING_ACCEPTANCE: '待接单', WAITING_INBOUND: '待入仓', RECEIVING: '收货中', WAITING_CONSOLIDATION: '待合托', PENDING_DISPATCH: '待派车', DISPATCHED: '已派车', IN_TRANSIT: '运输中', COMPLETED: '已完成', CANCELLED: '已取消', ...poolOrderStatusLabels }
 const transportTypeLabels: Record<LocalTransportType, string> = { PORT_PICKUP: '港口提柜', WAREHOUSE_TO_WAREHOUSE: '仓到仓', WAREHOUSE_TO_DOOR: '仓到门' }
 const fields = computed<QueryField[]>(() => [
@@ -46,7 +47,7 @@ const fields = computed<QueryField[]>(() => [
   { key: 'routeKeyword', type: 'input', label: '运输路线', placeholder: '起运地/目的地', width: 240 },
 ])
 const truckColumns: DataTableColumn[] = [
-  { key: 'actions', label: '操作', width: 110, fixed: 'left', slotName: 'actions' }, { key: 'orderNo', prop: 'orderNo', label: '订单编号', minWidth: 170 },
+  { key: 'actions', label: '操作', width: 220, fixed: 'left', slotName: 'actions' }, { key: 'orderNo', prop: 'orderNo', label: '订单编号', minWidth: 170 },
   { key: 'vehicleType', label: '车辆类型', minWidth: 110, formatter: (row: LocalTransportOrder) => row.vehicleType ? ({ PALLET_15: '15拖', PALLET_30: '30拖' })[row.vehicleType] : '—' },
   { key: 'origin', prop: 'origin', label: '起运地', minWidth: 145 }, { key: 'destination', prop: 'destination', label: '目的地', minWidth: 145 },
   { key: 'originContactName', prop: 'originContactName', label: '起运地联系人', minWidth: 125 }, { key: 'originContactPhone', prop: 'originContactPhone', label: '起运地联系电话', minWidth: 155 },
@@ -97,6 +98,20 @@ function search(model: QueryModel) { applied.value = { ...model }; if (page.valu
 function openCreate() { void router.push({ name: isLooseboard.value ? 'overseas-business-looseboard-new' : 'overseas-business-truck-new' }) }
 function canEdit(row: LocalTransportOrder | LocalLooseboardOrder) { return !row.fleetArrangement && (isLooseboard.value ? row.status === 'PENDING_ACCEPTANCE' : row.status === 'PENDING_REVIEW') }
 function openEdit(row: LocalTransportOrder | LocalLooseboardOrder) { if (!canEdit(row)) return; void router.push({ name: isLooseboard.value ? 'overseas-business-looseboard-edit' : 'overseas-business-truck-edit', params: { orderId: row.orderNo }, query: { customerId: row.customerId } }) }
+function truckActions(row: LocalTransportOrder): RowActionItem[] {
+  return [
+    { key: 'detail', label: row.status === 'PENDING_REVIEW' && !row.fleetArrangement && access.can(overseasBusinessPermissions.truckStatus) ? '审核' : '详情', priority: 10 },
+    { key: 'edit', label: '编辑', visible: !row.fleetArrangement && access.can(editPermission.value), disabled: !canEdit(row) },
+    { key: 'arrangement', label: '承运安排', visible: !!row.fleetArrangement },
+  ]
+}
+function handleTruckAction(key: string, row: LocalTransportOrder) {
+  if (key === 'edit') openEdit(row)
+  else if (key === 'arrangement') showArrangement(row)
+  else if (key === 'detail') void router.push({ name: 'overseas-business-truck-detail', params: { orderId: row.orderNo }, query: { customerId: row.customerId } })
+}
+let activatedOnce = false
+onActivated(() => { if (activatedOnce) void load(); else activatedOnce = true })
 watch([page, pageSize], () => { void load() }); watch([isLooseboard, () => route.query.orderNo], () => { page.value = 1; applied.value = { orderNo: String(route.query.orderNo || ''), status: '', routeKeyword: '' }; filters.value = { ...applied.value }; void load() }); onMounted(() => { void load() })
 </script>
 
@@ -111,7 +126,7 @@ watch([page, pageSize], () => { void load() }); watch([isLooseboard, () => route
 
 
       <template #toolbar-actions><el-button v-if="access.can(createPermission)" type="primary" @click="openCreate"><Plus :size="16" />新增订单</el-button></template>
-      <template #actions="{ row }"><div class="row-actions density-actions admin-text-actions"><el-button v-if="row.fleetArrangement" class="density-action" @click="showArrangement(row as LocalTransportOrder | LocalLooseboardOrder)">承运安排</el-button><el-tooltip v-if="!row.fleetArrangement && access.can(editPermission)" :disabled="canEdit(row as LocalTransportOrder | LocalLooseboardOrder)" content="当前状态不可编辑"><span><el-button class="density-action" data-tone="neutral" size="small" :disabled="!canEdit(row as LocalTransportOrder | LocalLooseboardOrder)" @click="openEdit(row as LocalTransportOrder | LocalLooseboardOrder)">编辑</el-button></span></el-tooltip></div></template>
+      <template #actions="{ row }"><RowActions v-if="!isLooseboard" :actions="truckActions(row as LocalTransportOrder)" text-actions @action="handleTruckAction($event, row as LocalTransportOrder)" /><div v-else class="row-actions density-actions admin-text-actions"><el-button v-if="row.fleetArrangement" class="density-action" @click="showArrangement(row as LocalTransportOrder | LocalLooseboardOrder)">承运安排</el-button><el-tooltip v-if="!row.fleetArrangement && access.can(editPermission)" :disabled="canEdit(row as LocalTransportOrder | LocalLooseboardOrder)" content="当前状态不可编辑"><span><el-button class="density-action" data-tone="neutral" size="small" :disabled="!canEdit(row as LocalTransportOrder | LocalLooseboardOrder)" @click="openEdit(row as LocalTransportOrder | LocalLooseboardOrder)">编辑</el-button></span></el-tooltip></div></template>
       <template #pagination-left>共 {{ total }} 条{{ domainLabel }}订单</template>
       <template #routeMap="{ row }"><el-button v-if="row.orderNo" link type="primary" @click="openRoute(row as LocalLooseboardOrder)">查看路线</el-button></template>
     </DataTable></section>

src/modules/overseas-business/pages/TruckOrderDetailView.test.ts

@@ -0,0 +1,194 @@
+import ElementPlus from 'element-plus'
+import { createPinia, setActivePinia } from 'pinia'
+import { enableAutoUnmount, flushPromises, mount, type VueWrapper } from '@vue/test-utils'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { useAuthStore } from '@/core/auth/auth'
+import { useAccessPreviewStore } from '@/core/access/accessPreview'
+import { ApiResponseError } from '@/shared/api/http'
+import AppDialog from '@/shared/components/AppDialog.vue'
+import TruckOrderActions from '../components/TruckOrderActions.vue'
+import { executeUsTruckCommand, getUsTruckOrder } from '../api/platformOverseasBusiness'
+import { overseasBusinessPermissions as permissions } from '../permissions'
+import type { LocalTransportDetail } from '../types'
+import TruckOrderDetailView from './TruckOrderDetailView.vue'
+
+const routing = vi.hoisted(() => ({ push: vi.fn(), route: { params: { orderId: 'TR-TEST' }, query: { customerId: '9007199254741999' } as Record<string, string> } }))
+vi.mock('vue-router', () => ({ useRoute: () => routing.route, useRouter: () => ({ push: routing.push }) }))
+vi.mock('../api/platformOverseasBusiness', () => ({ getUsTruckOrder: vi.fn(), executeUsTruckCommand: vi.fn() }))
+vi.mock('@/core/unsaved-work/useUnsavedWorkRegistration', () => ({ useUnsavedWorkRegistration: () => ({ captureBaseline: vi.fn() }) }))
+
+function order(overrides: Partial<LocalTransportDetail> = {}): LocalTransportDetail {
+  return {
+    id: '9007199254741001', orderNo: 'TR-TEST', customerId: '9007199254741999', fleetArrangement: null,
+    vehicleType: 'PALLET_15', origin: 'LA', originAddress: '起运仓地址', destination: 'ONT', destinationAddress: '目的仓地址',
+    originContactName: '发货人', originContactPhone: '10001', destinationContactName: '收货人', destinationContactPhone: '10002',
+    pickupAt: '2026-10-20T09:30:00', deliveryAt: '2026-10-20T15:45:00',
+    palletCount: 0, receivedPalletCount: 0, allocatedPalletCount: 0, shippedPalletCount: 0, packageCount: 20,
+    totalWeightKg: '100', totalVolumeCbm: '2', budgetAmount: '500', currency: 'USD',
+    status: 'PENDING_REVIEW', version: 1, remark: '运输备注', createdBy: '7', createdAt: '2026-10-20T08:00:00', updatedAt: '2026-10-20T08:00:00',
+    pallets: [], histories: [], ...overrides,
+  }
+}
+function mountDetail(manage = true) {
+  const pinia = createPinia(); setActivePinia(pinia)
+  const auth = useAuthStore(); auth.token = 'test-token'; auth.user = { id: '7', name: '操作员', account: 'tester', roles: [] }
+  auth.permissions = [permissions.truckList, ...(manage ? [permissions.truckStatus] : [])]
+  useAccessPreviewStore().initializeAfterLogin()
+  return mount(TruckOrderDetailView, { global: { plugins: [pinia, ElementPlus], stubs: { teleport: true } } })
+}
+async function click(wrapper: VueWrapper, label: string) {
+  const button = wrapper.findAll('button').find(item => item.text() === label)
+  expect(button, `button ${label}`).toBeDefined()
+  await button!.trigger('click'); await flushPromises()
+}
+async function confirm(wrapper: VueWrapper) {
+  wrapper.findComponent(AppDialog).vm.$emit('confirm'); await flushPromises()
+}
+const formModel = (wrapper: VueWrapper) => wrapper.findComponent(TruckOrderActions).findComponent({ name: 'ElForm' }).props('model')
+
+enableAutoUnmount(afterEach)
+beforeEach(() => {
+  vi.clearAllMocks()
+  vi.stubGlobal('ResizeObserver', class { observe() {} unobserve() {} disconnect() {} })
+  routing.route.params = { orderId: 'TR-TEST' }; routing.route.query = { customerId: '9007199254741999' }
+  vi.mocked(getUsTruckOrder).mockResolvedValue(order())
+})
+afterEach(() => vi.unstubAllGlobals())
+
+describe('truck review and fulfillment', () => {
+  it('loads customer scoped documents and runs review through receipt, allocation and delivery completion', async () => {
+    let current = order()
+    vi.mocked(executeUsTruckCommand).mockImplementation(async (_no, _customer, operation) => {
+      const next = { ...current, version: current.version + 1 }
+      switch (operation.command) {
+        case 'review': next.status = 'WAITING_INBOUND'; break
+        case 'receive-pallets':
+          next.status = 'WAITING_CONSOLIDATION'; next.palletCount = 2; next.receivedPalletCount = 2
+          next.pallets = [1, 2].map(sequenceNo => ({ id: `900719925474100${sequenceNo}`, sequenceNo, palletNo: `P-${sequenceNo}`, source: 'PDA_RECEIPT', status: 'RECEIVED', warehousePalletId: null, packageCount: 10, receivedAt: '2026-10-20T10:00:00' }))
+          break
+        case 'allocate-pallets': next.status = 'ALLOCATED'; next.allocatedPalletCount = 2; next.pallets = next.pallets.map(row => ({ ...row, status: 'ALLOCATED' })); break
+        case 'prepare-dispatch': next.status = 'PENDING_DISPATCH'; break
+        case 'dispatch': next.status = 'DISPATCHED'; break
+        case 'start-transit': next.status = 'IN_TRANSIT'; break
+        case 'complete': next.status = 'COMPLETED'; break
+      }
+      next.histories = [...current.histories, { operationType: operation.command === 'review' ? 'REVIEW' : operation.command.toUpperCase().replaceAll('-', '_'), fromStatus: current.status, toStatus: next.status, operatorId: '操作员7', remark: operation.payload.remark || null, createdAt: '2026-10-20T10:00:00' }]
+      current = next; return next
+    })
+    const wrapper = mountDetail(); await flushPromises()
+    expect(getUsTruckOrder).toHaveBeenCalledWith('TR-TEST', '9007199254741999')
+    expect(wrapper.text()).toContain('起运仓地址'); expect(wrapper.text()).toContain('审核与操作记录')
+    await click(wrapper, '审核'); formModel(wrapper).remark = '资料核对通过'; await confirm(wrapper)
+    expect(wrapper.text()).toContain('登记实收'); expect(wrapper.text()).toContain('资料核对通过')
+    await click(wrapper, '登记实收'); Object.assign(formModel(wrapper), { actualPalletCount: 2, packageCount: 20 }); await confirm(wrapper)
+    await click(wrapper, '分配托盘'); formModel(wrapper).palletIds = current.pallets.map(row => row.id); await confirm(wrapper)
+    for (const label of ['确认待派车', '确认已派车', '确认发运', '确认完成']) { await click(wrapper, label); await confirm(wrapper) }
+    expect(wrapper.findComponent(TruckOrderActions).findAll('button')).toHaveLength(0)
+    expect(current.status).toBe('COMPLETED')
+    expect(vi.mocked(executeUsTruckCommand).mock.calls.map(call => call[2].payload.version)).toEqual([1, 2, 3, 4, 5, 6, 7])
+    expect(vi.mocked(executeUsTruckCommand).mock.calls[2][2]).toMatchObject({ command: 'allocate-pallets', payload: { palletIds: ['9007199254741001', '9007199254741002'] } })
+  })
+
+  it('requires a rejection reason and displays the resulting rejected state', async () => {
+    const wrapper = mountDetail(); await flushPromises(); await click(wrapper, '审核')
+    formModel(wrapper).decision = 'REJECT'; await confirm(wrapper)
+    expect(executeUsTruckCommand).not.toHaveBeenCalled(); expect(wrapper.text()).toContain('请填写拒绝或取消原因')
+    formModel(wrapper).remark = '取送时间需重新确认'
+    vi.mocked(executeUsTruckCommand).mockResolvedValue(order({ status: 'REJECTED', version: 2 }))
+    await confirm(wrapper)
+    expect(executeUsTruckCommand).toHaveBeenCalledWith('TR-TEST', '9007199254741999', expect.objectContaining({ command: 'review', payload: expect.objectContaining({ decision: 'REJECT', remark: '取送时间需重新确认', version: 1 }) }))
+    expect(wrapper.findComponent(TruckOrderActions).findAll('button')).toHaveLength(0)
+  })
+
+  it('preserves one immutable request and retries it after an ambiguous failure, then refreshes the detail', async () => {
+    vi.mocked(executeUsTruckCommand).mockRejectedValueOnce(new ApiResponseError('订单版本冲突', 'A0409', 409, 'TRUCK-409')).mockResolvedValueOnce(order({ status: 'WAITING_INBOUND', version: 2 }))
+    const wrapper = mountDetail(); await flushPromises(); await click(wrapper, '审核')
+    formModel(wrapper).remark = '核对完成'; await confirm(wrapper)
+    expect(wrapper.text()).toContain('订单版本冲突')
+    expect(wrapper.findComponent({ name: 'ElForm' }).props('disabled')).toBe(true)
+    const original = structuredClone(vi.mocked(executeUsTruckCommand).mock.calls[0][2])
+    wrapper.findComponent(AppDialog).vm.$emit('update:modelValue', false); await flushPromises()
+    await click(wrapper, '审核'); await confirm(wrapper)
+    expect(vi.mocked(executeUsTruckCommand).mock.calls[1][2]).toEqual(original)
+    expect(wrapper.text()).toContain('登记实收')
+  })
+
+  it('locks duplicate submission until the original response arrives', async () => {
+    let finish!: (value: LocalTransportDetail) => void
+    vi.mocked(executeUsTruckCommand).mockImplementation(() => new Promise(resolve => { finish = resolve }))
+    const wrapper = mountDetail(); await flushPromises(); await click(wrapper, '审核'); await confirm(wrapper); await confirm(wrapper)
+    expect(executeUsTruckCommand).toHaveBeenCalledTimes(1)
+    expect(wrapper.findComponent(AppDialog).props('confirmLoading')).toBe(true)
+    finish(order({ status: 'WAITING_INBOUND', version: 2 })); await flushPromises()
+    expect(wrapper.text()).toContain('登记实收')
+  })
+
+  it('validates cumulative receipt totals without submitting invalid input', async () => {
+    vi.mocked(getUsTruckOrder).mockResolvedValue(order({ status: 'RECEIVING', palletCount: 3, receivedPalletCount: 2 }))
+    const wrapper = mountDetail(); await flushPromises(); await click(wrapper, '登记实收')
+    formModel(wrapper).actualPalletCount = 1; await confirm(wrapper)
+    expect(executeUsTruckCommand).not.toHaveBeenCalled(); expect(wrapper.text()).toContain('不能少于已实收托数')
+    Object.assign(formModel(wrapper), { actualPalletCount: 3, packageCount: -1 }); await confirm(wrapper)
+    expect(executeUsTruckCommand).not.toHaveBeenCalled()
+  })
+
+  it('requires received pallets and permits partial allocation using their string IDs', async () => {
+    const pallet = { id: '9007199254741007', sequenceNo: 1, palletNo: 'P-1', source: 'PDA_RECEIPT', status: 'RECEIVED', warehousePalletId: null, packageCount: 10, receivedAt: null }
+    vi.mocked(getUsTruckOrder).mockResolvedValue(order({ status: 'WAITING_CONSOLIDATION', palletCount: 2, receivedPalletCount: 2, pallets: [pallet] }))
+    const wrapper = mountDetail(); await flushPromises(); await click(wrapper, '分配托盘'); await confirm(wrapper)
+    expect(executeUsTruckCommand).not.toHaveBeenCalled()
+    formModel(wrapper).palletIds = [pallet.id]
+    vi.mocked(executeUsTruckCommand).mockResolvedValue(order({ status: 'PARTIALLY_ALLOCATED', version: 2, allocatedPalletCount: 1, pallets: [{ ...pallet, status: 'ALLOCATED' }] }))
+    await confirm(wrapper)
+    expect(wrapper.text()).toContain('部分分配'); expect(wrapper.text()).not.toContain('确认待派车')
+    expect(executeUsTruckCommand).toHaveBeenCalledWith('TR-TEST', '9007199254741999', expect.objectContaining({ command: 'allocate-pallets', payload: expect.objectContaining({ palletIds: [pallet.id] }) }))
+  })
+
+  it.each(['APPROVE', 'REJECT'] as const)('reviews pallet overage with %s', async decision => {
+    vi.mocked(getUsTruckOrder).mockResolvedValue(order({ status: 'PALLET_OVERAGE_REVIEW', palletCount: 2, receivedPalletCount: 3 }))
+    vi.mocked(executeUsTruckCommand).mockResolvedValue(order({ status: 'WAITING_CONSOLIDATION', version: 2 }))
+    const wrapper = mountDetail(); await flushPromises(); await click(wrapper, '超托审核')
+    Object.assign(formModel(wrapper), { decision, remark: '已核对超收货物' }); await confirm(wrapper)
+    expect(executeUsTruckCommand).toHaveBeenCalledWith('TR-TEST', '9007199254741999', expect.objectContaining({ command: 'review-pallet-overage', payload: expect.objectContaining({ decision }) }))
+  })
+
+  it('requires cancellation reason and submits only the cancellation status', async () => {
+    const wrapper = mountDetail(); await flushPromises(); await click(wrapper, '取消订单'); await confirm(wrapper)
+    expect(executeUsTruckCommand).not.toHaveBeenCalled()
+    formModel(wrapper).remark = '客户取消需求'; vi.mocked(executeUsTruckCommand).mockResolvedValue(order({ status: 'CANCELLED', version: 2 })); await confirm(wrapper)
+    expect(executeUsTruckCommand).toHaveBeenCalledWith('TR-TEST', '9007199254741999', expect.objectContaining({ command: 'cancel', payload: expect.objectContaining({ status: 'CANCELLED', remark: '客户取消需求' }) }))
+  })
+
+  it('keeps list-only users read-only and guards direct attempts to emit submit', async () => {
+    const wrapper = mountDetail(false); await flushPromises()
+    expect(wrapper.findComponent(TruckOrderActions).findAll('button')).toHaveLength(0)
+    wrapper.findComponent(AppDialog).vm.$emit('confirm'); await flushPromises()
+    expect(executeUsTruckCommand).not.toHaveBeenCalled()
+  })
+
+  it('keeps pool sourced orders on the existing fleet fulfillment path', async () => {
+    vi.mocked(getUsTruckOrder).mockResolvedValue(order({ fleetArrangement: {
+      sourceType: 'FLEET_CAPACITY_OFFER', businessType: 'US_TRUCK', businessOrderNo: 'TR-TEST', bookingNo: 'FB-TEST', tripNo: 'TRIP-TEST',
+      plannedDepartureAt: null, originWarehouseName: 'LA', destinationLabel: 'ONT', deliveryMode: 'SELF_DELIVERY', deliveryInstructions: null,
+      fulfillmentStage: 'WAITING_INBOUND', stageOccurredAt: null, agreedFreightAmount: null, currency: 'USD', incomingNo: null, dispatchNo: null,
+      deliveryNo: null, signedPackages: null, unsignedPackages: null, returnedPackages: null, exceptionSummary: null, readOnlyReason: '按拼车承运实际履约推进',
+    } }))
+    const wrapper = mountDetail(); await flushPromises()
+    expect(wrapper.text()).toContain('按拼车承运实际履约推进')
+    expect(wrapper.findComponent(TruckOrderActions).exists()).toBe(false)
+    expect(executeUsTruckCommand).not.toHaveBeenCalled()
+  })
+
+  it('shows a scoped error without requesting detail when customer is missing', async () => {
+    routing.route.query = {}; const wrapper = mountDetail(); await flushPromises()
+    expect(getUsTruckOrder).not.toHaveBeenCalled(); expect(wrapper.text()).toContain('缺少有效客户或订单信息')
+  })
+
+  it('retains error metadata and retries a failed detail read', async () => {
+    vi.mocked(getUsTruckOrder).mockRejectedValueOnce(new ApiResponseError('读取失败', 'A0409', 409, 'DETAIL-409')).mockResolvedValueOnce(order())
+    const wrapper = mountDetail(); await flushPromises()
+    expect(wrapper.text()).toContain('读取失败'); expect(wrapper.text()).toContain('DETAIL-409')
+    await wrapper.findComponent({ name: 'LoadErrorState' }).vm.$emit('retry'); await flushPromises()
+    expect(wrapper.text()).toContain('TR-TEST'); expect(wrapper.text()).toContain('审核与操作记录')
+  })
+})

src/modules/overseas-business/pages/TruckOrderDetailView.vue

@@ -0,0 +1,86 @@
+<script setup lang="ts">
+import '@/styles/adminDensity.css'
+import { computed, ref, watch } from 'vue'
+import { useRoute, useRouter } from 'vue-router'
+import { ArrowLeft } from '@lucide/vue'
+import AdminPage from '@/shared/components/AdminPage.vue'
+import DetailPageLayout from '@/shared/components/DetailPageLayout.vue'
+import DataTable, { type DataTableColumn } from '@/shared/components/DataTable.vue'
+import ApiErrorMeta from '@/shared/components/ApiErrorMeta.vue'
+import LoadErrorState from '@/shared/components/LoadErrorState.vue'
+import { getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
+import { getUsTruckOrder } from '../api/platformOverseasBusiness'
+import FleetArrangementSummary from '../components/FleetArrangementSummary.vue'
+import TruckOrderActions from '../components/TruckOrderActions.vue'
+import { truckStatusLabels } from '../truckWorkflow'
+import type { LocalTransportDetail, LocalTransportPallet, OverseasBusinessHistory } from '../types'
+
+const route = useRoute(), router = useRouter()
+const orderNo = computed(() => typeof route.params.orderId === 'string' ? route.params.orderId : '')
+const customerId = computed(() => typeof route.query.customerId === 'string' ? route.query.customerId : '')
+const detail = ref<LocalTransportDetail | null>(null), loading = ref(false)
+const error = ref<ApiErrorDetails | null>(null)
+let requestSequence = 0
+const dateTime = (value: string | null | undefined) => value ? value.replace('T', ' ').slice(0, 16) : '—'
+const statusLabel = (value: string | null) => value ? truckStatusLabels[value as keyof typeof truckStatusLabels] || value : '—'
+const fields = computed(() => detail.value ? [
+  ['客户编号', detail.value.customerId], ['车辆类型', detail.value.vehicleType ? ({ PALLET_15: '15拖', PALLET_30: '30拖' })[detail.value.vehicleType] : '—'],
+  ['起运地', detail.value.origin], ['起运地详细地址', detail.value.originAddress], ['起运地联系人', detail.value.originContactName], ['起运地联系电话', detail.value.originContactPhone],
+  ['目的地', detail.value.destination], ['目的地详细地址', detail.value.destinationAddress], ['目的地联系人', detail.value.destinationContactName], ['目的地联系电话', detail.value.destinationContactPhone],
+  ['取货时间', dateTime(detail.value.pickupAt)], ['送货时间', dateTime(detail.value.deliveryAt)],
+  ['申报件数', detail.value.packageCount], ['总重量（kg）', detail.value.totalWeightKg], ['总体积（m³）', detail.value.totalVolumeCbm],
+  ['预算总价', detail.value.budgetAmount == null ? '—' : `${detail.value.budgetAmount} ${detail.value.currency}`],
+  ['已确认托数', detail.value.palletCount], ['累计实收托数', detail.value.receivedPalletCount], ['已分配托数', detail.value.allocatedPalletCount],
+  ['创建时间', dateTime(detail.value.createdAt)], ['备注', detail.value.remark],
+] : [])
+const palletLabels: Record<string, string> = { PLANNED: '待实收', RECEIVED: '已实收', ALLOCATED: '已分配', OVERAGE_PENDING_REVIEW: '超托待审', OVERAGE_REJECTED: '超托拒收' }
+const palletColumns: DataTableColumn[] = [
+  { key: 'palletNo', prop: 'palletNo', label: '托盘编号', minWidth: 180 },
+  { key: 'status', label: '状态', width: 130, formatter: (row: LocalTransportPallet) => palletLabels[row.status] || row.status },
+  { key: 'packageCount', prop: 'packageCount', label: '实收件数', width: 120 },
+  { key: 'receivedAt', label: '实收时间', minWidth: 170, formatter: (row: LocalTransportPallet) => dateTime(row.receivedAt) },
+]
+const operations: Record<string, string> = { CREATE: '创建', UPDATE: '编辑', REVIEW: '订单审核', RECEIVE_PALLETS: '登记实收', REVIEW_PALLET_OVERAGE: '超托审核', ALLOCATE_PALLETS: '分配托盘', PREPARE_DISPATCH: '确认待派车', DISPATCH: '确认已派车', START_TRANSIT: '确认发运', COMPLETE: '确认完成', CANCEL: '取消订单' }
+const historyColumns: DataTableColumn[] = [
+  { key: 'createdAt', label: '操作时间', minWidth: 170, formatter: (row: OverseasBusinessHistory) => dateTime(row.createdAt) },
+  { key: 'operationType', label: '操作', minWidth: 130, formatter: (row: OverseasBusinessHistory) => operations[row.operationType || ''] || row.operationType || '—' },
+  { key: 'fromStatus', label: '原状态', width: 130, formatter: (row: OverseasBusinessHistory) => statusLabel(row.fromStatus) },
+  { key: 'toStatus', label: '新状态', width: 130, formatter: (row: OverseasBusinessHistory) => statusLabel(row.toStatus) },
+  { key: 'operatorId', prop: 'operatorId', label: '操作人', minWidth: 140 }, { key: 'remark', prop: 'remark', label: '审核意见／操作说明', minWidth: 240 },
+]
+async function load() {
+  const sequence = ++requestSequence
+  detail.value = null; error.value = null
+  if (!orderNo.value || !customerId.value || customerId.value === '0') {
+    loading.value = false; error.value = { message: '缺少有效客户或订单信息，请返回本土卡车列表重新打开' }; return
+  }
+  loading.value = true
+  try { const result = await getUsTruckOrder(orderNo.value, customerId.value); if (sequence === requestSequence) detail.value = result }
+  catch (cause) { if (sequence === requestSequence) error.value = getApiErrorDetails(cause, '本土卡车订单加载失败，请稍后重试') }
+  finally { if (sequence === requestSequence) loading.value = false }
+}
+watch([orderNo, customerId], load, { immediate: true })
+</script>
+
+<template>
+  <AdminPage class="admin-density"><DetailPageLayout aria-label="本土卡车订单详情">
+    <template #header><div class="truck-detail-header"><el-button @click="router.push({ name: 'overseas-business-trucks' })"><ArrowLeft :size="16" />返回列表</el-button><h1>本土卡车订单 {{ detail?.orderNo || orderNo }}</h1></div></template>
+    <LoadErrorState v-if="error" title="本土卡车订单暂时无法加载" :message="error.message" :loading="loading" @retry="load"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState>
+    <el-skeleton v-else-if="loading" :rows="8" animated />
+    <template v-else-if="detail">
+      <section class="truck-detail-section"><div class="truck-detail-header"><h2>{{ statusLabel(detail.status) }}</h2><el-button @click="load">刷新订单</el-button></div>
+        <FleetArrangementSummary v-if="detail.fleetArrangement" :arrangement="detail.fleetArrangement" />
+        <template v-else><p>审核通过 → 实收托盘 → 分配托盘 → 待派车 → 已派车 → 运输中 → 完成</p><TruckOrderActions :detail="detail" @updated="detail = $event" /></template>
+      </section>
+      <section class="truck-detail-section"><h2>订单资料</h2><el-descriptions :column="3" border><el-descriptions-item v-for="[label, value] in fields" :key="String(label)" :label="String(label)">{{ value ?? '—' }}</el-descriptions-item></el-descriptions></section>
+      <section class="truck-detail-section"><h2>托盘记录</h2><DataTable :data="detail.pallets" :columns="palletColumns" empty-text="暂无托盘记录，独立订单首次实收后生成托盘" /></section>
+      <section class="truck-detail-section"><h2>审核与操作记录</h2><DataTable :data="detail.histories" :columns="historyColumns" empty-text="暂无操作记录" /></section>
+    </template>
+  </DetailPageLayout></AdminPage>
+</template>
+
+<style scoped>
+.truck-detail-header { display: flex; align-items: center; gap: 12px; flex-wrap: wrap; }
+.truck-detail-header h1, .truck-detail-header h2 { margin: 0; }
+.truck-detail-section { margin-bottom: 16px; }
+</style>

src/modules/overseas-business/routes.test.ts

@@ -10,6 +10,7 @@ describe('overseas business routes', () => {
       ['overseas-business/purchases/:purchaseId/edit', permission.purchaseEdit],
       ['overseas-business/trucks', permission.truckList],
       ['overseas-business/trucks/new', permission.truckCreate],
+      ['overseas-business/trucks/:orderId', permission.truckList],
       ['overseas-business/trucks/:orderId/edit', permission.truckEdit],
       ['overseas-business/looseboards', permission.looseboardList],
       ['overseas-business/looseboards/new', permission.looseboardCreate],
@@ -17,10 +18,10 @@ describe('overseas business routes', () => {
     ])
   })
 
-  it('does not invent excluded create or detail routes', () => {
+  it('adds the requested truck detail without opening unrelated routes', () => {
     const paths = overseasBusinessRoutes.map((route) => route.path)
     expect(paths).not.toContain('overseas-business/purchases/new')
-    expect(paths).not.toContain('overseas-business/trucks/:orderId')
+    expect(paths).toContain('overseas-business/trucks/:orderId')
     expect(paths).not.toContain('overseas-business/looseboards/:orderId')
     expect(JSON.stringify(overseasBusinessRoutes)).not.toContain('permissionAnyOf')
   })

src/modules/overseas-business/routes.ts

@@ -34,6 +34,12 @@ export const overseasBusinessRoutes = [
     props: { domain: 'truck' },
     meta: { title: '新增本土卡车订单', description: '创建海外本土卡车订单', permission: permission.truckCreate, showPageHeading: false },
   },
+  {
+    path: 'overseas-business/trucks/:orderId',
+    name: 'overseas-business-truck-detail',
+    component: () => import('./pages/TruckOrderDetailView.vue'),
+    meta: { title: '本土卡车订单详情', description: '审核及处理本土卡车订单', permission: permission.truckList, showPageHeading: false },
+  },
   {
     path: 'overseas-business/trucks/:orderId/edit',
     name: 'overseas-business-truck-edit',

src/modules/overseas-business/truckWorkflow.ts

@@ -0,0 +1,46 @@
+import type { LocalTransportDetail, LocalTransportStatus } from './types'
+
+export const truckStatusLabels: Record<LocalTransportStatus, string> = {
+  PENDING_REVIEW: '待审核', WAITING_INBOUND: '待入仓', RECEIVING: '收货中', WAITING_CONSOLIDATION: '待合托',
+  PALLET_OVERAGE_REVIEW: '超托待审', PARTIALLY_ALLOCATED: '部分分配', ALLOCATED: '已分配',
+  PENDING_DISPATCH: '待派车', DISPATCHED: '已派车', IN_TRANSIT: '运输中', COMPLETED: '已完成', REJECTED: '已拒绝', CANCELLED: '已取消',
+}
+export const truckCommandLabels = {
+  review: '审核', 'receive-pallets': '登记实收', 'review-pallet-overage': '超托审核', 'allocate-pallets': '分配托盘',
+  'prepare-dispatch': '确认待派车', dispatch: '确认已派车', 'start-transit': '确认发运', complete: '确认完成', cancel: '取消订单',
+} as const
+export type TruckCommand = keyof typeof truckCommandLabels
+export interface TruckCommandBase { version: number; idempotencyKey: string; remark?: string }
+export type TruckOperation =
+  | { command: 'review' | 'review-pallet-overage'; payload: TruckCommandBase & { decision: 'APPROVE' | 'REJECT' } }
+  | { command: 'receive-pallets'; payload: TruckCommandBase & { actualPalletCount: number; packageCount?: number; palletPackageCounts?: number[] } }
+  | { command: 'allocate-pallets'; payload: TruckCommandBase & { palletIds: string[] } }
+  | { command: 'prepare-dispatch' | 'dispatch' | 'start-transit' | 'complete'; payload: TruckCommandBase }
+  | { command: 'cancel'; payload: TruckCommandBase & { status: 'CANCELLED' } }
+
+const nextCommands: Partial<Record<LocalTransportStatus, TruckCommand>> = {
+  PENDING_REVIEW: 'review', WAITING_INBOUND: 'receive-pallets', RECEIVING: 'receive-pallets',
+  PALLET_OVERAGE_REVIEW: 'review-pallet-overage', WAITING_CONSOLIDATION: 'allocate-pallets',
+  PARTIALLY_ALLOCATED: 'allocate-pallets', ALLOCATED: 'prepare-dispatch', PENDING_DISPATCH: 'dispatch',
+  DISPATCHED: 'start-transit', IN_TRANSIT: 'complete',
+}
+const cancellable = new Set<LocalTransportStatus>(['PENDING_REVIEW', 'WAITING_INBOUND', 'RECEIVING', 'PALLET_OVERAGE_REVIEW', 'WAITING_CONSOLIDATION', 'PARTIALLY_ALLOCATED', 'ALLOCATED', 'PENDING_DISPATCH'])
+
+/** 拼车来源只读，独立单据只能执行当前状态对应的具名命令。 */
+export function availableTruckCommands(order: Pick<LocalTransportDetail, 'status' | 'fleetArrangement'>): TruckCommand[] {
+  if (order.fleetArrangement) return []
+  const next = nextCommands[order.status]
+  return [...(next ? [next] : []), ...(cancellable.has(order.status) ? ['cancel' as const] : [])]
+}
+
+export const truckCommandHints: Record<TruckCommand, string> = {
+  review: '请核对车型、路线、两端联系信息、取送时间和货物资料。通过后进入待入仓，拒绝后结束本次申请。',
+  'receive-pallets': '按实际收货填写截至本次的累计实收托数。首次实收确定本单托数，后续超出已确认托数需要超托审核。',
+  'review-pallet-overage': '通过后将超收托盘纳入本单；拒绝后将超收托盘标记为拒收，按原已确认托数继续。',
+  'allocate-pallets': '选择本单已实收且未分配的托盘，可分批分配；全部已接收托盘分配完成后才能进入待派车。',
+  'prepare-dispatch': '确认全部已接收托盘已分配完成，将本单交由调度安排车辆。',
+  dispatch: '请在车辆安排已实际完成后确认，本单将进入已派车。',
+  'start-transit': '请在车辆已实际发运后确认，本单将进入运输中。',
+  complete: '请在运输及交付已实际完成后确认。确认完成后不能撤回。',
+  cancel: '取消后本单不能继续履约，请填写取消原因并核对已有收货和托盘记录。',
+}

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

@@ -3,7 +3,12 @@ import { normalizeOverseasPage, type OverseasPagePayload } from './lastMileOrder
 
 export interface CargoDiscardQuery { page: number; size: number; customerId?: string; discardNo?: string; inboundCode?: string; overseasWarehouseId?: string; status?: string }
 export interface CargoDiscardSummary { id: string; customerId?: string | null; discardNo: string; outboundNo?: string | null; inboundCodes?: string | null; overseasWarehouseId?: string | null; overseasWarehouseName?: string | null; totalPackages?: number | null; totalFee?: number | string | null; currency?: string | null; status?: string | null; createdBy?: string | null; createdAt?: string | null; reviewedAt?: string | null }
-export interface CargoDiscardItem { cartonMarks?: string[]; id: string; orderId?: string | null; inboundCode?: string | null; skuCode?: string | null; productName?: string | null; availablePackagesSnapshot?: number | null; discardPackages?: number | null }
+export interface CargoDiscardItem { quantityUnit?: string | null; actualDiscardPackages?: number | null; pdaStatus?: string | null; cartonMarks?: string[]; id: string; orderId?: string | null; inboundCode?: string | null; skuCode?: string | null; productName?: string | null; availablePackagesSnapshot?: number | null; discardPackages?: number | null }
+export interface CargoDiscardStatistics { orderCount: number; skuCount: number; requestedPackages: number; actualPackages: number | null; requestedPieces: number | null; actualPieces: number | null; palletCount: number | null }
+export async function getCargoDiscardStatistics(query: CargoDiscardQuery) {
+  const response = await http.get<ApiEnvelope<CargoDiscardStatistics>, ApiEnvelope<CargoDiscardStatistics>>('/platform/v1/last-leg/cargo-discards/statistics', { params: query })
+  return unwrapApiResponse(response)
+}
 export interface CargoDiscardPhoto { fileId: string; palletNo: string; fileName: string; createdAt: string; submittedAt: string }
 export interface CargoDiscardDetail { photos: CargoDiscardPhoto[]; summary: CargoDiscardSummary; feePerPackage?: number | string | null; remark?: string | null; reviewedBy?: string | null; reviewRemark?: string | null; items: CargoDiscardItem[]; histories: { fromStatus?: string | null; toStatus?: string | null; operatorId?: string | null; remark?: string | null; createdAt?: string | null }[] }
 export interface CargoDiscardCandidate { orderId?: string | null; sourceType: string; returnCartonId?: string | null; cartonMark?: string | null; inboundCode?: string | null; inboundOrderNo?: string | null; overseasWarehouseId?: string | null; overseasWarehouseName?: string | null; availablePackages?: number; skus: { skuCode: string; productName?: string | null; availablePackages?: number }[] }

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

@@ -52,6 +52,7 @@ export interface RelabelWarehouseOptionDto {
 }
 
 export interface RelabelSummaryDto {
+  operationTypes?: Array<'CARTON_LABEL' | 'SKU_LABEL' | 'CARTON_AND_SKU' | 'RETURN_BULK_SKU_LABEL'>
   id: string
   relabelNo: string
   lastlegOrderId?: string | null
@@ -93,7 +94,7 @@ export interface RelabelSummaryDto {
 
 export interface RelabelItemDto {
   id: string
-  operationType?: 'CARTON_LABEL' | 'SKU_LABEL' | 'CARTON_AND_SKU'
+  operationType?: 'CARTON_LABEL' | 'SKU_LABEL' | 'CARTON_AND_SKU' | 'RETURN_BULK_SKU_LABEL'
   skuItems?: Array<{ skuCode: string; newSkuCode: string; quantity: number; remark?: string }>
   skuCode?: string | null
   productNameZh?: string | null
@@ -129,6 +130,30 @@ export interface RelabelDetailDto {
   completionEvidence?: { taskId: string; photoFileIds: string[]; completionRemark?: string | null; reviewerName?: string | null; reviewRemark?: string | null; completedAt?: string | null } | null
 }
 
+export interface RelabelQuantity {
+  labelPieceCount: number | null
+  cartonCount: number | null
+  skuCount: number
+  duplicateCarton: boolean
+  quantityUnit: string
+  sourcePalletCount: number | null
+  targetPalletCount: number | null
+}
+export interface RelabelQuantityTotals {
+  orderCount: number
+  skuCount: number
+  knownLabelPieceCount: number
+  unknownPieceOrders: number
+  knownCartonCount: number
+  unknownCartonOrders: number
+  orders: Record<string, RelabelQuantity>
+}
+/** 汇总同一筛选下全部单据，不以当前页合计代替。 */
+export async function getRelabelQuantities(query: RelabelOrderQuery) {
+  const response = await http.get<ApiEnvelope<RelabelQuantityTotals>, ApiEnvelope<RelabelQuantityTotals>>('/platform/v1/last-leg/relabel-applications/quantity-summary', { params: query })
+  return unwrapApiResponse(response)
+}
+
 export interface ReturnPackingPlanBoxItem {
   skuCode: string
   quantity: number
@@ -233,8 +258,14 @@ export async function changeRelabelOrderStatus(relabelNo: string, status: string
   return unwrapApiResponse(response)
 }
 
+export interface RelabelReviewTask {
+  version: number
+  taskStatus: string
+  items?: Array<{ sourcePalletCode?: string | null; sourcePalletBasis?: string }>
+  history?: Array<{ action: string; detail?: string }>
+}
 export async function getRelabelReviewTask(relabelNo: string) {
-  const response = await http.get<ApiEnvelope<{ version: number; taskStatus: string }>, ApiEnvelope<{ version: number; taskStatus: string }>>(`/platform/v1/last-leg/relabel-applications/${encodeURIComponent(relabelNo)}/review-task`)
+  const response = await http.get<ApiEnvelope<RelabelReviewTask>, ApiEnvelope<RelabelReviewTask>>(`/platform/v1/last-leg/relabel-applications/${encodeURIComponent(relabelNo)}/review-task`)
   return unwrapApiResponse(response)
 }
 

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

@@ -5,10 +5,11 @@ import { normalizeOverseasPage, type OverseasPagePayload } from './lastMileOrder
 export interface ReturnStockRow { customerId: string; overseasWarehouseId: string; skuCode: string; productNameZh?: string; totalQuantity: number; availableQuantity: number; relabelLockedQuantity: number; looseAvailableQuantity?: number; cartonQuantity: number; updatedAt: string }
 export interface ReturnCartonRow { customerId: string; overseasWarehouseId: string; cartonMark: string; sourceReturnNo?: string; sourceUnitType?: 'PALLET' | 'BOX' | 'PARCEL' | string; sourceBatchNo?: string; status: string; fbaCartonMark?: string; destinationWarehouseCode?: string; destinationWarehouseName?: string; relabelNo?: string; relabelStatus?: string; relabelledQuantity?: number; relabelReservedQuantity?: number; skuTypes: number; totalQuantity: number; length?: number; width?: number; height?: number; weight?: number; createdAt: string }
 export interface ReturnCartonMergeHistory { planNo?: string; sourceCartonMark: string; targetCartonMark: string; returnNo: string; skuCode: string; quantity: number; createdAt: string }
-export interface ReturnCartonDetail extends ReturnCartonRow { customerId: string; items: Array<{ skuCode: string; productNameZh?: string; quantity: number; availableQuantity?: number }>; mergeHistory?: ReturnCartonMergeHistory[] }
+export interface ReturnCartonDiscardHistory { discardNo: string; skuCode: string; productNameZh?: string; beforeQuantity: number; quantity: number; afterQuantity: number; operatorId?: string; occurredAt: string }
+export interface ReturnCartonDetail extends ReturnCartonRow { customerId: string; items: Array<{ skuCode: string; productNameZh?: string; quantity: number; availableQuantity?: number }>; mergeHistory?: ReturnCartonMergeHistory[]; discardHistory?: ReturnCartonDiscardHistory[] }
 export interface ReturnCartonLabel extends ReturnCartonDetail { printableHtml: string }
 export interface ReturnPackingSource { cartonMark: string; sourceReturnNo?: string; sourceUnitType?: string; items: ReturnCartonDetail['items'] }
-export interface ReturnInventoryMovement { customerId: string; overseasWarehouseId: string; skuCode: string; productNameZh?: string; movementType: 'RECEIPT' | 'MERGE' | 'OUTBOUND'; referenceNo: string; totalDelta: number; availableDelta: number; occurredAt: string }
+export interface ReturnInventoryMovement { customerId: string; overseasWarehouseId: string; skuCode: string; productNameZh?: string; movementType: 'RECEIPT' | 'MERGE' | 'OUTBOUND' | 'DISCARD'; referenceNo: string; totalDelta: number; availableDelta: number; occurredAt: string }
 export interface ReturnInventoryQuery { page: number; size: number; customerId?: string; overseasWarehouseId?: string; skuCode?: string; cartonMark?: string; returnNo?: string; status?: string }
 
 export async function listReturnStock(params: ReturnInventoryQuery) { const response = await http.get<ApiEnvelope<OverseasPagePayload<ReturnStockRow>>, ApiEnvelope<OverseasPagePayload<ReturnStockRow>>>('/platform/v1/last-leg/return-inventory', { params }); return normalizeOverseasPage(unwrapApiResponse(response)) }

src/modules/overseas-warehouse/components/WarehouseTransferReceiptPanel.test.ts

@@ -30,6 +30,19 @@ function fixture(): WarehouseTransferDetailDto {
 beforeEach(() => { vi.mocked(getWarehouseTransfer).mockReset(); vi.mocked(getWarehouseTransferCartonLabel).mockReset() })
 afterEach(() => vi.restoreAllMocks())
 describe('转运预报与实际签收明细', () => {
+  it('keeps historical receipt totals after discard or shipment and leaves unknown declaration differences blank', async () => {
+    const value = fixture()
+    value.items[0]!.quantity = null
+    value.cartons[0]!.status = 'DISCARD_PENDING'
+    value.cartons[1]!.status = 'SHIPPED'
+    value.cartons[2]!.status = 'DISCARDED'
+    vi.mocked(getWarehouseTransfer).mockResolvedValue(value)
+    const wrapper = render(); await flushPromises()
+    expect(wrapper.emitted('summary')!.at(-1)![0]).toMatchObject({ boxes: 3, quantity: 27, skus: 2, forecastQuantity: null })
+    const rows = wrapper.findAllComponents(DataTableStub)[0]!.props('data')
+    expect(rows[0]).toMatchObject({ receivedQuantity: 20, receivedBoxes: 2, quantityDifference: null })
+    expect(wrapper.findAll('.test-table')[0]!.text()).toContain('未记录')
+  })
   it('shows every SKU in a mixed box and counts its physical measurements once', async () => {
     const value = fixture()
     value.cartons = [{ ...value.cartons[0]!, quantity: 10, items: [{ transferItemId: '10', skuCode: 'SKU-A', quantity: 3 }, { transferItemId: '20', skuCode: 'SKU-B', quantity: 7 }] }]

src/modules/overseas-warehouse/components/WarehouseTransferReceiptPanel.vue

@@ -46,7 +46,8 @@ const cartonsOpen = ref(false)
 let generation = 0
 // 同一完成原因保存于箱记录，去重后在尾程详情直接展示。
 const discrepancyReasons = computed(() => [...new Set((detail.value?.cartons || []).map(box => box.discrepancyReason?.trim()).filter((reason): reason is string => Boolean(reason)))])
-const cartons = computed(() => (detail.value?.cartons || []).filter(box => box.status === 'COUNTED'))
+// 已签收是历史事实，后续废弃占用、废弃或出库不能从实收汇总中移除。
+const cartons = computed(() => (detail.value?.cartons || []).filter(box => ['COUNTED', 'DISCARD_PENDING', 'DISCARDED', 'SHIPPED'].includes(box.status)))
 function itemFor(box: WarehouseTransferCartonDto) { return detail.value?.items.find(item => box.transferItemId != null && String(item.id) === String(box.transferItemId)) }
 function boxLines(box: WarehouseTransferCartonDto) {
   if (box.items?.length) return box.items
@@ -64,9 +65,10 @@ watch([detail, totals], () => emit('summary', detail.value ? { ...totals.value,
 const comparisonRows = computed(() => (detail.value?.items || []).map(item => {
   const boxes = cartons.value.filter(box => boxLines(box).some(line => String(line.transferItemId) === String(item.id)))
   const receivedQuantity = boxes.reduce((sum, box) => sum + boxLines(box).filter(line => String(line.transferItemId) === String(item.id)).reduce((total, line) => total + Number(line.quantity), 0), 0)
-  return { ...item, receivedQuantity, receivedBoxes: boxes.length, quantityDifference: receivedQuantity - Number(item.quantity || 0), boxDifference: boxes.length - Number(item.packageCount || 0) }
+  return { ...item, receivedQuantity, receivedBoxes: boxes.length, quantityDifference: item.quantity == null ? null : receivedQuantity - Number(item.quantity), boxDifference: boxes.length - Number(item.packageCount || 0) }
 }))
 function differenceText(value: unknown) {
+  if (value == null) return '未记录'
   if (!cartons.value.length) return '待签收'
   const difference = Number(value)
   return difference > 0 ? `+${difference}` : String(difference)

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

@@ -9,13 +9,16 @@ import QueryToolbar, { type QueryField, type QueryModel } from '@/shared/compone
 import StatusBadge from '@/shared/components/StatusBadge.vue'
 import AppDialog from '@/shared/components/AppDialog.vue'
 import { getApiErrorDetails } from '@/shared/api/http'
-import { downloadCargoDiscardPhoto, listCargoDiscards, getCargoDiscard, reviewCargoDiscard, type CargoDiscardDetail, type CargoDiscardSummary } from '../api/cargoDiscards'
+import { downloadCargoDiscardPhoto, listCargoDiscards, getCargoDiscard, reviewCargoDiscard, getCargoDiscardStatistics, type CargoDiscardStatistics, type CargoDiscardDetail, type CargoDiscardSummary } from '../api/cargoDiscards'
 import { listPlatformTenants, type PlatformTenantResource } from '@/modules/iam'
 import { overseasWarehousePermissions as permission } from '../permissions'
 import { useAccessPreviewStore } from '@/core/access/accessPreview'
 const access = useAccessPreviewStore(); const rows = ref<CargoDiscardSummary[]>([]); const customers = ref<PlatformTenantResource[]>([]); const page = ref(1); const pageSize = ref(10); const total = ref(0); const loading = ref(false); const detailOpen = ref(false); const detail = ref<CargoDiscardDetail | null>(null); const filters = ref<QueryModel>({ customerId: '', discardNo: '', inboundCode: '', status: '' })
+const statistics = ref<CargoDiscardStatistics | null>(null)
+/** 数量事实缺失时明确提示，不用零代替未记录。 */
+function quantity(value: number | null | undefined, unit: string) { return value == null ? '未记录 / 不适用' : `${value} ${unit}` }
 const fields: QueryField[] = [{ key: 'customerId', type: 'select', label: '客户', placeholder: '请选择客户', options: [] }, { key: 'discardNo', type: 'input', label: '废弃单号', placeholder: '废弃单号', width: 220 }, { key: 'inboundCode', type: 'input', label: '入仓码', placeholder: '请输入入仓码', width: 180 }, { key: 'status', type: 'select', label: '状态', placeholder: '全部状态', options: [{ label: '待审核', value: 'PENDING_REVIEW' }, { label: '已审核', value: 'APPROVED' }, { label: '待客户确认', value: 'PDA_COMPLETED' }, { label: '已完成', value: 'COMPLETED' }, { label: '已驳回', value: 'REJECTED' }, { label: '已取消', value: 'CANCELLED' }] }]
-const columns: DataTableColumn[] = [{ key: 'actions', label: '操作', width: 140, fixed: 'left', slotName: 'actions' }, { key: 'discardNo', label: '废弃单号', minWidth: 180 }, { key: 'inboundCodes', label: '入仓码', minWidth: 180 }, { key: 'overseasWarehouseName', label: '仓库', minWidth: 140 }, { key: 'totalPackages', label: '总箱数', width: 90 }, { key: 'totalFee', label: '废弃费用', width: 120, formatter: (row: CargoDiscardSummary) => `${row.currency || 'USD'} ${row.totalFee ?? 0}` }, { key: 'createdBy', label: '申请人', width: 110 }, { key: 'createdAt', label: '创建时间', minWidth: 170 }, { key: 'status', label: '状态', width: 150, slotName: 'status' }]
+const columns: DataTableColumn[] = [{ key: 'actions', label: '操作', width: 140, fixed: 'left', slotName: 'actions' }, { key: 'discardNo', label: '废弃单号', minWidth: 180 }, { key: 'inboundCodes', label: '入仓码', minWidth: 180 }, { key: 'overseasWarehouseName', label: '仓库', minWidth: 140 }, { key: 'totalPackages', label: '申请箱数', width: 90 }, { key: 'totalFee', label: '废弃费用', width: 120, formatter: (row: CargoDiscardSummary) => `${row.currency || 'USD'} ${row.totalFee ?? 0}` }, { key: 'createdBy', label: '申请人', width: 110 }, { key: 'createdAt', label: '创建时间', minWidth: 170 }, { key: 'status', label: '状态', width: 150, slotName: 'status' }]
 const statusLabels: Record<string, string> = { PENDING_REVIEW: '待审核', APPROVED: '已审核，待 PDA', PDA_COMPLETED: 'PDA 已完成，待客户确认', COMPLETED: '已完成', REJECTED: '已驳回', CANCELLED: '已取消' }
 const photoUrls = reactive<Record<string, string>>({}); const photoLoading = reactive<Record<string, boolean>>({}); const photoErrors = reactive<Record<string, boolean>>({})
 const photoPreviewUrls = computed(() => (detail.value?.photos || []).map(photo => photoUrls[photo.fileId]).filter(Boolean))
@@ -32,14 +35,16 @@ async function loadPhoto(fileId: string) {
 watch(detailOpen, value => { if (!value) clearPhotos() })
 onBeforeUnmount(clearPhotos)
 function text(key: string) { return String(filters.value[key] || '').trim() || undefined }
-async function load(model: QueryModel = filters.value) { Object.assign(filters.value, model); loading.value = true; try { const result = await listCargoDiscards({ page: page.value, size: pageSize.value, customerId: text('customerId'), discardNo: text('discardNo'), inboundCode: text('inboundCode'), status: text('status') }); rows.value = result.records; total.value = result.total } catch (e) { ElMessage.error(getApiErrorDetails(e, '废弃单列表加载失败').message) } finally { loading.value = false } }
+/** 同一筛选读取分页与全量统计，失败时清除旧数据，避免陈旧合计。 */
+let loadGeneration = 0
+async function load(model: QueryModel = filters.value) { const generation = ++loadGeneration; Object.assign(filters.value, model); loading.value = true; try { const query = { page: page.value, size: pageSize.value, customerId: text('customerId'), discardNo: text('discardNo'), inboundCode: text('inboundCode'), status: text('status') }; const [result, summary] = await Promise.all([listCargoDiscards(query), getCargoDiscardStatistics(query)]); if (generation !== loadGeneration) return; rows.value = result.records; total.value = result.total; statistics.value = summary } catch (e) { if (generation !== loadGeneration) return; rows.value = []; total.value = 0; statistics.value = null; ElMessage.error(getApiErrorDetails(e, '废弃单列表加载失败').message) } finally { if (generation === loadGeneration) loading.value = false } }
 async function openDetail(row: CargoDiscardSummary) { try { detail.value = await getCargoDiscard(row.discardNo, row.customerId || undefined); detailOpen.value = true; clearPhotos(); void Promise.all(detail.value.photos.map(photo => loadPhoto(photo.fileId))) } catch (e) { ElMessage.error(getApiErrorDetails(e, '废弃单详情加载失败').message) } }
 async function audit(row: CargoDiscardSummary) { try { await ElMessageBox.confirm('审核通过后将推送 PDA 执行废弃，确认继续？', '审核确认', { confirmButtonText: '通过并推送 PDA', cancelButtonText: '取消' }); await reviewCargoDiscard(row.discardNo, 'APPROVE', undefined, row.customerId || undefined); ElMessage.success('已审核通过并推送 PDA'); await load() } catch (e) { if (e !== 'cancel') ElMessage.error(getApiErrorDetails(e, '审核失败').message) } }
 onMounted(async () => { try { const result = await listPlatformTenants({ page: 1, size: 200, status: 'ACTIVE' }); customers.value = result.records; const field = fields[0]; if (field.type === 'select') field.options = [{ label: '全部客户', value: '' }, ...customers.value.map(item => ({ label: item.tenantName, value: String(item.id) }))]; await load() } catch (e) { ElMessage.error(getApiErrorDetails(e, '客户列表加载失败').message) } })
 </script>
 <template>
-<AdminPage class="admin-density"><ListPageLayout aria-label="废弃单列表"><section><DataTable appearance="integrated" :stripe="false" :data="rows" :columns="columns" :loading="loading" :total="total" v-model:page="page" v-model:page-size="pageSize" preference-key="overseas-cargo-discards" row-key="id" empty-text="暂无废弃单" @update:page="load()" @update:page-size="page = 1; load()"><template #toolbar-start><h1>废弃单</h1></template><template #filters><QueryToolbar ariaLabel="废弃单筛选" v-model="filters" :fields="fields" :loading="loading" preference-key="overseas-cargo-discards-query" @search="page = 1; load($event)" @reset="page = 1; load($event)" /></template><template #actions="{ row }"><el-button size="small" @click="openDetail(row as CargoDiscardSummary)">详情</el-button><el-button v-if="access.can(permission.discardApprove) && (row as CargoDiscardSummary).status === 'PENDING_REVIEW'" size="small" type="primary" @click="audit(row as CargoDiscardSummary)">审核并推送 PDA</el-button></template><template #status="{ row }"><StatusBadge :status="statusLabels[String((row as CargoDiscardSummary).status)] || String((row as CargoDiscardSummary).status)" /></template><template #pagination-left>共 {{ total }} 条废弃单</template></DataTable></section></ListPageLayout></AdminPage>
+<AdminPage class="admin-density"><ListPageLayout aria-label="废弃单列表"><section><DataTable appearance="integrated" :stripe="false" :data="rows" :columns="columns" :loading="loading" :total="total" v-model:page="page" v-model:page-size="pageSize" preference-key="overseas-cargo-discards" row-key="id" empty-text="暂无废弃单" @update:page="load()" @update:page-size="page = 1; load()"><template #toolbar-start><h1>废弃单</h1></template><template #filters><QueryToolbar ariaLabel="废弃单筛选" v-model="filters" :fields="fields" :loading="loading" preference-key="overseas-cargo-discards-query" @search="page = 1; load($event)" @reset="page = 1; load($event)" /></template><template #actions="{ row }"><el-button size="small" @click="openDetail(row as CargoDiscardSummary)">详情</el-button><el-button v-if="access.can(permission.discardApprove) && (row as CargoDiscardSummary).status === 'PENDING_REVIEW'" size="small" type="primary" @click="audit(row as CargoDiscardSummary)">审核并推送 PDA</el-button></template><template #status="{ row }"><StatusBadge :status="statusLabels[String((row as CargoDiscardSummary).status)] || String((row as CargoDiscardSummary).status)" /></template><template #pagination-left><span v-if="statistics">全筛选：{{ statistics.orderCount }} 票 · {{ statistics.skuCount }} 种 SKU · 申请 {{ statistics.requestedPackages }} 箱 · 已确认实际 {{ quantity(statistics.actualPackages, '箱') }} · 商品 {{ quantity(statistics.requestedPieces, '个') }} · 托盘 {{ quantity(statistics.palletCount, '托盘') }}</span><span v-else>统计未加载</span></template></DataTable></section></ListPageLayout></AdminPage>
-<AppDialog v-model="detailOpen" title="废弃单详情" :show-confirm="false" cancel-text="关闭" width="min(920px, calc(100vw - 28px))"><template v-if="detail"><el-descriptions :column="3" border><el-descriptions-item label="废弃单号">{{ detail.summary.discardNo }}</el-descriptions-item><el-descriptions-item label="出库单号">{{ detail.summary.outboundNo || '—' }}</el-descriptions-item><el-descriptions-item label="状态">{{ statusLabels[String(detail.summary.status)] }}</el-descriptions-item><el-descriptions-item label="仓库">{{ detail.summary.overseasWarehouseName || '—' }}</el-descriptions-item><el-descriptions-item label="入仓码" :span="2">{{ detail.summary.inboundCodes || '—' }}</el-descriptions-item><el-descriptions-item label="备注">{{ detail.remark || '—' }}</el-descriptions-item></el-descriptions><h3>废弃明细</h3><el-table :data="detail.items" border><el-table-column prop="inboundCode" label="入仓码"/><el-table-column prop="skuCode" label="SKU"/><el-table-column prop="productName" label="品名"/><el-table-column prop="discardPackages" label="申请数量" width="100"/><el-table-column label="所选箱唛" min-width="180"><template #default="{ row }">{{ row.cartonMarks?.join('、') || '全部库存（历史记录无箱唛快照）' }}</template></el-table-column></el-table><h3>废弃现场照片</h3><div v-if="detail.photos.length" class="discard-photo-grid"><div v-for="photo in detail.photos" :key="photo.fileId" class="discard-photo-item"><el-image v-if="photoUrls[photo.fileId]" :src="photoUrls[photo.fileId]" :preview-src-list="photoPreviewUrls" :initial-index="photoPreviewUrls.indexOf(photoUrls[photo.fileId])" fit="cover" preview-teleported /><span v-else-if="photoLoading[photo.fileId]">照片加载中…</span><el-button v-else @click="loadPhoto(photo.fileId)">{{ photoErrors[photo.fileId] ? '加载失败，点击重试' : '加载照片' }}</el-button><small>托盘：{{ photo.palletNo }} · {{ photo.submittedAt }}</small></div></div><p v-else>暂无已提交的废弃现场照片</p><h3>状态流转</h3><el-timeline><el-timeline-item v-for="(item, index) in detail.histories" :key="index" :timestamp="item.createdAt || ''">{{ statusLabels[item.toStatus || ''] || item.toStatus }} {{ item.remark ? `— ${item.remark}` : '' }}</el-timeline-item></el-timeline></template></AppDialog>
+<AppDialog v-model="detailOpen" title="废弃单详情" :show-confirm="false" cancel-text="关闭" width="min(920px, calc(100vw - 28px))"><template v-if="detail"><el-descriptions :column="3" border><el-descriptions-item label="废弃单号">{{ detail.summary.discardNo }}</el-descriptions-item><el-descriptions-item label="出库单号">{{ detail.summary.outboundNo || '—' }}</el-descriptions-item><el-descriptions-item label="状态">{{ statusLabels[String(detail.summary.status)] }}</el-descriptions-item><el-descriptions-item label="仓库">{{ detail.summary.overseasWarehouseName || '—' }}</el-descriptions-item><el-descriptions-item label="入仓码" :span="2">{{ detail.summary.inboundCodes || '—' }}</el-descriptions-item><el-descriptions-item label="备注">{{ detail.remark || '—' }}</el-descriptions-item></el-descriptions><h3>废弃明细</h3><el-table :data="detail.items" border><el-table-column prop="inboundCode" label="入仓码"/><el-table-column prop="skuCode" label="SKU"/><el-table-column prop="productName" label="品名"/><el-table-column label="申请数量" width="120"><template #default="{ row }">{{ row.discardPackages }} {{ row.quantityUnit || '单位未记录' }}</template></el-table-column><el-table-column label="实际废弃" width="150"><template #default="{ row }">{{ quantity(row.actualDiscardPackages, row.quantityUnit || '单位未记录') }}</template></el-table-column><el-table-column label="所选箱唛" min-width="180"><template #default="{ row }">{{ row.cartonMarks?.join('、') || '全部库存（历史记录无箱唛快照）' }}</template></el-table-column></el-table><h3>废弃现场照片</h3><div v-if="detail.photos.length" class="discard-photo-grid"><div v-for="photo in detail.photos" :key="photo.fileId" class="discard-photo-item"><el-image v-if="photoUrls[photo.fileId]" :src="photoUrls[photo.fileId]" :preview-src-list="photoPreviewUrls" :initial-index="photoPreviewUrls.indexOf(photoUrls[photo.fileId])" fit="cover" preview-teleported /><span v-else-if="photoLoading[photo.fileId]">照片加载中…</span><el-button v-else @click="loadPhoto(photo.fileId)">{{ photoErrors[photo.fileId] ? '加载失败，点击重试' : '加载照片' }}</el-button><small>托盘：{{ photo.palletNo }} · {{ photo.submittedAt }}</small></div></div><p v-else>暂无已提交的废弃现场照片</p><h3>状态流转</h3><el-timeline><el-timeline-item v-for="(item, index) in detail.histories" :key="index" :timestamp="item.createdAt || ''">{{ statusLabels[item.toStatus || ''] || item.toStatus }} {{ item.remark ? `— ${item.remark}` : '' }}</el-timeline-item></el-timeline></template></AppDialog>
 </template>
 
 

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

@@ -15,6 +15,16 @@ vi.mock('../api/warehouseTransfers', () => ({ getWarehouseTransfer: vi.fn() }))
 enableAutoUnmount(afterEach)
 
 describe('LastMileOrderDetailView domestic detail alignment', () => {
+  it('counts mixed parcel and box receipts by their physical unit instead of calling both parcels', async () => {
+    vi.mocked(getLastMileOrder).mockResolvedValue({ order: { id: 'return-tail', customerId: 'C1', orderType: 'RETURN_RELABEL', orderNo: 'RT-1' }, cargo: [], fees: [], statusHistory: [], operationHistory: [],
+      returnReceipt: { order: { returnNo: 'RT-1', expectedQuantity: 8, receivedQuantity: 8 }, receipts: [{ receiptNo: 'P1', unitType: 'PARCEL' }, { receiptNo: 'B1', unitType: 'BOX', length: 30, width: 20, height: 10, weight: 2 }],
+        cartons: [{ receiptNo: 'P1', cartonMark: 'PK1', items: [] }, { receiptNo: 'B1', cartonMark: 'RC1', items: [] }] } })
+    const wrapper = mount(LastMileOrderDetailView, { global: { plugins: [ElementPlus] } }); await flushPromises()
+    await wrapper.get('#tab-return-receipt').trigger('click'); await flushPromises()
+    expect(wrapper.text()).toContain('签收实物明细（1 包裹 · 1 箱）')
+    expect(wrapper.text()).not.toContain('2 包裹')
+    expect(wrapper.text()).toContain('长 30 cm · 宽 20 cm · 高 10 cm · 体积 0.006 m³ · 重量 2 kg')
+  })
   it.each(['PENDING_REVIEW', 'PARTIALLY_RECEIVED', 'COMPLETED'])('shows only customer SKU forecast regardless of receipt status (%s)', async status => {
     vi.mocked(getLastMileOrder).mockResolvedValue({ order: { id: 'return-tail', customerId: 'C1', orderType: 'RETURN_RELABEL', orderNo: 'RT-1', currentStatus: status, packageCount: 30 },
       cargo: [], fees: [], statusHistory: [], operationHistory: [],

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

@@ -75,10 +75,25 @@ 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 returnReceiptUnits = computed(() => {
+  const receiptTypes = new Map((detail.value?.returnReceipt?.receipts || []).map(receipt => [receipt.receiptNo, receipt.unitType]))
+  const counts = { parcels: 0, boxes: 0, unknown: 0 }
+  for (const carton of detail.value?.returnReceipt?.cartons || []) {
+    const type = receiptTypes.get(carton.receiptNo)
+    if (type === 'PARCEL') counts.parcels++
+    else if (type === 'BOX' || type === 'PALLET') counts.boxes++
+    else counts.unknown++
+  }
+  return counts
+})
+const returnReceiptUnitLabel = computed(() => returnReceiptUnits.value.parcels && !returnReceiptUnits.value.boxes && !returnReceiptUnits.value.unknown ? '包裹' : returnReceiptUnits.value.parcels || returnReceiptUnits.value.unknown ? '实物' : '箱')
+const returnReceiptUnitSummary = computed(() => {
+  const { parcels, boxes, unknown } = returnReceiptUnits.value
+  return [parcels ? `${parcels} 包裹` : '', boxes ? `${boxes} 箱` : '', unknown ? `${unknown} 个未识别载体` : ''].filter(Boolean).join(' · ') || '0 箱'
+})
 const signedReturnCartons = computed(() => (detail.value?.returnReceipt?.cartons || []).map(box => {
-  const parcel = detail.value?.returnReceipt?.receipts.find(receipt => receipt.receiptNo === box.receiptNo && receipt.unitType === 'PARCEL')
+  const measuredUnit = detail.value?.returnReceipt?.receipts.find(receipt => receipt.receiptNo === box.receiptNo && (receipt.unitType === 'PARCEL' || receipt.unitType === 'BOX'))
-  return { ...box, length: box.length ?? parcel?.length, width: box.width ?? parcel?.width, height: box.height ?? parcel?.height, weight: box.weight ?? parcel?.weight }
+  return { ...box, length: box.length ?? measuredUnit?.length, width: box.width ?? measuredUnit?.width, height: box.height ?? measuredUnit?.height, weight: box.weight ?? measuredUnit?.weight }
 }))
 function returnCartonVolume(box: { length?: number | null; width?: number | null; height?: number | null }) {
   if (box.length == null || box.width == null || box.height == null) return '—'
@@ -302,7 +317,7 @@ onMounted(load)
               <el-table-column prop="boxCount" label="实收箱数" width="100" />
               <el-table-column prop="receivedQuantity" label="实收数量" width="100" />
             </el-table>
-            <h3>签收{{ returnReceiptUnitLabel }}明细（{{ detail.returnReceipt.cartons?.length || 0 }} {{ returnReceiptUnitLabel }}）</h3>
+            <h3>签收{{ returnReceiptUnitLabel }}明细（{{ returnReceiptUnitSummary }}）</h3>
             <el-collapse v-if="detail.returnReceipt.cartons?.length">
               <el-collapse-item v-for="box in signedReturnCartons" :key="box.cartonMark" :name="box.cartonMark">
                 <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>
@@ -319,7 +334,7 @@ onMounted(load)
             <el-empty v-else description="暂无签收箱号明细" />
             <h3>合箱记录</h3>
             <el-table :data="detail.returnReceipt.packingDetails || []" size="small" border empty-text="暂无合箱记录">
-              <el-table-column prop="planNo" label="合箱计划" min-width="210" />
+              <el-table-column label="合箱计划" min-width="210"><template #default="{ row }">{{ row.planNo && row.planNo !== 'null' ? row.planNo : '—' }}</template></el-table-column>
               <el-table-column prop="sourceCartonMark" label="来源箱唛" min-width="220" />
               <el-table-column prop="targetCartonMark" label="目标箱唛" min-width="220" />
               <el-table-column prop="skuCode" label="SKU" min-width="180" />

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

@@ -5,7 +5,7 @@ import { CheckCircle2, Eye, FileUp, Undo2 } from '@lucide/vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { useAccessPreviewStore } from '@/core/access/accessPreview'
 import { overseasWarehousePermissions as permission } from '../permissions'
-import { changeRelabelOrderStatus, confirmRelabelCompletion, getRelabelReviewTask, returnRelabelForRework } from '../api/relabelOrders'
+import { changeRelabelOrderStatus, confirmRelabelCompletion, getRelabelReviewTask, returnRelabelForRework, getRelabelQuantities, type RelabelQuantity } from '../api/relabelOrders'
 import { useRoute, useRouter } from 'vue-router'
 import { getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
 import ApiErrorMeta from '@/shared/components/ApiErrorMeta.vue'
@@ -21,6 +21,11 @@ const route = useRoute()
 const router = useRouter()
 const orderId = computed(() => String(route.params.orderId || ''))
 const detail = ref<RelabelDetailDto | null>(null)
+const quantity = ref<RelabelQuantity | null>(null)
+const currentPallets = ref<string[]>([])
+const targetPallets = ref<string[]>([])
+const sourceMissing = ref(false)
+const quantityMessage = ref('')
 const loading = ref(false)
 const access = useAccessPreviewStore()
 const returning = ref(false)
@@ -65,7 +70,7 @@ const previewTitle = ref('')
 const previewOpen = ref(false)
 const groups = [
   { title: '单据信息', fields: ['换标单号', '关联订单', '状态', '资金状态', '创建时间', '更新时间'] },
-  { title: '商品信息', fields: ['商品SKU', '中文品名', '箱数', '预算总价'] },
+  { title: '商品信息', fields: ['商品SKU', '中文品名', '箱数', '贴标件数', 'SKU种数', '当前关联托盘', '本轮目标托盘', '原托盘快照', '预算总价'] },
   { title: '作业要求', fields: ['贴标要求', '上传文件', '备注'] },
   { title: '费用明细', fields: ['换标费总计', '资金异常说明'] },
 ]
@@ -96,7 +101,12 @@ const fieldValues = computed<Record<string, string | number>>(() => {
     更新时间: value?.history.length ? formatOverseasDateTime(value.history[value.history.length - 1]?.createdAt) : '—',
     商品SKU: [...new Set(items.flatMap(relabelSkuCodes))].join('、') || '—',
     中文品名: items.map((item) => text(item.productNameZh)).join('、') || '—',
-    箱数: Number(value?.application.totalPackageCount || 0),
+    箱数: quantity.value?.cartonCount ?? '未提供',
+    贴标件数: quantity.value?.labelPieceCount ?? '未提供／不适用',
+    SKU种数: quantity.value?.skuCount ?? '未提供',
+    当前关联托盘: currentPallets.value.length ? `${currentPallets.value.length} 托：${currentPallets.value.join('、')}${sourceMissing.value ? '（部分来源未提供）' : ''}` : '未提供',
+    本轮目标托盘: targetPallets.value.length ? `${targetPallets.value.length} 托：${targetPallets.value.join('、')}` : '未提供／不适用',
+    原托盘快照: '未提供（当前关联托盘不代表换标前快照）',
     预算总价: '—',
     贴标要求: items.map((item) => text(item.labelRequirement)).join('；') || '—',
     上传文件: items.map((item) => text(item.relabelFileName)).filter((item) => item !== '—').join('、') || '—',
@@ -108,7 +118,24 @@ const fieldValues = computed<Record<string, string | number>>(() => {
 async function load() {
   if (!orderId.value) { loadError.value = { message: '详情缺少换标单号，请从换标单列表重新进入' }; return }
   loading.value = true; loadError.value = null
-  try { detail.value = await getRelabelOrder(orderId.value) }
+  try {
+    detail.value = await getRelabelOrder(orderId.value)
+    quantity.value = null; quantityMessage.value = ''; currentPallets.value = []; targetPallets.value = []; sourceMissing.value = false
+    try {
+      const result = await getRelabelQuantities({ page: 1, size: 1, relabelNo: orderId.value })
+      quantity.value = result.orders[orderId.value] || null
+      if (quantity.value?.duplicateCarton) quantityMessage.value = '该单存在重复箱唛关联，箱数已按箱唛去重，贴标件数待核查。'
+      const task = await getRelabelReviewTask(orderId.value)
+      currentPallets.value = [...new Set((task.items || []).map(item => item.sourcePalletCode).filter((value): value is string => Boolean(value)))]
+      sourceMissing.value = (task.items || []).some(item => !item.sourcePalletCode)
+      const history = task.history || []
+      const lastRework = history.map(item => item.action).lastIndexOf('REWORK_ARCHIVE')
+      const targets = history.slice(lastRework + 1).filter(item => item.action === 'PALLET_BIND').flatMap(item => {
+        try { const parsed: { targetPallets?: string[] } = JSON.parse(item.detail || '{}'); return parsed.targetPallets || [] } catch { return [] }
+      })
+      targetPallets.value = [...new Set(targets)]
+    } catch { quantityMessage.value = '部分数量或托盘资料加载失败，未将缺失值显示为0。' }
+  }
   catch (error) { loadError.value = getApiErrorDetails(error, '换标单详情加载失败，请重试') }
   finally { loading.value = false }
 }
@@ -145,6 +172,7 @@ async function previewCompletionPhoto(fileId: string) {
       <section v-if="access.can(permission.relabelOrderStatus) && ['CUSTOMER_CONFIRM_PENDING', 'PROCESSING'].includes(detail?.application.status || '') && detail?.completionEvidence?.photoFileIds?.length" class="relabel-document-panel relabel-review-actions"><el-button v-if="detail?.application.status === 'CUSTOMER_CONFIRM_PENDING'" type="primary" :loading="confirming" @click="confirmCompletion"><CheckCircle2 :size="15" />确认换标完成</el-button><el-button type="warning" :loading="returning" @click="returnForRework"><Undo2 :size="15" />退回重新贴标</el-button></section>
       <RelabelDocumentsPanel v-if="detail" :relabel-no="detail.application.relabelNo" :detail="detail" /><section class="relabel-document-panel" aria-label="PDA换标完工证据"><div class="relabel-mark-list__head"><h2>PDA 换标完工证据</h2><span>{{ detail?.completionEvidence?.reviewerName ? `复核人：${detail.completionEvidence.reviewerName}` : '等待仓库作业' }}</span></div><div v-if="detail?.completionEvidence?.photoFileIds?.length" class="document-row"><strong>共 {{ detail.completionEvidence.photoFileIds.length }} 张完工照片</strong><span class="document-actions density-actions"><el-button class="density-action" data-tone="neutral" v-for="(fileId, index) in detail.completionEvidence.photoFileIds" :key="fileId" size="small" @click="previewCompletionPhoto(fileId)"><Eye :size="14" />照片 {{ index + 1 }}</el-button></span></div><div v-else class="attachment-empty">暂未上传完工照片</div></section>
       <section class="relabel-document-panel" aria-label="总换标文件"><div class="relabel-mark-list__head"><h2>总换标 PDF</h2><label class="file-picker"><FileUp :size="15" />{{ uploading ? '上传中' : (detail?.application.totalFileName ? '更换PDF' : '上传PDF') }}<input type="file" accept="application/pdf,.pdf" :disabled="uploading" @change="uploadPdf($event, 'TOTAL')" /></label></div><div v-if="detail?.application.totalFileId" class="document-row"><strong>{{ detail.application.totalFileName }}</strong><el-button class="density-action" data-tone="neutral" size="small" @click="previewPdf(detail.application.totalFileId, detail.application.totalFileName || '总换标PDF', 'TOTAL')"><Eye :size="14" />直接预览</el-button></div><div v-else class="attachment-empty">暂未上传总换标PDF</div></section>
+      <p v-if="quantityMessage" role="status">{{ quantityMessage }}</p>
       <section class="relabel-mark-list" aria-label="箱唛换标信息">
         <div class="relabel-mark-list__head"><h2>箱唛换标信息</h2><span>共 {{ detail?.items.length || 0 }} 条</span></div>
         <div class="relabel-mark-list__scroll">

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

@@ -8,6 +8,7 @@ import {
   createRelabelOrder,
   getRelabelOrder,
   listRelabelOrders,
+  getRelabelQuantities,
   listRelabelWarehouseOptions,
 } from '../api/relabelOrders'
 import RelabelOrdersView from './RelabelOrdersView.vue'
@@ -21,6 +22,7 @@ vi.mock('../api/relabelOrders', () => ({
   createRelabelOrder: vi.fn(),
   getRelabelOrder: vi.fn(),
   listRelabelOrders: vi.fn(),
+  getRelabelQuantities: vi.fn(),
   listRelabelWarehouseOptions: vi.fn(),
 }))
 
@@ -62,6 +64,7 @@ describe('RelabelOrdersView', () => {
     expect(wrapper.text()).toContain('贴标要求111')
   })
   beforeEach(() => {
+    vi.mocked(getRelabelQuantities).mockReset().mockResolvedValue({ orderCount: 0, skuCount: 0, knownLabelPieceCount: 0, unknownPieceOrders: 0, knownCartonCount: 0, unknownCartonOrders: 0, orders: {} })
     vi.stubGlobal('ResizeObserver', ResizeObserverStub)
     vi.stubGlobal('localStorage', memoryStorage())
     vi.mocked(listPlatformTenants).mockReset().mockResolvedValue({ records: [{ id: '10001', tenantName: '客户甲', status: 'ACTIVE' } as never], page: 1, size: 200, total: 1, pages: 1 })

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

@@ -15,14 +15,15 @@ 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 AppDialog from '@/shared/components/AppDialog.vue'
-import { changeRelabelOrderStatus, createRelabelOrder, getRelabelOrder, listRelabelOrders, listRelabelWarehouseOptions, type RelabelWarehouseOptionDto } from '../api/relabelOrders'
+import { changeRelabelOrderStatus, createRelabelOrder, getRelabelOrder, listRelabelOrders, listRelabelWarehouseOptions, getRelabelQuantities, type RelabelQuantityTotals, type RelabelWarehouseOptionDto } from '../api/relabelOrders'
 import { overseasWarehousePermissions as permission } from '../permissions'
 import { formatOverseasDateTime, relabelBusinessStatusLabel } from '../lastMilePresentation'
 import type { RelabelOrderListItem } from '../types'
 
 const access = useAccessPreviewStore()
 const router = useRouter()
-const rows = ref<RelabelOrderListItem[]>([])
+type RelabelRow = Omit<RelabelOrderListItem, 'cartons'> & { cartons: string; labelPieces: string; skuCount: string }
+const rows = ref<RelabelRow[]>([])
 const loading = ref(false)
 const voiding = ref('')
 const loadError = ref<ApiErrorDetails | null>(null)
@@ -33,11 +34,15 @@ const warehousesLoading = ref(false)
 const page = ref(1)
 const pageSize = ref(10)
 const total = ref(0)
+const quantities = ref<RelabelQuantityTotals | null>(null)
+const quantityError = ref('')
+function dimension(value: number | null | undefined) { return value == null ? '未提供' : String(value) }
+function knownDimension(value: number, unknown: number, unit: string) { return Number(value) === 0 && Number(unknown) > 0 ? `${unit === '箱' ? '箱数' : '贴标件数'}未提供（${unknown}票）` : `已知 ${value} ${unit}${Number(unknown) > 0 ? `（${unknown}票未提供）` : ''}` }
 const filters = ref<QueryModel>({ relabelNo: '', sku: '', status: '' })
 const fields = computed<QueryField[]>(() => [
   { key: 'relabelNo', type: 'input', label: '换标单号', placeholder: '请输入换标单号', width: 220 },
   { key: 'sku', type: 'input', label: '商品SKU', placeholder: '请输入商品SKU', width: 180 },
-  { key: 'status', type: 'select', label: '状态', placeholder: '全部状态', width: 160, options: [{ label: '待审核', value: 'PENDING_REVIEW' }, { label: '待处理', value: 'PENDING_PROCESSING' }, { label: '处理中', value: 'PROCESSING' }, { label: '换标完成', value: 'COMPLETED' }, { label: '已作废', value: 'CANCELLED' }] },
+  { key: 'status', type: 'select', label: '状态', placeholder: '全部状态', width: 160, options: [{ label: '待审核', value: 'PENDING_REVIEW' }, { label: '待处理', value: 'PENDING_PROCESSING' }, { label: '处理中', value: 'PROCESSING' }, { label: '待客户确认', value: 'CUSTOMER_CONFIRM_PENDING' }, { label: '已驳回', value: 'REJECTED' }, { label: '换标完成', value: 'COMPLETED' }, { label: '已作废', value: 'CANCELLED' }] },
 ])
 const columns: DataTableColumn[] = [
   { key: 'actions', label: '操作', width: 180, fixed: 'left', slotName: 'actions' },
@@ -46,6 +51,8 @@ const columns: DataTableColumn[] = [
   { key: 'sku', label: '商品SKU', minWidth: 150 },
   { key: 'productName', label: '中文品名', minWidth: 180 },
   { key: 'cartons', label: '箱数', width: 90, align: 'right' },
+  { key: 'labelPieces', label: '贴标件数', width: 110, align: 'right' },
+  { key: 'skuCount', label: 'SKU种数', width: 100, align: 'right' },
   { key: 'budgetTotal', label: '预算总价', width: 120, align: 'right' },
   { key: 'relabelCost', label: '换标费用', width: 120, align: 'right' },
   { key: 'walletStatus', label: '资金状态', width: 120 },
@@ -61,7 +68,7 @@ const detailLoading = ref(false)
 const editSourceStatus = ref('')
 const form = reactive({ orderNo: '', customerId: '', relatedOrderNo: '', sku: '', productName: '', cartons: undefined as number | undefined, budgetTotal: undefined as number | undefined, status: 'PENDING_PROCESSING', labelRequirement: '', relabelCost: undefined as number | undefined, remark: '', warehouseId: '', labelDeadline: '', contactName: '', contactPhone: '', shipmentNo: '', newSkuCode: '' })
 const createIdempotencyKey = ref('')
-const selectedRows = ref<RelabelOrderListItem[]>([])
+const selectedRows = ref<RelabelRow[]>([])
 const allowedStatusOptions = computed(() => {
   if (editSourceStatus.value === 'PENDING_REVIEW') return ['PENDING_PROCESSING', 'REJECTED']
   if (editSourceStatus.value === 'PENDING_PROCESSING') return ['PROCESSING', 'REJECTED', 'CANCELLED']
@@ -77,7 +84,7 @@ function openPackingPlan() {
   void router.push({ name: 'overseas-return-inventory', query: { packing: '1', ...(customerIds[0] ? { customerId: customerIds[0] } : {}) } })
 }
 async function openForm(mode: 'create' | 'edit', source?: object) {
-  const row = source as RelabelOrderListItem | undefined
+  const row = source as RelabelRow | undefined
   dialogMode.value = mode
   Object.assign(form, { orderNo: '', customerId: '', relatedOrderNo: '', sku: '', productName: '', cartons: undefined, budgetTotal: undefined, status: 'PENDING_PROCESSING', labelRequirement: '', relabelCost: undefined, remark: '', warehouseId: '', labelDeadline: '', contactName: '', contactPhone: '', shipmentNo: '', newSkuCode: '' })
   editSourceStatus.value = ''
@@ -173,21 +180,23 @@ async function submitForm() {
 }
 
 function openDetail(source: object) {
-  const row = source as RelabelOrderListItem
+  const row = source as RelabelRow
   void router.push({ name: 'overseas-relabel-order-detail', params: { orderId: String(row.orderNo) } })
 }
 
 function relabelStatus(value: unknown) {
+  if (value === 'REJECTED') return '已驳回'
+  if (value === 'PENDING_REVIEW') return '待审核'
   if (value === 'CANCELLED') return '已作废'
   if (value === 'CUSTOMER_CONFIRM_PENDING') return '待客户确认'
   return relabelBusinessStatusLabel(value)
 }
 function canVoid(source: object) {
-  const row = source as RelabelOrderListItem
+  const row = source as RelabelRow
   return !['READY_FOR_OUTBOUND', 'COMPLETED', 'CANCELLED'].includes(row.rawStatus || relabelStatusCode(row.status))
 }
 async function voidOrder(source: object) {
-  const row = source as RelabelOrderListItem
+  const row = source as RelabelRow
   if (voiding.value || !canVoid(row) || !access.can(permission.relabelOrderStatus)) return
   voiding.value = String(row.orderNo)
   try {
@@ -213,7 +222,7 @@ function relabelStatusCode(value: unknown) {
 }
 function walletStatus(value: unknown) { return ({ FREEZE_PENDING: '冻结中', FROZEN: '已冻结', SETTLE_PENDING: '结算中', SETTLED: '已结算', RELEASE_PENDING: '释放中', RELEASED: '已释放', FREEZE_FAILED: '冻结失败', SETTLE_FAILED: '结算失败', RELEASE_FAILED: '释放失败' } as Record<string,string>)[String(value || '')] || String(value || '—') }
 function canAudit(source: object) {
-  const row = source as RelabelOrderListItem
+  const row = source as RelabelRow
   return row.reviewChannel !== 'TAIL_ORDER'
     && (row.rawStatus || relabelStatusCode(row.status)) === 'PENDING_REVIEW'
 }
@@ -221,10 +230,14 @@ async function load(model: QueryModel = filters.value) {
   Object.assign(filters.value, model)
   loading.value = true; loadError.value = null
   try {
-    const result = await listRelabelOrders({ page: page.value, size: pageSize.value, relabelNo: String(filters.value.relabelNo || '').trim() || undefined, skuCode: String(filters.value.sku || '').trim() || undefined, status: String(filters.value.status || '').trim() || undefined })
+    const query = { page: page.value, size: pageSize.value, relabelNo: String(filters.value.relabelNo || '').trim() || undefined, skuCode: String(filters.value.sku || '').trim() || undefined, status: String(filters.value.status || '').trim() || undefined }
+    quantities.value = null; quantityError.value = ''
+    const result = await listRelabelOrders(query)
+    try { quantities.value = await getRelabelQuantities(query) }
+    catch { quantityError.value = '数量汇总加载失败，请重试；未将当前页作为全部合计' }
     rows.value = result.records.map((item) => ({
       customerId: '', orderNo: String(item.relabelNo), relatedOrderNo: String(item.lastlegOrderNo || item.customerOrderNo || '—'), sku: String(item.skuCodes || '—'),
-      productName: item.productNameZh?.trim() || '—', cartons: Number(item.totalPackageCount || 0), budgetTotal: null, relabelCost: Number(item.chargeAmount || 0), walletStatus: walletStatus(item.walletStatus), walletErrorMessage: item.walletErrorMessage || '', labelRequirement: item.labelRequirement?.trim() || '—', fileName: '—', status: relabelStatus(item.status), rawStatus: String(item.status || ''), remark: '',
+      productName: item.productNameZh?.trim() || '—', cartons: dimension(quantities.value?.orders[item.relabelNo]?.cartonCount), labelPieces: dimension(quantities.value?.orders[item.relabelNo]?.labelPieceCount), skuCount: dimension(quantities.value?.orders[item.relabelNo]?.skuCount), budgetTotal: null, relabelCost: Number(item.chargeAmount || 0), walletStatus: walletStatus(item.walletStatus), walletErrorMessage: item.walletErrorMessage || '', labelRequirement: item.labelRequirement?.trim() || '—', fileName: '—', status: relabelStatus(item.status), rawStatus: String(item.status || ''), remark: '',
       reviewChannel: item.reviewChannel || undefined,
       createdAt: formatOverseasDateTime(item.createdAt),
     }))
@@ -243,6 +256,7 @@ watch(dialogOpen, (open) => { if (!open) createIdempotencyKey.value = '' })
   <AdminPage class="admin-density"><ListPageLayout aria-label="换标单列表">
 
 
+    <section class="quantity-summary" aria-label="全部筛选结果数量汇总"><template v-if="quantities"><strong>全部筛选结果</strong><span>{{ quantities.orderCount }} 票</span><span>{{ quantities.skuCount }} 种 SKU</span><span>{{ knownDimension(quantities.knownLabelPieceCount, quantities.unknownPieceOrders, '件') }}</span><span>{{ knownDimension(quantities.knownCartonCount, quantities.unknownCartonOrders, '箱') }}</span><span>原托盘／目标托盘数：未提供</span></template><span v-else-if="quantityError" role="alert">{{ quantityError }}</span></section>
     <section><DataTable appearance="integrated" :stripe="false" column-settings-mode="show" :results-visible="!loadError" 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="暂无换标单" @selection-change="selectedRows = $event" @update:page="load()" @update:page-size="page = 1; load()">
         <template #toolbar-start><h1>换标单</h1></template>
         <template #filters><QueryToolbar v-model="filters" :fields="fields" :loading="loading" ariaLabel="换标单筛选" preference-key="overseas-relabel-orders-query" :search-on-reset="false" @search="search" @reset="reset" /></template>
@@ -280,6 +294,7 @@ watch(dialogOpen, (open) => { if (!open) createIdempotencyKey.value = '' })
 </template>
 
 <style scoped>
+.quantity-summary { display: flex; flex-wrap: wrap; gap: 8px 18px; padding: 12px 16px; border: 1px solid var(--cc-border); border-radius: 8px; background: var(--cc-bg-card, white); margin-bottom: 12px; font-size: 13px; }
 h3 { margin: 0 0 var(--admin-space-5); color: var(--cc-text); font-size: var(--admin-font-section); }
 h3:not(:first-child) { margin-top: var(--admin-space-1); padding-top: var(--admin-space-5); border-top: 1px solid var(--cc-border); }
 .el-form :deep(.el-row) { margin-left: 0 !important; margin-right: 0 !important; }

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

@@ -56,6 +56,24 @@ afterEach(() => {
 })
 
 describe('ReturnInventoryManagementView shared list', () => {
+  it('shows discard deductions in stock movements and the physical carton history', async () => {
+    vi.mocked(listReturnInventoryMovements).mockResolvedValue({ records: [{ ...stock, movementType: 'DISCARD', referenceNo: 'CD-TEST-1', totalDelta: -5, availableDelta: -5, occurredAt: '2026-10-19T17:00:00' }], page: 1, size: 20, total: 1, pages: 1 })
+    const inventory = await mountView('inventory')
+    const tabs = inventory.getComponent({ name: 'ElTabs' })
+    tabs.vm.$emit('update:modelValue', 'movements'); tabs.vm.$emit('tab-change', 'movements')
+    await flushPromises()
+    expect(inventory.text()).toContain('货物废弃')
+    expect(inventory.text()).toContain('CD-TEST-1')
+    expect(inventory.text()).toContain('-5')
+    vi.mocked(getReturnCarton).mockResolvedValue({ ...carton, totalQuantity: 5, items: [{ skuCode: 'SKU-TEST', quantity: 5 }], discardHistory: [{ discardNo: 'CD-TEST-1', skuCode: 'SKU-TEST', beforeQuantity: 10, quantity: 5, afterQuantity: 5, occurredAt: '2026-10-19T17:00:00' }] })
+    const cartons = await mountView('cartons')
+    await cartons.findAll('button').find(button => button.text() === '详情')!.trigger('click')
+    await flushPromises()
+    expect(document.body.textContent).toContain('废弃扣减明细')
+    expect(document.body.textContent).toContain('扣减前（件）')
+    expect(document.body.textContent).toContain('扣减后（件）')
+    expect(document.body.textContent).toContain('CD-TEST-1')
+  })
   it('退货库存展示服务端换标占用列', async () => {
     const wrapper = await mountView('inventory')
     const columns = wrapper.findComponent(DataTable).props('columns')

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

@@ -679,7 +679,7 @@ const tableColumns = computed(() =>
         warehouseName(row.overseasWarehouseId)
       }}</template>
       <template #movement-4="{ row }">{{
-        ({ RECEIPT: "退货签收", MERGE: "退货合箱", OUTBOUND: "退货出库",
+        ({ RECEIPT: "退货签收", MERGE: "退货合箱", OUTBOUND: "退货出库", DISCARD: "货物废弃",
           SKU_CONVERSION_OUT: "SKU换标", SKU_CONVERSION_IN: "SKU换标",
           SKU_CONVERSION_REVERSE_IN: "SKU换标撤销", SKU_CONVERSION_REVERSE_OUT: "SKU换标撤销"
         } as Record<string, string>)[row.movementType] || row.movementType || "—"
@@ -959,6 +959,16 @@ const tableColumns = computed(() =>
             prop="quantity"
             label="数量"
             align="right" /></el-table>
+        <h3>废弃扣减明细</h3>
+        <el-table :data="detail.discardHistory || []" class="detail-items" empty-text="暂无废弃记录">
+          <el-table-column prop="occurredAt" label="操作时间" min-width="170" />
+          <el-table-column prop="discardNo" label="废弃单号" min-width="210" />
+          <el-table-column prop="skuCode" label="SKU" min-width="170" />
+          <el-table-column prop="productNameZh" label="中文品名" min-width="140" />
+          <el-table-column prop="beforeQuantity" label="扣减前（件）" width="110" align="right" />
+          <el-table-column prop="quantity" label="废弃数量（件）" width="120" align="right" />
+          <el-table-column prop="afterQuantity" label="扣减后（件）" width="110" align="right" />
+        </el-table>
         <h3>合箱明细</h3>
         <el-table :data="detail.mergeHistory || []" class="detail-items" empty-text="暂无合箱记录">
           <el-table-column prop="createdAt" label="合箱时间" min-width="170" />

src/modules/unified-orders/api/unifiedOrders.test.ts

@@ -8,6 +8,7 @@ import {
   getPlatformUnifiedOrder,
   downloadPlatformProductImage,
   listPlatformUnifiedOrders,
+  getPlatformUnifiedOrderStatusCounts,
   listPlatformUnifiedOrderFeeDetails,
   updatePlatformUnifiedOrderDeclaration,
   updatePlatformUnifiedOrderPlanning,
@@ -26,6 +27,14 @@ describe('unified orders API contract', () => {
     vi.mocked(http.put).mockReset()
   })
 
+  it('requests unpaged counts without main status and preserves unknown counts as absent', async () => {
+    vi.mocked(http.get).mockResolvedValue({ data: { counts: { PENDING_REVIEW: 8, WAIT_MEASURE: 0, LOADED: -1, LOADING: null, DELIVERED: '2' } } })
+    await expect(getPlatformUnifiedOrderStatusCounts({ inboundCode: 'IN-8', loaded: false, fullContainer: false, channelName: '', ...{ page: 2, size: 20, mainStatus: 'LOADING' } })).resolves.toEqual({ counts: { PENDING_REVIEW: 8, WAIT_MEASURE: 0 } })
+    expect(http.get).toHaveBeenCalledWith('/platform/v1/orders/status-counts', {
+      params: { inboundCode: 'IN-8', loaded: false, fullContainer: false },
+    })
+  })
+
   it('uploads the old-system workbook with a retry-safe key', async () => {
     vi.mocked(http.post).mockResolvedValue({ data: { total: 1, succeeded: 1, failed: 0, items: [] } })
     const file = new File(['xlsx'], 'legacy.xlsx', { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' })

src/modules/unified-orders/api/unifiedOrders.ts

@@ -11,16 +11,26 @@ export type UnifiedOrderMainStatus =
   | 'LOADED'
   | 'DELIVERED'
   | 'COMPLETED'
+  | 'WAIT_WEIGHT_CONFIRM' | 'WEIGHT_CONFIRMED' | 'WAIT_CUSTOMS_DOCS' | 'EXPORT_CUSTOMS'
+  | 'SAILING_CLEARANCE' | 'WAIT_UNLOAD' | 'WAIT_DISPATCH' | 'OUTBOUND_DOCUMENT' | 'DELIVERING' | 'SIGNED'
 
 export const unifiedOrderStatusOptions: Array<{ value: UnifiedOrderMainStatus; label: string }> = [
   { value: 'PENDING_REVIEW', label: '待审核' },
   { value: 'WAIT_MEASURE', label: '待测量数据' },
+  { value: 'WAIT_WEIGHT_CONFIRM', label: '待客户确认' },
+  { value: 'WEIGHT_CONFIRMED', label: '已确认数据' },
+  { value: 'WAIT_CUSTOMS_DOCS', label: '待上传资料' },
   { value: 'WAIT_PALLETIZE', label: '一件代发打托' },
   { value: 'WAIT_SPLIT', label: '待分柜' },
   { value: 'LOADING', label: '装柜中' },
   { value: 'LOADED', label: '装柜完成' },
-  { value: 'DELIVERED', label: '派送完成' },
+  { value: 'EXPORT_CUSTOMS', label: '出口报关' },
-  { value: 'COMPLETED', label: '已完成' },
+  { value: 'SAILING_CLEARANCE', label: '已开船／待清关' },
+  { value: 'WAIT_UNLOAD', label: '待拆柜' },
+  { value: 'WAIT_DISPATCH', label: '待排车' },
+  { value: 'OUTBOUND_DOCUMENT', label: '出库单' },
+  { value: 'DELIVERING', label: '派送中' },
+  { value: 'SIGNED', label: '签收完成' },
 ]
 
 export interface UnifiedOrderMeasurementSummary {
@@ -314,6 +324,23 @@ export interface UnifiedOrderQuery {
   size: number
 }
 
+export type UnifiedOrderStatusCountQuery = Omit<UnifiedOrderQuery, 'page' | 'size' | 'mainStatus'>
+export interface UnifiedOrderStatusCounts {
+  counts: Partial<Record<UnifiedOrderMainStatus | 'MEASUREMENT_REVIEW', number>>
+}
+
+export async function getPlatformUnifiedOrderStatusCounts(query: UnifiedOrderStatusCountQuery): Promise<UnifiedOrderStatusCounts> {
+  // Strip these fields at runtime too, so callers cannot accidentally scope the other tabs.
+  const params = Object.fromEntries(Object.entries(query).filter(([key, value]) =>
+    !['page', 'size', 'mainStatus'].includes(key) && value !== undefined && value !== ''))
+  const response = await http.get<ApiEnvelope<UnifiedOrderStatusCounts>, ApiEnvelope<UnifiedOrderStatusCounts>>(
+    `${unifiedOrdersApiPath}/status-counts`, { params },
+  )
+  const result = unwrapApiResponse(response)
+  return { counts: Object.fromEntries(Object.entries(result.counts || {}).filter(([, count]) =>
+    typeof count === 'number' && Number.isSafeInteger(count) && count >= 0)) }
+}
+
 type PagePayload = Omit<UnifiedOrderPageResource, 'page' | 'size' | 'total' | 'pages'> & {
   page: number | string
   size: number | string
@@ -667,5 +694,7 @@ export async function listPlatformUnifiedOrderFeeDetails(accountId: string, inbo
 }
 
 export function unifiedOrderStatusLabel(status: UnifiedOrderMainStatus) {
+  if (status === 'DELIVERED') return '签收完成'
+  if (status === 'COMPLETED') return '已完成'
   return unifiedOrderStatusOptions.find((item) => item.value === status)?.label || '未知状态'
 }

src/modules/unified-orders/pages/UnifiedOrdersView.coLoad.test.ts

@@ -14,7 +14,7 @@ vi.mock('@/modules/inbounds', () => ({ downloadWeightImage: vi.fn(), getInboundM
 vi.mock('@/modules/unified-orders/workflows', () => ({ UnifiedOrderWorkflowPanel: { template: '<div />' } }))
 vi.mock('@/modules/unified-orders/api/unifiedOrders', () => ({
   updatePlatformUnifiedOrderRemarks: vi.fn(), approvePlatformUnifiedOrder: vi.fn(), batchApprovePlatformUnifiedOrders: vi.fn(),
-  getPlatformUnifiedOrder: vi.fn(), listPlatformUnifiedOrderFeeDetails: vi.fn(), listPlatformUnifiedOrders: vi.fn(),
+  getPlatformUnifiedOrder: vi.fn(), listPlatformUnifiedOrderFeeDetails: vi.fn(), getPlatformUnifiedOrderStatusCounts: vi.fn().mockResolvedValue({ counts: {} }), listPlatformUnifiedOrders: vi.fn(),
   unifiedOrderStatusOptions: [{ value: 'WAIT_SPLIT', label: '待分柜' }],
 }))
 vi.mock('@/modules/unified-orders/api/coLoadGroups', () => ({

src/modules/unified-orders/pages/UnifiedOrdersView.fulfillment.test.ts

@@ -28,7 +28,7 @@ vi.mock('@/shared/api/inboundCodeRelations', () => ({
 vi.mock('@/modules/unified-orders/api/unifiedOrders', () => ({
   updatePlatformUnifiedOrderRemarks: vi.fn(), approvePlatformUnifiedOrder: vi.fn(), batchApprovePlatformUnifiedOrders: vi.fn(),
   downloadPlatformProductImage: vi.fn(),
-  getPlatformUnifiedOrder: vi.fn(), listPlatformUnifiedOrderFeeDetails: vi.fn(), listPlatformUnifiedOrders: vi.fn(),
+  getPlatformUnifiedOrder: vi.fn(), listPlatformUnifiedOrderFeeDetails: vi.fn(), getPlatformUnifiedOrderStatusCounts: vi.fn().mockResolvedValue({ counts: {} }), listPlatformUnifiedOrders: vi.fn(),
   unifiedOrderStatusOptions: [],
 }))
 

src/modules/unified-orders/pages/UnifiedOrdersView.requests.test.ts

@@ -1,6 +1,6 @@
 import { flushPromises, shallowMount } from '@vue/test-utils'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
-import { listPlatformUnifiedOrders, updatePlatformUnifiedOrderPlanning } from '@/modules/unified-orders/api/unifiedOrders'
+import { getPlatformUnifiedOrderStatusCounts, listPlatformUnifiedOrders, updatePlatformUnifiedOrderPlanning } from '@/modules/unified-orders/api/unifiedOrders'
 import { createPlatformExportTask } from '@/modules/downloads'
 import { showExportTaskCreatedDialog } from '@/shared/components/exportTaskCreatedDialog'
 import { ApiResponseError } from '@/shared/api/http'
@@ -31,7 +31,7 @@ vi.mock('@/modules/unified-orders/api/unifiedOrders', () => ({
   approvePlatformUnifiedOrder: vi.fn(),
   getPlatformUnifiedOrder: vi.fn(),
   listPlatformUnifiedOrderFeeDetails: vi.fn(),
-  listPlatformUnifiedOrders: vi.fn(),
+  getPlatformUnifiedOrderStatusCounts: vi.fn().mockResolvedValue({ counts: {} }), listPlatformUnifiedOrders: vi.fn(),
   updatePlatformUnifiedOrderPlanning: vi.fn(),
   unifiedOrderStatusOptions: [
     { value: 'PENDING_REVIEW', label: '待审核' },
@@ -39,8 +39,8 @@ vi.mock('@/modules/unified-orders/api/unifiedOrders', () => ({
     { value: 'WAIT_SPLIT', label: '待分柜' },
     { value: 'LOADING', label: '装柜中' },
     { value: 'LOADED', label: '装柜完成' },
-    { value: 'DELIVERED', label: '派送完成' },
+    { value: 'DELIVERING', label: '派送中' },
-    { value: 'COMPLETED', label: '已完成' },
+    { value: 'SIGNED', label: '签收完成' },
   ],
 }))
 
@@ -69,12 +69,70 @@ function mountView() {
 
 describe('UnifiedOrdersView list request coordination', () => {
   beforeEach(() => {
+    vi.mocked(getPlatformUnifiedOrderStatusCounts).mockReset().mockResolvedValue({ counts: {} })
     vi.mocked(listPlatformUnifiedOrders).mockReset().mockResolvedValue(emptyPage())
     vi.mocked(updatePlatformUnifiedOrderPlanning).mockReset()
     vi.mocked(createPlatformExportTask).mockReset().mockResolvedValue({ taskName: '国内仓订单', taskNo: 'EXP-1' } as never)
     vi.mocked(showExportTaskCreatedDialog).mockReset().mockResolvedValue(false)
   })
 
+  it('shows only supported counts, keeps all text-only and never scopes counts by status or pagination', async () => {
+    vi.mocked(getPlatformUnifiedOrderStatusCounts).mockResolvedValue({ counts: { PENDING_REVIEW: 12, WAIT_MEASURE: 0, SIGNED: 3 } })
+    const wrapper = mountView()
+    await flushPromises()
+    const tabs = wrapper.findAll('[role="tab"]')
+    expect(tabs[0]!.text()).toBe('全部')
+    expect(tabs[1]!.text()).toBe('待审核（12）')
+    expect(tabs[2]!.text()).toBe('待测量数据（0）')
+    expect(tabs[3]!.text()).toBe('测量数据审核')
+    expect(tabs.at(-1)!.text()).toBe('签收完成（3）')
+    expect(tabs.map((tab) => tab.text())).not.toContain('派送完成')
+    expect(tabs.map((tab) => tab.text())).not.toContain('已完成')
+    await tabs[1]!.trigger('click')
+    wrapper.getComponent({ name: 'DataTable' }).vm.$emit('update:page', 2)
+    await flushPromises()
+    expect(getPlatformUnifiedOrderStatusCounts).toHaveBeenCalledTimes(1)
+    const toolbar = wrapper.getComponent({ name: 'QueryToolbar' })
+    toolbar.vm.$emit('update:modelValue', { ...toolbar.props('modelValue'), inboundCode: ' IN-9 ', loaded: 'false' })
+    toolbar.vm.$emit('search')
+    await flushPromises()
+    expect(getPlatformUnifiedOrderStatusCounts).toHaveBeenCalledTimes(2)
+    const params = vi.mocked(getPlatformUnifiedOrderStatusCounts).mock.lastCall![0]
+    expect(params).toMatchObject({ inboundCode: 'IN-9', loaded: false })
+    expect(params).not.toHaveProperty('mainStatus')
+    expect(params).not.toHaveProperty('page')
+    expect(params).not.toHaveProperty('size')
+    toolbar.vm.$emit('reset')
+    await flushPromises()
+    expect(getPlatformUnifiedOrderStatusCounts).toHaveBeenCalledTimes(3)
+  })
+
+  it('ignores older count responses and hides stale counts during loading and failures with retry', async () => {
+    let resolveOld!: (value: { counts: { PENDING_REVIEW: number } }) => void
+    vi.mocked(getPlatformUnifiedOrderStatusCounts).mockImplementationOnce(() => new Promise((resolve) => { resolveOld = resolve }))
+    const wrapper = mountView()
+    await flushPromises()
+    expect(wrapper.get('[role="tablist"]').attributes('aria-busy')).toBe('true')
+    expect(wrapper.find('.order-status-count').exists()).toBe(false)
+    vi.mocked(getPlatformUnifiedOrderStatusCounts).mockResolvedValueOnce({ counts: { PENDING_REVIEW: 7 } })
+    wrapper.getComponent({ name: 'QueryToolbar' }).vm.$emit('search')
+    await flushPromises()
+    resolveOld({ counts: { PENDING_REVIEW: 99 } })
+    await flushPromises()
+    expect(wrapper.findAll('[role="tab"]')[1]!.text()).toBe('待审核（7）')
+    vi.mocked(getPlatformUnifiedOrderStatusCounts).mockRejectedValueOnce(new Error('统计不可用'))
+    wrapper.getComponent({ name: 'QueryToolbar' }).vm.$emit('search')
+    await flushPromises()
+    expect(wrapper.find('.order-status-count').exists()).toBe(false)
+    expect(wrapper.findComponent({ name: 'DataTable' }).exists()).toBe(true)
+    expect(wrapper.find('.order-status-feedback').text()).toContain('重试数量')
+    vi.mocked(getPlatformUnifiedOrderStatusCounts).mockResolvedValueOnce({ counts: { PENDING_REVIEW: 8, MEASUREMENT_REVIEW: 3 } })
+    await wrapper.findAll('button').find((button) => button.text() === '重试数量')!.trigger('click')
+    await flushPromises()
+    expect(wrapper.findAll('[role="tab"]')[1]!.text()).toBe('待审核（8）')
+    expect(wrapper.findAll('[role="tab"]')[3]!.text()).toBe('测量数据审核（3）')
+  })
+
   it('loads once initially and once for query, reset, status tab and pagination', async () => {
     const wrapper = mountView()
     await flushPromises()

src/modules/unified-orders/pages/UnifiedOrdersView.test.ts

@@ -62,9 +62,9 @@ describe('UnifiedOrdersView contract', () => {
 
   it('exposes the product main statuses including dropship palletizing', () => {
     expect(unifiedOrderStatusOptions.map((item) => item.label)).toEqual([
-      '待审核', '待测量数据', '一件代发打托', '待分柜', '装柜中', '装柜完成', '派送完成', '已完成',
+      '待审核', '待测量数据', '待客户确认', '已确认数据', '待上传资料', '一件代发打托', '待分柜', '装柜中', '装柜完成', '出口报关', '已开船／待清关', '待拆柜', '待排车', '出库单', '派送中', '签收完成',
     ])
-    for (const legacyLabel of ['待客户确认', '差异处理中', '派送中', '进入分柜']) {
+    for (const legacyLabel of ['差异处理中', '进入分柜']) {
       expect(source).not.toContain(legacyLabel)
     }
   })
@@ -629,7 +629,7 @@ describe('UnifiedOrdersView contract', () => {
     expect(source).toContain('feePanelRevision.value += 1')
     expect(source).not.toContain('<h3 class="fee-section-title">头程自动初算</h3>')
     expect(source).toContain('其他费用明细')
-    expect(source).toContain('@changed="loadDetail(true)"')
+    expect(source).toContain('@changed="loadDetail(true); loadStatusCounts()"')
     expect(source).toContain('firstLegTransportModeLabel(detail.order.order?.transportMode)')
     expect(source).toContain('firstLegPickupMethodLabel(detail.order.order?.pickupMethod)')
     expect(source).toContain('firstLegDestinationTypeLabel(detail.order.order?.destinationType)')

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

@@ -11,6 +11,9 @@ import {
   getPlatformUnifiedOrderBatchApprovalPreview,
   updatePlatformUnifiedOrderRemarks,
   listPlatformUnifiedOrders,
+  getPlatformUnifiedOrderStatusCounts,
+  type UnifiedOrderStatusCountQuery,
+  type UnifiedOrderStatusCounts,
   updatePlatformUnifiedOrderPlanning,
   unifiedOrderStatusOptions,
   type UnifiedOrderDetailResource,
@@ -121,6 +124,10 @@ const page = ref(1)
 const pageSize = ref(20)
 const total = ref(0)
 const loading = ref(false)
+const statusCounts = ref<UnifiedOrderStatusCounts['counts']>({})
+const statusCountsLoading = ref(false)
+const statusCountsError = ref<ApiErrorDetails | null>(null)
+let statusCountsRequestSerial = 0
 const loadError = ref<ApiErrorDetails | null>(null)
 const legacyImportOpen = ref(false)
 const legacyImportFile = ref<File | null>(null)
@@ -714,11 +721,16 @@ function optionalBoolean(value: string | null | undefined) {
 
 function selectStatus(status: UnifiedOrderMainStatus | '' | 'MEASUREMENT_REVIEW') {
   if (selectedTab.value === status) return
+  const leavingMeasurementReview = measurementReviewSelected.value
   measurementReviewSelected.value = status === 'MEASUREMENT_REVIEW'
   if (measurementReviewSelected.value) selectedOrders.value = []
-  if (status === 'MEASUREMENT_REVIEW') return
+  if (status === 'MEASUREMENT_REVIEW') {
+    void loadStatusCounts()
+    return
+  }
   selectedStatus.value = status
-  if (page.value === 1) void loadOrders()
+  if (leavingMeasurementReview) void loadStatusCounts()
+  if (page.value === 1) void loadOrders(false)
   else page.value = 1
 }
 
@@ -786,6 +798,7 @@ async function savePlanning(row: UnifiedOrderResource) {
     row.estimatedVolumeCbm = estimatedVolumeCbm
     draft.savedExpectedArrivalAt = draft.expectedArrivalAt
     draft.savedEstimatedVolumeCbm = estimatedVolumeCbm
+    void loadStatusCounts()
     ElMessage.success('订单运营预估已更新')
   } catch (error) {
     const details = getApiErrorDetails(error, '订单运营预估保存失败')
@@ -821,6 +834,7 @@ const canEditDeclaration = computed(() => Boolean(
 ))
 
 async function handleDeclarationUpdated() {
+  void loadStatusCounts()
   activeDetailTab.value = 'basic'
   await loadDetail(true)
 }
@@ -1089,6 +1103,7 @@ async function updateMeasurementCalculationMode(row: Record<string, unknown> | n
     measurementSectionModes.outer = mode
     measurementLoadedKey.value = ''
     ElMessage.success(`${row ? '当前数据' : '全部测量数据'}已保存并绑定计算规则，体积已重新计算`)
+    void loadStatusCounts()
     return true
   } catch (error) {
     measurementLoadedKey.value = ''
@@ -1141,6 +1156,7 @@ async function saveWarehouseOuterDimensions(row: Record<string, unknown>) {
     if (refreshed) measurementDetail.value = refreshed
     measurementLoadedKey.value = ''
     ElMessage.success(`序号 ${row.itemNo || '—'} 的外箱规已更新，相关数值已重新计算`)
+    void loadStatusCounts()
   } catch (error) {
     measurementLoadedKey.value = ''
     await loadMeasurementDetails()
@@ -1583,20 +1599,11 @@ async function loadWarehouses() {
   }
 }
 
-async function loadOrders() {
+function orderCountFilters(): UnifiedOrderStatusCountQuery {
-  if (measurementReviewSelected.value) return
-  selectedApprovalOrders.value = []
-  selectedOrders.value = []
-  loading.value = true
-  loadError.value = null
-  coLoadError.value = null
-  Object.keys(planningDrafts).forEach((key) => delete planningDrafts[key])
-  try {
   const activeFilters = appliedFilters.value
   const range = activeFilters.createdRange
-    const result = await listPlatformUnifiedOrders({
+  return {
     tenantId: activeFilters.tenantId || undefined,
-      mainStatus: selectedStatus.value || undefined,
     receivingWarehouseId: activeFilters.receivingWarehouseId || undefined,
     destinationWarehouseId: activeFilters.destinationWarehouseId || undefined,
     inboundCode: trimmed(activeFilters.inboundCode),
@@ -1612,6 +1619,41 @@ async function loadOrders() {
     fbaCode: trimmed(activeFilters.fbaCode),
     createdFrom: range.length === 2 ? `${range[0]}T00:00:00` : undefined,
     createdTo: range.length === 2 ? `${range[1]}T23:59:59` : undefined,
+  }
+}
+
+async function loadStatusCounts() {
+  const serial = ++statusCountsRequestSerial
+  statusCounts.value = {}
+  statusCountsLoading.value = true
+  statusCountsError.value = null
+  try {
+    const result = await getPlatformUnifiedOrderStatusCounts(orderCountFilters())
+    if (serial === statusCountsRequestSerial) statusCounts.value = result.counts
+  } catch (error) {
+    if (serial === statusCountsRequestSerial) statusCountsError.value = getApiErrorDetails(error, '订单页签数量加载失败')
+  } finally {
+    if (serial === statusCountsRequestSerial) statusCountsLoading.value = false
+  }
+}
+
+function tabCount(value: UnifiedOrderMainStatus | '' | 'MEASUREMENT_REVIEW') {
+  return value ? statusCounts.value[value] : undefined
+}
+
+async function loadOrders(refreshCounts = true) {
+  if (refreshCounts) void loadStatusCounts()
+  if (measurementReviewSelected.value) return
+  selectedApprovalOrders.value = []
+  selectedOrders.value = []
+  loading.value = true
+  loadError.value = null
+  coLoadError.value = null
+  Object.keys(planningDrafts).forEach((key) => delete planningDrafts[key])
+  try {
+    const result = await listPlatformUnifiedOrders({
+      ...orderCountFilters(),
+      mainStatus: selectedStatus.value || undefined,
       page: page.value,
       size: pageSize.value,
     })
@@ -1628,17 +1670,19 @@ async function loadOrders() {
 
 function search() {
   appliedFilters.value = cloneFilters(filters.value)
+  void loadStatusCounts()
   if (page.value !== 1) {
     page.value = 1
     return
   }
-  void loadOrders()
+  void loadOrders(false)
 }
 
 function reset() {
   filters.value = emptyFilters()
   appliedFilters.value = emptyFilters()
-  if (page.value === 1) void loadOrders()
+  void loadStatusCounts()
+  if (page.value === 1) void loadOrders(false)
   else page.value = 1
 }
 
@@ -1806,6 +1850,7 @@ async function executeConfirmAndSendFee() {
       automaticFee.value = { feeStatus: snapshot.feeStatus, totalAmount: Number(snapshot.totalAmount || 0) }
       feePanelRevision.value += 1
       ElMessage.success('计费量和单价已确认并发送给客户')
+      void loadStatusCounts()
       feeConfirmOpen.value = false
       feeConfirmAttempt = null
       await loadDetail(true)
@@ -2298,7 +2343,7 @@ async function loadDetail(force = false) {
   }
 }
 
-watch([page, pageSize], () => { void loadOrders() })
+watch([page, pageSize], () => { void loadOrders(false) })
 watch(businessInboundCode, (value) => {
   detailAssociationRequestSerial += 1
   resolvedDetailTarget.value = null
@@ -2321,12 +2366,16 @@ watch(detailRouteKey, (value) => {
 watch(measurementPreviewOpen, (open) => {
   if (!open) releaseMeasurementPreview()
 })
+watch(smartLoadingOpen, (open, wasOpen) => {
+  if (wasOpen && !open) void loadOrders()
+})
 onMounted(() => {
   void loadCustomers()
   void loadWarehouses()
   if (!isDetailRoute.value) void loadOrders()
 })
 onBeforeUnmount(() => {
+  statusCountsRequestSerial += 1
   detailAssociationRequestSerial += 1
   measurementRequestSerial += 1
   holdRequestSerial += 1
@@ -2506,7 +2555,7 @@ onBeforeUnmount(() => {
                 :inbound-id="normalizedInboundId"
                 :destination-type="detail.summary.destinationType"
                 @summary="otherFeeSummary = $event"
-                @changed="loadDetail(true)"
+                @changed="loadDetail(true); loadStatusCounts()"
               />
               </template>
             </template>
@@ -2703,9 +2752,9 @@ onBeforeUnmount(() => {
 
     <template v-else>
     <div v-if="measurementReviewSelected" id="unified-orders-results" role="tabpanel">
-      <InboundTaskList mode="review" title="订单列表">
+      <InboundTaskList mode="review" title="订单列表" @changed="loadStatusCounts">
         <template #status-tabs>
-          <div ref="statusTabList" class="status-tabs density-status-tabs" role="tablist" aria-label="订单主状态">
+          <div ref="statusTabList" class="status-tabs density-status-tabs" role="tablist" aria-label="订单主状态" :aria-busy="statusCountsLoading">
             <button
               v-for="(tab, index) in statusTabs"
               :key="tab.value || 'ALL'"
@@ -2717,7 +2766,13 @@ onBeforeUnmount(() => {
               :class="['status-tab', { 'is-active': selectedTab === tab.value }]"
               @click="selectStatus(tab.value)"
               @keydown="handleTabKeydown($event, index)"
-            >{{ tab.label }}</button>
+            ><span>{{ tab.label }}</span><span v-if="tabCount(tab.value) !== undefined" class="order-status-count">（{{ tabCount(tab.value) }}）</span></button>
+          </div>
+          <div v-if="statusCountsLoading" class="order-status-feedback" role="status">页签数量加载中…</div>
+          <div v-else-if="statusCountsError" class="order-status-feedback" role="status">
+            <span>{{ statusCountsError.message }}</span>
+            <el-button link type="primary" @click="loadStatusCounts">重试数量</el-button>
+            <ApiErrorMeta :details="statusCountsError" />
           </div>
         </template>
       </InboundTaskList>
@@ -2732,7 +2787,7 @@ onBeforeUnmount(() => {
         <template #toolbar-start><h1>订单列表</h1></template>
         <template #filters>
     <div class="orders-query-panel integrated-query-group">
-      <div ref="statusTabList" class="status-tabs density-status-tabs" role="tablist" aria-label="订单主状态">
+      <div ref="statusTabList" class="status-tabs density-status-tabs" role="tablist" aria-label="订单主状态" :aria-busy="statusCountsLoading">
         <button
           v-for="(tab, index) in statusTabs"
           :key="tab.value || 'ALL'"
@@ -2744,9 +2799,15 @@ onBeforeUnmount(() => {
           :class="['status-tab', { 'is-active': selectedTab === tab.value }]"
           @click="selectStatus(tab.value)"
           @keydown="handleTabKeydown($event, index)"
-        >{{ tab.label }}</button>
+        ><span>{{ tab.label }}</span><span v-if="tabCount(tab.value) !== undefined" class="order-status-count">（{{ tabCount(tab.value) }}）</span></button>
       </div>
 
+          <div v-if="statusCountsLoading" class="order-status-feedback" role="status">页签数量加载中…</div>
+          <div v-else-if="statusCountsError" class="order-status-feedback" role="status">
+            <span>{{ statusCountsError.message }}</span>
+            <el-button link type="primary" @click="loadStatusCounts">重试数量</el-button>
+            <ApiErrorMeta :details="statusCountsError" />
+          </div>
       <QueryToolbar id="unified-orders-advanced-filters" v-model="filters" class="orders-query-toolbar" ariaLabel="订单列表筛选" :fields="queryFields" :available-fields="allQueryFields" preference-key="unified-orders-query-v2" :search-on-reset="false" @search="search" @reset="reset">
         <template #actions>
           <el-button :aria-expanded="showAdvancedFilters" aria-controls="unified-orders-advanced-filters" @click="showAdvancedFilters = !showAdvancedFilters">

src/modules/unified-orders/styles/orderDensity.css

@@ -1,4 +1,6 @@
 /* Order-specific sections. Shared density lives in styles/adminDensity.css. */
+.unified-orders-page .order-status-count { font-variant-numeric: tabular-nums; }
+.unified-orders-page .order-status-feedback { display: flex; align-items: center; flex-wrap: wrap; gap: var(--admin-space-3, 8px); padding: var(--admin-space-2, 6px) var(--admin-space-4, 10px); color: var(--cc-muted); font-size: var(--admin-font-caption, 12px); }
 .unified-orders-page .inbound-fee-panel .fee-summary {
   grid-template-columns: minmax(230px, 1.3fr) repeat(4, minmax(150px, 1fr));
   border-top: 0;