fix(fleet): validate pallet destination identity before capacity confirmation

Merge pull request '发布已通过 TEST 回归的 2026-10-08 批次至灰度' (#16 ) from release/test into main
优化
2026-10-09 11:48:53 +08:00 · 2026-10-08 22:17:40 +08:00 · 2026-10-08 20:25:25 +08:00 · 2026-10-08 20:16:19 +08:00 · 2026-10-08 18:13:43 +08:00 · 2026-10-08 17:08:04 +08:00
330 changed files with 15247 additions and 1465 deletions
@@ -6,9 +6,9 @@
 2. 视觉还原、布局/交互承载方式变更或真实页面验收时读取 `../../docs/Admin-Client前端原型还原验收规则.md`；需要原型依据才读取 `../../docs/悦/货代SAAS平台后台/AGENTS.md` 并定位目标片段。纯文案、逻辑或单元测试任务不自动读取。
   Admin 样式优化还须读取 `../../docs/Admin高密度界面规范.md` 的“样式维护边界”和“新模块接入规则”；以已确认密度与彩色页签为视觉基线，逐操作保留业务语义和承载方式。国内仓、客户管理是样板；新增菜单按本轮范围显式接入，货柜管理入口见 `../../docs/Admin货柜管理样式核对记录.md`。
 3. 标准列表或公共组件任务读取 `src/shared/components/AGENTS.md`；国内/海外 HTTP、Token 或刷新任务读取 `src/shared/api/AGENTS.md`；Finance 任务读取 `src/modules/finance/AGENTS.md`；海外仓全流程任务先读 `../../docs/海外仓业务/README.md`。
-4. 平台/客户层级与权限公共语义读取 `../../docs/平台客户层级与权限契约.md`；双区域 API、海外 Token 和跨区事件读取 `../../docs/统一认证与服务通信契约.md`。
+4. 平台/客户层级与权限公共语义读取 `../../docs/平台客户层级与权限契约.md`；统一 API、Token、会话撤销或可靠事件任务按需读取 `../../docs/统一认证与服务通信契约.md` 对应章节。

-普通单端任务的最小读取集是本文件、目标模块最近的 `AGENTS.md` 和目标代码命中段；只有跨服务状态、权限或接口边界无法判断时才增加后端契约。累计超过约 250 行时改用定向检索，不全文加载无关专题。
+普通单端任务的最小读取集是本文件、目标模块最近的 `AGENTS.md` 和目标代码命中段；只有跨服务状态、权限或接口边界无法判断时才增加后端契约。读取预算遵循根指引的行数与字符数标准，先读适用规则，再定向读取业务表，不全文加载无关专题。

 ## 项目定位与技术基线

@@ -60,7 +60,7 @@
 | 入库单扣货、解除、凭证与历史 | `modules/inbounds/pages/InboundOrdersView.vue`、详情工作区、`modules/inbounds/core/api.ts` | 列表展示服务端 `holdFlag/currentHoldReason` 并支持筛选；详情只按 `canHold/canRelease/actionBlockReason` 开放操作。扣货与解除提交当前 `version`、原因和独立幂等键，可选凭证先按明确客户与入库单上传；历史文件只调用专用下载入口，不把上传成功但未提交命令的文件冒充扣货证据 |
 | 客户专属价格簿、柜级阶梯运费与受控调价 | 列表/上传 `modules/fba-pricing/carrier-rates/pages/CarrierRatesView.vue`，版本详情/仓库映射/确认 `modules/fba-pricing/carrier-rates/pages/CarrierRateDetailView.vue`，路由 `modules/fba-pricing/routes.ts`；`modules/inbounds/fee/`、`modules/unified-orders/components/InboundFeeDetailManager.vue` | 列表与上传后按 `versionId` 进入 `fba-carrier-rate-detail` 独立详情页，价格行只读；回归入口 `modules/fba-pricing/carrier-rates/pages/CarrierRatesView.test.ts`。价格簿页面显式选择公共报价或具体客户；列表、上传、确认只作用于该 `customerId`，不得混合版本。计价优先消费客户专属 ACTIVE 版本，无专属版本才回退公共 ACTIVE；柜级阶梯金额和各客户分摊只展示服务端结果。调整计费量只能在服务端返回的上下 10% 范围内并提交当前费用版本、原因与二次确认；私人仓尾程派送费使用稳定 `PRIVATE_LAST_MILE_DELIVERY` 代码且只对 `PRIVATE` 目的地开放；一件代发须在预装确认前完成试算，计价后保持服务端 `WAIT_PALLETIZE` 状态 |
 | 财务、客户资金账户与柜级公共费用分摊 | `modules/finance/`，继续读该目录 `AGENTS.md`；客户账户 `pages/FinanceCustomerAccountsView.vue`，柜费 `modules/loading-lists/components/ContainerFeesPanel.vue`、`api/containerFees.ts` | `finance/`、`firstleg/`、`file/`、`docs/财务管理/`；实际、冻结、可用余额、授信与流水只消费 Finance 权威结果，充值审核和手工充扣携带版本与幂等键。跨客户公共柜费只按服务端柜内客户/订单事实分摊，金额必须守恒，创建与审核、驳回、调整、作废均整组原子处理 |
-| 货柜双工作台、排柜、预装/装柜清单、真实柜号后补与整柜报关 | 国内 `modules/container-loading/pages/DomesticContainersView.vue`、海外 `OverseasContainersView.vue`，共享详情实现 `ContainerDetailView.vue`；预装详情 `modules/loading-lists/pages/PreloadPlanDetailView.vue`，资料/PDA 证据 `components/ContainerOverviewPanel.vue`，报关 `components/ContainerCustomsPanel.vue` | 国内“送柜报关”只消费 `/containers/domestic` 与服务端 `allowedActions`，承载模拟柜、订舱关联、智能装柜；模拟柜创建选择与智能装柜一致的 9 类计划渠道，未关联订舱前实际渠道为空，订舱关联候选按计划渠道组匹配并同时展示订舱号与提单号、装柜清单页签、出口报关和国内出仓；创建柜次时自动生成唯一预装计划，预装详情先调用 `/loading-plans/{planId}/lifecycle`，完成后深链进入国内货柜详情的装柜清单页签，不再注册独立正式清单导航和路由。订舱关联允许真实集装箱号为空，但确认预装和创建 PDA 任务前必须补齐；历史已建但缺号的任务仍可在预装详情首次补录，保存后恢复 PDA 可进入状态；全买单柜继续使用 `complete-all-buy`。海外“清关提柜”只消费 `/containers/overseas`，承载船节点、目的港清关、DO/PU、码头车队和还空；原预约/实际提柜展示位改为整柜预计/实际到仓，预计到仓在列表内人工快捷维护并经海外接口同步整柜尾程订单，实际到仓只读海外 PDA 首次开始收货时间。还空截止事实由服务端基于卸柜完成时间加 72 小时计算，前端不重算。两端统一使用 `containerBookingId`，列表范围由服务端 `scope=ACTIVE/HISTORY` 分页，禁止浏览器筛选或本地推导写资格。后端为 `LoadingListService`、`firstleg/customs/container/`、`firstleg/terminaldrayage/` 和 `lastleg-service/`，文件归 `file/` |
+| 货柜双工作台、排柜、预装/装柜清单、真实柜号后补与整柜报关 | 国内 `modules/container-loading/pages/DomesticContainersView.vue`、海外 `OverseasContainersView.vue`，共享详情实现 `ContainerDetailView.vue`；预装详情 `modules/loading-lists/pages/PreloadPlanDetailView.vue`，资料/PDA 证据 `components/ContainerOverviewPanel.vue`，报关 `components/ContainerCustomsPanel.vue` | 国内“送柜报关”只消费 `/containers/domestic` 与服务端 `allowedActions`，承载模拟柜、订舱关联、智能装柜；模拟柜创建选择与智能装柜一致的 9 类计划渠道，未关联订舱前实际渠道为空，订舱关联候选按计划渠道组匹配并同时展示订舱号与提单号、装柜清单页签、出口报关和国内出仓；创建柜次时自动生成唯一预装计划，预装详情先调用 `/loading-plans/{planId}/lifecycle`，完成后深链进入国内货柜详情的装柜清单页签，独立装柜清单导航 `/loading-lists` 复用已确认清单 API，查看进入独立详情路由 `/loading-lists/:planId`，保留返回列表和打印；独立清单详情与货柜清单页签共同使用 `useLoadingListDetail.ts` 加载、校验和处理错误，`LoadingListDetailDrawer.vue` 统一密度、摘要、明细、历史及打印入口，打印实现归 `printLoadingList.ts`，外层只保留返回目标与货柜专属 PDA/报关区域；货柜列表经 `ContainerWorkbenchView.vue` 在国内装柜与海外清关提柜之间按权限切换。订舱关联允许真实集装箱号为空，但确认预装和创建 PDA 任务前必须补齐；历史已建但缺号的任务仍可在预装详情首次补录，保存后恢复 PDA 可进入状态；全买单柜继续使用 `complete-all-buy`。海外“清关提柜”只消费 `/containers/overseas`，承载船节点、目的港清关、DO/PU、码头车队和还空；原预约/实际提柜展示位改为整柜预计/实际到仓，预计到仓在列表内人工快捷维护并经海外接口同步整柜尾程订单，实际到仓只读海外 PDA 首次开始收货时间。还空截止事实由服务端基于卸柜完成时间加 72 小时计算，前端不重算。两端统一使用 `containerBookingId`，列表范围由服务端 `scope=ACTIVE/HISTORY` 分页，禁止浏览器筛选或本地推导写资格。后端为 `LoadingListService`、`firstleg/customs/container/`、`firstleg/terminaldrayage/` 和 `lastleg-service/`，文件归 `file/` |
 | 合柜报关 / 同柜不可拆组 | `modules/unified-orders/api/coLoadGroups.ts`、`pages/UnifiedOrdersView.vue`；装柜消费 `modules/container-loading/pages/SmartLoadingWorkbenchView.vue` | 前端只提交订单 ID；Backend `firstleg/loading/coload/` 展开并冻结每票全部可用入仓片段。成员数是入仓片段数，不等于订单票数；只要求同国内仓、同渠道，允许跨客户及不同目的仓港；分配、移除、取消均整组处理 |
 | 全局智能装柜工作台、入仓码候选与箱数分配 | `modules/container-loading/components/SmartLoadingDialog.vue` 内嵌 `pages/GlobalSmartLoadingView.vue`，柜次页 `SmartLoadingWorkbenchView.vue`，以及 `smartLoadingChannelGroups.ts`、`smartLoadingItems.ts`、`api/platformContainerLoading.ts`；全局页当前不注册独立路由 | Backend `firstleg/` 的 `/inbound-candidates`、`/containers`、`/inbound-assignments`、`/plans/{planId}/pending-review-assignments`、`/group-assignments`、`/unpicked-items`。`orderStatuses` 最多四项且未传表示全部未完成状态；候选状态多选覆盖待审核、待测量、待分柜、装柜中，状态只用于筛选展示，按钮资格以服务端 `canAssign` 为准；待审核/待测量可提前占位但不得提前确认预装或启动 PDA。计划箱数编辑上限、已用和未用展示只消费服务端 `totalPackageCount/remainingPackageCount`，不得从候选页或本地规格重新拼算。人工加入允许跨渠道，智能推荐仍按柜次渠道。柜次容量和限重取服务端字段；同柜组作为单卡整组分页、分配和移除，任一成员已拣时整组保留 |
 | 国内货柜履约订舱资料、打印、关联候选与出仓前船期 | `modules/ocean-bookings/` 的 `components/OceanBookingDocumentsPanel.vue`、`OceanBookingPrintDialog.vue`，以及 `modules/container-loading/`、`modules/port-schedules/` | 订舱草稿按当前版本维护资料，放舱后资料与表单只读；打印对草稿与已放舱订舱均开放，按当前已保存资料生成，未填写字段显示“—”。`platformOceanBookings.ts` 的 `/link-candidates` 只消费服务端分页，`containerCount` 是柜型需求 `quantity` 总和；Backend `firstleg/oceanbooking/`、`file/`、`print/`、`firstleg/portschedule/` |
@@ -75,7 +75,7 @@
 | 海外排车、出库与派送 | `modules/overseas-warehouse/AGENTS.md` | 按模块表定位排车、出库、派送页面及 API；履约边界在模块内维护 |
 | 海外异常退回与客户回访 | `modules/overseas-warehouse/AGENTS.md` | 派送异常退回区别于退货库存；页面、API 与原子推进约束见模块指引 |

-全量验收按业务从 `../../docs/订单与客户/`、`入库测量与计费/`、`国内货柜履约/`、`财务管理/` 选择最小契约；海外仓业务开发先读 `../../docs/海外仓业务/README.md`。进度、排期或验收状态问题再读取进度表和报告。
+全量验收按业务从 `../../docs/订单与客户/`、`入库测量与计费/`、`国内货柜履约/`、`财务管理/` 选择最小契约；海外跨模块流程或入口不明时读 `../../docs/海外仓业务/README.md`，已定位局部任务直接沿模块入口。进度、排期或验收状态问题再读取对应进度表和报告。

 散货托盘码打印：`modules/loading-lists/components/PalletLabelPrintDialog.vue`、`modules/loading-lists/api/platformLoadingLists.ts`，由货柜详情与装柜清单详情进入；先调用 `/pallet-labels/prepare` 获取服务端按 FBA 仓分组的冻结清单，再通过 `/pallet-labels/print` 下载 PDF。托盘码使用“真实柜号-FBA 地址内部编号-三位序号”，页面同时展示 FBA 仓码和内部编号；支持全部打印或按仓指定张数补打，一件代发托盘不在该清单，前端不生成或重新编号托盘码。

@@ -88,6 +88,7 @@
 | 海外采购 | `modules/overseas-business/pages/PurchaseOrdersView.vue`、详情/编辑页 | `modules/overseas-business/api/platformOverseasBusiness.ts` 的 purchase 方法；Backend `lastleg-service/procurement/` |
 | 美国卡车、本土散板 | `modules/overseas-business/pages/TransportOrdersView.vue`、`TransportOrderFormView.vue` | 同一 API 的 us-truck/looseboard 方法；Backend `lastleg-service/trucking/`、`looseboard/` |
 | 海外报价、月度汇率、车辆 | `modules/overseas-master-data/pages/OverseasQuotesView.vue`、`ExchangeRatesView.vue`、`VehiclesView.vue` | `modules/overseas-master-data/api/overseasMasterData.ts`；Backend `lastleg-service/masterdata/` |
+| 司机档案、驾驶证、到期提醒与资格预览 | `modules/overseas-master-data/pages/DriversView.vue`、`DriverDetailView.vue`；最近指引 `modules/overseas-master-data/AGENTS.md` | `api/drivers.ts`；Backend `lastleg-service/fleet/driver/`、File `FLEET_DRIVER_LICENSE` |

 ## 业务、安全与共享装配

@@ -1,15 +1,16 @@
 pipeline {
-  agent { label 'java-test' }
+  agent { label "${env.JOB_BASE_NAME?.endsWith('-prod') ? 'java-builder' : 'java-test'}" }
  options {
    timestamps()
    disableConcurrentBuilds()
  }
  stages {
    stage('检查测试发布参数') {
+      when { expression { !env.JOB_BASE_NAME?.endsWith('-prod') } }
      steps {
        script {
-          if (env.JOB_BASE_NAME?.endsWith('-dev') || env.JOB_BASE_NAME?.endsWith('-prod')) {
-            error('当前仅支持 test，请使用测试环境 Job')
+          if (env.JOB_BASE_NAME?.endsWith('-dev')) {
+            error('此流水线仅支持 test 和本轮授权的 prod 灰度')
          }
          env.IMAGE_TAG = sh(script: 'git rev-parse --short=12 HEAD', returnStdout: true).trim()
        }
@@ -23,6 +24,7 @@ pipeline {
      }
    }
    stage('构建并部署测试前端') {
+      when { expression { !env.JOB_BASE_NAME?.endsWith('-prod') } }
      steps {
        sh '''set -eu
          docker compose -f docker-compose.test.yml build --pull=false
@@ -31,8 +33,30 @@ pipeline {
        '''
      }
    }
+    stage('发布临时生产灰度') {
+      when { expression { env.JOB_BASE_NAME?.endsWith('-prod') } }
+      steps {
+        lock(resource: 'firstleg-production-admin-web-deploy') {
+          withCredentials([
+            usernamePassword(credentialsId: 'gitea-registry-token', usernameVariable: 'BUILD_REGISTRY_USER', passwordVariable: 'BUILD_REGISTRY_PASSWORD'),
+            usernamePassword(credentialsId: 'gitea-production-pull-token', usernameVariable: 'REGISTRY_USER', passwordVariable: 'REGISTRY_PASSWORD'),
+            sshUserPrivateKey(credentialsId: 'firstleg-production-ssh', keyFileVariable: 'TARGET_SSH_KEY', usernameVariable: 'TARGET_SSH_USER'),
+            string(credentialsId: 'firstleg-production-host', variable: 'TARGET_SSH_HOST'),
+            file(credentialsId: 'firstleg-production-known-hosts', variable: 'TARGET_SSH_KNOWN_HOSTS')
+          ]) {
+            sh 'sh scripts/deploy-production.sh'
+          }
+        }
+      }
+    }
  }
  post {
-    failure { sh 'docker compose -f docker-compose.test.yml logs --tail=100 || true' }
+    failure {
+      script {
+        if (!env.JOB_BASE_NAME?.endsWith('-prod')) {
+          sh 'docker compose -f docker-compose.test.yml logs --tail=100 || true'
+        }
+      }
+    }
  }
 }
@@ -0,0 +1,23 @@
+name: firstleg-prod-admin-web
+services:
+  admin-web:
+    image: "${PRODUCTION_IMAGE_REPOSITORY:?PRODUCTION_IMAGE_REPOSITORY is required}:${IMAGE_TAG:?IMAGE_TAG is required}"
+    container_name: firstleg-prod-admin-web
+    restart: unless-stopped
+    ports:
+      - "127.0.0.1:${HOST_PORT:-29011}:80"
+    environment:
+      CLIENT_WEB_URL: "${PUBLIC_WEB_ORIGIN:?PUBLIC_WEB_ORIGIN is required}"
+      API_UPSTREAM: "http://gateway:9000"
+    healthcheck:
+      test: ["CMD", "wget", "-qO-", "http://127.0.0.1/healthz"]
+      interval: 5s
+      timeout: 3s
+      retries: 12
+      start_period: 5s
+    networks:
+      - backend
+networks:
+  backend:
+    external: true
+    name: firstleg-production-network
@@ -0,0 +1,58 @@
+#!/bin/sh
+set -eu
+set +x
+: "${PUBLIC_WEB_ORIGIN:?PUBLIC_WEB_ORIGIN is required}"
+: "${PRODUCTION_IMAGE_REPOSITORY:?PRODUCTION_IMAGE_REPOSITORY is required}"
+: "${TARGET_SSH_KEY:?}"
+: "${TARGET_SSH_USER:?}"
+: "${TARGET_SSH_HOST:?}"
+: "${TARGET_SSH_KNOWN_HOSTS:?}"
+: "${BUILD_REGISTRY_USER:?}"
+: "${BUILD_REGISTRY_PASSWORD:?}"
+: "${REGISTRY_USER:?}"
+: "${REGISTRY_PASSWORD:?}"
+case "$PUBLIC_WEB_ORIGIN" in https://*) ;; *) echo 'prod requires HTTPS web origin' >&2; exit 2 ;; esac
+# Only an origin (optionally a trailing slash) is accepted; no shell/env-file metacharacters.
+printf '%s' "$PUBLIC_WEB_ORIGIN" | grep -Eq '^https://[A-Za-z0-9.-]+(:[0-9]+)?/?$'
+printf '%s' "$PRODUCTION_IMAGE_REPOSITORY" | grep -Eq '^[A-Za-z0-9.-]+(:[0-9]+)?/[a-z0-9._/-]+$'
+git fetch --no-tags origin +refs/heads/main:refs/remotes/origin/main
+test "$(git rev-parse HEAD)" = "$(git rev-parse origin/main)"
+IMAGE_TAG=$(git rev-parse --short=12 HEAD)
+registry=${PRODUCTION_IMAGE_REPOSITORY%%/*}
+image="$PRODUCTION_IMAGE_REPOSITORY:$IMAGE_TAG"
+TARGET_SSH_TARGET="$TARGET_SSH_USER@$TARGET_SSH_HOST"
+remote_dir=/data/firstleg/deploy/gray-admin-web
+run_ssh() {
+  ssh -i "$TARGET_SSH_KEY" -o BatchMode=yes -o StrictHostKeyChecking=yes \
+    -o UserKnownHostsFile="$TARGET_SSH_KNOWN_HOSTS" -o ConnectTimeout=12 "$TARGET_SSH_TARGET" "$@"
+}
+run_scp() {
+  scp -i "$TARGET_SSH_KEY" -o BatchMode=yes -o StrictHostKeyChecking=yes \
+    -o UserKnownHostsFile="$TARGET_SSH_KNOWN_HOSTS" -o ConnectTimeout=12 "$@"
+}
+export DOCKER_CONFIG
+DOCKER_CONFIG=$(mktemp -d)
+cleanup() { rm -f "$DOCKER_CONFIG/config.json"; rmdir "$DOCKER_CONFIG" 2>/dev/null || true; }
+trap cleanup EXIT HUP INT TERM
+printf '%s' "$BUILD_REGISTRY_PASSWORD" | docker login -u "$BUILD_REGISTRY_USER" --password-stdin "$registry"
+docker build --build-arg NODE_IMAGE="${NODE_BASE_IMAGE:-node:22-alpine}" \
+  --build-arg NGINX_IMAGE="${NGINX_BASE_IMAGE:-nginx:1.27-alpine}" \
+  --build-arg VITE_CLIENT_WEB_URL="$PUBLIC_WEB_ORIGIN" -t "$image" .
+docker push "$image"
+run_ssh install -d -m 750 "$remote_dir"
+run_scp docker-compose.production.yml "$TARGET_SSH_TARGET:$remote_dir/compose.yml"
+# The remote env file contains only image coordinates and public web origin, never credentials.
+printf 'PRODUCTION_IMAGE_REPOSITORY=%s\nIMAGE_TAG=%s\nPUBLIC_WEB_ORIGIN=%s\n' \
+  "$PRODUCTION_IMAGE_REPOSITORY" "$IMAGE_TAG" "$PUBLIC_WEB_ORIGIN" | run_ssh sh -c "'umask 077; cat > $remote_dir/release.env'"
+# Registry credentials exist only in an isolated temporary Docker config, removed after pull.
+printf '%s' "$REGISTRY_USER" | grep -Eq '^[A-Za-z0-9_.@-]+$'
+run_scp scripts/pull-production-image.sh "$TARGET_SSH_TARGET:$remote_dir/pull-image.sh"
+printf '%s' "$REGISTRY_PASSWORD" | run_ssh sh "$remote_dir/pull-image.sh" "$REGISTRY_USER" "$registry" "$image"
+run_ssh sh -s -- "$remote_dir" <<'REMOTE'
+set -eu
+cd "$1"
+docker network inspect firstleg-production-network >/dev/null
+docker compose --env-file release.env -f compose.yml config --quiet
+docker compose --env-file release.env -f compose.yml up -d --wait --wait-timeout 120
+docker compose --env-file release.env -f compose.yml exec -T admin-web wget -qO- http://127.0.0.1/healthz
+REMOTE
@@ -0,0 +1,9 @@
+#!/bin/sh
+set -eu
+set +x
+export DOCKER_CONFIG
+DOCKER_CONFIG=$(mktemp -d)
+cleanup() { rm -f "$DOCKER_CONFIG/config.json"; rmdir "$DOCKER_CONFIG" 2>/dev/null || true; }
+trap cleanup EXIT HUP INT TERM
+docker login -u "$1" --password-stdin "$2"
+docker pull "$3"
@@ -63,10 +63,12 @@ describe('AdminSidebarMenu', () => {
    expect(groupTitles).not.toContain('供应商中心')
    expect(groupTitles).toContain('通用')
    expect(groupTitles).toContain('系统管理')
+    expect(groupTitles).not.toContain('预约管理')
    expect(groupTitles).not.toContain('财务管理')
+    expect(paths).not.toContain('/finance/customer-accounts')
    expect(paths).toContain('/dashboard')
    expect(paths).toContain('/orders')
-    expect(paths).toContain('/master-data/express-companies')
+    expect(paths).not.toContain('/master-data/express-companies')
    expect(paths).not.toContain('/orders/first-leg')
    expect(paths).not.toContain('/first-leg-pricing/customer-rules')
    expect(paths).toContain('/downloads')
@@ -241,4 +241,101 @@ describe('admin auth session', () => {
    expect(auth.refreshToken).toBe('')
    expect(localStorage.getItem('cc-admin-token')).toBeNull()
  })
+
+  it('refreshes a rejected logout once and revokes the rotated pair without restoring local state', async () => {
+    const previous = token()
+    const rotated = token({ token_version: 2 })
+    localStorage.setItem('cc-admin-token', previous)
+    localStorage.setItem('cc-admin-refresh-token', 'refresh-old')
+    mocks.post.mockRejectedValueOnce({ isAxiosError: true, response: { status: 401 } })
+      .mockResolvedValueOnce(loginResponse(rotated, 'refresh-rotated'))
+      .mockResolvedValueOnce({ code: '200', data: null })
+    const auth = useAuthStore()
+
+    await expect(auth.logout()).resolves.toBeUndefined()
+
+    expect(mocks.post).toHaveBeenCalledTimes(3)
+    expect(mocks.post).toHaveBeenNthCalledWith(2, '/auth/refresh', { refreshToken: 'refresh-old' })
+    expect(mocks.post).toHaveBeenNthCalledWith(3, '/auth/logout', { refreshToken: 'refresh-rotated' }, {
+      headers: { Authorization: `Bearer ${rotated}` },
+    })
+    expect(auth.isAuthenticated).toBe(false)
+    expect(localStorage.getItem('cc-admin-token')).toBeNull()
+    expect(localStorage.getItem('cc-admin-refresh-token')).toBeNull()
+    expect(mocks.listCurrentPlatformPermissionCodes).not.toHaveBeenCalled()
+  })
+
+  it('revokes a persisted refresh session when startup already removed its expired access token', async () => {
+    localStorage.setItem('cc-admin-token', token({ exp: 1 }))
+    localStorage.setItem('cc-admin-refresh-token', 'refresh-old')
+    const rotated = token()
+    mocks.post.mockResolvedValueOnce(loginResponse(rotated, 'refresh-rotated'))
+      .mockResolvedValueOnce({ code: '200', data: null })
+    const auth = useAuthStore()
+    expect(auth.token).toBe('')
+
+    await auth.logout()
+
+    expect(mocks.post).toHaveBeenCalledTimes(2)
+    expect(mocks.post).toHaveBeenNthCalledWith(1, '/auth/refresh', { refreshToken: 'refresh-old' })
+    expect(mocks.post).toHaveBeenNthCalledWith(2, '/auth/logout', { refreshToken: 'refresh-rotated' }, {
+      headers: { Authorization: `Bearer ${rotated}` },
+    })
+    expect(auth.isAuthenticated).toBe(false)
+  })
+
+  it('leaves a subsequent login intact while finishing revocation of the previous session', async () => {
+    localStorage.setItem('cc-admin-token', token())
+    localStorage.setItem('cc-admin-refresh-token', 'refresh-old')
+    let finishRefresh: ((value: ReturnType<typeof loginResponse>) => void) | undefined
+    const started = new Promise<void>(resolve => {
+      mocks.post.mockRejectedValueOnce({ isAxiosError: true, response: { status: 401 } })
+        .mockImplementationOnce(() => { resolve(); return new Promise(done => { finishRefresh = done }) })
+    })
+    const auth = useAuthStore()
+    const loggingOut = auth.logout()
+    // Attach immediately so a regression rejecting early does not become an unhandled rejection.
+    const result = loggingOut.then(() => null, error => error)
+    await Promise.race([started, loggingOut.catch(() => undefined)])
+    expect(finishRefresh).toBeTypeOf('function')
+    const newAccess = token({ user_id: '1000002', username: 'second' })
+    mocks.post.mockResolvedValueOnce(loginResponse(newAccess, 'refresh-new-login'))
+      .mockResolvedValueOnce({ code: '200', data: null })
+    mocks.listCurrentPlatformPermissionCodes.mockResolvedValue(['platform:warehouse:list'])
+    await auth.login('second', 'password')
+    const revocationAccess = token({ token_version: 3 })
+    finishRefresh?.(loginResponse(revocationAccess, 'refresh-revocation-only'))
+
+    expect(await result).toBeNull()
+    expect(auth.token).toBe(newAccess)
+    expect(localStorage.getItem('cc-admin-refresh-token')).toBe('refresh-new-login')
+    expect(mocks.post).toHaveBeenLastCalledWith('/auth/logout', { refreshToken: 'refresh-revocation-only' }, {
+      headers: { Authorization: `Bearer ${revocationAccess}` },
+    })
+  })
+
+  it('does not refresh or retry an ambiguous logout transport failure', async () => {
+    localStorage.setItem('cc-admin-token', token())
+    localStorage.setItem('cc-admin-refresh-token', 'refresh-old')
+    const failure = { isAxiosError: true, response: { status: 503 } }
+    mocks.post.mockRejectedValue(failure)
+    const auth = useAuthStore()
+    await expect(auth.logout()).rejects.toBe(failure)
+    expect(mocks.post).toHaveBeenCalledTimes(1)
+    expect(auth.isAuthenticated).toBe(false)
+  })
+
+  it.each(['refresh', 'second-logout'])('stops after a %s rejection and never restores the logged-out session', async stage => {
+    localStorage.setItem('cc-admin-token', token())
+    localStorage.setItem('cc-admin-refresh-token', 'refresh-old')
+    const unauthorized = { isAxiosError: true, response: { status: 401 } }
+    mocks.post.mockRejectedValueOnce(unauthorized)
+    if (stage === 'second-logout') mocks.post.mockResolvedValueOnce(loginResponse())
+    mocks.post.mockRejectedValueOnce(unauthorized)
+    const auth = useAuthStore()
+    await expect(auth.logout()).rejects.toBe(unauthorized)
+    expect(mocks.post).toHaveBeenCalledTimes(stage === 'refresh' ? 2 : 3)
+    expect(localStorage.getItem('cc-admin-token')).toBeNull()
+    expect(localStorage.getItem('cc-admin-refresh-token')).toBeNull()
+  })
 })
@@ -1,5 +1,6 @@
 import { computed, ref } from 'vue'
 import { defineStore } from 'pinia'
+import { isAxiosError } from 'axios'
 import type { CurrentUser } from '@chongchong/shared'
 import {
  http,
@@ -157,9 +158,29 @@ export const useAuthStore = defineStore('admin-auth', () => {
  }

  async function revokeTokenPair(accessToken: string, refreshTokenToRevoke: string) {
-    await http.post('/auth/logout', { refreshToken: refreshTokenToRevoke }, {
-      headers: { Authorization: `Bearer ${accessToken}` },
-    })
+    async function revoke(access: string, refresh: string) {
+      const response = await http.post<ApiEnvelope<null>, ApiEnvelope<null>>(
+        '/auth/logout', { refreshToken: refresh }, { headers: { Authorization: `Bearer ${access}` } },
+      )
+      unwrapApiResponse(response)
+    }
+    if (accessToken) {
+      try {
+        await revoke(accessToken, refreshTokenToRevoke)
+        return
+      } catch (error) {
+        if (!isAxiosError(error) || error.response?.status !== 401) throw error
+      }
+    }
+    // Logout has already cleared local state. Refresh only this captured pair
+    // for revocation; never apply it to this tab or overwrite a subsequent login.
+    const response = await http.post<ApiEnvelope<LoginResponse>, ApiEnvelope<LoginResponse>>(
+      '/auth/refresh', { refreshToken: refreshTokenToRevoke },
+    )
+    const rotated = unwrapApiResponse<LoginResponse>(response)
+    sessionFromToken(rotated.accessToken)
+    if (!rotated.refreshToken) throw new Error('退出时刷新响应缺少会话凭据')
+    await revoke(rotated.accessToken, rotated.refreshToken)
  }

  async function login(account: string, password: string) {
@@ -245,7 +266,7 @@ export const useAuthStore = defineStore('admin-auth', () => {
    const accessToken = token.value
    const tokenToRevoke = refreshToken.value
    clearSession()
-    if (accessToken && tokenToRevoke) {
+    if (tokenToRevoke) {
      await revokeTokenPair(accessToken, tokenToRevoke)
    }
  }
@@ -8,79 +8,30 @@ import {
 } from './adminNavigation'

 describe('adminNavigation', () => {
-  it('keeps the latest prototype menu skeleton in source order and groups additions under general', () => {
-    expect(adminNavigation.map((item) => item.title)).toEqual([
-      '首页数据看板',
-      '客户管理',
-      '国内仓',
-      '海外派送',
-      '货柜管理',
-      '海外业务',
-      '海外仓',
-      '客户服务',
-      '财务管理',
-      '销售管理',
-      '通用',
-      '系统管理',
-    ])
-    expect(adminNavigation.find((item) => item.key === 'customers')?.children?.map((item) => item.title)).toEqual([
-      '客户列表',
-      '海外仓阶梯费用',
-    ])
-    expect(adminNavigation.find((item) => item.key === 'domestic-warehouse')?.children?.map((item) => item.title)).toEqual([
-      '订单列表',
-      '订单测量',
-      '测量数据审核',
-      '预装清单',
-      '库位管理',
-      '托盘管理',
-      '整柜业务',
-      '船期日历',
-    ])
-    expect(adminNavigation.find((item) => item.key === 'customer-service')?.children?.map((item) => item.title)).toEqual(['异常订单', '客户回访'])
-    expect(adminNavigation.find((item) => item.key === 'supplier-center')).toBeUndefined()
-    expect(adminNavigation.find((item) => item.key === 'container-management')?.children?.map((item) => item.title)).toEqual([
-      '订舱列表',
-      '拖车列表',
-      '货柜列表',
-      '清关提柜',
-    ])
-    expect(adminNavigation.find((item) => item.key === 'overseas-inventory')?.children?.map((item) => item.title)).toEqual([
-      '尾程订单',
-      '入库单',
-      '库位管理',
-      '排车列表',
-      '出库单',
-      '派送单列表',
-      '换标单',
-      '托盘管理',
-      '库存管理',
-      '退货库存管理',
-      '退货箱号管理',
-    ])
-    expect(adminNavigation.find((item) => item.key === 'general')?.children?.map((item) => item.title)).toEqual([
-      '产品信息',
-      '供应商列表',
-      '快递公司',
-      '往来单位',
-      '费用项目',
-      '汇率管理',
-      '仓库管理',
-      '海外仓报价',
-      '船期价格表',
-      '车辆列表',
-      '下载中心',
-      '称重机器',
+  it('offers the common container menu to overseas-only operators', () => {
+    const visible = filterAdminNavigation(adminNavigation, new Set(['platform:firstleg:terminal-drayage:list']))
+    expect(getNavigationLeaves(visible).map(item => item.path)).toEqual(['/dashboard', '/container-loading/domestic'])
+  })
+  it('matches the latest prototype sidebar using only implemented menu entries', () => {
+    // 新版.html sidebar (1404–1539), ordered by its data-menu CSS rules (45–56).
+    const allPermissions = new Set(getNavigationLeaves(adminNavigation).flatMap(node => node.permission ? [node.permission] : []))
+    const visible = filterAdminNavigation(adminNavigation, allPermissions)
+    expect(visible.map(node => ({ title: node.title, children: node.children?.map(child => child.title) ?? [] }))).toEqual([
+      { title: '首页数据看板', children: [] },
+      { title: '客户管理', children: ['客户列表', '海外仓阶梯费用'] },
+      { title: '国内头程', children: ['订单列表', '订单测量', '测量数据审核', '库位管理', '托盘管理', '整柜业务', '船期管理'] },
+      { title: '货柜管理', children: ['订舱列表', '拖车列表', '货柜列表', '装柜清单', '预装清单'] },
+       { title: '海外尾程', children: ['尾程订单', '入库单', '废弃单', '出库单', '换标单', '派送单', '托盘管理', '库位管理', '库存管理', '退货库存管理', '退货箱号管理'] },
+      { title: '车辆管理', children: ['排车列表', '车辆列表', '司机管理', '车次管理', '拼车需求池', '出车记录'] },
+      { title: '海外业务', children: ['采购订单', '本土卡车', '本土散板'] },
+      { title: '客户服务', children: ['异常订单'] },
+      { title: '财务管理', children: ['客户账户', '客户应收应付', '应收款统计表', '客户对账单', '结算单应收', '结算单应付'] },
+      { title: '通用', children: ['费用项目', '汇率管理', '仓库管理', '海外仓报价', '车队报价', '船期价格表', '下载中心'] },
+      { title: '系统管理', children: ['用户管理', '角色权限', '菜单权限'] },
    ])
+    expect(visible).toHaveLength(11)
+     expect(visible.flatMap(node => node.children ?? [])).toHaveLength(51)
    expect(adminNavigation.find((item) => item.key === 'notifications')).toBeUndefined()
-    expect(adminNavigation.find((item) => item.key === 'system')?.children?.map((item) => item.title)).toEqual([
-      '用户管理',
-      '角色权限',
-      '租户管理',
-      '品牌设置',
-      '菜单权限',
-      'PDA版本',
-    ])
  })

  it('assigns every page a unique path and only shares permissions backed by the API contract', () => {
@@ -100,7 +51,7 @@ describe('adminNavigation', () => {
    expect(paths).toContain('/container-loading/overseas')
    expect(paths).not.toContain('/container-loading/smart-loading')
    expect(paths).toContain('/loading-plans')
-    expect(paths).not.toContain('/loading-lists')
+    expect(paths).toContain('/loading-lists')
    expect(paths).not.toContain('/port-schedules')
    expect(paths).not.toContain('/customs')
    expect(paths).not.toContain('/outbound-dispatches')
@@ -173,7 +124,6 @@ describe('adminNavigation', () => {
      '/overseas-warehouse/outbounds',
      '/overseas-warehouse/delivery-orders',
      '/overseas-warehouse/exception-orders',
-      '/overseas-warehouse/customer-visits',
      '/overseas-warehouse/relabel-orders',
      '/overseas-warehouse/pallets',
      '/overseas-warehouse/inventory',
@@ -213,12 +163,10 @@ describe('adminNavigation', () => {
    ]))
    const paths = getNavigationLeaves(filtered).map((item) => item.path)

-    expect(filtered.map((item) => item.title)).toEqual(['首页数据看板', '国内仓', '通用'])
+    expect(filtered.map((item) => item.title)).toEqual(['首页数据看板', '国内头程', '通用'])
    expect(paths).toEqual([
      '/dashboard',
      '/orders',
-      '/master-data/express-companies',
-      '/master-data/counterparties',
      '/warehouses',
    ])
    expect(paths).toContain('/dashboard')
@@ -238,11 +186,12 @@ describe('adminNavigation', () => {
    expect(getNavigationLeaves(filtered).map((item) => item.path)).toEqual(['/dashboard', '/master-data/fee-items'])
  })

-  it('shows the public supplier list only with the list permission', () => {
+  it('retains the supplier route permission while omitting its entry from the latest sidebar', () => {
    const visible = filterAdminNavigation(adminNavigation, new Set(['platform:supplier:list']))
    const missing = filterAdminNavigation(adminNavigation, new Set())

-    expect(getNavigationLeaves(visible).map((item) => item.path)).toEqual(['/dashboard', '/suppliers'])
+    expect(getNavigationLeaves(adminNavigation).find(item => item.path === '/suppliers')?.permission).toBe('platform:supplier:list')
+    expect(getNavigationLeaves(visible).map((item) => item.path)).toEqual(['/dashboard'])
    expect(getNavigationLeaves(missing).map((item) => item.path)).toEqual(['/dashboard'])
  })

@@ -256,9 +205,9 @@ describe('adminNavigation', () => {

    expect(getNavigationLeaves(filtered).map((item) => item.path)).toEqual([
      '/dashboard',
-      '/loading-plans',
      '/container-loading/domestic',
-      '/container-loading/overseas',
+      '/loading-lists',
+      '/loading-plans',
    ])
  })

@@ -17,6 +17,7 @@ import {
 } from '@lucide/vue'
 import {
  PrototypeContainerIcon,
+  PrototypeCustomerServiceIcon,
  PrototypeCustomerIcon,
  PrototypeDashboardIcon,
  PrototypeDeliveryIcon,
@@ -27,6 +28,7 @@ import {
  PrototypeOverseasWarehouseIcon,
  PrototypeSalesIcon,
  PrototypeSystemIcon,
+  PrototypeVehicleIcon,
 } from './prototypeMenuIcons'

 export interface AdminNavigationNode {
@@ -61,17 +63,16 @@ export const adminNavigation: AdminNavigationNode[] = [
  },
  {
    key: 'domestic-warehouse',
-    title: '国内仓',
+    title: '国内头程',
    icon: PrototypeDomesticWarehouseIcon,
    children: [
      { key: 'order-list', title: '订单列表', icon: ClipboardList, path: '/orders', permission: 'platform:order:list', permissionAnyOf: ['platform:firstleg:inbound:list'] },
      { key: 'inbound-dedup', title: '订单测量', icon: ClipboardList, path: '/inbounds/measurements', permission: 'platform:firstleg:inbound:measure:view' },
      { key: 'inbound-measure', title: '测量数据审核', icon: FileCheck2, path: '/inbounds/measurement-reviews', permission: 'firstleg:inbound:measurement-review' },
-      { key: 'container-preload', title: '预装清单', icon: ClipboardList, path: '/loading-plans', permission: 'platform:firstleg:preload:list' },
      { key: 'locations', title: '库位管理', icon: WarehouseIcon, path: '/master-data/locations', permission: 'platform:location:list' },
      { key: 'pallets', title: '托盘管理', icon: WarehouseIcon, path: '/master-data/pallets', permission: 'platform:pallet:list' },
      { key: 'domestic-containers', title: '整柜业务', icon: WarehouseIcon, path: '/domestic-containers', permission: 'platform:domestic-container:list' },
-      { key: 'sailing-calendar', title: '船期日历', icon: CalendarDays, path: '/sailing-calendar', permission: 'platform:firstleg:sailing-calendar:list' },
+      { key: 'sailing-calendar', title: '船期管理', icon: CalendarDays, path: '/sailing-calendar', permission: 'platform:firstleg:sailing-calendar:list' },
    ],
  },
  {
@@ -93,8 +94,41 @@ export const adminNavigation: AdminNavigationNode[] = [
    children: [
      { key: 'booking-list', title: '订舱列表', icon: ClipboardList, path: '/ocean-bookings', permission: 'platform:firstleg:ocean-booking:list' },
      { key: 'truck-list', title: '拖车列表', icon: Truck, path: '/trucking', permission: 'platform:firstleg:truck-appointment:list' },
-      { key: 'domestic-container-workbench', title: '货柜列表', icon: WarehouseIcon, path: '/container-loading/domestic', permission: 'platform:firstleg:container:list' },
-      { key: 'overseas-container-workbench', title: '清关提柜', icon: ClipboardList, path: '/container-loading/overseas', permission: 'platform:firstleg:terminal-drayage:list' },
+      { key: 'domestic-container-workbench', title: '货柜列表', icon: WarehouseIcon, path: '/container-loading/domestic', permission: 'platform:firstleg:container:list', permissionAnyOf: ['platform:firstleg:terminal-drayage:list'] },
+      { key: 'container-manifest', title: '装柜清单', icon: ClipboardList, path: '/loading-lists', permission: 'platform:firstleg:loading-list:list' },
+      { key: 'container-preload', title: '预装清单', icon: ClipboardList, path: '/loading-plans', permission: 'platform:firstleg:preload:list' },
+      { key: 'overseas-container-workbench', title: '清关提柜', icon: ClipboardList, path: '/container-loading/overseas', permission: 'platform:firstleg:terminal-drayage:list', hidden: true },
+    ],
+  },
+  {
+    key: 'overseas-inventory',
+    title: '海外尾程',
+    icon: PrototypeOverseasWarehouseIcon,
+    children: [
+      { key: 'last-mile-orders', title: '尾程订单', icon: ClipboardList, path: '/overseas-warehouse/last-mile-orders', permission: 'platform:overseas-warehouse:last-mile-order:list' },
+      { key: 'fba-inbound-order', title: '入库单', icon: ClipboardList, path: '/overseas-warehouse/inbound-orders', permission: 'platform:overseas-warehouse:inbound-order:list' },
+      { key: 'fba-cargo-discard', title: '废弃单', icon: ClipboardList, path: '/overseas-warehouse/cargo-discards', permission: 'platform:overseas-warehouse:discard:list' },
+      { key: 'fba-outbound', title: '出库单', icon: ClipboardList, path: '/overseas-warehouse/outbounds', permission: 'platform:overseas-warehouse:outbound:list' },
+      { key: 'fba-relabel-order', title: '换标单', icon: ClipboardList, path: '/overseas-warehouse/relabel-orders', permission: 'platform:overseas-warehouse:relabel-order:list' },
+      { key: 'fba-delivery', title: '派送单', icon: Truck, path: '/overseas-warehouse/delivery-orders', permission: 'platform:overseas-warehouse:delivery:list' },
+      { key: 'fba-pallet', title: '托盘管理', icon: WarehouseIcon, path: '/overseas-warehouse/pallets', permission: 'platform:overseas-warehouse:pallet:list' },
+      { key: 'overseas-locations', title: '库位管理', icon: WarehouseIcon, path: '/overseas-warehouse/locations', permission: 'platform:overseas-warehouse:location:list' },
+      { key: 'overseas-inventory-list', title: '库存管理', icon: WarehouseIcon, path: '/overseas-warehouse/inventory', permission: 'platform:overseas-warehouse:inventory:list' },
+      { key: 'return-inventory-list', title: '退货库存管理', icon: WarehouseIcon, path: '/overseas-warehouse/return-inventory', permission: 'platform:overseas-warehouse:return-inventory:list' },
+      { key: 'return-cartons-list', title: '退货箱号管理', icon: WarehouseIcon, path: '/overseas-warehouse/return-cartons', permission: 'platform:overseas-warehouse:return-cartons:list' },
+    ],
+  },
+  {
+    key: 'vehicle-management',
+    title: '车辆管理',
+    icon: PrototypeVehicleIcon,
+    children: [
+      { key: 'fba-dispatch', title: '排车列表', icon: Truck, path: '/overseas-warehouse/dispatches', permission: 'platform:overseas-warehouse:dispatch:list' },
+      { key: 'vehicle-list', title: '车辆列表', icon: Truck, path: '/overseas-master-data/vehicles', permission: 'platform:overseas-master-data:vehicle:list' },
+      { key: 'driver-management', title: '司机管理', icon: ContactRound, path: '/overseas-master-data/drivers', permission: 'platform:overseas-master-data:driver:list' },
+      { key: 'fleet-trips', title: '车次管理', icon: Truck, path: '/overseas-master-data/trips', permission: 'platform:fleet:trip:list' },
+      { key: 'fleet-capacity-offers', title: '拼车需求池', icon: Truck, path: '/overseas-master-data/capacity-offers', permission: 'platform:fleet:capacity-offer:list', permissionAnyOf: ['platform:fleet:capacity-offer:manage'] },
+      { key: 'fleet-operations', title: '出车记录', icon: Truck, path: '/overseas-master-data/trip-operations', permission: 'platform:fleet:operations:list' },
    ],
  },
  {
@@ -107,31 +141,13 @@ export const adminNavigation: AdminNavigationNode[] = [
      { key: 'overseas-looseboard', title: '本土散板', icon: ClipboardList, path: '/overseas-business/looseboards', permission: 'platform:overseas-business:looseboard:list' },
    ],
  },
-  {
-    key: 'overseas-inventory',
-    title: '海外仓',
-    icon: PrototypeOverseasWarehouseIcon,
-    children: [
-      { key: 'last-mile-orders', title: '尾程订单', icon: ClipboardList, path: '/overseas-warehouse/last-mile-orders', permission: 'platform:overseas-warehouse:last-mile-order:list' },
-      { key: 'fba-inbound-order', title: '入库单', icon: ClipboardList, path: '/overseas-warehouse/inbound-orders', permission: 'platform:overseas-warehouse:inbound-order:list' },
-      { key: 'overseas-locations', title: '库位管理', icon: WarehouseIcon, path: '/overseas-warehouse/locations', permission: 'platform:overseas-warehouse:location:list' },
-      { key: 'fba-dispatch', title: '排车列表', icon: Truck, path: '/overseas-warehouse/dispatches', permission: 'platform:overseas-warehouse:dispatch:list' },
-      { key: 'fba-outbound', title: '出库单', icon: ClipboardList, path: '/overseas-warehouse/outbounds', permission: 'platform:overseas-warehouse:outbound:list' },
-      { key: 'fba-delivery', title: '派送单列表', icon: Truck, path: '/overseas-warehouse/delivery-orders', permission: 'platform:overseas-warehouse:delivery:list' },
-      { key: 'fba-relabel-order', title: '换标单', icon: ClipboardList, path: '/overseas-warehouse/relabel-orders', permission: 'platform:overseas-warehouse:relabel-order:list' },
-      { key: 'fba-pallet', title: '托盘管理', icon: WarehouseIcon, path: '/overseas-warehouse/pallets', permission: 'platform:overseas-warehouse:pallet:list' },
-      { key: 'overseas-inventory-list', title: '库存管理', icon: WarehouseIcon, path: '/overseas-warehouse/inventory', permission: 'platform:overseas-warehouse:inventory:list' },
-      { key: 'return-inventory-list', title: '退货库存管理', icon: WarehouseIcon, path: '/overseas-warehouse/return-inventory', permission: 'platform:overseas-warehouse:return-inventory:list' },
-      { key: 'return-cartons-list', title: '退货箱号管理', icon: WarehouseIcon, path: '/overseas-warehouse/return-cartons', permission: 'platform:overseas-warehouse:return-cartons:list' },
-    ],
-  },
  {
    key: 'customer-service',
    title: '客户服务',
-    icon: ContactRound,
+    icon: PrototypeCustomerServiceIcon,
    children: [
      { key: 'exception-orders', title: '异常订单', icon: ClipboardList, path: '/overseas-warehouse/exception-orders', permission: 'platform:overseas-warehouse:exception-order:list' },
-      { key: 'customer-visits', title: '客户回访', icon: ContactRound, path: '/overseas-warehouse/customer-visits', permission: 'platform:overseas-warehouse:customer-visit:list' },
+      { key: 'customer-visits', title: '客户回访', icon: ContactRound, path: '/overseas-warehouse/customer-visits', permission: 'platform:overseas-warehouse:customer-visit:list', hidden: true },
    ],
  },
  {
@@ -162,18 +178,17 @@ export const adminNavigation: AdminNavigationNode[] = [
    title: '通用',
    icon: PrototypeGeneralIcon,
    children: [
-      { key: 'general-product', title: '产品信息', icon: Database, path: '/prototype/general/product-information', hidden: true },
-      { key: 'supplier-list', title: '供应商列表', icon: ContactRound, path: '/suppliers', permission: 'platform:supplier:list' },
-      { key: 'express-companies', title: '快递公司', icon: Truck, path: '/master-data/express-companies', permission: 'platform:express:list' },
-      { key: 'counterparties', title: '往来单位', icon: ContactRound, path: '/master-data/counterparties', permission: 'platform:counterparty:list' },
      { key: 'general-fee', title: '费用项目', icon: Database, path: '/master-data/fee-items', permission: 'firstleg:fee-item:view' },
      { key: 'exchange-rates', title: '汇率管理', icon: CircleDollarSign, path: '/overseas-master-data/exchange-rates', permission: 'platform:overseas-master-data:exchange-rate:list' },
      { key: 'warehouses', title: '仓库管理', icon: WarehouseIcon, path: '/warehouses', permission: 'platform:warehouse:list' },
      { key: 'overseas-quotes', title: '海外仓报价', icon: CircleDollarSign, path: '/overseas-master-data/quotes', permission: 'platform:overseas-master-data:quote:list' },
+      { key: 'fleet-quotes', title: '车队报价', icon: Truck, path: '/overseas-master-data/fleet-quotes', permission: 'platform:fleet:quote:list' },
      { key: 'fba-carrier-rates', title: '船期价格表', icon: CircleDollarSign, path: '/first-leg-pricing/carrier-rates', permission: 'firstleg:fba-pricing:rate:view' },
-      { key: 'vehicle-list', title: '车辆列表', icon: Truck, path: '/overseas-master-data/vehicles', permission: 'platform:overseas-master-data:vehicle:list' },
      { key: 'download-center', title: '下载中心', icon: Download, path: '/downloads', permission: 'platform:download:list' },
-      { key: 'mojia-sku-sync', title: '称重机器', icon: Database, path: '/general/mojia-sku-sync', permission: 'platform:mojia-sku-sync:list' },
+      { key: 'supplier-list', title: '供应商列表', icon: ContactRound, path: '/suppliers', permission: 'platform:supplier:list', hidden: true },
+      { key: 'express-companies', title: '快递公司', icon: Truck, path: '/master-data/express-companies', permission: 'platform:express:list', hidden: true },
+      { key: 'counterparties', title: '往来单位', icon: ContactRound, path: '/master-data/counterparties', permission: 'platform:counterparty:list', hidden: true },
+      { key: 'mojia-sku-sync', title: '称重机器', icon: Database, path: '/general/mojia-sku-sync', permission: 'platform:mojia-sku-sync:list', hidden: true },
    ],
  },
  {
@@ -186,7 +201,7 @@ export const adminNavigation: AdminNavigationNode[] = [
      { key: 'tenant-management', title: '租户管理', icon: Building2, path: '/prototype/system-management/tenant-management', hidden: true },
      { key: 'brand-settings', title: '品牌设置', icon: Settings, path: '/prototype/system-management/brand-settings', hidden: true },
      { key: 'permissions', title: '菜单权限', icon: KeyRound, path: '/system/permissions', permission: 'platform:permission:list' },
-      { key: 'pda-releases', title: 'PDA版本', icon: Download, path: '/system/pda-releases', permission: 'platform:pda-release:list' },
+      { key: 'pda-releases', title: 'PDA版本', icon: Download, path: '/system/pda-releases', permission: 'platform:pda-release:list', hidden: true },
    ],
  },
 ]
@@ -120,6 +120,18 @@ export const PrototypeOverseasBusinessIcon = createPrototypeMenuIcon('PrototypeO
  h('path', { d: 'M3 12h18M12 3c3 3 3 15 0 18M12 3c-3 3-3 15 0 18', stroke: '#8c8c8c', 'stroke-width': 1.5, 'stroke-linecap': 'round' }),
 ])

+export const PrototypeVehicleIcon = createPrototypeMenuIcon('PrototypeVehicleIcon', [
+  h('path', { d: 'M3 6h12v11H3zM15 10h3l3 3v4h-6z', stroke: '#149b8f', 'stroke-width': 1.8, 'stroke-linejoin': 'round' }),
+  h('circle', { cx: 7, cy: 18, r: 2, stroke: '#149b8f', 'stroke-width': 1.8 }),
+  h('circle', { cx: 18, cy: 18, r: 2, stroke: '#149b8f', 'stroke-width': 1.8 }),
+])
+
+export const PrototypeCustomerServiceIcon = createPrototypeMenuIcon('PrototypeCustomerServiceIcon', [
+  h('path', { d: 'M4 13v-2a8 8 0 0116 0v2', stroke: '#13c2c2', 'stroke-width': 2, 'stroke-linecap': 'round' }),
+  h('path', { d: 'M4 13a2 2 0 012-2h1v6H6a2 2 0 01-2-2v-2zM20 13a2 2 0 00-2-2h-1v6h1a2 2 0 002-2v-2z', stroke: '#13c2c2', 'stroke-width': 2, 'stroke-linejoin': 'round' }),
+  h('path', { d: 'M17 17c0 2-2 3-5 3', stroke: '#13c2c2', 'stroke-width': 2, 'stroke-linecap': 'round' }),
+])
+
 export const PrototypeFinanceIcon = createPrototypeMenuIcon('PrototypeFinanceIcon', [
  h('circle', { cx: 12, cy: 12, r: 10, stroke: '#f5a623', 'stroke-width': 2 }),
  h('path', { d: 'M12 6v6l4 2', stroke: '#f5a623', 'stroke-width': 2, 'stroke-linecap': 'round' }),
@@ -27,13 +27,12 @@ test('test deployment requires an explicit shared network, Gateway and version',
  assert.match(compose, /external: true/)
  assert.match(compose, /127\.0\.0\.1:/)
  assert.doesNotMatch(compose, /overseas|host\.docker\.internal|production|development/)
-  assert.match(jenkins, /label 'java-test'/)
+  assert.match(jenkins, /'java-builder' : 'java-test'/)
  assert.match(jenkins, /docker compose -f docker-compose\.test\.yml config --quiet/)
  assert.match(jenkins, /docker network inspect/)
-  assert.doesNotMatch(jenkins, /docker-compose\.(production|development)|deploy-production|sshUserPrivateKey/)
-  for (const file of ['docker-compose.production.yml', 'docker-compose.development.yml', 'scripts/deploy-production.sh']) {
-    assert.equal(existsSync(resolve(root, file)), false)
-  }
+  assert.match(jenkins, /scripts\/deploy-production\.sh/)
+  assert.match(jenkins, /firstleg-production-ssh/)
+
 })

 test('application shell is revalidated and missing chunks remain 404', () => {
@@ -65,3 +64,13 @@ test('container build excludes local environment values and waits for Nginx heal
  assert.match(compose, /http:\/\/127\.0\.0\.1\/healthz/)
  assert.match(jenkins, /up -d --wait --wait-timeout 120/)
 })
+
+test('gray production is isolated from TEST and routes to the single Gateway', () => {
+  const production = readFileSync(resolve(root, 'docker-compose.production.yml'), 'utf8')
+  assert.match(production, /name: firstleg-production-network/)
+  assert.match(production, /API_UPSTREAM: "http:\/\/gateway:9000"/)
+  assert.match(production, /127\.0\.0\.1:/)
+  assert.match(production, /healthcheck:/)
+  assert.doesNotMatch(production, /test-network|gateway-overseas|gateway-active|routing-network/)
+  assert.doesNotMatch(jenkins, /wecom|sendProductionWeComNotification/)
+})
@@ -22,4 +22,8 @@ describe('overseas container fees API', () => {
    expect(post).toHaveBeenCalledWith('/platform/v1/last-leg/finance-fee-sources/81/adjust', { expectedVersion: 2, fee, idempotencyKey: 'adjust-1' })
    expect(post).toHaveBeenCalledWith('/platform/v1/last-leg/finance-fee-sources/81/void', { expectedVersion: 2, reason: '重复费用', idempotencyKey: 'void-1' })
  })
+  it('preserves a pending financial cancellation without marking the source voided', async () => {
+    vi.spyOn(http, 'post').mockResolvedValue({ code: '200', data: { ...raw, reviewStatus: 'APPROVED', sourceStatus: 'ACTIVE', voidStatus: 'PENDING_FINANCE' } })
+    await expect(voidOverseasContainerFee('81', 2, '重复费用', 'void-1')).resolves.toMatchObject({ sourceStatus: 'ACTIVE', voidStatus: 'PENDING_FINANCE' })
+  })
 })
@@ -17,6 +17,7 @@ export interface OverseasContainerFeeSource {
  paymentVoucherFileIds: string[]; businessDate: string; currency: 'CNY'; amount: number
  reviewStatus: 'DRAFT' | 'PENDING' | 'APPROVED' | 'REJECTED'; sourceStatus: 'ACTIVE' | 'SUPERSEDED' | 'VOIDED'
  reviewReason: string | null; reviewedAt: string | null
+  voidStatus?: string | null
 }
 export interface OverseasContainerFeeSaveRequest {
  customerId: string; customerName: string | null; sourceType: 'OVERSEAS_CONTAINER_FEE'; businessType: 'OVERSEAS_CONTAINER'
@@ -39,6 +40,7 @@ function normalizeFee(raw: RawResource): OverseasContainerFeeSource {
    supplierId: text(raw.supplierId), supplierName: text(raw.supplierName), supplierCategory: text(raw.supplierCategory), settlementMode: text(raw.settlementMode), paidAt: text(raw.paidAt), paymentMethod: text(raw.paymentMethod), paymentReferenceNo: text(raw.paymentReferenceNo),
    paymentVoucherFileIds: Array.isArray(raw.paymentVoucherFileIds) ? raw.paymentVoucherFileIds.map(String) : [], businessDate: requiredText(raw.businessDate), currency: 'CNY', amount: numberValue(raw.amount),
    reviewStatus: raw.reviewStatus as OverseasContainerFeeSource['reviewStatus'], sourceStatus: raw.sourceStatus as OverseasContainerFeeSource['sourceStatus'], reviewReason: text(raw.reviewReason), reviewedAt: text(raw.reviewedAt),
+    voidStatus: text(raw.voidStatus),
  }
 }
 export async function listOverseasContainerFees(containerBookingId: string) {
@@ -37,6 +37,15 @@ describe('尾程付款凭证', () => {
    mocks.download.mockResolvedValue(new Blob(['image']))
  })

+  it('作废待财务确认时保留有效来源，停止调整和重复作废', async () => {
+    mocks.fees.mockResolvedValue([{ sourceFeeId: '81', customerId: '11', amount: 10, reviewStatus: 'APPROVED', sourceStatus: 'ACTIVE', voidStatus: 'PENDING_FINANCE', paymentVoucherFileIds: [] }])
+    const wrapper = await setup()
+    expect(wrapper.text()).toContain('待财务确认')
+    expect(wrapper.text()).not.toContain('已作废')
+    expect(wrapper.findAll('button').some(button => ['调整', '作废'].includes(button.text()))).toBe(false)
+    wrapper.unmount()
+  })
+
  it('显示上传文件名，允许再次上传替换和移除', async () => {
    const wrapper = await setup()
    await wrapper.get('button').trigger('click')
@@ -68,6 +68,8 @@ const feeItems: Array<{ value: OverseasContainerFeeItem; label: string }> = [
 ]
 const feeItemLabel = (value: string) => feeItems.find((item) => item.value === value)?.label || value
 const reviewLabels: Record<string, string> = { DRAFT: '草稿', PENDING: '待审核', APPROVED: '已审核', REJECTED: '已驳回' }
+const voidLabels: Record<string, string> = { NOT_REQUESTED: '—', PENDING_FINANCE: '待财务确认', FINANCE_ATTENTION: '待财务处理', CONFIRMED: '已作废' }
+function voidPending(row: OverseasContainerFeeSource) { return ['PENDING_FINANCE', 'FINANCE_ATTENTION'].includes(row.voidStatus || '') }
 const form = reactive<{ customerId: string; feeItemCode: OverseasContainerFeeItem; direction: OverseasContainerFeeDirection; businessDate: string; amount: number | null; supplierId: string; settlementMode: ContainerFeeSettlementMode; paidAt: string; paymentMethod: ContainerFeePaymentMethod; paymentReferenceNo: string; paymentVoucherFileIds: string[] }>({ customerId: '', feeItemCode: 'PORT_FEE', direction: 'PAYABLE', businessDate: new Date().toISOString().slice(0, 10), amount: null, supplierId: '', settlementMode: 'ON_ACCOUNT', paidAt: '', paymentMethod: 'BANK_TRANSFER', paymentReferenceNo: '', paymentVoucherFileIds: [] })

 watch(() => form.customerId, () => { uploadSequence++; voucherUploading.value = false; form.paymentVoucherFileIds = [] }, { flush: 'sync' })
@@ -155,7 +157,7 @@ async function review(row: OverseasContainerFeeSource, decision: 'APPROVE' | 'RE
 }
 async function voidFee(row: OverseasContainerFeeSource) {
  const result = await ElMessageBox.prompt('请输入作废原因', '作废费用', { customClass: 'admin-density-confirm', inputPattern: /\S+/, inputErrorMessage: '请输入作废原因', type: 'warning' })
-  await mutate(() => voidOverseasContainerFee(row.sourceFeeId, row.sourceVersion, result.value.trim(), key('container-fee-void')), '费用已作废')
+  await mutate(() => voidOverseasContainerFee(row.sourceFeeId, row.sourceVersion, result.value.trim(), key('container-fee-void')), '作废申请已提交，请查看财务确认状态')
 }
 onMounted(load)
 </script>
@@ -168,7 +170,7 @@ onMounted(load)
    <el-alert v-if="!canView" type="warning" :closable="false" title="当前账号无权查看尾程计费。" />
    <LoadErrorState v-else-if="error" title="尾程计费加载失败" :message="error.message" :loading="loading" @retry="load"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState>
    <el-table v-else v-loading="loading" :data="rows" empty-text="当前货柜暂无尾程费用">
-      <el-table-column label="操作" fixed="left" width="240"><template #default="{ row }"><div class="row-actions density-actions"><el-button data-tone="primary" class="density-action" v-if="canEdit && row.sourceStatus === 'ACTIVE' && ['DRAFT', 'REJECTED'].includes(row.reviewStatus)" type="primary" @click="submit(row as OverseasContainerFeeSource)">提交</el-button><el-button data-tone="warning" class="density-action" v-if="canReview && row.sourceStatus === 'ACTIVE' && row.reviewStatus === 'PENDING'" type="success" @click="review(row as OverseasContainerFeeSource, 'APPROVE')">通过</el-button><el-button data-tone="danger" class="density-action" v-if="canReview && row.sourceStatus === 'ACTIVE' && row.reviewStatus === 'PENDING'" type="danger" @click="review(row as OverseasContainerFeeSource, 'REJECT')">驳回</el-button><el-button class="density-action" v-if="canEdit && row.sourceStatus === 'ACTIVE' && row.reviewStatus === 'APPROVED'" type="primary" @click="openAdjust(row as OverseasContainerFeeSource)">调整</el-button><el-button data-tone="danger" class="density-action" v-if="canReview && row.sourceStatus === 'ACTIVE' && row.reviewStatus === 'APPROVED'" type="danger" @click="voidFee(row as OverseasContainerFeeSource)">作废</el-button><span v-if="row.sourceStatus !== 'ACTIVE' || (!canEdit && !canReview)">—</span></div></template></el-table-column>
+      <el-table-column label="操作" fixed="left" width="240"><template #default="{ row }"><div class="row-actions density-actions"><el-button data-tone="primary" class="density-action" v-if="canEdit && row.sourceStatus === 'ACTIVE' && ['DRAFT', 'REJECTED'].includes(row.reviewStatus)" type="primary" @click="submit(row as OverseasContainerFeeSource)">提交</el-button><el-button data-tone="warning" class="density-action" v-if="canReview && row.sourceStatus === 'ACTIVE' && row.reviewStatus === 'PENDING'" type="success" @click="review(row as OverseasContainerFeeSource, 'APPROVE')">通过</el-button><el-button data-tone="danger" class="density-action" v-if="canReview && row.sourceStatus === 'ACTIVE' && row.reviewStatus === 'PENDING'" type="danger" @click="review(row as OverseasContainerFeeSource, 'REJECT')">驳回</el-button><el-button class="density-action" v-if="canEdit && row.sourceStatus === 'ACTIVE' && row.reviewStatus === 'APPROVED' && !voidPending(row as OverseasContainerFeeSource)" type="primary" @click="openAdjust(row as OverseasContainerFeeSource)">调整</el-button><el-button data-tone="danger" class="density-action" v-if="canReview && row.sourceStatus === 'ACTIVE' && row.reviewStatus === 'APPROVED' && !voidPending(row as OverseasContainerFeeSource)" type="danger" @click="voidFee(row as OverseasContainerFeeSource)">作废</el-button><span v-if="row.sourceStatus !== 'ACTIVE' || (!canEdit && !canReview)">—</span></div></template></el-table-column>
      <el-table-column prop="customerName" label="客户" min-width="160" show-overflow-tooltip><template #default="{ row }">{{ row.customerName || '—' }}</template></el-table-column>
      <el-table-column prop="feeItemCode" label="费用项目" min-width="140" show-overflow-tooltip><template #default="{ row }">{{ feeItemLabel(row.feeItemCode) }}</template></el-table-column>
      <el-table-column prop="direction" label="方向" width="100"><template #default="{ row }">{{ row.direction === 'RECEIVABLE' ? '应收' : '应付' }}</template></el-table-column>
@@ -177,6 +179,7 @@ onMounted(load)
      <el-table-column label="付款凭证" min-width="180"><template #default="{ row }"><div v-if="row.paymentVoucherFileIds.length" class="voucher-list"><el-button v-for="(fileId, index) in (row.paymentVoucherFileIds as string[])" :key="fileId" link type="primary" @click="previewVoucher(row.customerId, fileId)">{{ voucherNames[fileId] || `付款凭证 ${index + 1}` }}</el-button></div><span v-else>—</span></template></el-table-column>
      <el-table-column prop="businessDate" label="业务日期" width="120" />
      <el-table-column prop="reviewStatus" label="审核状态" width="110"><template #default="{ row }"><el-tag>{{ reviewLabels[row.reviewStatus] || row.reviewStatus }}</el-tag></template></el-table-column>
+      <el-table-column label="作废确认" min-width="130"><template #default="{ row }">{{ voidLabels[row.voidStatus] || '—' }}</template></el-table-column>
      <el-table-column prop="reviewReason" label="审核说明" min-width="180" show-overflow-tooltip><template #default="{ row }">{{ row.reviewReason || '—' }}</template></el-table-column>
    </el-table>
    <AppDialog class="admin-density-dialog" v-model="dialogOpen" :title="editing ? '调整尾程费用' : '新增尾程费用'" width="min(620px, calc(100vw - 28px))" confirm-text="保存" :confirm-loading="actionLoading" :confirm-disabled="voucherUploading" @confirm="save">
@@ -0,0 +1,17 @@
+import { describe, expect, it } from 'vitest'
+import { containerChannelLabel } from './containerChannelLabel'
+
+describe('container actual channel label', () => {
+  it('preserves the supplied channel name regardless of booking linkage', () => {
+    expect(containerChannelLabel({ channelName: '纽约海铁', oceanBookingId: '123' })).toBe('纽约海铁')
+    expect(containerChannelLabel({ channelName: '纽约海铁', oceanBookingId: null })).toBe('纽约海铁')
+  })
+  it('does not describe a linked booking as unlinked when the channel is absent', () => {
+    expect(containerChannelLabel({ channelName: null, oceanBookingId: '123' })).toBe('—')
+    expect(containerChannelLabel({ channelName: '', oceanBookingId: '123' })).toBe('—')
+  })
+  it('shows pending linkage only when both channel and booking are absent', () => {
+    expect(containerChannelLabel({ channelName: null, oceanBookingId: null })).toBe('待关联订舱')
+    expect(containerChannelLabel({ channelName: '', oceanBookingId: undefined })).toBe('待关联订舱')
+  })
+})
@@ -0,0 +1,5 @@
+import type { ContainerBookingResource } from './types'
+
+export function containerChannelLabel(container: Pick<ContainerBookingResource, 'channelName' | 'oceanBookingId'>): string {
+  return container.channelName || (container.oceanBookingId ? '—' : '待关联订舱')
+}
@@ -17,10 +17,20 @@ const routeState = vi.hoisted(() => ({ params: { containerId: '9001' }, query: {
 const routerPush = vi.hoisted(() => vi.fn())
 vi.mock('@/core/access/accessPreview', () => ({ useAccessPreviewStore: () => ({ can: canAccess }) }))
 vi.mock('vue-router', () => ({ useRoute: () => routeState, useRouter: () => ({ push: routerPush }) }))
-vi.mock('@/modules/loading-lists', () => ({ ContainerFeesPanel: { template: '<div />' }, LoadingListDetailDrawer: { name: 'LoadingListDetailDrawer', props: ['detail', 'error', 'loading', 'mode', 'embedded'], template: '<div data-testid="loading-detail">{{ detail?.planNo }}</div>' }, PalletLabelPrintDialog: { template: '<div />' }, getConfirmedLoadingList: vi.fn(), getPreloadPlan: vi.fn() }))
+vi.mock('@/modules/loading-lists', async (importOriginal) => {
+  const actual = await importOriginal<typeof import('@/modules/loading-lists')>()
+  const api = { getConfirmedLoadingList: vi.fn(), getPreloadPlan: vi.fn() }
+  return {
+    ...api,
+    useLoadingListDetail: () => actual.useLoadingListDetail(api),
+    ContainerFeesPanel: { template: '<div />' },
+    LoadingListDetailDrawer: { name: 'LoadingListDetailDrawer', props: ['detail', 'error', 'loading', 'mode', 'embedded', 'dense', 'backLabel'], template: '<div data-testid="loading-detail">{{ detail?.planNo }}</div>' },
+    PalletLabelPrintDialog: { template: '<div />' },
+  }
+})
 vi.mock('@/modules/ocean-bookings', () => ({ listOceanBookingLinkCandidates: vi.fn() }))
 vi.mock('@/modules/outbound-dispatch', () => ({ confirmContainerOutboundDispatch: vi.fn(), getContainerOutboundDispatch: vi.fn() }))
-vi.mock('@/modules/port-schedules', () => ({ CarrierScheduleQueryPanel: { template: '<div />' } }))
+vi.mock('@/modules/port-schedules', () => ({ CarrierScheduleQueryPanel: { template: '<div />' }, ContainerPortSchedulePanel: { name: 'ContainerPortSchedulePanel', props: ['container'], emits: ['saved'], template: '<div />' } }))
 vi.mock('../api/platformContainerLoading', () => ({ getContainer: vi.fn(), getContainerOverview: vi.fn(), linkContainerOceanBooking: vi.fn(), cancelContainerException: vi.fn(), completeContainerClearance: vi.fn(), downloadContainerClearance: vi.fn(), downloadContainerDocument: vi.fn(), getContainerClearance: vi.fn(), markContainerException: vi.fn(), uploadContainerClearance: vi.fn(), uploadContainerDocument: vi.fn(), updateContainerPickupCode: vi.fn() }))
 vi.mock('../api/terminalDrayages', () => ({ recordTerminalDrayageEmptyReturn: vi.fn() }))
 vi.mock('../api/containerArrivalTimes', () => ({ listContainerArrivalTimes: vi.fn() }))
@@ -44,6 +54,16 @@ function accessibleText(wrapper: { element: Element } | undefined) {
 }

 describe('ContainerDetailView empty return', () => {
+  it('passes the original container to schedule maintenance and reloads its projection after save', async () => {
+    const wrapper = await mountDetail('DOMESTIC')
+    const panel = wrapper.findComponent({ name: 'ContainerPortSchedulePanel' })
+    expect(panel.props('container').id).toBe('9001')
+    vi.mocked(getContainer).mockResolvedValue({ ...base, vesselName: 'REASSIGNED', voyageNo: 'V2', currentPortScheduleId: 'S1' } as never)
+    panel.vm.$emit('saved'); await flushPromises()
+    expect(getContainer).toHaveBeenCalledTimes(2)
+    expect(wrapper.text()).toContain('REASSIGNED / V2')
+    expect(wrapper.findComponent({ name: 'ContainerPortSchedulePanel' }).props('container').currentPortScheduleId).toBe('S1')
+  })
  beforeEach(() => {
    routeState.query = {}
    routerPush.mockReset()
@@ -51,7 +71,7 @@ describe('ContainerDetailView empty return', () => {
    vi.mocked(getContainerOutboundDispatch).mockReset().mockResolvedValue({ aggregate: { dispatchStatus: 'WAITING_FOR_LOADING', gate: { inbounds: [] } }, timeline: [] } as never)
    vi.mocked(getContainer).mockReset().mockResolvedValue(base as never)
    vi.mocked(getContainerOverview).mockReset().mockResolvedValue(overview as never)
-    vi.mocked(getConfirmedLoadingList).mockReset().mockResolvedValue({ planNo: 'LP-1', items: [] } as never)
+    vi.mocked(getConfirmedLoadingList).mockReset().mockResolvedValue({ planNo: 'LP-1', summary: { status: 'COMPLETED' }, items: [] } as never)
    vi.mocked(recordTerminalDrayageEmptyReturn).mockReset().mockResolvedValue({ ...base.terminalDrayage, status: 'EMPTY_RETURNED', version: 4, actualEmptyReturnAt: '2026-09-09T12:00:00', allowedActions: [] } as never)
    vi.mocked(listContainerArrivalTimes).mockReset().mockResolvedValue([{ sourceContainerBookingId: '9001', estimatedWarehouseArrivalAt: '2026-09-25T15:31:00', actualWarehouseArrivalAt: '2026-09-26T09:00:00', version: 0 }])
  })
@@ -123,6 +143,7 @@ describe('ContainerDetailView empty return', () => {
    vi.mocked(getContainerOverview).mockResolvedValue({ ...overview, loadingPlanId: '7001' } as never)
    vi.mocked(getConfirmedLoadingList).mockResolvedValue({
      planNo: 'LP-1',
+      summary: { status: 'COMPLETED' },
      items: [{ destinationWarehouse: 'ABE4' }, { destinationWarehouse: 'ABE4' }],
    } as never)

@@ -148,7 +169,7 @@ describe('ContainerDetailView empty return', () => {

 describe('domestic container loading list and booking link', () => {
  const domestic = { ...base, containerNo: null, warehouseId: '8', channelCode: 'ZBYHK', sourceType: 'SIMULATION', oceanBookingId: null, planId: '7001', planStatus: 'EDITING', version: 1, allowedActions: ['EDIT_CONTAINER'], terminalDrayage: null }
-  const loadingDetail = { planNo: 'LP-1', items: [] }
+  const loadingDetail = { planNo: 'LP-1', summary: { status: 'COMPLETED' }, items: [] }

  beforeEach(() => {
    routeState.query = {}
@@ -202,7 +223,8 @@ describe('domestic container loading list and booking link', () => {
        if (permitted) {
          const drawer = wrapper.findComponent({ name: 'LoadingListDetailDrawer' })
          expect(drawer.props('mode')).toBe(planStatus === 'COMPLETED' ? 'confirmed' : 'preload')
-          expect(drawer.props('embedded')).not.toBeUndefined()
+          expect(drawer.props('embedded')).toBeUndefined()
+          expect(drawer.props('backLabel')).toBe('返回货柜概览')
        }
        wrapper.unmount()
      }
@@ -30,23 +30,23 @@ describe('ContainerDetailView customs integration', () => {
    expect(source).toContain(':sections="[\'documents\']"')
    expect(source).toContain(':sections="[\'pda\']"')
    expect(source).toContain('<LoadingListDetailDrawer')
-    expect(source).toContain('getConfirmedLoadingList')
-    expect(source).toContain('getPreloadPlan')
+    expect(source).toContain('useLoadingListDetail')
+    expect(source).toContain('await loadListDetail(mode, aggregate.loadingPlanId')
    expect(source).toContain('label="装柜清单"')
-    expect(source).toContain('打印装柜清单')
+    expect(source).not.toContain('function printLoadingList')
    expect(source).toContain("const loadingListMode = computed<LoadingListMode>(() => detail.value?.planStatus === 'COMPLETED' ? 'confirmed' : 'preload')")
-    expect(source).toContain('<LoadingListDetailDrawer dense :mode="loadingListMode" embedded')
+    expect(source).toContain('<LoadingListDetailDrawer dense :mode="loadingListMode" back-label="返回货柜概览"')
    expect(source).toContain(':sections="[\'pda\']"')
  })

-  it('keeps the confirmed loading list inside the domestic container detail only', () => {
+  it('keeps the container detail entry alongside the standalone manifest', () => {
    expect(routeSource).toContain("name: 'domestic-container-detail'")
    expect(routeSource).toContain("name: 'overseas-container-detail'")
-    expect(loadingRouteSource).not.toContain("name: 'loading-lists'")
-    expect(navigationSource).not.toContain("title: '装柜清单'")
+    expect(loadingRouteSource).toContain("name: 'loading-lists'")
+    expect(navigationSource).toContain("title: '装柜清单'")
    expect(source).toContain('<el-tabs v-model="activeTab"')
    expect(source).toContain("v-if=\"isDomestic && activeTab === 'loading-list'\"")
-    expect(source).toContain("loadingDetail.value = await getConfirmedLoadingList(aggregate.loadingPlanId, resource.warehouseId)")
+    expect(source).toContain("await loadListDetail(mode, aggregate.loadingPlanId || '', resource.warehouseId || '')")
    expect(source).toContain('getContainer(containerId.value, props.workbench)')
    expect(source).toContain('getContainerOverview(containerId.value)')
    expect(source).toContain(':can-edit="false"')
@@ -11,8 +11,8 @@ import ApiErrorMeta from '@/shared/components/ApiErrorMeta.vue'
 import AppDialog from '@/shared/components/AppDialog.vue'
 import LoadErrorState from '@/shared/components/LoadErrorState.vue'
 import StatusBadge from '@/shared/components/StatusBadge.vue'
-import { CarrierScheduleQueryPanel } from '@/modules/port-schedules'
-import { ContainerFeesPanel, getConfirmedLoadingList, getPreloadPlan, LoadingListDetailDrawer, PalletLabelPrintDialog, type LoadingDetail, type LoadingListMode } from '@/modules/loading-lists'
+import { CarrierScheduleQueryPanel, ContainerPortSchedulePanel } from '@/modules/port-schedules'
+import { ContainerFeesPanel, useLoadingListDetail, LoadingListDetailDrawer, PalletLabelPrintDialog, type LoadingListMode } from '@/modules/loading-lists'
 import {
  confirmContainerOutboundDispatch,
  getContainerOutboundDispatch,
@@ -24,6 +24,7 @@ import ContainerLastLegFeesPanel from '../components/ContainerLastLegFeesPanel.v
 import ContainerOverviewPanel from '../components/ContainerOverviewPanel.vue'
 import OceanBookingLinkDialog from '../components/OceanBookingLinkDialog.vue'
 import { getSmartLoadingChannelGroup, isSeaRailChannel } from '../smartLoadingChannelGroups'
+import { containerChannelLabel } from '../containerChannelLabel'
 import {
  cancelContainerException,
  completeContainerClearance,
@@ -143,9 +144,7 @@ const outboundDetail = ref<ContainerOutboundDispatchDetail | null>(null)
 const outboundError = ref<ApiErrorDetails | null>(null)
 const showPassedGates = ref(false)
 const carrierRefreshKey = ref(0)
-const loadingDetail = ref<LoadingDetail | null>(null)
-const loadingDetailLoading = ref(false)
-const loadingDetailError = ref<ApiErrorDetails | null>(null)
+const { detail: loadingDetail, loading: loadingDetailLoading, error: loadingDetailError, load: loadListDetail, reset: resetLoadingDetail } = useLoadingListDetail()
 const emptyReturnOpen = ref(false)
 const emptyReturnAt = ref('')
 const emptyReturnReason = ref('')
@@ -294,6 +293,7 @@ async function confirmEmptyReturn() {

 async function load() {
  if (!containerId.value) return
+  resetLoadingDetail()
  loading.value = true; error.value = null; overviewError.value = null
  try {
    const [resource, aggregate, arrivals] = await Promise.all([
@@ -330,23 +330,12 @@ async function loadOutboundDispatch() {
 }

 async function loadLoadingDetail(resource: ContainerBookingResource, aggregate: ContainerOverview) {
-  if (loadingDetail.value || loadingDetailLoading.value) return
-  loadingDetail.value = null; loadingDetailError.value = null
-  if (!aggregate.loadingPlanId || !resource.warehouseId) return
-  loadingDetailLoading.value = true
-  try {
-    if (resource.planStatus === 'COMPLETED') {
-      if (!canViewLoadingList.value) return
-      loadingDetail.value = await getConfirmedLoadingList(aggregate.loadingPlanId, resource.warehouseId)
-      return
-    }
-    if (!canViewPreload.value) return
-    loadingDetail.value = await getPreloadPlan(aggregate.loadingPlanId, resource.warehouseId)
-  } catch (cause) {
-    loadingDetailError.value = getApiErrorDetails(cause, '装柜清单加载失败')
-  } finally {
-    loadingDetailLoading.value = false
+  const mode = resource.planStatus === 'COMPLETED' ? 'confirmed' : 'preload'
+  if (!(mode === 'confirmed' ? canViewLoadingList.value : canViewPreload.value)) {
+    resetLoadingDetail()
+    return
  }
+  await loadListDetail(mode, aggregate.loadingPlanId || '', resource.warehouseId || '')
 }
 async function refreshAfterCustoms() {
  if (canViewOutboundDispatch.value) await loadOutboundDispatch()
@@ -517,7 +506,6 @@ async function completeClearance() {
 }

 function goBack() { void router.push({ name: isDomestic.value ? 'domestic-container-workbench' : 'overseas-container-workbench' }) }
-function printLoadingList() { window.print() }

 onMounted(async () => { await load(); if (isOverseas.value && route.query.action === 'documents') openDocument('DELIVERY_ORDER') })
 </script>
@@ -542,12 +530,13 @@ onMounted(async () => { await load(); if (isOverseas.value && route.query.action
      <LoadErrorState v-if="overviewError" compact title="履约摘要加载失败" :message="overviewError.message" :show-retry="false" />
      <section v-show="activeTab === 'overview'" class="detail-section surface-panel" aria-labelledby="container-information-heading">
        <header class="detail-section__heading"><h2 id="container-information-heading">货柜信息</h2><PalletLabelPrintDialog dense v-if="overview?.loadingPlanId && detail.warehouseId" :plan-id="overview.loadingPlanId" :warehouse-id="detail.warehouseId" :disabled="!detail.containerNo || detail.planStatus === 'EDITING'" /></header>
-        <div class="detail-fields"><dl class="density-fields"><div><dt>真实订舱</dt><dd><span>{{ detail.oceanBookingId ? (detail.billOfLadingNo || '已关联') : '未关联' }}</span><el-button v-if="canLinkOceanBooking" class="density-action" data-tone="primary" @click="openOceanBookingLink">关联已放舱订舱</el-button></dd></div><div><dt>计划渠道</dt><dd>{{ plannedChannelName }}</dd></div><div><dt>实际渠道</dt><dd>{{ detail.channelName || '待关联订舱' }}</dd></div><div><dt>异常状态</dt><dd>{{ detail.exceptionActive ? '异常' : '正常' }}</dd></div><div><dt>目的仓</dt><dd>{{ overseasDestinationText }}</dd></div><div><dt>拖车公司</dt><dd>{{ detail.terminalTruckingCompany || workbenchDetail?.terminalDrayage?.fleetSupplierName || '—' }}</dd></div></dl></div>
+        <div class="detail-fields"><dl class="density-fields"><div><dt>真实订舱</dt><dd><span>{{ detail.oceanBookingId ? (detail.billOfLadingNo || '已关联') : '未关联' }}</span><el-button v-if="canLinkOceanBooking" class="density-action" data-tone="primary" @click="openOceanBookingLink">关联已放舱订舱</el-button></dd></div><div><dt>计划渠道</dt><dd>{{ plannedChannelName }}</dd></div><div><dt>实际渠道</dt><dd>{{ containerChannelLabel(detail) }}</dd></div><div><dt>异常状态</dt><dd>{{ detail.exceptionActive ? '异常' : '正常' }}</dd></div><div><dt>目的仓</dt><dd>{{ overseasDestinationText }}</dd></div><div><dt>拖车公司</dt><dd>{{ detail.terminalTruckingCompany || workbenchDetail?.terminalDrayage?.fleetSupplierName || '—' }}</dd></div></dl></div>
        <ContainerOverviewPanel v-if="isDomestic && overview" :overview="overview" :sections="['exception']" :can-manage-documents="canEdit" :can-manage-customs="canManageCustoms" :can-manage-exception="canEdit" @manage-exception="openException" />
      </section>

      <section v-show="activeTab === 'overview'" class="detail-section surface-panel" aria-labelledby="container-voyage-heading">
        <h2 id="container-voyage-heading">船名航次信息</h2>
+        <ContainerPortSchedulePanel :container="detail" @saved="load" />
        <div class="detail-fields"><dl class="density-fields"><div><dt>船公司</dt><dd>{{ detail.shippingCompanyName || '—' }}</dd></div><div><dt>船名 / 航次</dt><dd>{{ [detail.vesselName, detail.voyageNo].filter(Boolean).join(' / ') || '—' }}</dd></div><div><dt>预计开船</dt><dd>{{ formatTime(detail.estimatedSailingAt) }}</dd></div><div><dt>预计到港</dt><dd>{{ formatTime(detail.estimatedPortArrivalAt) }}</dd></div></dl></div>
        <div class="carrier-panel"><CarrierScheduleQueryPanel dense :key="carrierRefreshKey" :ocean-booking-id="detail.oceanBookingId" :container-booking-id="detail.id" :warehouse-timeline="overview?.timeline || []" /></div>
      </section>
@@ -586,10 +575,10 @@ onMounted(async () => { await load(); if (isOverseas.value && route.query.action
      </section>

      <section v-if="isDomestic && activeTab === 'loading-list'" class="detail-section surface-panel" aria-labelledby="container-loading-list-heading">
-        <header class="loading-list-heading"><div><h2 id="container-loading-list-heading">{{ loadingListHeading }}</h2><p>{{ loadingListDescription }}</p></div><el-button v-if="loadingDetail && loadingListMode === 'confirmed'" @click="printLoadingList">打印装柜清单</el-button></header>
+        <header class="loading-list-heading"><div><h2 id="container-loading-list-heading">{{ loadingListHeading }}</h2><p>{{ loadingListDescription }}</p></div></header>
        <ContainerOverviewPanel v-if="overview" :overview="overview" :sections="['pda']" :can-manage-documents="false" :can-manage-customs="false" :can-manage-exception="false" />
        <ContainerCustomsPanel v-if="overview?.loadingPlanId && canListCustoms" :loading-plan-id="overview.loadingPlanId" :can-list="canListCustoms" :can-manage="canManageCustoms" :departure-state="customsDepartureState" @refreshed="refreshAfterCustoms" />
-        <LoadingListDetailDrawer dense :mode="loadingListMode" embedded :loading="loadingDetailLoading" :detail="loadingDetail" :error="loadingDetailError" :can-edit="false" @back="activeTab = 'overview'" @retry="overview && loadLoadingDetail(detail, overview)" />
+        <LoadingListDetailDrawer dense :mode="loadingListMode" back-label="返回货柜概览" :loading="loadingDetailLoading" :detail="loadingDetail" :error="loadingDetailError" :can-edit="false" @back="activeTab = 'overview'" @retry="overview && loadLoadingDetail(detail, overview)" />
      </section>

      <section v-if="canViewFirstLegFees && firstLegFeesOpened" v-show="activeTab === 'first-leg-fees'" v-loading="loadingDetailLoading" class="detail-section surface-panel" aria-label="头程计费">
@@ -0,0 +1,33 @@
+import { mount } from '@vue/test-utils'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import ContainerWorkbenchView from './ContainerWorkbenchView.vue'
+
+const mocks = vi.hoisted(() => ({ permissions: new Set<string>(), push: vi.fn() }))
+vi.mock('@/core/access/accessPreview', () => ({ useAccessPreviewStore: () => ({ can: (permission: string) => mocks.permissions.has(permission) }) }))
+vi.mock('vue-router', () => ({ useRouter: () => ({ push: mocks.push }) }))
+vi.mock('./ContainersView.vue', () => ({ default: { props: ['workbench'], template: '<div data-testid="workbench">{{ workbench }}</div>' } }))
+
+function render(stage: 'DOMESTIC' | 'OVERSEAS' = 'DOMESTIC') {
+  return mount(ContainerWorkbenchView, { props: { stage }, global: { stubs: { ElButton: { template: '<button><slot /></button>' } } } })
+}
+
+describe('container stage entry permissions', () => {
+  beforeEach(() => { mocks.permissions.clear(); mocks.push.mockReset() })
+  it('opens overseas operations for an overseas-only user entering the common menu', () => {
+    mocks.permissions.add('platform:firstleg:terminal-drayage:list')
+    const wrapper = render()
+    expect(wrapper.get('[data-testid="workbench"]').text()).toBe('OVERSEAS')
+    expect(wrapper.text()).not.toContain('国内装柜')
+  })
+  it('preserves a direct overseas visit and allows switching back to domestic', async () => {
+    mocks.permissions.add('platform:firstleg:terminal-drayage:list')
+    mocks.permissions.add('platform:firstleg:container:list')
+    const wrapper = render('OVERSEAS')
+    expect(wrapper.get('[data-testid="workbench"]').text()).toBe('OVERSEAS')
+    await wrapper.findAll('button')[0]!.trigger('click')
+    expect(mocks.push).toHaveBeenCalledWith({ name: 'domestic-container-workbench' })
+  })
+  it('does not mount data consumers without either list permission', () => {
+    expect(render().find('[data-testid="workbench"]').exists()).toBe(false)
+  })
+})
@@ -0,0 +1,24 @@
+<script setup lang="ts">
+import '@/styles/adminDensity.css'
+import { computed } from 'vue'
+import { useRouter } from 'vue-router'
+import { useAccessPreviewStore } from '@/core/access/accessPreview'
+import ContainersView from './ContainersView.vue'
+
+const props = defineProps<{ stage: 'DOMESTIC' | 'OVERSEAS' }>()
+const access = useAccessPreviewStore()
+const router = useRouter()
+const canDomestic = computed(() => access.can('platform:firstleg:container:list'))
+const canOverseas = computed(() => access.can('platform:firstleg:terminal-drayage:list'))
+const current = computed(() => props.stage === 'DOMESTIC' && !canDomestic.value && canOverseas.value ? 'OVERSEAS' : props.stage)
+</script>
+
+<template>
+  <div class="admin-density">
+    <nav class="density-status-tabs" aria-label="货柜业务阶段">
+      <el-button v-if="canDomestic" :class="{ 'is-active': current === 'DOMESTIC' }" :aria-current="current === 'DOMESTIC' ? 'page' : undefined" @click="router.push({ name: 'domestic-container-workbench' })">📦 国内装柜</el-button>
+      <el-button v-if="canOverseas" :class="{ 'is-active': current === 'OVERSEAS' }" :aria-current="current === 'OVERSEAS' ? 'page' : undefined" @click="router.push({ name: 'overseas-container-workbench' })">🚢 海外清关提柜</el-button>
+    </nav>
+    <ContainersView v-if="canDomestic || canOverseas" :key="current" :workbench="current" />
+  </div>
+</template>
@@ -456,7 +456,7 @@ describe('ContainersView', () => {
    expect(source).toContain("import RowActions, { type RowActionItem } from '@/shared/components/RowActions.vue'")
    expect(source).toContain("{ key: 'view', label: '查看', ariaLabel: containerViewLabel(row), priority: 500")
    expect(source).toContain("hasAction(row, 'EDIT_CONTAINER')")
-    expect(source).toContain('<RowActions :actions="containerRowActions(row as ContainerWorkbenchRow)"')
+    expect(source).toContain('<RowActions text-actions :actions="containerRowActions(row as ContainerWorkbenchRow)"')
    expect(source).not.toContain("row.containerNo ? '修改集装箱号' : '录入集装箱号'")
    expect(source).toContain('货柜基础资料不提供柜号写入')
    expect(source).toContain('containerNo: optional(detail.value?.containerNo || null)')
@@ -465,7 +465,8 @@ describe('ContainersView', () => {
    expect(source).toContain("row.planStatus === 'EDITING' ? canSmartLoading.value")
    expect(source).not.toContain('canSmartLoading && row.containerNo')
    expect(source).not.toContain('link type="primary" :aria-label="containerViewLabel')
-    expect(source).toContain(':loading="loading" stripe preference-key="container-loading-table"')
+    expect(source).toContain(':loading="loading" preference-key="container-loading-table"')
+    expect(source).toContain('appearance="integrated" :stripe="false"')
  })

  it('updates an ACTIVE TRUCKING fleet inline and records actual empty return once', async () => {
@@ -579,7 +580,7 @@ describe('ContainersView', () => {
    try {
      await flushPromises()
      const actions = wrapper.find('.el-table__body .row-actions')
-      expect(actions.findAll('button').map((button) => button.text())).toEqual(['查看', '编辑', ({ EDITING: '装柜', LOADING: '预装清单', COMPLETED: '装柜清单' })[planStatus], ''])
+      expect(actions.findAll('button').map((button) => button.text())).toEqual(['查看', '编辑', ({ EDITING: '装柜', LOADING: '预装清单', COMPLETED: '装柜清单' })[planStatus], '更多'])
      await actions.find('button[aria-label="更多货柜操作"]').trigger('click')
      await flushPromises()
      const link = Array.from(document.body.querySelectorAll<HTMLElement>('.el-dropdown-menu__item'))
@@ -2,7 +2,7 @@
 import '@/styles/adminDensity.css'
 import { computed, onMounted, reactive, ref, watch } from 'vue'
 import ContainerSimulationCreate from '../components/ContainerSimulationCreate.vue'
-import { useRouter } from 'vue-router'
+import { useRoute, useRouter } from 'vue-router'
 import { ElMessage, ElMessageBox, type FormInstance, type FormRules } from 'element-plus'
 import { useAccessPreviewStore } from '@/core/access/accessPreview'
 import { listPlatformTenants, type PlatformTenantResource } from '@/modules/iam'
@@ -23,6 +23,7 @@ import { getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
 import { getContainer, listContainers, updateContainer } from '../api/platformContainerLoading'
 import OceanBookingLinkDialog from '../components/OceanBookingLinkDialog.vue'
 import { getSmartLoadingChannelGroup } from '../smartLoadingChannelGroups'
+import { containerChannelLabel } from '../containerChannelLabel'
 import {
  getTerminalDrayageEmails,
  sendTerminalDrayageEmail,
@@ -45,6 +46,7 @@ type ContainerForm = ContainerSaveRequest & Pick<ContainerBookingResource, 'cabi
 const props = withDefaults(defineProps<{ workbench?: 'DOMESTIC' | 'OVERSEAS' }>(), { workbench: 'DOMESTIC' })

 const router = useRouter()
+const route = useRoute()
 const access = useAccessPreviewStore()
 const rows = ref<ContainerWorkbenchRow[]>([])
 const customers = ref<PlatformTenantResource[]>([])
@@ -66,7 +68,7 @@ const page = ref(1)
 const pageSize = ref(20)
 const total = ref(0)
 const scope = ref<'ACTIVE' | 'HISTORY'>('ACTIVE')
-const filters = ref<Filters>({ customerId: '', keyword: '', containerType: '', status: '', sailingRange: [] })
+const filters = ref<Filters>({ customerId: '', keyword: typeof route.query.keyword === 'string' ? route.query.keyword : '', containerType: '', status: '', sailingRange: [] })
 const applied = ref<Filters>({ ...filters.value })
 const detail = ref<ContainerBookingResource | null>(null)
 const editorOpen = ref(false)
@@ -244,7 +246,7 @@ const allColumns: DataTableColumn[] = [
  { key: 'oceanBooking', label: '真实订舱', minWidth: 170, slotName: 'oceanBooking' },
  { key: 'warehouseName', prop: 'warehouseName', label: '装柜仓库', minWidth: 160 },
  { key: 'channelGroupCode', label: '计划渠道', minWidth: 140, formatter: (row: ContainerBookingResource) => getSmartLoadingChannelGroup(row.channelGroupCode)?.name || '—' },
-  { key: 'channelName', label: '实际渠道', minWidth: 160, formatter: (row: ContainerBookingResource) => row.channelName || '待关联订舱' },
+  { key: 'channelName', label: '实际渠道', minWidth: 160, formatter: (row: ContainerBookingResource) => containerChannelLabel(row) },
  { key: 'terminalTruckingCompany', label: '码头车队', width: 190, slotName: 'terminalTruckingCompany' },
  { key: 'pickupAppointmentAt', label: '预计到仓', width: 210, slotName: 'pickupAppointmentAt' },
  { key: 'actualPickupAt', label: '实际到仓', width: 165, slotName: 'actualPickupAt' },
@@ -730,22 +732,26 @@ onMounted(async () => { await Promise.all([loadCustomers(), loadRows()]) })
  <AdminPage class="admin-density" as="div">
    <section class="container-page">
      <ListPageLayout :ariaLabel="isDomestic ? '送柜报关工作台' : '清关提柜工作台'">
-      <template #toolbar>
-        <div class="container-query-panel">
-          <div class="container-scope-tabs density-tabs" role="tablist" aria-label="货柜完结状态">
-            <button type="button" role="tab" aria-controls="container-workbench-results" :aria-selected="scope === 'ACTIVE'" :tabindex="scope === 'ACTIVE' ? 0 : -1" :class="['container-scope-tab', { active: scope === 'ACTIVE' }]" @click="scope = 'ACTIVE'">未完结</button>
-            <button type="button" role="tab" aria-controls="container-workbench-results" :aria-selected="scope === 'HISTORY'" :tabindex="scope === 'HISTORY' ? 0 : -1" :class="['container-scope-tab', { active: scope === 'HISTORY' }]" @click="scope = 'HISTORY'">已完结</button>
+
+
+        <section id="container-workbench-results" ><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" :total="total" :loading="loading" preference-key="container-loading-table" empty-text="暂无货柜">
+        <template #toolbar-start><h1>{{ isDomestic ? '货柜列表' : '清关提柜' }}</h1></template>
+        <template #filters>
+        <div class="container-query-panel integrated-query-group">
+          <div class="container-scope-tabs density-status-tabs" role="tablist" aria-label="货柜完结状态">
+            <button type="button" role="tab" aria-controls="container-workbench-results" :aria-selected="scope === 'ACTIVE'" :tabindex="scope === 'ACTIVE' ? 0 : -1" :class="['container-scope-tab', { 'is-active': scope === 'ACTIVE' }]" @click="scope = 'ACTIVE'">未完结</button>
+            <button type="button" role="tab" aria-controls="container-workbench-results" :aria-selected="scope === 'HISTORY'" :tabindex="scope === 'HISTORY' ? 0 : -1" :class="['container-scope-tab', { 'is-active': scope === 'HISTORY' }]" @click="scope = 'HISTORY'">已完结</button>
          </div>
          <QueryToolbar v-model="filters" class="container-query-toolbar" ariaLabel="货柜筛选" :fields="queryFields" preference-key="container-loading-query" @search="search" />
        </div>
      </template>
-      <template v-if="loadError" #state>
+        <template #notices><template v-if="loadError">
        <LoadErrorState title="货柜列表加载失败" :message="loadError.message" :loading="loading" @retry="loadRows"><template #details><ApiErrorMeta :details="loadError" /></template></LoadErrorState>
-      </template>
-        <section v-if="!loadError" id="container-workbench-results" class="surface-panel table-panel">
-          <DataTable v-model:page="page" v-model:page-size="pageSize" :data="rows" :columns="columns" :total="total" :loading="loading" stripe preference-key="container-loading-table" empty-text="暂无货柜">
+      </template></template>
+
+
            <template #toolbar-actions><ContainerSimulationCreate dense v-if="isDomestic && canCreate" :load-warehouse-options="loadSimulationWarehouses" @created="loadRows" /></template>
-            <template #actions="{ row }"><RowActions :actions="containerRowActions(row as ContainerWorkbenchRow)" more-label="更多货柜操作" @action="handleContainerRowAction($event, row as ContainerWorkbenchRow)" /></template>
+            <template #actions="{ row }"><RowActions text-actions :actions="containerRowActions(row as ContainerWorkbenchRow)" more-label="更多货柜操作" @action="handleContainerRowAction($event, row as ContainerWorkbenchRow)" /></template>
            <template #emptyReturnWarning="{ row }"><el-tag :type="drayageWarningType(row as ContainerBookingResource)" effect="light" :title="drayageWarningTitle(row as ContainerBookingResource)">{{ drayageWarningText(row as ContainerBookingResource) }}</el-tag></template>
            <template #cabinet="{ row }"><strong>{{ row.cabinetNo }}</strong><small>系统生成</small></template>
            <template #oceanBooking="{ row }"><span v-if="row.oceanBookingId"><strong>{{ row.billOfLadingNo || '已关联订舱' }}</strong><small>{{ row.containerNo ? `集装箱号：${row.containerNo}` : '集装箱号：待补录' }}</small></span><span v-else>未关联</span></template>
@@ -764,8 +770,7 @@ onMounted(async () => { await Promise.all([loadCustomers(), loadRows()]) })
            <template #actualSailingAt="{ row }">{{ formatTime(row.actualFacts?.actualSailingAt) }}</template>
            <template #estimatedPortArrivalAt="{ row }">{{ formatTime(row.estimatedPortArrivalAt) }}</template>
            <template #actualPortArrivalAt="{ row }">{{ formatTime(row.actualFacts?.actualPortArrivalAt) }}</template>
-          </DataTable>
-        </section>
+          </DataTable></section>
      </ListPageLayout>

    <OceanBookingLinkDialog v-model="linkOpen" :container="linkTarget" @linked="loadRows" />
@@ -819,7 +824,7 @@ onMounted(async () => { await Promise.all([loadCustomers(), loadRows()]) })
 </template>

 <style scoped>
-.container-page { display: grid; gap: var(--admin-space-5); min-width: 0; }.container-page small { display: block; margin-top: var(--admin-space-1); color: var(--cc-muted); }.container-query-panel { overflow: hidden; border: 1px solid var(--cc-border); border-radius: var(--admin-radius); background: var(--admin-surface); }.container-scope-tabs { display: flex; max-width: 100%; overflow-x: auto; margin-bottom: 0; border-bottom: 1px solid #e5e7eb; scrollbar-width: thin; }.container-query-toolbar { border: 0; }.row-actions { flex-wrap: nowrap; white-space: nowrap; }.row-actions :deep(.el-button + .el-button) { margin-left: 0; }.form-grid { display: grid; grid-template-columns: repeat(2, minmax(0, 1fr)); gap: 0 var(--admin-space-5); }.form-grid :deep(.el-select),.form-grid :deep(.el-date-editor),.form-grid :deep(.el-input-number),.simulation-form :deep(.el-select),.simulation-form :deep(.el-input-number),.fleet-select { width: 100%; }.arrival-time-cell { display: flex; align-items: center; width: 100%; min-width: 0; padding-right: var(--admin-space-1); box-sizing: border-box; }.arrival-time-picker { width: 200px !important; max-width: 100%; min-width: 0; box-sizing: border-box; }.details :deep(.el-descriptions__label) { width: 120px; }.drayage-load-alert { margin-bottom: var(--admin-space-5); }.drayage-summary { margin-bottom: var(--admin-space-5); }
+.container-page { display: grid; gap: var(--admin-space-5); min-width: 0; }.container-page small { display: block; margin-top: var(--admin-space-1); color: var(--cc-muted); }.container-query-panel { min-width: 0; }.container-query-toolbar { border: 0; }.row-actions { flex-wrap: nowrap; white-space: nowrap; }.row-actions :deep(.el-button + .el-button) { margin-left: 0; }.form-grid { display: grid; grid-template-columns: repeat(2, minmax(0, 1fr)); gap: 0 var(--admin-space-5); }.form-grid :deep(.el-select),.form-grid :deep(.el-date-editor),.form-grid :deep(.el-input-number),.simulation-form :deep(.el-select),.simulation-form :deep(.el-input-number),.fleet-select { width: 100%; }.arrival-time-cell { display: flex; align-items: center; width: 100%; min-width: 0; padding-right: var(--admin-space-1); box-sizing: border-box; }.arrival-time-picker { width: 200px !important; max-width: 100%; min-width: 0; box-sizing: border-box; }.details :deep(.el-descriptions__label) { width: 120px; }.drayage-load-alert { margin-bottom: var(--admin-space-5); }.drayage-summary { margin-bottom: var(--admin-space-5); }
 .container-query-panel { width: 100%; max-width: 100%; min-width: 0; box-sizing: border-box; }
 .container-query-toolbar :deep(.query-toolbar__tail) { width: 100%; flex: 0 0 100%; }
 .container-page .table-panel { width: 100%; max-width: 100%; min-width: 0; }
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import ContainersView from './ContainersView.vue'
+import ContainerWorkbenchView from './ContainerWorkbenchView.vue'
 </script>

-<template><ContainersView workbench="DOMESTIC" /></template>
+<template><ContainerWorkbenchView stage="DOMESTIC" /></template>
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import ContainersView from './ContainersView.vue'
+import ContainerWorkbenchView from './ContainerWorkbenchView.vue'
 </script>

-<template><ContainersView workbench="OVERSEAS" /></template>
+<template><ContainerWorkbenchView stage="OVERSEAS" /></template>
@@ -5,7 +5,7 @@ export const containerLoadingRoutes = [
    path: 'container-loading/domestic',
    name: 'domestic-container-workbench',
    component: () => import('./pages/DomesticContainersView.vue'),
-    meta: { title: '货柜列表', description: '管理国内送柜、装柜、出口报关与出仓', permission: 'platform:firstleg:container:list' },
+    meta: { showPageHeading: false, title: '货柜列表', description: '管理国内装柜、海外清关提柜与到仓', permission: 'platform:firstleg:container:list', permissionAnyOf: ['platform:firstleg:terminal-drayage:list'] },
  },
  {
    path: 'container-loading/domestic/:containerId',
@@ -23,7 +23,7 @@ export const containerLoadingRoutes = [
    path: 'container-loading/overseas',
    name: 'overseas-container-workbench',
    component: () => import('./pages/OverseasContainersView.vue'),
-    meta: { title: '清关提柜', description: '管理海运轨迹、目的港清关、提柜与还空', permission: 'platform:firstleg:terminal-drayage:list' },
+    meta: { showPageHeading: false, title: '清关提柜', description: '管理海运轨迹、目的港清关、提柜与还空', permission: 'platform:firstleg:terminal-drayage:list' },
  },
  {
    path: 'container-loading/overseas/:containerId',
@@ -16,6 +16,7 @@ export interface ContainerBookingResource {
  channelCode: string | null
  channelName: string | null
  oceanBookingId?: string | null
+  currentPortScheduleId?: string | null
  oceanBookingRequirementId?: string | null
  customerId?: string | null
  customerName?: string | null
@@ -1060,23 +1060,25 @@ onMounted(() => { void loadCustomers() })
  <AdminPage as="div" class="customers-page admin-density customer-density">
    <OperationErrorToast :details="passwordError || impersonationError || archiveError" />
    <ListPageLayout aria-label="客户管理">
-      <template #toolbar><QueryToolbar v-model="filters" class="surface-panel" ariaLabel="客户筛选" :fields="queryFields" preference-key="customers-query" @search="applyFilters" /></template>
-      <template v-if="loadError" #state>
+
+
+      <section :aria-busy="loading"><DataTable appearance="integrated" :stripe="false" column-settings-mode="show" :results-visible="!loadError" v-model:page="page" v-model:page-size="pageSize" :data="result.records" :columns="customerColumns" preference-key="customers-table" :loading="loading" :total="result.total" aria-label="客户列表" row-key="id" empty-text="暂无符合筛选条件的客户" class="customer-list-table" border>
+        <template #toolbar-start><h1>客户列表</h1></template>
+        <template #filters><QueryToolbar v-model="filters" ariaLabel="客户筛选" :fields="queryFields" preference-key="customers-query" @search="applyFilters" /></template>
+        <template #notices><template v-if="loadError">
        <LoadErrorState title="客户列表暂时无法加载" :message="loadError.message" :loading="loading" @retry="loadCustomers">
          <template #details><ApiErrorMeta :details="loadError" /></template>
        </LoadErrorState>
-      </template>
-      <section v-if="!loadError" class="surface-panel table-panel" :aria-busy="loading">
-      <div v-if="reviewLoadError" class="review-sync-error" role="alert"><div><ShieldX :size="17" /><span>{{ reviewLoadError.message }}</span></div><el-button link type="primary" @click="reloadPendingReviews">重新加载待审核客户</el-button></div>
-      <DataTable v-model:page="page" v-model:page-size="pageSize" :data="result.records" :columns="customerColumns" preference-key="customers-table" :loading="loading" :total="result.total" aria-label="客户列表" row-key="id" empty-text="暂无符合筛选条件的客户" class="customer-list-table" :stripe="true" border>
+      </template></template>
+        <template #before-results><div v-if="reviewLoadError" class="review-sync-error" role="alert"><div><ShieldX :size="17" /><span>{{ reviewLoadError.message }}</span></div><el-button link type="primary" @click="reloadPendingReviews">重新加载待审核客户</el-button></div></template>
+
        <template #toolbar-actions><div class="customers-table-actions"><el-button v-if="access.can('platform:customer:export') && access.can('platform:download:list')" :loading="exportSubmitting" :disabled="loading || exportSubmitting" @click="exportCustomers">导出Excel</el-button><el-button v-if="access.can('platform:customer:create')" type="primary" :disabled="loading" @click="openCreate">新增客户</el-button></div></template>
-        <template #actions="{ row }"><RowActions class="density-action" :actions="customerRowActions(row as PlatformTenantResource)" :more-label="customerMoreActionsLabel(row as PlatformTenantResource)" @action="handleCustomerRowAction(row as PlatformTenantResource, $event)" /></template>
+        <template #actions="{ row }"><RowActions text-actions class="density-action" :actions="customerRowActions(row as PlatformTenantResource)" :more-label="customerMoreActionsLabel(row as PlatformTenantResource)" @action="handleCustomerRowAction(row as PlatformTenantResource, $event)" /></template>
        <template #company="{ row }"><strong class="customer-company-name">{{ (row as PlatformTenantResource).tenantName }}</strong></template>
        <template #status="{ row }"><el-tag :type="statusMeta((row as PlatformTenantResource).status).type" effect="light">{{ statusMeta((row as PlatformTenantResource).status).label }}</el-tag></template>
        <template #orderCount="{ row }">{{ access.can('platform:order:list') ? (orderCounts[String((row as PlatformTenantResource).id)] ?? '—') : '—' }}</template>
        <template #pagination-left="{ total: tableTotal }"><span>共 {{ tableTotal }} 个客户</span></template>
-      </DataTable>
-      </section>
+      </DataTable></section>
    </ListPageLayout>

    <AppDialog v-model="editorOpen" :title="editorTitle" :width="editorDialogWidth" class="admin-density-dialog customer-density-dialog customer-editor-dialog" :loading="editorLoading" :confirm-loading="saving" destroy-on-close>
@@ -69,11 +69,15 @@ onMounted(() => { void load() })
  <AdminPage>
  <div class="business-page overseas-fees-page admin-density customer-density">
    <ListPageLayout ariaLabel="海外仓阶梯费用列表">
-      <template #toolbar><QueryToolbar v-model="filters" class="surface-panel" :fields="queryFields" ariaLabel="海外仓阶梯费用筛选" preference-key="overseas-storage-fees-query" @search="search" /></template>
-      <template v-if="error" #state><section class="surface-panel error-state" role="alert"><div><strong>{{ error.message }}</strong><ApiErrorMeta :details="error" /></div><el-button type="primary" @click="load">重新加载</el-button></section></template>
-    <section v-if="!error" class="surface-panel table-panel">
-      <DataTable v-model:page="page" v-model:page-size="size" :data="rows" :columns="columns" :loading="loading" :total="total" preference-key="overseas-storage-fees-table" row-key="id" border stripe empty-text="暂无海外仓阶梯费用配置" @update:page="load" @update:page-size="load">
-        <template #actions="{ row }"><el-button v-if="access.can('platform:overseas-storage-fee:edit')" class="density-action" size="small" plain @click="openEdit(row as OverseasStorageFeeConfig)">编辑</el-button></template>
+
+
+    <section><DataTable appearance="integrated" :stripe="false" column-settings-mode="show" :results-visible="!error" v-model:page="page" v-model:page-size="size" :data="rows" :columns="columns" :loading="loading" :total="total" preference-key="overseas-storage-fees-table" row-key="id" border empty-text="暂无海外仓阶梯费用配置" @update:page="load" @update:page-size="load">
+        <template #toolbar-start><h1>海外仓阶梯费用</h1></template>
+        <template #filters><QueryToolbar v-model="filters" :fields="queryFields" ariaLabel="海外仓阶梯费用筛选" preference-key="overseas-storage-fees-query" @search="search" /></template>
+        <template #notices><template v-if="error"><section class="surface-panel error-state" role="alert"><div><strong>{{ error.message }}</strong><ApiErrorMeta :details="error" /></div><el-button type="primary" @click="load">重新加载</el-button></section></template></template>
+
+
+        <template #actions="{ row }"><div class="row-actions density-actions admin-text-actions"><el-button v-if="access.can('platform:overseas-storage-fee:edit')" class="density-action" size="small" plain @click="openEdit(row as OverseasStorageFeeConfig)">编辑</el-button></div></template>
        <template #storage="{ row }">
          <dl class="tier-list" aria-label="仓租阶梯单价，币种见本行币种列">
            <div v-for="tier in tiersFor(row as OverseasStorageFeeConfig, 'STORAGE')" :key="tier.id" class="tier-item"><dt>{{ label(tier) }}：</dt><dd>{{ tier.unitPrice }}</dd></div>
@@ -85,8 +89,7 @@ onMounted(() => { void load() })
          </dl>
        </template>
        <template #pagination-left="{ total: tableTotal }"><span>共 {{ tableTotal }} 个客户</span></template>
-      </DataTable>
-    </section>
+      </DataTable></section>
    </ListPageLayout>
    <AppDialog class="admin-density-dialog customer-density-dialog" v-model="dialogOpen" title="编辑海外仓阶梯费用" width="min(1120px, calc(100vw - 28px))" :confirm-loading="saving" @confirm="save">
      <el-form label-position="top"><el-form-item label="币种"><el-select v-model="form.currency" style="width:180px"><el-option label="USD" value="USD" /><el-option label="CNY" value="CNY" /><el-option label="EUR" value="EUR" /></el-select></el-form-item><div class="groups"><div v-for="(group, index) in [storageTiers, returnTiers]" :key="index"><div class="group-heading"><h3>{{ index === 0 ? '仓租（CBM/天）' : '退货仓储费（托/天）' }} · {{ group.length }}档</h3><el-button class="density-action" data-tone="primary" type="primary" plain size="small" :disabled="form.tiers.length >= 100" @click="addTier(index === 0 ? 'STORAGE' : 'RETURN_STORAGE')">新增阶梯</el-button></div><el-table :data="group" size="small" border stripe><el-table-column label="操作" width="88" fixed="left"><template #default="{ row }"><el-button class="density-action" data-tone="danger" size="small" plain type="danger" :disabled="group.length <= 1" @click="removeTier(row as OverseasStorageFeeTier)">删除</el-button></template></el-table-column><el-table-column label="开始天数"><template #default="{ row }"><el-input-number v-model="row.startDay" :min="1" :max="36500" :controls="false" placeholder="请输入开始天数" /></template></el-table-column><el-table-column label="结束天数"><template #default="{ row }"><el-input-number v-if="row.endDay !== null" v-model="row.endDay" :min="1" :max="36500" :controls="false" placeholder="请输入结束天数" /><span v-else>以上</span></template></el-table-column><el-table-column label="价格"><template #default="{ row }"><el-input-number v-model="row.unitPrice" :min="0" :precision="6" :controls="false" placeholder="请输入单价" /></template></el-table-column></el-table></div></div></el-form>
@@ -5,13 +5,13 @@ export const customerRoutes = [
    path: 'customers',
    name: 'customers',
    component: () => import('@/modules/customers/pages/CustomersView.vue'),
-    meta: { title: '客户管理', description: '维护客户企业资料、合作状态和注册审核', permission: 'platform:customer:list', permissionAnyOf: ['platform:customer:review'] },
+    meta: { title: '客户管理', showPageHeading: false, description: '维护客户企业资料、合作状态和注册审核', permission: 'platform:customer:list', permissionAnyOf: ['platform:customer:review'] },
  },
  {
    path: 'customers/overseas-storage-fees',
    name: 'overseas-storage-fees',
    component: () => import('@/modules/customers/pages/OverseasStorageFeesView.vue'),
-    meta: { title: '海外仓阶梯费用', description: '维护客户仓租和退货仓储费阶梯', permission: 'platform:overseas-storage-fee:list' },
+    meta: { title: '海外仓阶梯费用', showPageHeading: false, description: '维护客户仓租和退货仓储费阶梯', permission: 'platform:overseas-storage-fee:list' },
  },
  {
    path: 'customers/:tenantId',
@@ -1,7 +1,10 @@
 import { enableAutoUnmount, flushPromises, mount } from '@vue/test-utils'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import DashboardView from './DashboardView.vue'
-import { getTodayNewOrderCount } from '../api/dashboard'
+import { getTodayNewOrderCount, getActiveCustomerCount, getDashboardOperationalMetrics } from '../api/dashboard'
+
+const access = vi.hoisted(() => ({ permissions: new Set<string>() }))
+vi.mock('@/core/access/accessPreview', () => ({ useAccessPreviewStore: () => ({ can: (permission: string) => access.permissions.has(permission) }) }))

 vi.mock('../api/dashboard', () => ({
  getTodayNewOrderCount: vi.fn().mockResolvedValue(12),
@@ -18,7 +21,28 @@ vi.mock('../api/dashboard', () => ({
 enableAutoUnmount(afterEach)

 describe('DashboardView', () => {
-  beforeEach(() => vi.clearAllMocks())
+  beforeEach(() => {
+    vi.clearAllMocks()
+    access.permissions = new Set(['platform:order:list', 'platform:customer:list', 'platform:firstleg:container:list', 'platform:firstleg:customs:list'])
+  })
+
+  it('makes no metric requests for a minimal pool sales account and gives an authorized-menu hint', async () => {
+    access.permissions = new Set(['platform:fleet:capacity-offer:list', 'platform:fleet:capacity-offer:inquiry-create', 'platform:fleet:capacity-offer:inquiry-edit', 'platform:fleet:capacity-offer:inquiry-cancel'])
+    const wrapper = mount(DashboardView); await flushPromises()
+    expect(getTodayNewOrderCount).not.toHaveBeenCalled(); expect(getActiveCustomerCount).not.toHaveBeenCalled(); expect(getDashboardOperationalMetrics).not.toHaveBeenCalled()
+    expect(wrapper.findAll('.dashboard-metric')).toHaveLength(0)
+    expect(wrapper.text()).toContain('请从左侧菜单进入已授权业务')
+    expect(wrapper.text()).not.toContain('指标加载失败'); expect(wrapper.text()).not.toContain('刷新数据')
+  })
+
+  it('requests only granted metric sources and requires both container and customs permissions', async () => {
+    access.permissions = new Set(['platform:customer:list', 'platform:firstleg:container:list'])
+    const wrapper = mount(DashboardView); await flushPromises()
+    expect(getActiveCustomerCount).toHaveBeenCalledOnce(); expect(getTodayNewOrderCount).not.toHaveBeenCalled(); expect(getDashboardOperationalMetrics).not.toHaveBeenCalled()
+    expect(wrapper.findAll('.dashboard-metric p').map(node => node.text())).toEqual(['活跃客户'])
+    await wrapper.findAll('button').find(button => button.text().trim() === '刷新数据')!.trigger('click'); await flushPromises()
+    expect(getActiveCustomerCount).toHaveBeenCalledTimes(2); expect(getDashboardOperationalMetrics).not.toHaveBeenCalled()
+  })

  it('renders only the four live metrics', async () => {
    const wrapper = mount(DashboardView)
@@ -7,6 +7,7 @@ import {
  RefreshCw,
 } from '@lucide/vue'
 import AdminPage from '@/shared/components/AdminPage.vue'
+import { useAccessPreviewStore } from '@/core/access/accessPreview'
 import {
  getActiveCustomerCount,
  getDashboardOperationalMetrics,
@@ -22,6 +23,11 @@ const todayNewOrderCount = ref<number | null>(null)
 const activeCustomerCount = ref<number | null>(null)
 const operationalMetrics = ref<DashboardOperationalMetrics | null>(null)
 const metricsUpdatedAt = ref<string | null>(null)
+const access = useAccessPreviewStore()
+const canReadOrders = computed(() => access.can('platform:order:list'))
+const canReadCustomers = computed(() => access.can('platform:customer:list'))
+const canReadOperations = computed(() => access.can('platform:firstleg:container:list') && access.can('platform:firstleg:customs:list'))
+const hasMetrics = computed(() => canReadOrders.value || canReadCustomers.value || canReadOperations.value)

 function displayNumber(value: number | null | undefined, maximumFractionDigits = 0) {
  if (metricsLoading.value) return '…'
@@ -30,17 +36,18 @@ function displayNumber(value: number | null | undefined, maximumFractionDigits =
 }

 const metrics = computed(() => [
-  { label: '今日新运单', value: displayNumber(todayNewOrderCount.value), unit: '票', note: '按今日创建时间统计', tone: 'blue' },
+  { label: '今日新运单', value: displayNumber(todayNewOrderCount.value), unit: '票', note: '按今日创建时间统计', tone: 'blue', visible: canReadOrders.value },
  {
    label: '在途柜量', value: displayNumber(operationalMetrics.value?.inTransitTeu, 2), unit: 'TEU',
    note: operationalMetrics.value
      ? `已开船未到仓 · ${operationalMetrics.value.inTransitContainerCount} 柜${operationalMetrics.value.unknownContainerTypeCount ? ` · ${operationalMetrics.value.unknownContainerTypeCount} 柜箱型未知` : ''}`
      : '已开船且尚未到仓',
    tone: 'green',
+    visible: canReadOperations.value,
  },
-  { label: '活跃客户', value: displayNumber(activeCustomerCount.value), unit: '家', note: '客户状态为启用', tone: 'purple' },
-  { label: '待清关票数', value: displayNumber(operationalMetrics.value?.pendingCustomsOrderCount), unit: '票', note: '已进入清关且尚未完成', tone: 'rose' },
-])
+  { label: '活跃客户', value: displayNumber(activeCustomerCount.value), unit: '家', note: '客户状态为启用', tone: 'purple', visible: canReadCustomers.value },
+  { label: '待清关票数', value: displayNumber(operationalMetrics.value?.pendingCustomsOrderCount), unit: '票', note: '已进入清关且尚未完成', tone: 'rose', visible: canReadOperations.value },
+].filter(metric => metric.visible))

 async function toggleFullscreen() {
  if (!document.fullscreenElement) await dashboardRef.value?.requestFullscreen()
@@ -55,17 +62,17 @@ async function loadMetrics() {
  metricsLoading.value = true
  metricsError.value = false
  const [orders, customers, operations] = await Promise.allSettled([
-    getTodayNewOrderCount(),
-    getActiveCustomerCount(),
-    getDashboardOperationalMetrics(),
+    canReadOrders.value ? getTodayNewOrderCount() : Promise.resolve(null),
+    canReadCustomers.value ? getActiveCustomerCount() : Promise.resolve(null),
+    canReadOperations.value ? getDashboardOperationalMetrics() : Promise.resolve(null),
  ])
  todayNewOrderCount.value = orders.status === 'fulfilled' ? orders.value : null
  activeCustomerCount.value = customers.status === 'fulfilled' ? customers.value : null
  operationalMetrics.value = operations.status === 'fulfilled' ? operations.value : null
  metricsError.value = [orders, customers, operations].some(result => result.status === 'rejected')
-  metricsUpdatedAt.value = operations.status === 'fulfilled' && operations.value.asOf
+  metricsUpdatedAt.value = operations.status === 'fulfilled' && operations.value?.asOf
    ? operations.value.asOf
-    : dayjs().format('YYYY-MM-DDTHH:mm:ss')
+    : hasMetrics.value ? dayjs().format('YYYY-MM-DDTHH:mm:ss') : null
  metricsLoading.value = false
 }

@@ -80,10 +87,10 @@ onBeforeUnmount(() => document.removeEventListener('fullscreenchange', syncFulls
  <section ref="dashboardRef" class="dashboard-view">
    <AdminPage as="div" spacing="normal">
      <section class="dashboard-context" aria-label="数据看板说明">
-        <p>{{ metricsError ? '部分核心指标加载失败，可刷新重试。' : '核心指标来自实时业务数据。' }}</p>
+        <p>{{ !hasMetrics ? '当前账号暂无可查看的首页指标，请从左侧菜单进入已授权业务。' : metricsError ? '部分核心指标加载失败，可刷新重试。' : '核心指标来自实时业务数据。' }}</p>
        <div class="dashboard-head-actions">
-          <span>数据更新时间：{{ metricsUpdatedAt ? dayjs(metricsUpdatedAt).format('YYYY-MM-DD HH:mm') : '加载中' }}</span>
-          <button type="button" class="dashboard-outline-button" :disabled="metricsLoading" @click="loadMetrics">
+          <span v-if="hasMetrics">数据更新时间：{{ metricsUpdatedAt ? dayjs(metricsUpdatedAt).format('YYYY-MM-DD HH:mm') : '加载中' }}</span>
+          <button v-if="hasMetrics" type="button" class="dashboard-outline-button" :disabled="metricsLoading" @click="loadMetrics">
            <RefreshCw :size="16" aria-hidden="true" />
            刷新数据
          </button>
@@ -95,7 +102,7 @@ onBeforeUnmount(() => document.removeEventListener('fullscreenchange', syncFulls
        </div>
      </section>

-      <div class="dashboard-metrics" aria-label="核心业务指标">
+      <div v-if="hasMetrics" class="dashboard-metrics" aria-label="核心业务指标">
        <article v-for="metric in metrics" :key="metric.label" class="dashboard-metric" :class="`is-${metric.tone}`">
          <span class="dashboard-metric-mark" aria-hidden="true" />
          <p>{{ metric.label }}</p>
@@ -8,7 +8,7 @@ describe('DomesticContainersView', () => {
  it('gates create actions with backend permissions', () => { expect(source).toContain("access.can('platform:domestic-container:inbound:create')"); expect(source).toContain("access.can('platform:domestic-container:outbound:create')") })
  it('loads only active domestic warehouse candidates and surfaces errors', () => { expect(source).toContain("listAllPlatformWarehouses({ warehouseType: 'DOMESTIC', status: 'ACTIVE' })"); expect(source).toContain('国内仓候选加载失败') })
  it('keeps idempotency key stable through retry and handles conflicts by refreshing inventory', () => { expect(source).toContain('idempotencyKey.value'); expect(source).toContain("submitError.value.code === 'A0409'"); expect(source).toContain('await loadCandidates()'); expect(source).not.toContain('localStorage') })
-  it('reuses the order-list tab panel and keyboard interaction', () => { expect(source).toContain('class="business-query-panel"'); expect(source).toContain('role="tablist"'); expect(source).toContain('role="tab"'); expect(source).toContain('handleTabKeydown'); expect(source).toContain(".status-tab.is-active::after{background:var(--cc-primary)}"); expect(source).not.toContain('<el-tabs') })
+  it('reuses the order-list tab panel and keyboard interaction', () => { expect(source).toContain('class="business-query-panel integrated-query-group"'); expect(source).toContain('role="tablist"'); expect(source).toContain('role="tab"'); expect(source).toContain('handleTabKeydown'); expect(source).toContain('class="status-tabs density-status-tabs"'); expect(source).not.toContain('<el-tabs') })
  it('keeps desktop filters and actions on one row with explicit field widths', () => { expect(source).toContain("key: 'warehouseId', type: 'select', width: 210"); expect(source).toContain("key: 'orderNo', type: 'input', width: 220"); expect(source).toContain("key: 'containerNo', type: 'input', width: 220"); expect(source).toContain("key: 'cargoName', type: 'input', width: 220"); expect(source).toContain("key: 'status', type: 'select', width: 180") })
  it('uses the shared query toolbar flow without a page-level layout override', () => { expect(source).not.toContain('.query-toolbar__filters') })
  it('keeps all four inventory facts in the approved compact summary', () => {
@@ -74,7 +74,12 @@ watch([page, pageSize], load); onMounted(async () => { await Promise.all([loadWa

 <template><AdminPage as="div" class="domestic-containers-page admin-density">
 <LoadErrorState v-if="warehouseError" compact title="国内仓候选加载失败" :message="warehouseError.message" :loading="warehouseLoading" @retry="loadWarehouses"><template #details><ApiErrorMeta :details="warehouseError" /></template></LoadErrorState>
-<ListPageLayout :aria-label="`${activeTab === 'inbound' ? '整柜入库单' : activeTab === 'outbound' ? '整柜出库单' : '整柜库存'}列表`"><template #toolbar><div class="business-query-panel"><div class="status-tabs" role="tablist" aria-label="整柜业务类型"><button v-for="(tab, index) in businessTabs" :key="tab.value" type="button" role="tab" :aria-selected="activeTab === tab.value" aria-controls="domestic-container-results" :tabindex="activeTab === tab.value ? 0 : -1" :class="['status-tab', { 'is-active': activeTab === tab.value }]" @click="switchTab(tab.value)" @keydown="handleTabKeydown($event, index)"><span class="density-tab-icon" aria-hidden="true">{{ tab.icon }}</span>{{ tab.label }}</button></div><QueryToolbar v-model="filters" class="business-query-toolbar" ariaLabel="整柜业务筛选" :fields="queryFields" :preference-key="`domestic-containers-${activeTab}-query`" @search="search" /></div></template><template v-if="loadError" #state><LoadErrorState title="整柜业务加载失败" :message="loadError.message" :loading="loading" @retry="load"><template #details><ApiErrorMeta :details="loadError" /></template></LoadErrorState></template><section v-if="!loadError" id="domestic-container-results" class="surface-panel table-panel"><div v-if="activeTab === 'inventory'" class="inventory-summary"><div><span>入库箱数</span><strong>{{ summary.inboundBoxes }}</strong></div><div><span>已出库箱数</span><strong>{{ summary.outboundBoxes }}</strong></div><div><span>当前库存</span><strong>{{ summary.availableBoxes }}</strong></div><div><span>累计入库体积</span><strong>{{ summary.inboundVolumeCbm.toFixed(2) }} m³</strong></div></div><DataTable v-model:page="page" v-model:page-size="pageSize" :data="rows" :columns="columns" :loading="loading" :total="total" stripe row-key="id" :preference-key="`domestic-containers-${activeTab}-table`" :empty-text="activeTab === 'inbound' ? '暂无整柜入库单' : activeTab === 'outbound' ? '暂无整柜出库单' : '暂无整柜库存'"><template #toolbar-actions><el-button v-if="activeTab === 'inbound' && access.can('platform:domestic-container:inbound:create')" type="primary" @click="openInbound"><Plus :size="16" />新建入库单</el-button><el-button v-if="activeTab === 'outbound' && access.can('platform:domestic-container:outbound:create')" type="primary" @click="openOutbound"><Plus :size="16" />新建出库单</el-button></template><template #actions="{ row }"><el-button v-if="canViewInventory(row as ContainerOrder | InventoryRecord)" class="density-action" size="small" @click="viewInventory(row as ContainerOrder | InventoryRecord)">查看</el-button><span v-else>—</span></template><template #status="{ row }"><StatusBadge :status="statusLabel(row as ContainerOrder | InventoryRecord)" /></template></DataTable></section></ListPageLayout>
+<ListPageLayout :aria-label="`${activeTab === 'inbound' ? '整柜入库单' : activeTab === 'outbound' ? '整柜出库单' : '整柜库存'}列表`"><section id="domestic-container-results" ><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" row-key="id" :preference-key="`domestic-containers-${activeTab}-table`" :empty-text="activeTab === 'inbound' ? '暂无整柜入库单' : activeTab === 'outbound' ? '暂无整柜出库单' : '暂无整柜库存'">
+        <template #toolbar-start><h1>整柜业务</h1></template>
+        <template #filters><div class="business-query-panel integrated-query-group"><div class="status-tabs density-status-tabs" role="tablist" aria-label="整柜业务类型"><button v-for="(tab, index) in businessTabs" :key="tab.value" type="button" role="tab" :aria-selected="activeTab === tab.value" aria-controls="domestic-container-results" :tabindex="activeTab === tab.value ? 0 : -1" :class="['status-tab', { 'is-active': activeTab === tab.value }]" @click="switchTab(tab.value)" @keydown="handleTabKeydown($event, index)"><span class="density-tab-icon" aria-hidden="true">{{ tab.icon }}</span>{{ tab.label }}</button></div><QueryToolbar v-model="filters" class="business-query-toolbar" ariaLabel="整柜业务筛选" :fields="queryFields" :preference-key="`domestic-containers-${activeTab}-query`" @search="search" /></div></template>
+        <template #notices><template v-if="loadError"><LoadErrorState title="整柜业务加载失败" :message="loadError.message" :loading="loading" @retry="load"><template #details><ApiErrorMeta :details="loadError" /></template></LoadErrorState></template></template>
+        <template #before-results><div v-if="activeTab === 'inventory'" class="inventory-summary"><div><span>入库箱数</span><strong>{{ summary.inboundBoxes }}</strong></div><div><span>已出库箱数</span><strong>{{ summary.outboundBoxes }}</strong></div><div><span>当前库存</span><strong>{{ summary.availableBoxes }}</strong></div><div><span>累计入库体积</span><strong>{{ summary.inboundVolumeCbm.toFixed(2) }} m³</strong></div></div></template>
+<template #toolbar-actions><el-button v-if="activeTab === 'inbound' && access.can('platform:domestic-container:inbound:create')" type="primary" @click="openInbound"><Plus :size="16" />新建入库单</el-button><el-button v-if="activeTab === 'outbound' && access.can('platform:domestic-container:outbound:create')" type="primary" @click="openOutbound"><Plus :size="16" />新建出库单</el-button></template><template #actions="{ row }"><div class="row-actions density-actions admin-text-actions"><el-button v-if="canViewInventory(row as ContainerOrder | InventoryRecord)" class="density-action" size="small" @click="viewInventory(row as ContainerOrder | InventoryRecord)">查看</el-button><span v-else>—</span></div></template><template #status="{ row }"><StatusBadge :status="statusLabel(row as ContainerOrder | InventoryRecord)" /></template></DataTable></section></ListPageLayout>
 <AppDialog v-model="dialogOpen" class="domestic-container-create-dialog admin-density-dialog" :title="dialogType === 'inbound' ? '新建整柜入库单' : '新建整柜出库单'" width="min(720px, calc(100vw - 28px))" :confirm-loading="saving" :close-on-click-modal="false" :confirm-text="dialogType === 'inbound' ? '创建入库单' : '创建出库单'" @confirm="submit"><LoadErrorState v-if="submitError" compact title="创建失败" :message="submitError.message" :show-retry="false"><template #details><ApiErrorMeta :details="submitError" /></template></LoadErrorState><el-form ref="formRef" :model="currentForm" :rules="rules" label-position="top"><el-row :gutter="16"><template v-if="dialogType === 'inbound'"><el-col :xs="24" :sm="12"><el-form-item label="国内仓" prop="warehouseId"><el-select v-model="inboundForm.warehouseId" :loading="warehouseLoading" :disabled="Boolean(warehouseError)" placeholder="请选择启用的国内仓"><el-option v-for="item in warehouseOptions" :key="String(item.value)" :label="item.label" :value="String(item.value)" /></el-select></el-form-item></el-col><el-col :xs="24" :sm="12"><el-form-item label="货物名称" prop="cargoName"><el-input v-model="inboundForm.cargoName" maxlength="128" placeholder="请输入货物名称" /></el-form-item></el-col><el-col :xs="24" :sm="12"><el-form-item label="集装箱号" prop="containerNo"><el-input v-model="inboundForm.containerNo" maxlength="32" placeholder="如 MSCU1234567" /></el-form-item></el-col><el-col :xs="24" :sm="12"><el-form-item label="箱子数量" prop="boxCount"><el-input-number v-model="inboundForm.boxCount" :min="1" :max="999999999" :precision="0" controls-position="right" placeholder="请输入入库箱数" /></el-form-item></el-col><el-col :xs="24" :sm="12"><el-form-item label="体积(m³)" prop="volumeCbm"><el-input-number v-model="inboundForm.volumeCbm" :min="0.0001" :max="999999999999.9999" :precision="4" controls-position="right" placeholder="请输入体积" /></el-form-item></el-col></template><template v-else><el-col :xs="24" :sm="12"><el-form-item label="国内仓" prop="warehouseId"><el-select v-model="outboundForm.warehouseId" :loading="warehouseLoading" :disabled="Boolean(warehouseError)" placeholder="请选择启用的国内仓" @change="loadCandidates"><el-option v-for="item in warehouseOptions" :key="String(item.value)" :label="item.label" :value="String(item.value)" /></el-select></el-form-item></el-col><el-col :xs="24" :sm="12"><el-form-item label="绑定集装箱号" prop="containerNo"><el-select v-model="outboundForm.inventoryId" :loading="candidateLoading" :disabled="!outboundForm.warehouseId || Boolean(candidateError)" placeholder="请选择已有集装箱号" @change="selectInventory"><el-option v-for="item in inventoryCandidates" :key="String(item.id)" :label="`${item.containerNo} · 可用 ${item.availableBoxes} 箱`" :value="String(item.id)" /></el-select><input v-model="outboundForm.containerNo" class="sr-only" tabindex="-1"></el-form-item></el-col><el-col :xs="24" :sm="12"><el-form-item label="货物名称"><el-input v-model="outboundForm.cargoName" readonly /></el-form-item></el-col><el-col :xs="24" :sm="12"><el-form-item label="出库箱数" prop="boxCount"><el-input-number v-model="outboundForm.boxCount" :min="1" :max="999999999" :precision="0" controls-position="right" placeholder="请输入出库箱数" /></el-form-item></el-col><el-col :xs="24" :sm="12"><el-form-item label="可用库存"><el-input :model-value="`${outboundForm.availableBoxes} 箱`" readonly /></el-form-item></el-col><el-col v-if="candidateError" :xs="24"><LoadErrorState compact title="可出库库存加载失败" :message="candidateError.message" @retry="loadCandidates"><template #details><ApiErrorMeta :details="candidateError" /></template></LoadErrorState></el-col></template><el-col :xs="24" :sm="12"><el-form-item :label="dialogType === 'inbound' ? '入库时间' : '出库时间'" prop="operationTime"><el-date-picker v-model="currentForm.operationTime" type="datetime" value-format="YYYY-MM-DDTHH:mm:ss" format="YYYY-MM-DD HH:mm" /></el-form-item></el-col><el-col :xs="24" :sm="12"><el-form-item label="状态" prop="status"><el-select v-model="currentForm.status"><el-option :label="dialogType === 'inbound' ? '已入库' : '已出库'" value="COMPLETED" /><el-option :label="dialogType === 'inbound' ? '待入库' : '待出库'" value="PENDING" /></el-select></el-form-item></el-col><el-col :xs="24"><el-form-item label="备注"><el-input v-model="currentForm.remark" type="textarea" :rows="3" maxlength="500" show-word-limit placeholder="请输入备注" /></el-form-item></el-col></el-row></el-form></AppDialog></AdminPage></template>

-<style scoped>.domestic-containers-page{min-width:0}.business-query-panel{overflow:hidden;border:1px solid var(--cc-border);border-radius:var(--admin-radius, 4px);background:var(--admin-surface, #fff)}.status-tabs{display:flex;max-width:100%;overflow-x:auto;margin-bottom:0;border-bottom:1px solid var(--admin-table-border, #e5e7eb);background:#f9fafb;scrollbar-width:thin}.status-tab{position:relative;flex:0 0 auto;display:inline-flex;align-items:center;gap:var(--admin-space-2, 6px);min-height:var(--admin-tab-height, 38px);padding:0 var(--admin-space-6, 16px);border:0;background:transparent;color:var(--cc-muted);font:inherit;font-size:var(--admin-font-body, 13px);cursor:pointer}.status-tab::after{position:absolute;right:12px;bottom:0;left:12px;height:3px;background:transparent;content:''}.status-tab:hover{color:var(--cc-primary);background:#f6f9fd}.status-tab:focus-visible{outline:2px solid var(--cc-primary);outline-offset:-2px}.status-tab.is-active{color:var(--cc-primary);font-weight:600}.status-tab.is-active::after{background:var(--cc-primary)}.business-query-toolbar{border:0}.inventory-summary{display:flex;align-items:center;gap:0;margin:0 var(--admin-space-6, 16px) var(--admin-space-5, 12px);border:1px solid var(--cc-border);background:var(--admin-label-bg, #f8fafc)}.inventory-summary>div{display:flex;align-items:baseline;gap:var(--admin-space-3, 8px);min-width:0;padding:9px var(--admin-space-6, 16px);border-right:1px solid var(--cc-border)}.inventory-summary>div:last-child{border-right:0}.inventory-summary span{color:var(--cc-muted);font-size:var(--admin-font-caption, 12px)}.inventory-summary strong{font-size:15px}.domestic-container-create-dialog :deep(.el-select),.domestic-container-create-dialog :deep(.el-date-editor),.domestic-container-create-dialog :deep(.el-input-number){width:100%}.sr-only{position:absolute;width:1px;height:1px;overflow:hidden;clip:rect(0,0,0,0)}@media(max-width:720px){.status-tab{min-height:46px;padding:0 14px}.inventory-summary{display:grid;grid-template-columns:repeat(2,minmax(0,1fr))}.inventory-summary>div:nth-child(2){border-right:0}.inventory-summary>div:nth-child(-n+2){border-bottom:1px solid var(--cc-border)}}@media(max-width:360px){.status-tab{padding:0 10px;font-size:13px}.inventory-summary{grid-template-columns:1fr}.inventory-summary>div{border-right:0;border-bottom:1px solid var(--cc-border)}.inventory-summary>div:last-child{border-bottom:0}}</style>
+<style scoped>.domestic-containers-page{min-width:0}.business-query-panel{min-width:0}.business-query-toolbar{border:0}.inventory-summary{display:flex;align-items:center;gap:0;margin:0 var(--admin-space-6, 16px) var(--admin-space-5, 12px);border:1px solid var(--cc-border);background:var(--admin-label-bg, #f8fafc)}.inventory-summary>div{display:flex;align-items:baseline;gap:var(--admin-space-3, 8px);min-width:0;padding:9px var(--admin-space-6, 16px);border-right:1px solid var(--cc-border)}.inventory-summary>div:last-child{border-right:0}.inventory-summary span{color:var(--cc-muted);font-size:var(--admin-font-caption, 12px)}.inventory-summary strong{font-size:15px}.domestic-container-create-dialog :deep(.el-select),.domestic-container-create-dialog :deep(.el-date-editor),.domestic-container-create-dialog :deep(.el-input-number){width:100%}.sr-only{position:absolute;width:1px;height:1px;overflow:hidden;clip:rect(0,0,0,0)}@media(max-width:720px){.inventory-summary{display:grid;grid-template-columns:repeat(2,minmax(0,1fr))}.inventory-summary>div:nth-child(2){border-right:0}.inventory-summary>div:nth-child(-n+2){border-bottom:1px solid var(--cc-border)}}@media(max-width:360px){.inventory-summary{grid-template-columns:1fr}.inventory-summary>div{border-right:0;border-bottom:1px solid var(--cc-border)}.inventory-summary>div:last-child{border-bottom:0}}</style>
@@ -1,5 +1,5 @@
 import type { RouteRecordRaw } from 'vue-router'
 export const domesticContainerRoutes = [
-  { path: 'domestic-containers', name: 'domestic-containers', component: () => import('./pages/DomesticContainersView.vue'), meta: { title: '整柜业务', description: '管理国内仓整柜入库、出库与库存', permission: 'platform:domestic-container:list' } },
+  { path: 'domestic-containers', name: 'domestic-containers', component: () => import('./pages/DomesticContainersView.vue'), meta: { showPageHeading: false, title: '整柜业务', description: '管理国内仓整柜入库、出库与库存', permission: 'platform:domestic-container:list' } },
  { path: 'domestic-containers/inventories/:inventoryId', name: 'domestic-container-inventory-detail', component: () => import('./pages/DomesticContainerInventoryDetailView.vue'), meta: { title: '整柜库存详情', description: '查看整柜库存快照与不可变交易记录', permission: 'platform:domestic-container:list', showPageHeading: false } },
 ] satisfies RouteRecordRaw[]
@@ -3,6 +3,14 @@ import { ApiResponseError, http, unwrapApiResponse, type ApiEnvelope } from '@/s

 export type ExportTaskStatus = 'PENDING' | 'RUNNING' | 'SUCCEEDED' | 'FAILED' | 'EXPIRED'
 export type KnownExportTaskType =
+  | 'LAST_MILE_ORDER_LIST'
+  | 'OVERSEAS_INVENTORY_BALANCE'
+  | 'OVERSEAS_INVENTORY_LEDGER'
+  | 'OVERSEAS_QUOTE_LIST'
+  | 'MONTHLY_EXCHANGE_RATE_LIST'
+  | 'VEHICLE_LIST'
+  | 'FLEET_QUOTE_LIST'
+  | 'TRIP_OPERATIONS_LIST'
  | 'CUSTOMER_LIST'
  | 'DOMESTIC_WAREHOUSE_ORDER_LIST'
  | 'FINANCE_CUSTOMER_ACCOUNT_LIST'
@@ -1 +1,2 @@
 export * from './api/platformExportTasks'
+export { useExportTask } from './useExportTask'
@@ -233,10 +233,10 @@ describe('DownloadCenterView', () => {
    const wrapper = mount(DownloadCenterView, { global: { plugins: [createPinia(), ElementPlus] } })
    await wrapper.vm.$nextTick()

-    expect(wrapper.find('.table-panel').attributes('aria-busy')).toBe('true')
+    expect(wrapper.find('.el-table').attributes('aria-busy')).toBe('true')
    resolveRequest({ records: [], page: 1, size: 20, total: 0, pages: 0 })
    await flushPromises()
-    expect(wrapper.find('.table-panel').attributes('aria-busy')).toBe('false')
+    expect(wrapper.find('.el-table').attributes('aria-busy')).toBe('false')
  })

  it('does not schedule another refresh after an in-flight load finishes on an unmounted page', async () => {
@@ -26,6 +26,16 @@ type DownloadFilters = QueryModel & {
 }

 const exportTypeMeta: Record<string, { label: string; retryPermission: string }> = {
+  LAST_MILE_ORDER_LIST: { label: '尾程订单', retryPermission: 'platform:overseas-warehouse:last-mile-order:export' },
+  OVERSEAS_INVENTORY_BALANCE: { label: '库存余额', retryPermission: 'platform:overseas-warehouse:inventory:export' },
+  OVERSEAS_INVENTORY_LEDGER: { label: '进销存记录', retryPermission: 'platform:overseas-warehouse:inventory:export' },
+  OVERSEAS_QUOTE_LIST: { label: '海外报价', retryPermission: 'platform:overseas-master-data:quote:export' },
+  MONTHLY_EXCHANGE_RATE_LIST: { label: '月度汇率', retryPermission: 'platform:overseas-master-data:exchange-rate:export' },
+  VEHICLE_LIST: { label: '车辆', retryPermission: 'platform:overseas-master-data:vehicle:export' },
+  FLEET_QUOTE_LIST: { label: '车队报价', retryPermission: 'platform:fleet:quote:export' },
+  TRIP_OPERATIONS_LIST: { label: '出车记录', retryPermission: 'platform:fleet:operations:export' },
+  FINANCE_RECEIVABLE_STATISTICS: { label: '应收统计', retryPermission: 'platform:finance:receivable-statistics:export' },
+  LOADING_LIST_BUY_DECLARATION_ITEMS: { label: '买单报关明细', retryPermission: 'platform:firstleg:customs:manage' },
  CUSTOMER_LIST: { label: '客户列表', retryPermission: 'platform:customer:export' },
  DOMESTIC_WAREHOUSE_ORDER_LIST: { label: '国内仓订单列表', retryPermission: 'platform:order:export' },
  FINANCE_CUSTOMER_ACCOUNT_LIST: { label: '客户账户', retryPermission: 'platform:finance:customer-account:export' },
@@ -266,25 +276,28 @@ onBeforeUnmount(() => {
  <AdminPage class="admin-density">
  <div class="business-page download-center-page">
    <ListPageLayout ariaLabel="下载任务列表">
-      <template #toolbar>
-        <QueryToolbar v-model="filters" class="surface-panel" ariaLabel="下载任务筛选" :fields="queryFields" preference-key="downloads-query" @search="applyFilters" />
-      </template>

-      <template v-if="loadError" #state>
+
+
+
+    <section :aria-busy="loading"><DataTable appearance="integrated" :stripe="false" column-settings-mode="show" :results-visible="!loadError" v-model:page="page" v-model:page-size="pageSize" :data="result.records" :columns="columns" preference-key="downloads-table" :loading="loading" :total="result.total" row-key="id" empty-text="暂无符合筛选条件的下载任务" aria-label="下载任务列表">
+        <template #toolbar-start><h1>下载中心</h1></template>
+        <template #filters>
+        <QueryToolbar v-model="filters" ariaLabel="下载任务筛选" :fields="queryFields" preference-key="downloads-query" @search="applyFilters" />
+      </template>
+        <template #notices><template v-if="loadError">
        <section class="surface-panel download-error" role="alert">
          <div><strong>下载任务暂时无法加载</strong><p>{{ loadError.message }}</p><ApiErrorMeta :details="loadError" /></div>
          <el-button type="primary" :loading="loading" @click="loadTasks()">重新加载</el-button>
        </section>
-      </template>
-
-    <section v-if="!loadError" class="surface-panel table-panel" :aria-busy="loading">
-      <div v-if="syncWarning" class="download-sync-warning" role="status">
+      </template></template>
+        <template #before-results><div v-if="syncWarning" class="download-sync-warning" role="status">
        <span>自动刷新暂时失败，正在保留当前任务并继续重试：{{ syncWarning.message }}</span>
        <ApiErrorMeta :details="syncWarning" />
-      </div>
-      <DataTable v-model:page="page" v-model:page-size="pageSize" :data="result.records" :columns="columns" preference-key="downloads-table" :loading="loading" :total="result.total" row-key="id" empty-text="暂无符合筛选条件的下载任务" aria-label="下载任务列表">
+      </div></template>
+
        <template #pagination-left="{ total: tableTotal }"><span>共 {{ tableTotal }} 个任务</span></template>
-        <template #actions="{ row }"><div class="table-actions density-actions">
+        <template #actions="{ row }"><div class="table-actions density-actions row-actions admin-text-actions">
          <el-button data-tone="neutral" class="density-action" v-if="(row as PlatformExportTask)?.id" @click="openDetail(row as PlatformExportTask)">详情</el-button>
          <el-button data-tone="neutral" class="density-action" v-if="(row as PlatformExportTask).status === 'SUCCEEDED'" :loading="downloadingId === (row as PlatformExportTask).id" @click="downloadTask(row as PlatformExportTask)">下载</el-button>
          <el-button data-tone="neutral" class="density-action" v-if="canRetry(row as PlatformExportTask)" :loading="retryingId === (row as PlatformExportTask).id" @click="retryTask(row as PlatformExportTask)">{{ retryLabel(row as PlatformExportTask) }}</el-button>
@@ -296,8 +309,7 @@ onBeforeUnmount(() => {
        <template #requestedAt="{ row }">{{ formatDate((row as PlatformExportTask).requestedAt) }}</template>
        <template #completedAt="{ row }">{{ formatDate((row as PlatformExportTask).completedAt) }}</template>
        <template #expiresAt="{ row }">{{ formatDate((row as PlatformExportTask).expiresAt) }}</template>
-      </DataTable>
-    </section>
+      </DataTable></section>
    </ListPageLayout>

    <AppDialog class="admin-density-dialog"
@@ -5,6 +5,6 @@ export const downloadRoutes = [
    path: 'downloads',
    name: 'download-center',
    component: () => import('@/modules/downloads/pages/DownloadCenterView.vue'),
-    meta: { title: '下载中心', description: '查看异步导出任务并下载已生成文件', permission: 'platform:download:list' },
+    meta: { showPageHeading: false, title: '下载中心', description: '查看异步导出任务并下载已生成文件', permission: 'platform:download:list' },
  },
 ] satisfies RouteRecordRaw[]
@@ -0,0 +1,48 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { readFileSync } from 'node:fs'
+import { createPlatformExportTask } from './api/platformExportTasks'
+import { showExportTaskCreatedDialog } from '@/shared/components/exportTaskCreatedDialog'
+import { useExportTask } from './useExportTask'
+
+const { push } = vi.hoisted(() => ({ push: vi.fn() }))
+vi.mock('vue-router', () => ({ useRouter: () => ({ push }) }))
+vi.mock('./api/platformExportTasks', () => ({ createPlatformExportTask: vi.fn() }))
+vi.mock('@/shared/components/exportTaskCreatedDialog', () => ({ showExportTaskCreatedDialog: vi.fn() }))
+beforeEach(() => {
+  vi.clearAllMocks()
+  vi.mocked(createPlatformExportTask).mockResolvedValue({ taskNo: 'EXP-1' } as Awaited<ReturnType<typeof createPlatformExportTask>>)
+  vi.mocked(showExportTaskCreatedDialog).mockResolvedValue(false)
+})
+
+describe('download center export submission', () => {
+  it('exports all matching rows and preserves false, zero, stage and business filters', async () => {
+    const filters = { page: 3, size: 20, detained: false, count: 0, orderNo: '', warehouse: undefined, sailingStage: 'BEFORE_DEPARTURE', relabelNo: 'RL-1' }
+    await useExportTask()('LAST_MILE_ORDER_LIST', '尾程订单', filters)
+    expect(createPlatformExportTask).toHaveBeenCalledWith({ exportType: 'LAST_MILE_ORDER_LIST', taskName: '尾程订单', format: 'XLSX',
+      parameters: { detained: false, count: 0, sailingStage: 'BEFORE_DEPARTURE', relabelNo: 'RL-1' } })
+    expect(filters.page).toBe(3)
+    expect(showExportTaskCreatedDialog).toHaveBeenCalledWith({ taskName: '尾程订单', taskNo: 'EXP-1', dense: true })
+    expect(push).not.toHaveBeenCalled()
+  })
+  it('opens the download center only after the user chooses it', async () => {
+    vi.mocked(showExportTaskCreatedDialog).mockResolvedValue(true)
+    await useExportTask()('VEHICLE_LIST', '车辆', {})
+    expect(push).toHaveBeenCalledWith({ name: 'download-center' })
+  })
+  it('preserves submission failure diagnostics without a success prompt or navigation', async () => {
+    const error = { message: '无导出权限', requestId: 'export-request' }
+    vi.mocked(createPlatformExportTask).mockRejectedValue(error)
+    await expect(useExportTask()('VEHICLE_LIST', '车辆', {})).rejects.toBe(error)
+    expect(showExportTaskCreatedDialog).not.toHaveBeenCalled()
+    expect(push).not.toHaveBeenCalled()
+  })
+  it.each([["overseas-warehouse/pages/LastMileOrdersView.vue","LAST_MILE_ORDER_LIST","platform:overseas-warehouse:last-mile-order:export"],["overseas-warehouse/pages/InventoryView.vue","OVERSEAS_INVENTORY_BALANCE","platform:overseas-warehouse:inventory:export"],["overseas-warehouse/pages/InventoryTransactionsView.vue","OVERSEAS_INVENTORY_LEDGER","platform:overseas-warehouse:inventory:export"],["overseas-master-data/pages/OverseasQuotesView.vue","OVERSEAS_QUOTE_LIST","platform:overseas-master-data:quote:export"],["overseas-master-data/pages/ExchangeRatesView.vue","MONTHLY_EXCHANGE_RATE_LIST","platform:overseas-master-data:exchange-rate:export"],["overseas-master-data/pages/VehiclesView.vue","VEHICLE_LIST","platform:overseas-master-data:vehicle:export"],["overseas-master-data/pages/FleetQuotesView.vue","FLEET_QUOTE_LIST","platform:fleet:quote:export"],["overseas-master-data/pages/TripOperationsView.vue","TRIP_OPERATIONS_LIST","platform:fleet:operations:export"]])('connects %s with the correct type and download-center retry permission', (path, type, permission) => {
+    const page = readFileSync(new URL('../' + path, import.meta.url), 'utf8')
+    expect(page).toContain("await submitExport('" + type + "'")
+    expect(page).not.toMatch(/saveCsv\(|saveFleetCsv\(/)
+    const center = readFileSync('src/modules/downloads/pages/DownloadCenterView.vue', 'utf8')
+    expect(center).toContain(type + ": { label:")
+    expect(center).toContain("retryPermission: '" + permission + "'")
+  })
+})
+
@@ -0,0 +1,16 @@
+import { useRouter } from 'vue-router'
+import { showExportTaskCreatedDialog } from '@/shared/components/exportTaskCreatedDialog'
+import { createPlatformExportTask, type CreatePlatformExportTaskRequest, type KnownExportTaskType } from './api/platformExportTasks'
+
+export function useExportTask() {
+  const router = useRouter()
+  return async (exportType: KnownExportTaskType, taskName: string, query: object) => {
+    const parameters = Object.fromEntries(Object.entries(query).filter(([key, value]) =>
+      key !== 'page' && key !== 'size' && value !== undefined && value !== null && value !== '',
+    )) as CreatePlatformExportTaskRequest['parameters']
+    const task = await createPlatformExportTask({ exportType, taskName, format: 'XLSX', parameters })
+    if (await showExportTaskCreatedDialog({ taskName, taskNo: task.taskNo, dense: true })) {
+      await router.push({ name: 'download-center' })
+    }
+  }
+}
@@ -140,13 +140,13 @@ describe('CarrierRatesView price-book source contract', () => {
    const queryToolbarBlock = source.slice(source.indexOf('<QueryToolbar'), queryToolbarEnd + 2)
    expect(queryToolbarBlock).not.toContain('#actions')
    expect(source).toContain('<template #toolbar-actions><el-button v-if="canEdit" type="primary" @click="openUpload">')
-    expect(source).not.toContain('#toolbar-start')
+    expect(source).toContain('<template #toolbar-start><h1>船期价格表</h1></template>')
    expect(source).toContain('<template #pagination-left>共 {{ rows.length }} 个版本')
  })

  it('keeps list spacing and error state mutually exclusive', () => {
-    expect(source).toContain('<template v-if="loadError" #state>')
-    expect(source).toContain('<section v-if="!loadError" class="surface-panel table-panel"')
+    expect(source).toContain('<template #notices>')
+    expect(source).toContain(':results-visible="!loadError"')
    expect(source).not.toContain('<template #state>')
  })

@@ -319,30 +319,11 @@ onMounted(() => {
 <template>
  <AdminPage as="div" class="price-book-page admin-density" spacing="normal">
    <ListPageLayout aria-label="承运商报价版本管理">
-      <template #toolbar>
-        <QueryToolbar
-          v-model="filters"
-          class="surface-panel"
-          ariaLabel="船期价格表筛选"
-          :fields="queryFields"
-          preference-key="price-book-query"
-          @search="applyQuery"
-        />
-      </template>

-      <template v-if="loadError" #state>
-        <LoadErrorState
-          title="船期价格表版本加载失败"
-          :message="loadErrorMessage"
-          :loading="loading"
-          @retry="loadPriceBooks()"
-        >
-          <template #details><ApiErrorMeta :details="loadError" /></template>
-        </LoadErrorState>
-      </template>

-      <section v-if="!loadError" class="surface-panel table-panel" aria-live="polite">
-      <DataTable
+
+
+      <section aria-live="polite"><DataTable appearance="integrated" :stripe="false" column-settings-mode="show" :results-visible="!loadError"
        v-model:page="page"
        v-model:page-size="pageSize"
        :data="pagedRows"
@@ -353,13 +334,33 @@ onMounted(() => {
        :page-sizes="[10, 20, 50]"
        row-key="id"
        border
-        stripe
        aria-label="船期价格表版本列表"
        empty-text="暂无船期价格表版本"
      >
+        <template #toolbar-start><h1>船期价格表</h1></template>
+        <template #filters>
+        <QueryToolbar
+          v-model="filters"
+          ariaLabel="船期价格表筛选"
+          :fields="queryFields"
+          preference-key="price-book-query"
+          @search="applyQuery"
+        />
+      </template>
+        <template #notices><template v-if="loadError">
+        <LoadErrorState
+          title="船期价格表版本加载失败"
+          :message="loadErrorMessage"
+          :loading="loading"
+          @retry="loadPriceBooks()"
+        >
+          <template #details><ApiErrorMeta :details="loadError" /></template>
+        </LoadErrorState>
+      </template></template>
+
+
        <template #toolbar-actions><el-button v-if="canEdit" type="primary" @click="openUpload"><FileUp :size="16" />上传价格表</el-button></template>
-        <template #actions="{ row }">
-          <div class="table-actions density-actions">
+        <template #actions="{ row }"><div class="table-actions density-actions row-actions admin-text-actions">
            <el-button data-tone="neutral" class="density-action" size="small" @click="openDetail(row as PlatformPriceBookVersion)">{{ detailActionLabel(row as PlatformPriceBookVersion) }}</el-button>
            <el-button data-tone="neutral" class="density-action"
              size="small"
@@ -375,8 +376,7 @@ onMounted(() => {
              :loading="voidingIds.has((row as PlatformPriceBookVersion).id)"
              @click="voidPending(row as PlatformPriceBookVersion)"
            >作废</el-button>
-          </div>
-        </template>
+          </div></template>
        <template #version="{ row }"><div class="version-cell"><strong>V{{ (row as PlatformPriceBookVersion).versionNo }}</strong></div></template>
        <template #scope="{ row }"><el-tag :type="(row as PlatformPriceBookVersion).customerId === '0' ? 'info' : 'warning'" effect="light">{{ priceBookScopeLabel((row as PlatformPriceBookVersion).customerId) }}</el-tag></template>
        <template #status="{ row }"><el-tag :type="priceBookStatusMeta((row as PlatformPriceBookVersion).status).type" effect="light">{{ priceBookStatusMeta((row as PlatformPriceBookVersion).status).label }}</el-tag></template>
@@ -384,8 +384,7 @@ onMounted(() => {
        <template #issues="{ row }"><div class="issue-counts"><span :class="{ 'is-blocking': (row as PlatformPriceBookVersion).blockingErrorCount }">阻断 {{ (row as PlatformPriceBookVersion).blockingErrorCount }}</span><span>警告 {{ (row as PlatformPriceBookVersion).warningCount }}</span></div></template>
        <template #empty><el-empty description="暂无船期价格表版本" /></template>
        <template #pagination-left>共 {{ rows.length }} 个版本 · {{ activeCount }} 个生效中 · {{ pendingCount }} 个待确认</template>
-      </DataTable>
-      </section>
+      </DataTable></section>
    </ListPageLayout>

    <AppDialog class="admin-density-dialog"
@@ -5,7 +5,7 @@ export const fbaPricingRoutes = [
    path: 'first-leg-pricing/carrier-rates',
    name: 'fba-carrier-rates',
    component: () => import('./carrier-rates/pages/CarrierRatesView.vue'),
-    meta: {
+    meta: { showPageHeading: false,
      title: '船期价格表',
      description: '上传、确认并查询平台公共船期价格表版本',
      permission: 'firstleg:fba-pricing:rate:view',
@@ -69,7 +69,7 @@ describe('FeeItemsView public master data and access', () => {
    expect(wrapper.find('.data-table').exists()).toBe(true)
    expect(wrapper.find('.query-toolbar__actions').text()).not.toContain('新增费用项目')
    expect(wrapper.find('.data-table__business-actions').text()).toContain('新增费用项目')
-    expect(wrapper.find('.data-table__toolbar-start').exists()).toBe(false)
+    expect(wrapper.get('.data-table__toolbar-start h1').text()).toBe('费用项目')
    expect(wrapper.find('.data-table__pagination-left').text()).toContain('平台公共主数据 · 共 0 项')
    expect(wrapper.find('.list-page-layout__state').exists()).toBe(false)
    expect(wrapper.text()).toContain('平台公共主数据')
@@ -86,8 +86,8 @@ describe('FeeItemsView public master data and access', () => {
    vi.mocked(listPlatformFeeItems).mockRejectedValueOnce(new Error('Gateway unavailable'))
    const wrapper = await mountView(['firstleg:fee-item:view'])

-    expect(wrapper.find('.list-page-layout__state').exists()).toBe(true)
-    expect(wrapper.find('.table-panel').exists()).toBe(false)
+    expect(wrapper.find('.data-table__notices').exists()).toBe(true)
+    expect(wrapper.find('.el-table').exists()).toBe(false)
    expect(wrapper.text()).toContain('费用项目加载失败')
    expect(wrapper.text()).not.toContain('Gateway unavailable')
  })
@@ -109,7 +109,8 @@ describe('FeeItemsView public master data and access', () => {
    expect(actions).not.toMatch(/<(?:el-dropdown|Pencil|Power|Eye|Trash2|Download|CircleX)\b/)
  })
  it('keeps the prototype table treatment and mobile form fallback without inventing a pricing mode', () => {
-    expect(source).toContain(':page-sizes="[20, 50, 100]"\n          border\n          stripe')
+    expect(source).toContain('appearance="integrated" :stripe="false"')
+    expect(source).toContain(':page-sizes="[20, 50, 100]"')
    expect(source).toContain('@media (max-width: 720px)')
    expect(source).toContain('.direction-grid, .form-grid.two-cols { grid-template-columns: 1fr; }')
    expect(source).not.toContain('pricingMode')
@@ -340,31 +340,11 @@ onMounted(() => {
    <el-result v-if="!canView" icon="warning" title="无权查看费用项目" sub-title="请联系管理员开通费用项目查看权限" />

    <ListPageLayout v-else aria-label="费用项目管理">
-      <template #toolbar>
-        <QueryToolbar
-          v-model="filters"
-          class="surface-panel"
-          ariaLabel="费用项目筛选"
-          :fields="queryFields"
-          :loading="loading"
-          preference-key="fee-items-query"
-          @search="applyFilters"
-        />
-      </template>

-      <template v-if="loadError" #state>
-        <LoadErrorState
-          title="费用项目加载失败"
-          :message="loadError.message"
-          :loading="loading"
-          @retry="loadFeeItems"
-        >
-          <template #details><ApiErrorMeta :details="loadError" /></template>
-        </LoadErrorState>
-      </template>

-      <section v-if="!loadError" class="surface-panel table-panel">
-        <DataTable
+
+
+      <section><DataTable appearance="integrated" :stripe="false" column-settings-mode="show" :results-visible="!loadError"
          v-model:page="page"
          v-model:page-size="pageSize"
          :data="rows"
@@ -373,12 +353,34 @@ onMounted(() => {
          :total="total"
          :page-sizes="[20, 50, 100]"
          border
-          stripe
          preference-key="fee-items-table"
          aria-label="费用项目列表"
          row-key="id"
          empty-text="暂无符合条件的费用项目"
        >
+        <template #toolbar-start><h1>费用项目</h1></template>
+        <template #filters>
+        <QueryToolbar
+          v-model="filters"
+          ariaLabel="费用项目筛选"
+          :fields="queryFields"
+          :loading="loading"
+          preference-key="fee-items-query"
+          @search="applyFilters"
+        />
+      </template>
+        <template #notices><template v-if="loadError">
+        <LoadErrorState
+          title="费用项目加载失败"
+          :message="loadError.message"
+          :loading="loading"
+          @retry="loadFeeItems"
+        >
+          <template #details><ApiErrorMeta :details="loadError" /></template>
+        </LoadErrorState>
+      </template></template>
+
+
          <template #toolbar-actions>
            <el-button
              v-if="access.can('firstleg:fee-item:create')"
@@ -387,7 +389,7 @@ onMounted(() => {
              @click="openCreate"
            ><Plus :size="16" />新增费用项目</el-button>
          </template>
-          <template #actions="{ row }">
+          <template #actions="{ row }"><div class="row-actions density-actions admin-text-actions">
            <div v-if="access.can('firstleg:fee-item:edit') || access.can('firstleg:fee-item:delete')" class="table-actions density-actions">
              <el-button data-tone="neutral" class="density-action" v-if="access.can('firstleg:fee-item:edit')" size="small" :disabled="loading || editorLoading" @click="openEdit(row as PlatformFeeItemResource)">编辑</el-button>
              <el-button class="density-action"
@@ -402,7 +404,7 @@ onMounted(() => {
              <el-button data-tone="danger" class="density-action" v-if="access.can('firstleg:fee-item:delete')" size="small" :disabled="loading" @click="requestDelete(row as PlatformFeeItemResource)">删除</el-button>
            </div>
            <span v-else class="muted-value">仅查看</span>
-          </template>
+          </div></template>
          <template #feeItem="{ row }"><div class="fee-item-name"><strong>{{ (row as PlatformFeeItemResource).feeTypeName }}</strong>
            <!-- <small>{{ (row as PlatformFeeItemResource).feeCode || '未分配编码' }}</small> -->
          </div></template>
@@ -419,8 +421,7 @@ onMounted(() => {
            </el-empty>
          </template>
          <template #pagination-left>平台公共主数据 · 共 {{ total }} 项</template>
-        </DataTable>
-      </section>
+        </DataTable></section>
    </ListPageLayout>

    <AppDrawer class="admin-density admin-density-drawer"
@@ -5,7 +5,7 @@ export const feeItemRoutes = [
    path: 'master-data/fee-items',
    name: 'fee-items',
    component: () => import('@/modules/fee-items/pages/FeeItemsView.vue'),
-    meta: {
+    meta: { showPageHeading: false,
      title: '费用项目',
      description: '统一维护平台公共费用项目及其适用范围',
      permission: 'firstleg:fee-item:view',
@@ -113,7 +113,7 @@ describe('FinanceCustomerAccountsView delivery', () => {
    expect(page).toContain("{ key: 'deduction', label: '扣款', priority: 200")
    expect(page).toContain("{ key: 'credit', label: '授信', priority: 100")
    expect(page).toContain("{ key: 'terms', label: '账期', visible: canUpdateTerms.value")
-    expect(page).toContain('<RowActions :actions="accountActions(row as FinanceAccountSummary)"')
+    expect(page).toContain('<RowActions text-actions :actions="accountActions(row as FinanceAccountSummary)"')
  })

  it('shows authoritative CNY wallet balances and independently permitted actions', () => {
@@ -125,7 +125,7 @@ describe('FinanceCustomerAccountsView delivery', () => {
  it.each([
    [[], ['详情'], false],
    [['platform:finance:customer-terms:view', 'platform:finance:customer-terms:update'], ['详情', '账期'], false],
-    [['platform:finance:customer-account:adjust'], ['详情', '充值', '扣款', ''], true],
+    [['platform:finance:customer-account:adjust'], ['详情', '充值', '扣款', '更多'], true],
  ])('folds account operations only when more than three are available: %j', async (extraPermissions, labels, overflow) => {
    const wrapper = await mountAccountsView(['platform:finance:customer-account:list', ...extraPermissions])
    const actions = wrapper.get('.el-table__body-wrapper .density-actions')
@@ -133,8 +133,8 @@ describe('FinanceCustomerAccountsView delivery', () => {
    expect(actions.find('.el-dropdown').exists()).toBe(overflow)
    if (overflow) {
      const trigger = actions.get('button[aria-label^="更多客户账户操作"]')
-      expect(trigger.text()).toBe('')
-      expect(trigger.find('svg').exists()).toBe(true)
+      expect(trigger.text()).toBe('更多')
+      expect(trigger.find('svg').exists()).toBe(false)
    }
    wrapper.unmount()
  })
@@ -436,12 +436,16 @@ onBeforeUnmount(clearVoucherPreview)
  <AdminPage as="div" class="finance-account-page admin-density" spacing="normal">
    <el-result v-if="!canView" icon="warning" title="无权访问客户账户" sub-title="请联系管理员开通客户账户查看权限" />
    <ListPageLayout v-else-if="!detailOpen" aria-label="客户账户">
-      <template #toolbar><QueryToolbar v-model="filters" class="surface-panel" ariaLabel="客户账户筛选" :fields="queryFields" preference-key="finance-customer-accounts-query" @search="search" /></template>
-      <template v-if="stateError" #state><LoadErrorState title="客户账户加载失败" :message="stateError.message" :loading="loading || customersLoading" @retry="customersError ? loadCustomers() : load()"><template #details><ApiErrorMeta :details="stateError" /></template></LoadErrorState></template>
-      <section v-if="!stateError" class="surface-panel table-panel">
-        <DataTable v-model:page="page" v-model:page-size="pageSize" :data="rows" :columns="columns" :loading="loading" :total="total" preference-key="finance-customer-accounts-table" aria-label="客户账户列表" row-key="customerId" empty-text="暂无客户账户" @update:page="load()" @update:page-size="page = 1; load()">
+
+
+      <section><DataTable appearance="integrated" :stripe="false" column-settings-mode="show" :results-visible="!stateError" v-model:page="page" v-model:page-size="pageSize" :data="rows" :columns="columns" :loading="loading" :total="total" preference-key="finance-customer-accounts-table" aria-label="客户账户列表" row-key="customerId" empty-text="暂无客户账户" @update:page="load()" @update:page-size="page = 1; load()">
+        <template #toolbar-start><h1>客户账户</h1></template>
+        <template #filters><QueryToolbar v-model="filters" ariaLabel="客户账户筛选" :fields="queryFields" preference-key="finance-customer-accounts-query" @search="search" /></template>
+        <template #notices><template v-if="stateError"><LoadErrorState title="客户账户加载失败" :message="stateError.message" :loading="loading || customersLoading" @retry="customersError ? loadCustomers() : load()"><template #details><ApiErrorMeta :details="stateError" /></template></LoadErrorState></template></template>
+
+
          <template #toolbar-actions><el-button v-if="canExport" :loading="accountExportBusy" :disabled="loading || accountExportBusy" @click="exportAccounts"><Download :size="16" />导出Excel</el-button></template>
-          <template #actions="{ row }"><RowActions :actions="accountActions(row as FinanceAccountSummary)" :more-label="`更多客户账户操作 · ${(row as FinanceAccountSummary).customerName || '当前客户'}`" @action="handleAccountAction($event, row as FinanceAccountSummary)" /></template>
+          <template #actions="{ row }"><RowActions text-actions :actions="accountActions(row as FinanceAccountSummary)" :more-label="`更多客户账户操作 · ${(row as FinanceAccountSummary).customerName || '当前客户'}`" @action="handleAccountAction($event, row as FinanceAccountSummary)" /></template>
          <template #customerName="{ row }">{{ customerName(row.customerId, row.customerName) }}</template>
          <template #customerCode="{ row }">{{ customerField(row.customerCode) }}</template><template #contactName="{ row }">{{ customerField(row.contactName) }}</template><template #contactPhone="{ row }">{{ customerField(row.contactPhone) }}</template>
          <template #lastChangedAt="{ row }">{{ formatLastChangedAt(row.lastChangedAt) }}</template>
@@ -449,8 +453,7 @@ onBeforeUnmount(clearVoucherPreview)
          <template #pendingRechargeCount="{ row }"><el-tag v-if="row.pendingRechargeCount" type="warning">{{ row.pendingRechargeCount }} 笔</el-tag><span v-else>—</span></template>
          <template #status="{ row }"><el-tag :type="row.status === 'ACTIVE' ? 'success' : 'info'">{{ row.status === 'ACTIVE' ? '正常' : '停用' }}</el-tag></template>
          <template #pagination-left><span>共 {{ total }} 个客户账户</span></template>
-        </DataTable>
-      </section>
+        </DataTable></section>
    </ListPageLayout>
    <AdminPage v-else as="div" class="finance-account-detail admin-density" spacing="normal">
      <section class="surface-panel finance-account-detail__surface">
@@ -101,7 +101,7 @@ describe('FinanceCustomerArapView G2 operations', () => {
  })

  it.each([
-    ['DRAFT', ['详情', '编辑', '提交审核', ''], true],
+    ['DRAFT', ['详情', '编辑', '提交审核', '更多'], true],
    ['APPROVED', ['详情', '调整', '作废'], false],
    ['PENDING', ['详情', '作废'], false],
  ])('keeps fee-source actions reachable at the three-action boundary: %s', async (reviewStatus, labels, overflow) => {
@@ -114,7 +114,7 @@ describe('FinanceCustomerArapView G2 operations', () => {
    expect(actions.find('.el-dropdown').exists()).toBe(overflow)
    if (overflow) {
      const trigger = actions.get('button[title^="更多费用来源操作"]')
-      expect(trigger.text()).toBe('')
+      expect(trigger.text()).toBe('更多')
      await trigger.trigger('click')
      await flushPromises()
      const item = [...document.querySelectorAll<HTMLElement>('.el-dropdown-menu__item')].find(item => item.textContent?.trim() === '作废')
@@ -279,7 +279,7 @@ describe('FinanceCustomerArapView G2 operations', () => {
    expect(page).toContain('!isUpstreamSource(detail)')
    expect(page).toContain("['INBOUND_FEE', 'CONTAINER_FEE'].includes(type)")
    expect(page).toContain("=== 'LASTLEG'")
-    expect(page).toContain('<RowActions v-if="row.feeSourceId" :actions="sourceActions(row as ArapRow)"')
+    expect(page).toContain('<RowActions text-actions v-if="row.feeSourceId" :actions="sourceActions(row as ArapRow)"')
  })

  it('resolves blank detail customer names and keeps source labels business-facing', async () => {
@@ -400,12 +400,16 @@ watch(() => [route.name, String(route.params.feeSourceId || '')], ([name, feeSou
    <OperationErrorToast :details="reviewError || mutationError" />
      <el-result v-if="!canView" icon="warning" title="无权访问客户应收应付" sub-title="请联系管理员开通账单查看权限" />
    <ListPageLayout v-else-if="!detailOpen" aria-label="客户应收应付">
-      <template #toolbar><QueryToolbar v-model="filters" class="surface-panel" ariaLabel="客户应收应付筛选" :fields="queryFields" preference-key="finance-customer-arap-query" @search="search" /></template>
-      <template v-if="stateError" #state><LoadErrorState title="客户应收应付加载失败" :message="stateError.message" :loading="customersLoading || loading" @retry="customersError ? loadCustomers() : load()"><template #details><ApiErrorMeta :details="stateError" /></template></LoadErrorState></template>
-      <section v-if="!customersError && !loadError" class="surface-panel table-panel">
-        <DataTable v-model:page="page" v-model:page-size="pageSize" :data="rows" :columns="columns" :loading="loading" :total="total" max-height="calc(100vh - 300px)" preference-key="finance-customer-arap-table" aria-label="客户应收应付列表" row-key="id" empty-text="暂无客户应收应付数据" @selection-change="onSelectionChange" @update:page="load()" @update:page-size="page = 1; load()">
+
+
+      <section><DataTable appearance="integrated" :stripe="false" column-settings-mode="show" :results-visible="!customersError && !loadError" v-model:page="page" v-model:page-size="pageSize" :data="rows" :columns="columns" :loading="loading" :total="total" max-height="calc(100vh - 300px)" preference-key="finance-customer-arap-table" aria-label="客户应收应付列表" row-key="id" empty-text="暂无客户应收应付数据" @selection-change="onSelectionChange" @update:page="load()" @update:page-size="page = 1; load()">
+        <template #toolbar-start><h1>客户应收应付</h1></template>
+        <template #filters><QueryToolbar v-model="filters" ariaLabel="客户应收应付筛选" :fields="queryFields" preference-key="finance-customer-arap-query" @search="search" /></template>
+        <template #notices><template v-if="stateError"><LoadErrorState title="客户应收应付加载失败" :message="stateError.message" :loading="customersLoading || loading" @retry="customersError ? loadCustomers() : load()"><template #details><ApiErrorMeta :details="stateError" /></template></LoadErrorState></template></template>
+
+
        <template #toolbar-actions><div class="generation-actions"><el-button v-if="canExport" :loading="exportBusy" :disabled="loading || exportBusy" @click="exportFeeSources"><Download :size="16" />导出Excel</el-button><el-button v-if="canCreateStatement" type="primary" :disabled="!selectedRows.length" @click="continueSelectedGeneration"><FilePlus2 :size="16" />生成所选对账单</el-button></div></template>
-        <template #actions="{ row }"><RowActions v-if="row.feeSourceId" :actions="sourceActions(row as ArapRow)" :more-label="`更多费用来源操作 · ${(row as ArapRow).documentNo || '当前费用'}`" @action="handleSourceAction($event, row as ArapRow)" /><span v-else class="muted-action">手工成本</span></template>
+        <template #actions="{ row }"><RowActions text-actions v-if="row.feeSourceId" :actions="sourceActions(row as ArapRow)" :more-label="`更多费用来源操作 · ${(row as ArapRow).documentNo || '当前费用'}`" @action="handleSourceAction($event, row as ArapRow)" /><span v-else class="muted-action">手工成本</span></template>
        <template #customerName="{ row }">{{ customerName(row.customerId, row.customerName) }}</template><template #direction="{ row }"><el-tag :type="row.direction === 'RECEIVABLE' ? 'success' : row.direction === 'PAYABLE' ? 'warning' : 'info'">{{ financeDirectionLabel(row.direction) }}</el-tag></template>
        <template #businessReference="{ row }">{{ businessReference(row as unknown as ArapRow) }}</template><template #sourceType="{ row }">{{ sourceTypeDisplay(row.sourceType) }}</template><template #supplierName="{ row }">{{ supplierDisplay(row as unknown as ArapRow) }}</template><template #sourceStatus="{ row }">{{ sourceStatusDisplay(row.status) }}</template>
        <template #status="{ row }"><el-tag :type="row.reviewStatus === 'APPROVED' ? 'success' : row.reviewStatus === 'REJECTED' ? 'danger' : 'warning'">{{ statusLabel(row.reviewStatus) }}</el-tag></template>
@@ -133,7 +133,7 @@ describe('FinanceCustomerStatementsView', () => {
    expect(source).toContain("{ key: 'approve', label: '通过', priority: 250")
    expect(source).toContain("{ key: 'reject', label: '驳回', priority: 200")
    expect(source).toContain("{ key: 'void', label: '作废', tone: 'danger', divided: true")
-    expect(source).toContain('<RowActions :actions="statementActions(row as FinanceStatementReadModel)"')
+    expect(source).toContain('<RowActions text-actions :actions="statementActions(row as FinanceStatementReadModel)"')
  })

  it('keeps three available row actions visible with primary and danger semantics', async () => {
@@ -669,16 +669,19 @@ watch(detailRouteId, (statementId) => {
      </el-tabs>
    </DetailPageLayout>
    <ListPageLayout v-else aria-label="客户对账单">
-      <template #toolbar><QueryToolbar v-model="filters" class="surface-panel" ariaLabel="客户对账单筛选" :fields="fields" :loading="loading" preference-key="finance-statements-query" :search-on-clear="false" @search="load" /></template>
-      <template v-if="customerError || error" #state><LoadErrorState title="客户对账单加载失败" :message="(customerError || error)?.message || ''" :loading="loading" @retry="customerError ? loadCustomers() : load()"><template #details><ApiErrorMeta :details="(customerError || error)!" /></template></LoadErrorState></template>
-      <template v-if="!customerError && !error">
-        <section class="surface-panel table-panel">
-          <DataTable v-model:page="page" v-model:page-size="pageSize" :data="paginatedRows" :columns="columns" :loading="loading" :total="filteredRows.length" aria-label="客户对账单列表" row-key="id" empty-text="暂无客户对账单" preference-key="finance-customer-statements" @row-click="openDetail">
+
+
+      <section><DataTable appearance="integrated" :stripe="false" column-settings-mode="show" :results-visible="!customerError && !error" v-model:page="page" v-model:page-size="pageSize" :data="paginatedRows" :columns="columns" :loading="loading" :total="filteredRows.length" aria-label="客户对账单列表" row-key="id" empty-text="暂无客户对账单" preference-key="finance-customer-statements" @row-click="openDetail">
+        <template #toolbar-start><h1>客户对账单</h1></template>
+        <template #filters><QueryToolbar v-model="filters" ariaLabel="客户对账单筛选" :fields="fields" :loading="loading" preference-key="finance-statements-query" :search-on-clear="false" @search="load" /></template>
+        <template #notices><template v-if="customerError || error"><LoadErrorState title="客户对账单加载失败" :message="(customerError || error)?.message || ''" :loading="loading" @retry="customerError ? loadCustomers() : load()"><template #details><ApiErrorMeta :details="(customerError || error)!" /></template></LoadErrorState></template></template>
+
+
            <template #toolbar-actions>
              <el-button v-if="canExport" :loading="exportBusy" :disabled="loading || exportBusy" @click="exportStatements"><Download :size="15" />导出</el-button>
              <el-button v-if="canCreate" type="primary" :disabled="!canGenerate" :title="canGenerate ? '生成对账单' : '缺少客户列表权限，无法选择客户'" @click="openCreate"><Plus :size="15" />生成对账单</el-button>
            </template>
-            <template #actions="{ row }"><RowActions :actions="statementActions(row as FinanceStatementReadModel)" :more-label="`更多对账单操作 · ${(row as FinanceStatementReadModel).billNo}`" @action="handleStatementAction($event, row as FinanceStatementReadModel)" /></template>
+            <template #actions="{ row }"><RowActions text-actions :actions="statementActions(row as FinanceStatementReadModel)" :more-label="`更多对账单操作 · ${(row as FinanceStatementReadModel).billNo}`" @action="handleStatementAction($event, row as FinanceStatementReadModel)" /></template>
            <template #status="{ row }"><el-tag :type="financeStatusTone(row.status)">{{ financeStatusLabel(row.status) }}</el-tag></template>
            <template #customerConfirmationStatus="{ row }"><el-tag :type="financeStatusTone(row.customerConfirmationStatus || 'NOT_REQUIRED')">{{ financeStatusLabel(row.customerConfirmationStatus || 'NOT_REQUIRED') }}</el-tag></template>
            <template #customerName="{ row }">{{ customerDisplayName(row.customerId, row.customerName) }}</template>
@@ -694,10 +697,7 @@ watch(detailRouteId, (statementId) => {
            <template #updatedByName="{ row }">{{ operatorDisplayName(row.updatedByName) }}</template>
            <template #updatedAt="{ row }">{{ formatDateTime(row.updatedAt) }}</template>
            <template #pagination-left>共 {{ filteredRows.length }} 条 · 币种：CNY</template>
-          </DataTable>
-        </section>
-
-      </template>
+          </DataTable></section>
    </ListPageLayout>

    <AppDialog class="admin-density-dialog" v-model="createOpen" title="生成客户对账单" width="min(680px, 94vw)" :confirm-loading="createBusy" @confirm="createStatement">
@@ -6,8 +6,10 @@ const source = readFileSync(resolve(process.cwd(), 'src/modules/finance/pages/Fi
 const statementsSource = readFileSync(resolve(process.cwd(), 'src/modules/finance/pages/FinanceCustomerStatementsView.vue'), 'utf8')

 describe('Finance formal settlement desktop presentation', () => {
-  it('keeps settlement totals on the left and list actions on the right of the table toolbar', () => {
+  it('keeps the title and actions in the toolbar and settlement totals before results', () => {
    expect(source).toContain('<template #toolbar-start>')
+    expect(source).toContain('<h1>{{ title }}</h1>')
+    expect(source).toContain('<template #before-results>')
    expect(source).toContain('<dl class="density-detail-overview settlement-summary" aria-label="结算汇总">')
    expect(source).toContain('<template #toolbar-actions>')
    expect(source).toContain('<div class="settlement-list-actions">')
@@ -26,9 +28,9 @@ describe('Finance formal settlement desktop presentation', () => {
    }
  })

-  it('renders at most three permitted row actions as shared outlined text buttons', () => {
+  it('renders at most three permitted row actions as shared text buttons', () => {
    expect(source.match(/key: 'actions', label: '操作', width: 250/g)).toHaveLength(2)
-    expect(source).toContain('class="settlement-row-actions density-actions"')
+    expect(source).toContain('class="settlement-row-actions density-actions row-actions admin-text-actions"')
    for (const action of ['openDetail(row)', 'openReceipt(row)', 'openPayment(row)']) expect(source).toContain('@click="' + action + '"')
    expect(source).toContain('data-tone="danger"')
    expect(source).toContain('class="density-action"')
@@ -589,37 +589,38 @@ onMounted(() => {
      </section>
    </DetailPageLayout>
    <ListPageLayout v-else :aria-label="title">
-      <template #toolbar>
-        <QueryToolbar v-model="filters" class="surface-panel" :ariaLabel="`${title}筛选`" :fields="fields" :preference-key="`finance-settlement-${kind}-query`" :search-on-clear="false" @search="load" />
+
+
+      <section><DataTable :preference-key="`finance-settlement-${kind}-table`" appearance="integrated" :stripe="false" column-settings-mode="show" :results-visible="!customerError && !error" v-model:page="page" v-model:page-size="pageSize" :data="paginatedRows" :columns="columns" :loading="loading" :total="filteredRows.length" :aria-label="`${title}列表`" row-key="id" empty-text="暂无符合条件的结算单">
+        <template #toolbar-start><h1>{{ title }}</h1></template>
+        <template #filters>
+        <QueryToolbar v-model="filters" :ariaLabel="`${title}筛选`" :fields="fields" :preference-key="`finance-settlement-${kind}-query`" :search-on-clear="false" @search="load" />
      </template>
-      <template v-if="customerError || error" #state>
+        <template #notices><template v-if="customerError || error">
        <LoadErrorState :title="`${title}加载失败`" :message="(customerError || error)?.message || ''" :loading="loading" @retry="customerError ? loadCustomers() : load()"><template #details><ApiErrorMeta :details="(customerError || error)!" /></template></LoadErrorState>
-      </template>
-      <template v-if="!customerError && !error">
-        <section class="surface-panel table-panel">
-          <DataTable v-model:page="page" v-model:page-size="pageSize" :data="paginatedRows" :columns="columns" :loading="loading" :total="filteredRows.length" :aria-label="`${title}列表`" row-key="id" empty-text="暂无符合条件的结算单">
-            <template #toolbar-start>
+      </template></template>
+        <template #before-results>
              <dl class="density-detail-overview settlement-summary" aria-label="结算汇总">
                <div class="summary-item"><dt>{{ kind === 'receivable' ? '应收总额' : '应付总额' }}</dt><dd>{{ money(totals.amount) }}</dd></div>
                <div class="summary-item"><dt>{{ kind === 'receivable' ? '已收' : '已付' }}</dt><dd class="is-success">{{ money(totals.paid) }}</dd></div>
                <div class="summary-item"><dt>{{ kind === 'receivable' ? '待收' : '待付' }}</dt><dd class="is-danger">{{ money(totals.outstanding) }}</dd></div>
              </dl>
            </template>
+
+
            <template #toolbar-actions>
              <div class="settlement-list-actions">
                <el-button v-if="canCreate" type="primary" @click="openCreate"><Plus :size="15" />{{ createLabel }}</el-button>
                <el-button v-if="canExport" :loading="exportSubmitting" :disabled="loading || exportSubmitting" @click="exportRows"><Download :size="15" />导出</el-button>
              </div>
            </template>
-            <template #actions="{ row }">
-              <div class="settlement-row-actions density-actions">
+            <template #actions="{ row }"><div class="settlement-row-actions density-actions row-actions admin-text-actions">
                <el-button data-tone="neutral" class="density-action" size="small" @click="openDetail(row)">详情</el-button>
                <el-button data-tone="neutral" class="density-action" v-if="canReceive && ['ISSUED','PARTIALLY_PAID'].includes(String(row.status))" size="small" :loading="receiptBusy" @click="openReceipt(row)">收款</el-button>
                <el-button data-tone="neutral" class="density-action" v-if="canPay && ['ISSUED','PARTIALLY_PAID'].includes(String(row.status))" size="small" @click="openPayment(row)">付款</el-button>
                <el-button data-tone="danger" class="density-action" v-if="canVoid && row.status === 'ISSUED'" size="small" :loading="actionBusy" @click="performAction(row as SettlementRow, 'VOID')">作废</el-button>
                <el-button data-tone="neutral" class="density-action" v-if="canVoid && row.status === 'VOIDED'" size="small" :loading="actionBusy" @click="performAction(row as SettlementRow, 'REOPEN')">重开</el-button>
-              </div>
-            </template>
+              </div></template>
            <template #customer="{ row }">{{ customerName(String(row.customerId), row.customerName) }}</template>
            <template #supplier="{ row }">{{ row.supplierName || '—' }}</template>
            <template #feeItemSummary="{ row }">{{ row.feeItemSummary || '—' }}</template>
@@ -636,9 +637,7 @@ onMounted(() => {
            <template #lastPaymentAt="{ row }">{{ displayDateTime(row.lastPaymentAt) }}</template>
            <template #settlementStatus="{ row }"><el-tag :type="financeStatusTone(row.status)">{{ financeStatusLabel(row.status) }}</el-tag></template>
            <template #pagination-left>共 {{ filteredRows.length }} 条 · 币种：CNY</template>
-          </DataTable>
-        </section>
-      </template>
+          </DataTable></section>
    </ListPageLayout>

    <AppDialog class="admin-density-dialog" v-model="createOpen" :title="`生成${title}`" width="min(600px, 94vw)" :confirm-loading="createBusy" @confirm="submitCreate">
@@ -92,27 +92,24 @@ onMounted(() => { void loadCustomers(); void load() })
  <AdminPage class="receivable-statistics-page admin-density" spacing="normal">
    <el-result v-if="!canView" icon="warning" title="无权访问应收款统计表" sub-title="请联系管理员开通应收款统计查看权限" />
    <template v-else>
-      <section class="surface-panel statistics-query" aria-label="应收款统计筛选">
+      <DataTable class="statistics-table" appearance="integrated" :stripe="false" column-settings-mode="show" :results-visible="!error" v-model:page="page" v-model:page-size="pageSize" :data="rows" :columns="columns" :loading="loading" :total="result?.totalCustomers ?? 0" :row-key="statisticsRowKey" preference-key="finance-receivable-statistics-table" aria-label="应收款统计列表" empty-text="当前月份暂无应收数据" @update:page="load()" @update:page-size="page = 1; load()">
+          <template #toolbar-start><h1>应收款统计表</h1></template>
+          <template #filters><section class="query-toolbar statistics-query" aria-label="应收款统计筛选">
        <div class="query-field"><span>统计月份</span><el-date-picker v-model="month" type="month" value-format="YYYY-MM" format="YYYY年MM月" :clearable="false" aria-label="统计月份" /></div>
        <div class="query-field"><span>应收单位</span><el-select v-model="customerId" clearable filterable placeholder="全部应收单位" aria-label="应收单位"><el-option v-for="customer in customers" :key="String(customer.id)" :label="customer.tenantName" :value="String(customer.id)" /></el-select></div>
        <div class="query-actions"><el-button type="primary" :loading="loading" @click="search"><Search :size="16" />查询</el-button><el-button @click="reset"><RotateCcw :size="16" />重置</el-button></div>
-      </section>
-      <LoadErrorState v-if="error" title="应收款统计加载失败" :message="error.message" :loading="loading" @retry="load"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState>
-      <template v-else>
-        <dl class="density-detail-overview statistics-summary" aria-label="CNY应收汇总">
+      </section></template>
+          <template #notices><LoadErrorState v-if="error" title="应收款统计加载失败" :message="error.message" :loading="loading" @retry="load"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState></template>
+          <template #before-results><dl class="density-detail-overview statistics-summary" aria-label="CNY应收汇总">
          <div><dt>应收总额</dt><dd>CNY {{ money(result?.totalReceivable) }}</dd></div>
          <div><dt>已收合计</dt><dd class="is-received">CNY {{ money(result?.totalReceived) }}</dd></div>
          <div><dt>余额未收</dt><dd class="is-outstanding">CNY {{ money(result?.totalOutstanding) }}</dd></div>
-        </dl>
-        <section class="surface-panel statistics-table">
-          <header><h2>应收款明细</h2><span>共 {{ result?.totalCustomers ?? 0 }} 个应收单位 · 仅统计CNY正式应收结算单</span></header>
-          <DataTable v-model:page="page" v-model:page-size="pageSize" :data="rows" :columns="columns" :loading="loading" :total="result?.totalCustomers ?? 0" :row-key="statisticsRowKey" preference-key="finance-receivable-statistics-table" aria-label="应收款统计列表" empty-text="当前月份暂无应收数据" @update:page="load()" @update:page-size="page = 1; load()">
+        </dl><div class="statistics-report-heading"><h2>应收款明细</h2><span>共 {{ result?.totalCustomers ?? 0 }} 个应收单位 · 仅统计CNY正式应收结算单</span></div></template>
+
            <template #toolbar-actions><div class="report-actions"><el-button :disabled="loading || !result" @click="printCurrent"><Printer :size="16" />打印</el-button><el-button v-if="canExport" type="primary" :loading="exporting" :disabled="loading || exporting" @click="exportCurrent"><Download :size="16" />导出Excel</el-button></div></template>
            <template #customerName="{ row }">{{ displayCustomerName(row) }}</template><template #totalReceivable="{ row }">{{ money(row.totalReceivable) }}</template><template #totalReceived="{ row }">{{ money(row.totalReceived) }}</template><template #totalOutstanding="{ row }"><span class="outstanding-cell">{{ money(row.totalOutstanding) }}</span></template>
            <template #pagination-left>统计月份：{{ result?.statisticsMonth }} · 币种：CNY</template>
          </DataTable>
-        </section>
-      </template>
    </template>
  </AdminPage>
 </template>
@@ -126,9 +123,9 @@ onMounted(() => { void loadCustomers(); void load() })
 .query-actions :deep(.el-button), .report-actions :deep(.el-button) { margin-left: 0; }
 .outstanding-cell { color: var(--el-color-danger); font-variant-numeric: tabular-nums; }
 .statistics-table { overflow: hidden; }
-.statistics-table > header { display: flex; align-items: center; justify-content: space-between; padding: var(--admin-space-5) var(--admin-space-6); border-bottom: 1px solid var(--cc-border, #e3e8ef); }
+.statistics-report-heading { display: flex; align-items: center; justify-content: space-between; padding: var(--admin-space-5) var(--admin-space-6); border-bottom: 1px solid var(--cc-border, #e3e8ef); }
 .statistics-table h2 { margin: 0; font-size: var(--admin-font-section); }
-.statistics-table header span { color: var(--cc-muted); font-size: var(--admin-font-body); }
+.statistics-report-heading span { color: var(--cc-muted); font-size: var(--admin-font-body); }
@media print {
  .statistics-query, :deep(.data-table__toolbar), :deep(.data-table__pagination) { display: none !important; }
  .receivable-statistics-page { gap: 10px; color: #000; }
@@ -1,15 +1,15 @@
 import type { RouteRecordRaw } from 'vue-router'

 export const financeRoutes = [
-  { path: 'finance/customer-accounts', name: 'finance-customer-accounts', component: () => import('./pages/FinanceCustomerAccountsView.vue'), meta: { title: '客户账户', description: '查看客户 CNY 应收台账并维护独立账期', permission: 'platform:finance:customer-account:list' } },
+  { path: 'finance/customer-accounts', name: 'finance-customer-accounts', component: () => import('./pages/FinanceCustomerAccountsView.vue'), meta: { showPageHeading: false, title: '客户账户', description: '查看客户 CNY 应收台账并维护独立账期', permission: 'platform:finance:customer-account:list' } },
  { path: 'finance/customer-accounts/:customerId', name: 'finance-customer-account-detail', component: () => import('./pages/FinanceCustomerAccountsView.vue'), meta: { title: '客户账户详情', description: '查看客户派生财务汇总与账户流水', permission: 'platform:finance:customer-account:list', showPageHeading: false } },
-  { path: 'finance/customer-arap', name: 'finance-customer-arap', component: () => import('./pages/FinanceCustomerArapView.vue'), meta: { title: '客户应收应付', description: '按客户追溯入库单、订单和柜次费用来源', permission: 'platform:finance:customer-arap:list' } },
+  { path: 'finance/customer-arap', name: 'finance-customer-arap', component: () => import('./pages/FinanceCustomerArapView.vue'), meta: { showPageHeading: false, title: '客户应收应付', description: '按客户追溯入库单、订单和柜次费用来源', permission: 'platform:finance:customer-arap:list' } },
  { path: 'finance/customer-arap/:feeSourceId', name: 'finance-customer-arap-detail', component: () => import('./pages/FinanceCustomerArapView.vue'), meta: { title: '费用来源详情', description: '查看费用来源、审核进度、关联业务与操作记录', permission: 'platform:finance:customer-arap:list', showPageHeading: false } },
-  { path: 'finance/receivable-statistics', name: 'finance-receivable-statistics', component: () => import('./pages/FinanceReceivableStatisticsView.vue'), meta: { title: '应收款统计表', description: '按月份和客户统计 CNY 应收、已收与未收余额', permission: 'platform:finance:receivable-statistics:list' } },
-  { path: 'finance/customer-statements', name: 'finance-customer-statements', component: () => import('./pages/FinanceCustomerStatementsView.vue'), meta: { title: '客户对账单', description: '维护 CNY 客户对账单并在出账后冻结', permission: 'platform:finance:customer-statement:list' } },
+  { path: 'finance/receivable-statistics', name: 'finance-receivable-statistics', component: () => import('./pages/FinanceReceivableStatisticsView.vue'), meta: { showPageHeading: false, title: '应收款统计表', description: '按月份和客户统计 CNY 应收、已收与未收余额', permission: 'platform:finance:receivable-statistics:list' } },
+  { path: 'finance/customer-statements', name: 'finance-customer-statements', component: () => import('./pages/FinanceCustomerStatementsView.vue'), meta: { showPageHeading: false, title: '客户对账单', description: '维护 CNY 客户对账单并在出账后冻结', permission: 'platform:finance:customer-statement:list' } },
  { path: 'finance/customer-statements/:statementId', name: 'finance-customer-statement-detail', component: () => import('./pages/FinanceCustomerStatementsView.vue'), meta: { title: '客户对账单详情', description: '查看对账单概要、费用明细、支付历史与调整记录', permission: 'platform:finance:customer-statement:list', showPageHeading: false } },
-  { path: 'finance/settlement-receivables', name: 'finance-settlement-receivables', component: () => import('./pages/FinanceSettlementReceivablesView.vue'), meta: { title: '结算单应收', description: '登记客户收款、凭证及对应对账单金额', permission: 'platform:finance:settlement-ar:list' } },
+  { path: 'finance/settlement-receivables', name: 'finance-settlement-receivables', component: () => import('./pages/FinanceSettlementReceivablesView.vue'), meta: { showPageHeading: false, title: '结算单应收', description: '登记客户收款、凭证及对应对账单金额', permission: 'platform:finance:settlement-ar:list' } },
  { path: 'finance/settlement-receivables/:settlementId', name: 'finance-settlement-receivable-detail', component: () => import('./pages/FinanceSettlementReceivablesView.vue'), meta: { title: '应收结算单详情', description: '查看应收结算信息、费用明细和收款记录', permission: 'platform:finance:settlement-ar:list', showPageHeading: false } },
-  { path: 'finance/settlement-payables', name: 'finance-settlement-payables', component: () => import('./pages/FinanceSettlementPayablesView.vue'), meta: { title: '结算单应付', description: '登记单票及整柜公共成本并追溯业务来源', permission: 'platform:finance:settlement-ap:list' } },
+  { path: 'finance/settlement-payables', name: 'finance-settlement-payables', component: () => import('./pages/FinanceSettlementPayablesView.vue'), meta: { showPageHeading: false, title: '结算单应付', description: '登记单票及整柜公共成本并追溯业务来源', permission: 'platform:finance:settlement-ap:list' } },
  { path: 'finance/settlement-payables/:settlementId', name: 'finance-settlement-payable-detail', component: () => import('./pages/FinanceSettlementPayablesView.vue'), meta: { title: '应付结算单详情', description: '查看应付结算信息、费用明细和付款记录', permission: 'platform:finance:settlement-ap:list', showPageHeading: false } },
 ] satisfies RouteRecordRaw[]
@@ -5,7 +5,6 @@ import {
  acceptPlatformFirstLegOrder,
  approvePlatformFirstLegOrder,
  cancelPlatformFirstLegOrder,
-  completePlatformFirstLegOrder,
  getPlatformFirstLegOrder,
  listPlatformFirstLegOrders,
  startPlatformFirstLegOrder,
@@ -82,15 +81,14 @@ describe('platform first-leg order API', () => {
    await approvePlatformFirstLegOrder('10001', '90001')
    await acceptPlatformFirstLegOrder('10001', '90001')
    await startPlatformFirstLegOrder('10001', '90001')
-    await completePlatformFirstLegOrder('10001', '90001')
-    await cancelPlatformFirstLegOrder('10001', '90001', '客户取消')
+    await cancelPlatformFirstLegOrder('10001', '90001', { expectedVersion: 7, reason: '客户取消' }, 'cancel-original-key')

    expect(http.get).toHaveBeenCalledWith('/platform/v1/orders/first-leg/90001', { params: { tenantId: '10001' } })
    expect(http.post).toHaveBeenNthCalledWith(1, '/platform/v1/orders/first-leg/90001/approve', undefined, { params: { tenantId: '10001' } })
    expect(http.post).toHaveBeenNthCalledWith(2, '/platform/v1/orders/first-leg/90001/accept', undefined, { params: { tenantId: '10001' } })
    expect(http.post).toHaveBeenNthCalledWith(3, '/platform/v1/orders/first-leg/90001/start', undefined, { params: { tenantId: '10001' } })
-    expect(http.post).toHaveBeenNthCalledWith(4, '/platform/v1/orders/first-leg/90001/complete', undefined, { params: { tenantId: '10001' } })
-    expect(http.post).toHaveBeenNthCalledWith(5, '/platform/v1/orders/first-leg/90001/cancel', { reason: '客户取消' }, { params: { tenantId: '10001' } })
+    expect(http.post).toHaveBeenNthCalledWith(4, '/platform/v1/orders/first-leg/90001/cancel', { expectedVersion: 7, reason: '客户取消' }, { params: { tenantId: '10001' }, headers: { 'Idempotency-Key': 'cancel-original-key' } })
+    expect(http.post).toHaveBeenCalledTimes(4)
  })

  it('writes the backend express contract as names, not a guessed master-data ID', async () => {
@@ -184,12 +184,17 @@ export function startPlatformFirstLegOrder(tenantId: string, orderId: string) {
  return postData<void>(`/platform/v1/orders/first-leg/${orderId}/start`, undefined, { tenantId })
 }

-export function completePlatformFirstLegOrder(tenantId: string, orderId: string) {
-  return postData<void>(`/platform/v1/orders/first-leg/${orderId}/complete`, undefined, { tenantId })
-}
-
-export function cancelPlatformFirstLegOrder(tenantId: string, orderId: string, reason: string) {
-  return postData<void>(`/platform/v1/orders/first-leg/${orderId}/cancel`, { reason }, { tenantId })
+export async function cancelPlatformFirstLegOrder(
+  tenantId: string,
+  orderId: string,
+  payload: { expectedVersion: number; reason: string },
+  idempotencyKey: string,
+) {
+  const response = await http.post<ApiEnvelope<void>, ApiEnvelope<void>>(
+    `/platform/v1/orders/first-leg/${orderId}/cancel`, payload,
+    { params: { tenantId }, headers: { 'Idempotency-Key': idempotencyKey } },
+  )
+  return unwrapApiResponse(response)
 }

 export function updatePlatformFirstLegOrderExpress(
@@ -382,28 +382,30 @@ onMounted(loadInitialData)
 <template>
  <AdminPage class="admin-density iam-density" as="div">
    <ListPageLayout aria-label="内部用户管理">
-      <template #toolbar>
+
+
+
+      <section :aria-busy="loading"><DataTable appearance="integrated" :stripe="false" column-settings-mode="show" :results-visible="!loadError" v-model:page="page" v-model:page-size="pageSize" :data="users" :columns="userColumns" preference-key="internal-users-table"
+        :loading="loading" :total="total" aria-label="内部用户列表" row-key="membershipId" empty-text="没有符合筛选条件的内部用户">
+        <template #toolbar-start><h1>用户管理</h1></template>
+        <template #filters>
        <QueryToolbar
          v-model="filters"
-          class="surface-panel"
          ariaLabel="用户筛选"
          :fields="queryFields"
          preference-key="internal-users-query"
          @search="applyFilters"
        />
      </template>
-      <template v-if="loadError" #state>
+        <template #notices><template v-if="loadError">
        <LoadErrorState title="内部用户列表暂时无法加载" :message="loadError.message" :loading="loading" @retry="loadInitialData">
          <template #details><ApiErrorMeta :details="loadError" /></template>
        </LoadErrorState>
-      </template>
+      </template></template>
+

-      <section v-if="!loadError" class="surface-panel table-panel" :aria-busy="loading">
-      <DataTable v-model:page="page" v-model:page-size="pageSize" :data="users" :columns="userColumns" preference-key="internal-users-table"
-        :loading="loading" :total="total" aria-label="内部用户列表" row-key="membershipId" empty-text="没有符合筛选条件的内部用户">
        <template #toolbar-actions><el-button v-if="canCreate" type="primary" @click="openCreate"><Plus :size="16" />新增用户</el-button></template>
-        <template #actions="{ row }">
-          <div class="table-actions density-actions">
+        <template #actions="{ row }"><div class="table-actions density-actions row-actions admin-text-actions">
            <el-button class="density-action" v-if="canEdit || canChangeStatus || canResetPassword" size="small" data-tone="neutral" @click="openEdit(row as PlatformManagedUser)">
              编辑
            </el-button>
@@ -414,8 +416,7 @@ onMounted(loadInitialData)
              @click="toggleStatus(row as PlatformManagedUser)">
              {{ (row as PlatformManagedUser).status === 'ACTIVE' ? '禁用' : '启用' }}
            </el-button>
-          </div>
-        </template>
+          </div></template>
        <template #roles="{ row }">
          <div class="tag-list">
            <el-tag v-for="role in (row as PlatformManagedUser).roleNames" :key="role" effect="plain" size="small">{{ role }}</el-tag>
@@ -425,8 +426,7 @@ onMounted(loadInitialData)
        <template #status="{ row }"><StatusBadge :status="(row as PlatformManagedUser).status === 'ACTIVE' ? '正常' : '禁用'" /></template>
        <template #lastLoginAt="{ row }">{{ formatLogin((row as PlatformManagedUser).lastLoginAt) }}</template>
        <template #pagination-left="{ total: tableTotal }"><span>共 {{ tableTotal }} 条</span></template>
-      </DataTable>
-      </section>
+      </DataTable></section>
    </ListPageLayout>

    <AppDialog v-model="editorOpen" :title="editorLabel" width="min(650px, calc(100vw - 28px))" class="internal-user-editor-dialog admin-density-dialog iam-density" destroy-on-close :confirm-loading="saving" :confirm-text="editingUser ? '保存修改' : '确认添加'" @confirm="saveUser">
@@ -58,7 +58,7 @@ function mountServerView(permissionCodes = ['platform:permission:list', 'platfor
        LoadErrorState: { props: ['message'], template: '<div role="alert">{{ message }}<slot name="details" /></div>' },
        DataTable: {
          props: ['data'],
-          template: '<section><slot name="toolbar-actions" /><div v-for="row in data" :key="row.id" class="row-actions" :data-row-id="row.id"><slot name="actions" :row="row" /></div><span data-testid="row-count">{{ data.length }}</span></section>',
+          template: '<section><slot name="toolbar-start" /><slot name="toolbar-actions" /><slot name="filters" /><slot name="notices" /><slot name="before-results" /><div v-for="row in data" :key="row.id" class="row-actions" :data-row-id="row.id"><slot name="actions" :row="row" /></div><span data-testid="row-count">{{ data.length }}</span></section>',
        },
        'el-alert': { props: ['title'], template: '<div role="alert">{{ title }}<slot name="title" /></div>' },
        'el-input': true,
@@ -91,7 +91,7 @@ describe('PermissionsView IAM mode', () => {
    expect(permissionsSource).toContain("{ key: 'edit', label: '编辑', priority: 300")
    expect(permissionsSource).toContain("{ key: 'status', label: row.status === '启用' ? '停用' : '启用'")
    expect(permissionsSource).toContain("{ key: 'delete', label: '删除', tone: 'danger', divided: true")
-    expect(permissionsSource).toContain('<RowActions v-if="permissionActions(row as Permission).some')
+    expect(permissionsSource).toContain('<RowActions text-actions v-if="permissionActions(row as Permission).some')
    expect(permissionsSource).toContain('<el-button link type="primary" @click="expandAllRows">展开全部</el-button>')
    expect(permissionsSource).not.toContain('canAddChild(row as Permission)" link')
    expect(permissionsSource).not.toContain('canEditRow(row as Permission)" link')
@@ -275,25 +275,28 @@ onMounted(loadPermissions)
 <template>
  <AdminPage class="admin-density iam-density" as="div">
    <ListPageLayout aria-label="平台权限资源管理">
-      <template #toolbar><QueryToolbar v-model="filters" class="surface-panel" ariaLabel="权限筛选" :fields="queryFields" preference-key="permissions-query" @search="applyFilters" /></template>
-      <template v-if="loadError" #state>
+
+
+
+      <section><DataTable appearance="integrated" :stripe="false" column-settings-mode="show" :results-visible="!loadError" :key="tableRenderKey" v-model:page="page" v-model:page-size="pageSize" :data="pagedTreeRows" :columns="permissionColumns" preference-key="permissions-table" :loading="loading" :total="treeRows.length" row-key="id" aria-label="平台权限资源列表" :expand-row-keys="expandedRowKeys" :tree-props="{ children: 'children' }" empty-text="没有符合条件的权限资源">
+        <template #toolbar-start><h1>菜单权限</h1></template>
+        <template #filters><QueryToolbar v-model="filters" ariaLabel="权限筛选" :fields="queryFields" preference-key="permissions-query" @search="applyFilters" /></template>
+        <template #notices><template v-if="loadError">
        <LoadErrorState title="权限资源暂时无法加载" :message="loadError.message" :loading="loading" @retry="loadPermissions">
          <template #details><ApiErrorMeta :details="loadError" /></template>
        </LoadErrorState>
-      </template>
+      </template></template>
+        <template #before-results><div class="permission-tree-tools"><div class="legend-list"><span><i class="is-menu" />目录 / 菜单</span><span><i class="is-action" />操作</span><span><i class="is-api" />接口预留</span><span class="permission-protection-hint">受保护资源不可编辑、停用或删除</span></div><div class="tree-view-actions"><el-button link type="primary" @click="expandAllRows">展开全部</el-button><el-button link @click="collapseActionRows">收起操作权限</el-button></div></div></template>
+

-      <section v-if="!loadError" class="surface-panel table-panel">
-      <DataTable :key="tableRenderKey" v-model:page="page" v-model:page-size="pageSize" :data="pagedTreeRows" :columns="permissionColumns" preference-key="permissions-table" :loading="loading" :total="treeRows.length" row-key="id" aria-label="平台权限资源列表" :expand-row-keys="expandedRowKeys" :tree-props="{ children: 'children' }" empty-text="没有符合条件的权限资源">
-        <template #toolbar-start><div class="permission-tree-tools"><div class="legend-list"><span><i class="is-menu" />目录 / 菜单</span><span><i class="is-action" />操作</span><span><i class="is-api" />接口预留</span><span class="permission-protection-hint">受保护资源不可编辑、停用或删除</span></div><div class="tree-view-actions"><el-button link type="primary" @click="expandAllRows">展开全部</el-button><el-button link @click="collapseActionRows">收起操作权限</el-button></div></div></template>
        <template #toolbar-actions><el-button v-if="canCreate" type="primary" @click="openCreate(null)"><Plus :size="16" />新增权限</el-button></template>
-        <template #actions="{ row }"><RowActions v-if="permissionActions(row as Permission).some(action => action.visible !== false)" :actions="permissionActions(row as Permission)" :more-label="moreActionsLabel(row as Permission)" @action="handlePermissionAction($event, row as Permission)" /><span v-else class="secondary-text">仅查看</span></template>
+        <template #actions="{ row }"><RowActions text-actions v-if="permissionActions(row as Permission).some(action => action.visible !== false)" :actions="permissionActions(row as Permission)" :more-label="moreActionsLabel(row as Permission)" @action="handlePermissionAction($event, row as Permission)" /><span v-else class="secondary-text">仅查看</span></template>
        <template #name="{ row }"><div class="permission-name"><span :class="`is-${typeClass((row as Permission).type)}`"><FolderTree v-if="['目录', '菜单', '页面'].includes((row as Permission).type)" :size="16" /><ShieldCheck v-else-if="(row as Permission).type === '按钮'" :size="16" /><Braces v-else :size="16" /></span><div><strong>{{ (row as Permission).name }}</strong><small v-if="(row as PermissionTreeNode).children?.length">{{ permissionSummary(row as PermissionTreeNode) }}</small></div></div></template>
        <template #code="{ row }"><code class="code-value">{{ (row as Permission).code }}</code></template>
        <template #endpoint="{ row }"><div class="endpoint-cell"><span v-if="(row as Permission).method !== '-'">{{ (row as Permission).method }}</span><code>{{ (row as Permission).path || '-' }}</code></div></template>
        <template #status="{ row }"><StatusBadge :status="(row as Permission).status || '—'" /></template>
        <template #pagination-left="{ total: tableTotal }"><span>共 {{ tableTotal }} 项</span></template>
-      </DataTable>
-      </section>
+      </DataTable></section>
    </ListPageLayout>

    <AppDialog v-model="editorOpen" :title="form.id ? '编辑权限资源' : '新增权限资源'" width="min(720px, calc(100vw - 28px))" class="permission-editor-dialog admin-density-dialog iam-density" :confirm-loading="saving" :confirm-text="form.id ? '保存修改' : '保存权限'" :show-confirm="form.id ? canEdit : canCreate" @confirm="savePermission">
@@ -45,7 +45,7 @@ function mountView(pinia = createPinia()) {
        FormSection: { template: '<section><slot /></section>' },
        AppDialog: { template: '<section><slot /><slot name="footer" /></section>' },
        LoadErrorState: { props: ['message'], template: '<div role="alert">{{ message }}<slot name="details" /></div>' },
-        DataTable: { props: ['data'], template: '<section><slot name="toolbar-actions" /><span data-testid="row-count">{{ data.length }}</span></section>' },
+        DataTable: { props: ['data'], template: '<section><slot name="toolbar-start" /><slot name="toolbar-actions" /><slot name="filters" /><slot name="notices" /><span data-testid="row-count">{{ data.length }}</span></section>' },
        'el-alert': { props: ['title'], template: '<div role="alert">{{ title }}<slot name="title" /></div>' },
        'el-input': true,
        'el-option': true,
@@ -76,7 +76,7 @@ describe('RolesView', () => {
    expect(rolesSource).toContain("(row as Role).status || '—'")
  })
  it('uses bordered striped tables and semantic role operation buttons', () => {
-    expect(rolesSource).toContain('border stripe')
+    expect(rolesSource).toContain('appearance="integrated" :stripe="false"')
    expect(rolesSource).toContain('size="small" data-tone="neutral"')
    expect(rolesSource).toContain('size="small" :data-tone=')
    expect(rolesSource).toContain('size="small" data-tone="danger"')
@@ -238,24 +238,27 @@ onMounted(loadRoles)
 <template>
  <AdminPage class="admin-density iam-density" as="div">
    <ListPageLayout aria-label="平台角色管理">
-      <template #toolbar><QueryToolbar v-model="filters" class="surface-panel" ariaLabel="角色筛选" :fields="queryFields" preference-key="roles-query" @search="applyFilters" /></template>
-      <template v-if="loadError" #state>
+
+
+
+      <section><DataTable appearance="integrated" :stripe="false" column-settings-mode="show" :results-visible="!loadError" v-model:page="page" v-model:page-size="pageSize" :data="pagedRows" :columns="roleColumns" preference-key="roles-table" :loading="loading" :total="filteredRows.length" row-key="id" border aria-label="平台角色列表" empty-text="没有符合条件的角色">
+        <template #toolbar-start><h1>角色权限</h1></template>
+        <template #filters><QueryToolbar v-model="filters" ariaLabel="角色筛选" :fields="queryFields" preference-key="roles-query" @search="applyFilters" /></template>
+        <template #notices><template v-if="loadError">
        <LoadErrorState title="角色列表暂时无法加载" :message="loadError.message" :loading="loading" @retry="loadRoles">
          <template #details><ApiErrorMeta :details="loadError" /></template>
        </LoadErrorState>
-      </template>
+      </template></template>
+

-      <section v-if="!loadError" class="surface-panel table-panel">
-      <DataTable v-model:page="page" v-model:page-size="pageSize" :data="pagedRows" :columns="roleColumns" preference-key="roles-table" :loading="loading" :total="filteredRows.length" row-key="id" border stripe aria-label="平台角色列表" empty-text="没有符合条件的角色">
        <template #toolbar-actions><el-button v-if="canCreate" type="primary" @click="openCreate"><Plus :size="16" />新增角色</el-button></template>
-        <template #actions="{ row }"><div v-if="canEdit || canGrant || access.can('platform:role:status') || access.can('platform:role:delete')" class="table-actions density-actions"><el-button class="density-action" v-if="canEdit || canGrant" size="small" data-tone="neutral" :disabled="rowActionId === (row as Role).id || (row as Role).builtIn" @click="openEdit(row as Role)">配置</el-button><el-button class="density-action" v-if="access.can('platform:role:status')" size="small" :data-tone="(row as Role).status === '启用' ? 'danger' : 'success'" :loading="rowActionId === (row as Role).id" :disabled="(row as Role).builtIn" @click="toggleStatus(row as Role)">{{ (row as Role).status === '启用' ? '停用' : '启用' }}</el-button><el-button class="density-action" v-if="access.can('platform:role:delete')" size="small" data-tone="danger" :disabled="(row as Role).builtIn || (row as Role).userCount > 0 || rowActionId === (row as Role).id" @click="removeRole(row as Role)">删除</el-button></div><span v-else class="secondary-text">仅查看</span></template>
+        <template #actions="{ row }"><div class="row-actions density-actions admin-text-actions"><div v-if="canEdit || canGrant || access.can('platform:role:status') || access.can('platform:role:delete')" class="table-actions density-actions"><el-button class="density-action" v-if="canEdit || canGrant" size="small" data-tone="neutral" :disabled="rowActionId === (row as Role).id || (row as Role).builtIn" @click="openEdit(row as Role)">配置</el-button><el-button class="density-action" v-if="access.can('platform:role:status')" size="small" :data-tone="(row as Role).status === '启用' ? 'danger' : 'success'" :loading="rowActionId === (row as Role).id" :disabled="(row as Role).builtIn" @click="toggleStatus(row as Role)">{{ (row as Role).status === '启用' ? '停用' : '启用' }}</el-button><el-button class="density-action" v-if="access.can('platform:role:delete')" size="small" data-tone="danger" :disabled="(row as Role).builtIn || (row as Role).userCount > 0 || rowActionId === (row as Role).id" @click="removeRole(row as Role)">删除</el-button></div><span v-else class="secondary-text">仅查看</span></div></template>
        <template #role="{ row }"><div class="role-cell"><span><ShieldCheck :size="18" /></span><div><strong>{{ (row as Role).name }}</strong></div></div></template>
        <template #permissionSummary="{ row }"><div class="primary-cell"><strong>{{ permissionSummary(row as Role) }}</strong><span>平台 IAM 权限</span></div></template>
        <template #roleType="{ row }"><el-tag :type="(row as Role).builtIn ? 'warning' : 'info'" effect="plain" size="small">{{ (row as Role).builtIn ? '系统内置' : '自定义' }}</el-tag></template>
        <template #status="{ row }"><StatusBadge :status="(row as Role).status || '—'" /></template>
        <template #pagination-left="{ total: tableTotal }"><span>共 {{ tableTotal }} 条</span></template>
-      </DataTable>
-      </section>
+      </DataTable></section>
    </ListPageLayout>

    <AppDialog v-model="editorOpen" :title="form.id ? '配置角色' : '新增角色'" width="min(860px, calc(100vw - 28px))" class="role-editor-dialog admin-density-dialog iam-density" :confirm-loading="saving" confirm-text="保存角色" :show-confirm="form.id ? canEdit || canGrant : canCreate" destroy-on-close @opened="initializePermissionSelection" @confirm="saveRole">
@@ -5,18 +5,18 @@ export const iamRoutes = [
    path: 'system/users',
    name: 'users',
    component: () => import('@/modules/iam/pages/InternalUsersView.vue'),
-    meta: { title: '用户管理', description: '统一管理平台内部用户、状态及角色', permission: 'platform:user:list' },
+    meta: { showPageHeading: false, title: '用户管理', description: '统一管理平台内部用户、状态及角色', permission: 'platform:user:list' },
  },
  {
    path: 'system/roles',
    name: 'roles',
    component: () => import('@/modules/iam/pages/RolesView.vue'),
-    meta: { title: '角色权限', description: '维护平台角色并配置菜单及操作权限', permission: 'platform:role:list' },
+    meta: { showPageHeading: false, title: '角色权限', description: '维护平台角色并配置菜单及操作权限', permission: 'platform:role:list' },
  },
  {
    path: 'system/permissions',
    name: 'permissions',
    component: () => import('@/modules/iam/pages/PermissionsView.vue'),
-    meta: { title: '菜单权限', description: '维护菜单、页面、按钮和接口权限编码', permission: 'platform:permission:list' },
+    meta: { showPageHeading: false, title: '菜单权限', description: '维护菜单、页面、按钮和接口权限编码', permission: 'platform:permission:list' },
  },
 ] satisfies RouteRecordRaw[]
@@ -102,7 +102,8 @@ export function buildNavigationPermissionTree(
  }

  function navigationNode(node: AdminNavigationNode): RolePermissionTreeNode | null {
-    if (node.hidden) return null
+    // Hiding a formal sidebar entry must not remove its existing assignable permissions.
+    if (node.hidden && !node.permission && !node.permissionAnyOf?.length) return null

    if (node.children?.length) {
      const children = node.children
@@ -338,32 +338,11 @@ onBeforeUnmount(() => { disposed = true; requestSerial += 1; optionsRequestSeria
 <template>
  <AdminPage as="div" class="inbound-task-page admin-density">
    <ListPageLayout :aria-label="`${taskLabel}待办`">
-      <template #toolbar>
-        <QueryToolbar
-          v-model="filters"
-          class="surface-panel"
-          :ariaLabel="`${taskLabel}待办筛选`"
-          :fields="queryFields"
-          :preference-key="`${preferenceKey}-query`"
-          :search-on-reset="false"
-          @search="applyFilters"
-          @reset="resetFilters"
-        />
-      </template>

-      <template v-if="customerLoadError || loadError" #state>
-        <div class="state-stack">
-          <el-alert v-if="customerLoadError" type="warning" :closable="false" show-icon>
-            <template #title><span>{{ customerLoadError.message }}</span></template>
-          </el-alert>
-          <LoadErrorState v-if="loadError" :title="`${taskLabel}待办暂时无法加载`" :message="loadError.message" @retry="loadTasks">
-            <template #details><ApiErrorMeta :details="loadError" /></template>
-          </LoadErrorState>
-        </div>
-      </template>

-      <section v-if="!loadError" class="surface-panel table-panel" :aria-busy="loading">
-        <DataTable
+
+
+      <section :aria-busy="loading"><DataTable appearance="integrated" :stripe="false" column-settings-mode="show" :results-visible="!loadError"
          v-model:page="page"
          v-model:page-size="pageSize"
          :data="result.records"
@@ -377,12 +356,35 @@ onBeforeUnmount(() => { disposed = true; requestSerial += 1; optionsRequestSeria
          :aria-label="`${taskLabel}待办列表`"
          @selection-change="handleReviewSelectionChange"
        >
+        <template #toolbar-start><h1>{{ isReview ? '测量数据审核' : '订单测量' }}</h1></template>
+        <template #filters>
+        <QueryToolbar
+          v-model="filters"
+          :ariaLabel="`${taskLabel}待办筛选`"
+          :fields="queryFields"
+          :preference-key="`${preferenceKey}-query`"
+          :search-on-reset="false"
+          @search="applyFilters"
+          @reset="resetFilters"
+        />
+      </template>
+        <template #notices><template v-if="customerLoadError || loadError">
+        <div class="state-stack">
+          <el-alert v-if="customerLoadError" type="warning" :closable="false" show-icon>
+            <template #title><span>{{ customerLoadError.message }}</span></template>
+          </el-alert>
+          <LoadErrorState v-if="loadError" :title="`${taskLabel}待办暂时无法加载`" :message="loadError.message" @retry="loadTasks">
+            <template #details><ApiErrorMeta :details="loadError" /></template>
+          </LoadErrorState>
+        </div>
+      </template></template>
+
+
          <template v-if="isReview && access.can(actionPermission)" #toolbar-actions>
            <el-button type="success" :loading="batchReviewLoading" :disabled="loading || !selectedReviewRows.length" @click="batchApproveMeasurements"><CircleCheckBig :size="16" />批量审核通过<span v-if="selectedReviewRows.length">（{{ selectedReviewRows.length }}）</span></el-button>
          </template>
          <template #pagination-left>当前显示 {{ result.records.length }} 条 · 共 {{ result.total }} 条</template>
-          <template #actions="{ row }">
-            <div class="row-actions density-actions">
+          <template #actions="{ row }"><div class="row-actions density-actions admin-text-actions">
              <el-button v-if="access.can(actionPermission)" class="density-action" :data-tone="isReview ? 'warning' : 'purple'" size="small" @click="openTask(row as InboundOrderSummary)">
                {{ taskLabel }}
              </el-button>
@@ -390,8 +392,7 @@ onBeforeUnmount(() => { disposed = true; requestSerial += 1; optionsRequestSeria
                查看
              </el-button>
              <span v-if="!access.can(actionPermission) && (!access.can('platform:firstleg:inbound:view') || !(row as InboundOrderSummary).orderId)" class="muted-action">无操作权限</span>
-            </div>
-          </template>
+            </div></template>
          <template #inboundCode="{ row }"><div class="inbound-code-cell"><strong>{{ text((row as InboundOrderSummary).inboundCode) }}</strong></div></template>
          <template #processStatus="{ row }"><el-tag effect="light">{{ inboundStatusLabel((row as InboundOrderSummary).processStatus, inboundProcessStatusLabels) }}</el-tag></template>
          <template #measureReviewStatus="{ row }">{{ inboundStatusLabel((row as InboundOrderSummary).measureReviewStatus, inboundReviewStatusLabels) }}</template>
@@ -408,8 +409,7 @@ onBeforeUnmount(() => { disposed = true; requestSerial += 1; optionsRequestSeria
          <template #actualVolumeCbm="{ row }">{{ formatNumber((row as InboundOrderSummary).actualVolumeCbm) }}</template>
          <template #measureCompletedAt="{ row }">{{ formatDate((row as InboundOrderSummary).measureCompletedAt) }}</template>
          <template #empty><el-empty :description="emptyText" /></template>
-        </DataTable>
-      </section>
+        </DataTable></section>
    </ListPageLayout>

    <el-dialog
@@ -104,7 +104,7 @@ function handleSubmitted() {
    </div>
    <template #footer>
      <div class="measurement-dialog-footer">
-        <span v-if="measurementPanelRef?.submissionBlockReason" class="measurement-dialog-footer__hint">
+        <span v-if="measurementPanelRef?.submissionBlockReason" class="measurement-dialog-footer__hint" role="status">
          {{ measurementPanelRef.submissionBlockReason }}
        </span>
        <el-button :disabled="Boolean(measurementPanelRef?.saving || measurementPanelRef?.submitting)" @click="requestClose">取消</el-button>
@@ -147,15 +147,6 @@ function handleSubmitted() {
 .inbound-measurement-workspace-dialog .measurement-panel { border: 0; border-radius: 0; box-shadow: none; }
 .inbound-measurement-workspace-dialog .measurement-panel__heading .measurement-panel__actions,
 .inbound-measurement-workspace-dialog .measurement-panel__footer { display: none; }
-.inbound-measurement-workspace-dialog .measurement-summary-section { margin: 0 -12px; padding: 10px 12px 13px; border: 1px solid #cce8df; border-left: 4px solid #20a477; border-radius: 8px; background: #f4fbf8; }
-.inbound-measurement-workspace-dialog .measurement-summary-context { min-height: auto; }
-.inbound-measurement-workspace-dialog .measurement-subheading { color: #18795d; font-size: 15px; }
-.inbound-measurement-workspace-dialog .measurement-metrics { padding: 0; border: 1px solid #cce8df; border-radius: 8px; background: #fff; overflow: hidden; }
-.inbound-measurement-workspace-dialog .measurement-metrics > div { min-height: 58px; padding: 9px 14px; border-left: 1px solid #e8ecf2; }
-.inbound-measurement-workspace-dialog .measurement-metrics > div:first-child { border-left: 0; }
-.inbound-measurement-workspace-dialog .measurement-declaration { margin-top: 12px; padding: 10px 12px 0; border: 1px solid #d9e2fa; border-left: 4px solid #647fec; border-radius: 8px; background: #f7f9ff; }
-.inbound-measurement-workspace-dialog .measurement-items-section { margin-top: 12px; padding: 10px 12px 13px; border: 1px solid #eadfc9; border-left: 4px solid #c79643; border-radius: 8px; background: #fffbf4; }
-.inbound-measurement-workspace-dialog .measurement-items-section .measurement-section__heading { margin-bottom: 8px; }
@media (max-width: 720px) {
  .inbound-measurement-workspace-dialog.el-dialog { width: calc(100vw - 20px) !important; max-width: calc(100vw - 20px); }
  .inbound-measurement-workspace-dialog .el-dialog__header { padding: 16px; }
@@ -266,7 +266,7 @@ describe('InboundMeasurementPanel', () => {
    const wrapper = await mountPanel()
    const text = wrapper.text()

-    expect(text).toContain('实测箱数')
+    expect(text).toContain('箱数')
    expect(text).toContain('货物净重')
    expect(text).toContain('总体积')
    expect(text).toContain('材积重')
@@ -274,7 +274,7 @@ describe('InboundMeasurementPanel', () => {
    expect(text).toContain('平台实测')
    expect(text).toContain('差异 +1.5 kg')
    expect(text).toContain('差异 -0.2 m³')
-    expect(text).toContain('箱规明细')
+    expect(text).toContain('平台实测箱规')
    expect(text).not.toContain('租户')
    expect(text).not.toContain('数据版本')

@@ -287,27 +287,58 @@ describe('InboundMeasurementPanel', () => {
    expect(source).toContain('<section class="measurement-declaration"')
    expect(source).not.toContain('<el-collapse-item name="declaration"')
    expect(source).toContain('grid-template-columns: repeat(4, minmax(0, 1fr))')
-    expect(source).toContain('.measurement-data-grid { display: grid; grid-template-columns: repeat(5, minmax(0, 1fr));')
+    expect(source).toContain('.measurement-data-grid { display: grid; grid-template-columns: repeat(2, minmax(0, 1fr));')
    expect(source).toContain('.measurement-table { width: 100%; font-size: var(--admin-font-caption, 12px); }')
    expect(source).toContain('.measurement-data-grid :deep(.el-input__wrapper)')
    expect(source).toContain('defineExpose({ saveDraft, submitForReview, updateWeightEvidence, submissionBlockReason, mayMaintain, maySubmit, saving, submitting, canEdit, canSubmit, isDirty })')
  })

+  it('aligns declared and measured values and keeps the declaration outside the measured section', async () => {
+    const wrapper = await mountPanel()
+    const rows = wrapper.findAll('.measurement-comparison tbody tr')
+    expect(rows.map(row => row.findAll('td').map(cell => cell.text()))).toEqual([
+      ['10', '10', '一致'], ['118.5', '120', '差异 +1.5 kg'], ['0.8', '0.6', '差异 -0.2 m³'],
+    ])
+    expect(wrapper.find('.measurement-summary-section .measurement-declaration').exists()).toBe(false)
+    expect(wrapper.find('.measurement-declaration').element.parentElement).toBe(wrapper.find('.measurement-summary-section').element.parentElement)
+  })
+
+  it('shows pending comparison rather than a negative count when no boxes have been measured', async () => {
+    vi.mocked(getInboundMeasurement).mockResolvedValueOnce(measurement({
+      items: [], actualPackageCount: null, actualGrossWeightKg: null, actualVolumeCbm: null,
+    }))
+    const wrapper = await mountPanel()
+    const rows = wrapper.findAll('.measurement-comparison tbody tr')
+    for (const row of rows) {
+      expect(row.findAll('td')[1].text()).toBe('未测量')
+      expect(row.findAll('td')[2].text()).toBe('待测量')
+    }
+  })
+
+  it('groups titles and related fields into shared header rows without duplicating submission warnings', async () => {
+    vi.mocked(getInboundMeasurement).mockResolvedValueOnce(measurement({ measurementId: null, items: [], weightResults: [] }))
+    const wrapper = await mountPanel()
+    expect(wrapper.find('.measurement-summary-header h4').text()).toBe('申报与实测对比')
+    expect(wrapper.find('.measurement-declaration-header').text()).toContain('DOC-001')
+    expect(wrapper.find('.measurement-section__heading .measurement-goods-name input').exists()).toBe(true)
+    expect(wrapper.find('.measurement-section__heading .measurement-section-actions').text()).toContain('手动录入箱规')
+    expect(wrapper.findAll('.el-alert').some(alert => alert.text().includes('请先完成箱规测量'))).toBe(false)
+    expect(wrapper.find('.measurement-panel__footer').text()).toContain('请先完成箱规测量')
+  })
+
  it('renders customer declaration facts as plain read-only values', async () => {
    const wrapper = await mountPanel()
    const declaration = wrapper.find('.measurement-declaration')

-    expect(declaration.text()).toContain('申报箱数')
-    expect(declaration.text()).toContain('10')
-    expect(declaration.text()).toContain('申报毛重（kg）')
-    expect(declaration.text()).toContain('118.5')
-    expect(declaration.text()).toContain('申报体积（m³）')
-    expect(declaration.text()).toContain('0.8')
+    const comparison = wrapper.find('.measurement-comparison')
+    expect(comparison.text()).toContain('118.5')
+    expect(comparison.text()).toContain('0.8')
+    expect(comparison.findAll('tbody tr')[0].text()).toContain('10')
    expect(declaration.text()).toContain('原单据号码')
    expect(declaration.text()).toContain('DOC-001')
-    expect(declaration.findAll('.measurement-readonly-field')).toHaveLength(4)
-    expect(declaration.findAll('input')).toHaveLength(1)
-    expect(declaration.find('.measurement-goods-name input').exists()).toBe(true)
+    expect(declaration.findAll('.measurement-readonly-field')).toHaveLength(1)
+    expect(declaration.findAll('input')).toHaveLength(0)
+    expect(wrapper.find('.measurement-items-section .measurement-goods-name input').exists()).toBe(true)
    expect(declaration.find('[aria-label="客户申报箱规明细"]').text()).toContain('蓝牙音箱')
    expect(declaration.find('[aria-label="客户申报箱规明细"]').text()).toContain('50 × 40 × 30')
  })
@@ -315,7 +346,7 @@ describe('InboundMeasurementPanel', () => {
  it('does not render differences when the corresponding declaration is unavailable', async () => {
    vi.mocked(getInboundMeasurement).mockResolvedValueOnce(measurement({ originalGrossWeightKg: null, originalVolumeCbm: null }))
    const wrapper = await mountPanel()
-    expect(wrapper.find('.measurement-metrics').text()).not.toContain('差异')
+    expect(wrapper.findAll('.measurement-comparison tbody tr').slice(1).map(row => row.findAll('td')[2].text())).toEqual(['—', '—'])
  })

  it('shows all declaration fields as plain text when measurement is not editable', async () => {
@@ -325,7 +356,8 @@ describe('InboundMeasurementPanel', () => {

    expect(declaration.find('input').exists()).toBe(false)
    expect(declaration.text()).toContain('蓝牙音箱')
-    expect(declaration.findAll('.measurement-readonly-field')).toHaveLength(5)
+    expect(declaration.findAll('.measurement-readonly-field')).toHaveLength(1)
+    expect(wrapper.find('.measurement-items-section .measurement-goods-name').text()).toContain('蓝牙音箱')
  })

  it('saves the corrected actual goods name without overriding declaration facts', async () => {
@@ -369,8 +401,8 @@ describe('InboundMeasurementPanel', () => {
    wrapper.vm.updateWeightEvidence(125.75, 115.75, true)
    await flushPromises()

-    expect(wrapper.find('.measurement-metrics').text()).toContain('125.75')
-    expect(wrapper.find('.measurement-metrics').text()).toContain('115.75')
+    expect(wrapper.find('.measurement-summary-section').text()).toContain('125.75')
+    expect(wrapper.find('.measurement-summary-section').text()).toContain('115.75')
    expect((countInput.element as HTMLInputElement).value).toBe('9')
  })

@@ -515,6 +547,35 @@ describe('InboundMeasurementPanel', () => {
    expect(wrapper.emitted('changed')).toHaveLength(1)
  })

+  it('explains missing measurement prerequisites and avoids duplicate empty source status', async () => {
+    vi.mocked(getInboundMeasurement).mockResolvedValueOnce(measurement({
+      measurementId: null, items: [], sourceType: null, weightResults: [],
+    }))
+    const wrapper = await mountPanel()
+    expect(wrapper.vm.maySubmit).toBe(false)
+    expect(wrapper.vm.submissionBlockReason).toContain('请先完成箱规测量')
+    expect(wrapper.vm.submissionBlockReason).toContain('称重图片')
+    expect(wrapper.find('.measurement-summary-status').text()).not.toContain('尚未测量')
+    expect(wrapper.find('.measurement-panel__footer [role="status"]').text()).toContain('请先完成箱规测量')
+  })
+
+  it('explains order review and submitted-state blockers before measurement prerequisites', async () => {
+    vi.mocked(getInboundMeasurement).mockResolvedValueOnce(measurement({ processStatus: 'PREPARING', measurementId: null }))
+    const pendingOrder = await mountPanel()
+    expect(pendingOrder.vm.submissionBlockReason).toContain('订单尚待客服审核')
+    vi.mocked(getInboundMeasurement).mockResolvedValueOnce(measurement({ processStatus: 'MEASURE_PENDING' }))
+    const pendingMeasurement = await mountPanel()
+    expect(pendingMeasurement.vm.submissionBlockReason).toContain('不能提交测量审核')
+  })
+
+  it('keeps dropship pallet edits in the platform section and declaration facts read-only', async () => {
+    vi.mocked(getInboundMeasurement).mockResolvedValueOnce(measurement({ fulfillmentType: 'ONE_CLICK_DROPSHIP', expectedPalletCount: 2 }))
+    const wrapper = await mountPanel()
+    expect(wrapper.find('.measurement-declaration input').exists()).toBe(false)
+    expect(wrapper.find('.measurement-items-section .measurement-expected-pallets input').exists()).toBe(true)
+    expect(wrapper.find('.measurement-items-section .measurement-goods-name input').exists()).toBe(true)
+  })
+
  it('requires at least one confirmed weight image before submitting for review', async () => {
    const messageSpy = vi.spyOn(ElMessage, 'warning')
    vi.mocked(getInboundMeasurement).mockResolvedValueOnce(measurement({ weightResults: [] }))
@@ -119,6 +119,13 @@ const mayMaintain = computed(() => canEdit.value && countEditableProcess.value &
 const manualEntryEditableProcess = computed(() => ['PREPARING', 'WAIT_MEASURE', 'MEASURING', 'MEASURE_REJECTED'].includes(detail.value?.processStatus || ''))
 const mayCreateManualEntry = computed(() => canManualEntry.value && manualEntryEditableProcess.value && !loading.value && !saving.value && !submitting.value && !isDirty.value)
 const confirmedPackageCount = computed(() => form.items.reduce((sum, item) => sum + (Number.isFinite(item.packageCount) ? item.packageCount : 0), 0))
+// No scan rows means no measured count yet, rather than a measured zero.
+const comparisonMetrics = computed(() => [
+  { label: '箱数', declared: detail.value?.originalPackageCount, actual: form.items.length ? confirmedPackageCount.value : null, digits: 0, unit: '' },
+  { label: '毛重（kg）', declared: detail.value?.originalGrossWeightKg, actual: detail.value?.actualGrossWeightKg, digits: 3, unit: ' kg' },
+  { label: '总体积（m³）', declared: detail.value?.originalVolumeCbm, actual: detail.value?.actualVolumeCbm, digits: 4, unit: ' m³' },
+])
+
 const expectedPackageCount = computed(() => detail.value?.originalPackageCount ?? null)
 const packageCountDifference = computed(() => expectedPackageCount.value == null ? null : confirmedPackageCount.value - expectedPackageCount.value)
 const packageCountMatched = computed(() => packageCountDifference.value === null || packageCountDifference.value === 0)
@@ -127,7 +134,10 @@ const isDropship = computed(() => detail.value?.fulfillmentType === 'ONE_CLICK_D
 const expectedPalletCountValid = computed(() => !isDropship.value || (Number.isInteger(form.expectedPalletCount) && Number(form.expectedPalletCount) >= 1))
 const maySubmit = computed(() => canSubmit.value && submitEditableProcess.value && Boolean(form.measurementId) && packageCountMatched.value && hasConfirmedWeightResult.value && expectedPalletCountValid.value && !loading.value && !saving.value)
 const submissionBlockReason = computed(() => {
-  if (!canSubmit.value || !submitEditableProcess.value || !form.measurementId) return ''
+  if (!canSubmit.value || !detail.value || loading.value) return ''
+  if (detail.value.processStatus === 'PREPARING') return '订单尚待客服审核，审核通过后才能提交测量审核'
+  if (!submitEditableProcess.value) return `当前${processStatusLabel(detail.value.processStatus)}，不能提交测量审核`
+  if (!form.measurementId) return hasConfirmedWeightResult.value ? '请先完成箱规测量并保存测量数据' : '请先完成箱规测量，并上传确认至少一张称重图片'
  if (!hasConfirmedWeightResult.value) return '即使只有一箱，也必须上传并确认至少一张称重图片后才能提交审核'
  if (!packageCountMatched.value) return '确认箱数合计必须与订单总箱数一致后才能提交审核'
  if (!expectedPalletCountValid.value) return '请先填写并保存有效的预计托数后再提交审核'
@@ -675,15 +685,6 @@ defineExpose({ saveDraft, submitForReview, updateWeightEvidence, submissionBlock

      <el-alert v-else-if="!canEdit" type="info" :closable="false" show-icon title="当前账号仅可查看测量数据" />

-      <el-alert
-        v-if="submissionBlockReason && !hasConfirmedWeightResult"
-        type="warning"
-        :closable="false"
-        show-icon
-        class="measurement-alert"
-        :title="submissionBlockReason"
-      />
-
      <el-alert v-if="conflictDetected" type="warning" :closable="false" show-icon class="measurement-alert">
        <template #title>数据版本已变化，当前修改尚未丢失</template>
        <p>{{ operationError?.message }}</p>
@@ -699,13 +700,14 @@ defineExpose({ saveDraft, submitForReview, updateWeightEvidence, submissionBlock
          <legend class="sr-only">测量草稿</legend>
          <section class="measurement-section measurement-summary-section">
            <header class="measurement-summary-header">
+              <h4 class="measurement-subheading">申报与实测对比</h4>
              <div class="measurement-summary-context">
                <p><span>客户</span>{{ displayCustomerName }}</p>
                <p><span>渠道</span>{{ detail.channelName || detail.channelCode || '渠道未填写' }}</p>
              </div>
              <div class="measurement-summary-status">
                <el-tag effect="light">{{ processStatusLabel(detail.processStatus) }}</el-tag>
-                <span>{{ sourceLabel }}</span>
+                <span v-if="detail.sourceType && form.items.length">{{ sourceLabel }}</span>
              </div>
            </header>

@@ -720,57 +722,66 @@ defineExpose({ saveDraft, submitForReview, updateWeightEvidence, submissionBlock
              <p v-for="warning in measurementDeviationWarnings" :key="warning.key">{{ warning.text }}</p>
            </el-alert>

-            <h4 class="measurement-subheading">平台实测</h4>
-            <dl class="measurement-metrics" aria-label="平台实测结果汇总">
-              <div :class="{ 'measurement-metric--warning': !packageCountMatched }">
-                <dt>实测箱数</dt>
-                <dd>{{ formatNumber(confirmedPackageCount, 0) }} <small v-if="formatDifference(confirmedPackageCount, expectedPackageCount, 0)">/ {{ formatDifference(confirmedPackageCount, expectedPackageCount, 0) }}</small></dd>
-              </div>
-              <div><dt>实测毛重</dt><dd>{{ formatNumber(detail.actualGrossWeightKg) }} <small>kg<span v-if="formatDifference(detail.actualGrossWeightKg, detail.originalGrossWeightKg, 3, ' kg')"> · {{ formatDifference(detail.actualGrossWeightKg, detail.originalGrossWeightKg, 3, ' kg') }}</span></small></dd></div>
-              <div class="measurement-metric--primary"><dt>货物净重</dt><dd>{{ formatNumber(detail.actualNetWeightKg) }} <small>kg</small></dd></div>
-              <div><dt>总体积</dt><dd>{{ formatNumber(detail.actualVolumeCbm, 4) }} <small>m³<span v-if="formatDifference(detail.actualVolumeCbm, detail.originalVolumeCbm, 4, ' m³')"> · {{ formatDifference(detail.actualVolumeCbm, detail.originalVolumeCbm, 4, ' m³') }}</span></small></dd></div>
-              <div><dt>材积重</dt><dd>{{ formatNumber(detail.volumeWeightKg) }} <small>kg</small></dd></div>
-            </dl>
+            <table class="measurement-comparison" aria-label="客户申报与平台实测对比">
+              <thead><tr><th scope="col">指标</th><th scope="col">客户申报</th><th scope="col">平台实测</th><th scope="col">差异（实测 − 申报）</th></tr></thead>
+              <tbody>
+                <tr v-for="metric in comparisonMetrics" :key="metric.label">
+                  <th scope="row">{{ metric.label }}</th>
+                  <td>{{ formatNumber(metric.declared, metric.digits) }}</td>
+                  <td>{{ metric.actual == null ? '未测量' : formatNumber(metric.actual, metric.digits) }}</td>
+                  <td :class="{ 'measurement-comparison__difference': metric.actual != null && metric.declared != null && metric.actual !== metric.declared }">
+                    {{ metric.actual == null ? '待测量' : metric.declared == null ? '—' : formatDifference(metric.actual, metric.declared, metric.digits, metric.unit) || '一致' }}
+                  </td>
+                </tr>
+              </tbody>
+            </table>
+            <div class="measurement-extra-facts">
+              <span>货物净重 <strong>{{ formatNumber(detail.actualNetWeightKg) }}</strong> kg</span>
+              <span>材积重 <strong>{{ formatNumber(detail.volumeWeightKg) }}</strong> kg</span>
+              <el-tooltip content="净重、材积重为平台数据，不与客户申报毛重比较"><span tabindex="0">平台补充数据</span></el-tooltip>
+            </div>
+          </section>

-            <section class="measurement-declaration" aria-labelledby="measurement-declaration-title">
-              <h4 id="measurement-declaration-title">客户申报</h4>
-              <div class="measurement-data-grid">
-                <div class="measurement-readonly-field"><span>申报箱数</span><strong>{{ formatNumber(expectedPackageCount, 0) }}</strong></div>
-                <div class="measurement-readonly-field"><span>申报毛重（kg）</span><strong>{{ formatNumber(detail.originalGrossWeightKg) }}</strong></div>
-                <div class="measurement-readonly-field"><span>申报体积（m³）</span><strong>{{ formatNumber(detail.originalVolumeCbm, 4) }}</strong></div>
-                <label v-if="mayMaintain" class="measurement-goods-name"><span>实际品名</span><el-input v-model="form.actualGoodsName" placeholder="请输入实际品名" maxlength="255" /></label>
-                <div v-else class="measurement-readonly-field measurement-goods-name"><span>实际品名</span><strong>{{ detail.actualGoodsName || '—' }}</strong></div>
-                <label v-if="isDropship && mayMaintain"><span>预计托数</span><el-input-number v-model="form.expectedPalletCount" placeholder="请输入预计托数" :min="1" :max="1000" :step="1" step-strictly controls-position="right" /></label>
-                <div v-else-if="isDropship" class="measurement-readonly-field"><span>预计托数</span><strong>{{ detail.expectedPalletCount ?? '—' }}</strong></div>
-                <div class="measurement-readonly-field"><span>原单据号码</span><strong>{{ detail.originalDocumentNo || '—' }}</strong></div>
-              </div>
-              <el-table
-                v-if="detail.latestDeclaration?.items.length"
-                :data="detail.latestDeclaration.items"
-                border
-                stripe
-                size="small"
-                class="measurement-declaration-table"
-                aria-label="客户申报箱规明细"
-              >
-                <el-table-column prop="itemNo" label="#" width="70" />
-                <el-table-column prop="cargoName" label="货物品名" min-width="150" show-overflow-tooltip />
-                <el-table-column prop="packageCount" label="申报箱数" width="100" />
-                <el-table-column label="申报尺寸 长×宽×高(cm)" min-width="190">
-                  <template #default="{ row }">{{ formatNumber(row.lengthCm) }} × {{ formatNumber(row.widthCm) }} × {{ formatNumber(row.heightCm) }}</template>
-                </el-table-column>
-              </el-table>
-            </section>
+          <section class="measurement-declaration" aria-labelledby="measurement-declaration-title">
+            <header class="measurement-declaration-header">
+              <h4 id="measurement-declaration-title">客户申报明细</h4>
+              <div class="measurement-readonly-field measurement-document-number"><span>原单据号码</span><strong>{{ detail.originalDocumentNo || '—' }}</strong></div>
+            </header>
+            <el-table
+              v-if="detail.latestDeclaration?.items.length"
+              :data="detail.latestDeclaration.items"
+              border
+              stripe
+              size="small"
+              class="measurement-declaration-table"
+              aria-label="客户申报箱规明细"
+            >
+              <el-table-column prop="itemNo" label="#" width="70" />
+              <el-table-column prop="cargoName" label="货物品名" min-width="150" show-overflow-tooltip />
+              <el-table-column prop="packageCount" label="申报箱数" width="100" />
+              <el-table-column label="申报尺寸 长×宽×高(cm)" min-width="190">
+                <template #default="{ row }">{{ formatNumber(row.lengthCm) }} × {{ formatNumber(row.widthCm) }} × {{ formatNumber(row.heightCm) }}</template>
+              </el-table-column>
+            </el-table>
          </section>

          <section class="measurement-section measurement-items-section">
            <div class="measurement-section__heading">
-              <div><h3>箱规明细</h3></div>
+              <div><h3>平台实测箱规</h3></div>
+
+              <div class="measurement-data-grid measurement-platform-fields">
+                <label v-if="mayMaintain" class="measurement-goods-name"><span>实际品名</span><el-input v-model="form.actualGoodsName" placeholder="请输入实际品名" maxlength="255" /></label>
+                <div v-else class="measurement-readonly-field measurement-goods-name"><span>实际品名</span><strong>{{ detail.actualGoodsName || '—' }}</strong></div>
+                <label v-if="isDropship && mayMaintain" class="measurement-expected-pallets"><span>预计托数</span><el-input-number v-model="form.expectedPalletCount" placeholder="请输入预计托数" :min="1" :max="1000" :step="1" step-strictly controls-position="right" /></label>
+                <div v-else-if="isDropship" class="measurement-readonly-field measurement-expected-pallets"><span>预计托数</span><strong>{{ detail.expectedPalletCount ?? '—' }}</strong></div>
+              </div>
              <div class="measurement-section-actions">
                <el-button v-if="canManualEntry" type="primary" plain :disabled="!mayCreateManualEntry" @click="openManualEntry"><Plus :size="15" />手动录入箱规</el-button>
              </div>
            </div>

+
+
            <el-table
              v-if="form.items.length"
              :data="form.items"
@@ -854,7 +865,7 @@ defineExpose({ saveDraft, submitForReview, updateWeightEvidence, submissionBlock
      </form>

      <footer v-if="canEdit || canSubmit" class="measurement-panel__footer">
-        <span v-if="!hasConfirmedWeightResult"><AlertTriangle :size="15" />至少上传并确认一张称重图片后才能提交审核</span>
+        <span v-if="submissionBlockReason" role="status"><AlertTriangle :size="15" />{{ submissionBlockReason }}</span>
        <span v-else-if="isDirty"><AlertTriangle :size="15" />有尚未保存的修改</span>
        <span v-else>所有修改已保存</span>
        <div>
@@ -906,6 +917,14 @@ defineExpose({ saveDraft, submitForReview, updateWeightEvidence, submissionBlock
 </template>

 <style scoped>
+.measurement-comparison { width: 100%; border-collapse: collapse; table-layout: fixed; background: var(--admin-surface, #fff); font-size: var(--admin-font-body, 13px); }
+.measurement-comparison th, .measurement-comparison td { padding: var(--admin-space-3, 8px) var(--admin-space-5, 12px); border: 1px solid var(--cc-border); text-align: left; overflow-wrap: anywhere; font-variant-numeric: tabular-nums; }
+.measurement-comparison thead th { background: #f8fafc; }
+.measurement-comparison thead th:nth-child(2) { background: #f7f9ff; color: #465fc4; }
+.measurement-comparison thead th:nth-child(3) { background: #f4fbf8; color: #18795d; }
+.measurement-comparison__difference { color: var(--el-color-warning-dark-2); font-weight: 600; }
+.measurement-extra-facts { display: flex; flex-wrap: wrap; gap: var(--admin-space-3, 8px) var(--admin-space-6, 16px); color: var(--cc-muted); font-size: var(--admin-font-caption, 12px); }
+.measurement-extra-facts strong { color: var(--cc-text); }
 .measurement-panel { overflow: hidden; }
 .measurement-panel__heading > div:first-child { display: flex; min-width: 0; align-items: flex-start; gap: 11px; }
 .measurement-panel__icon { display: grid; width: 34px; height: 34px; flex: 0 0 34px; place-items: center; border-radius: 8px; background: #eef4ff; color: var(--cc-primary); }
@@ -914,6 +933,7 @@ defineExpose({ saveDraft, submitForReview, updateWeightEvidence, submissionBlock
 .measurement-panel h3 { font-size: var(--admin-font-section, 14px); }
 .measurement-panel__heading p, .measurement-section__heading p { margin: var(--admin-space-1, 4px) 0 0; color: var(--cc-muted); font-size: var(--admin-font-caption, 12px); line-height: 1.55; }
 .measurement-panel__actions, .measurement-panel__footer > div { display: flex; flex: 0 0 auto; flex-wrap: wrap; justify-content: flex-end; gap: var(--admin-space-3, 8px); }
+.measurement-platform-fields { margin-bottom: var(--admin-space-5, 12px); }
 .measurement-declaration-table { margin-top: var(--admin-space-5, 12px); }
 .measurement-panel__actions :deep(.el-button), .measurement-panel__footer :deep(.el-button) { margin-left: 0; }
 .measurement-skeleton { padding: var(--admin-space-7, 24px); }
@@ -931,15 +951,7 @@ defineExpose({ saveDraft, submitForReview, updateWeightEvidence, submissionBlock
 .measurement-deviation-alert p { margin: 3px 0 0; line-height: 1.55; }
 .measurement-summary-context p { display: inline-flex; min-width: 0; align-items: baseline; gap: var(--admin-space-2, 6px); margin: 0; overflow-wrap: anywhere; color: var(--cc-text); font-size: var(--admin-font-caption, 12px); font-weight: 600; }
 .measurement-summary-status { display: flex; flex: 0 0 auto; align-items: center; gap: 9px; }
-.measurement-metrics { display: grid; grid-template-columns: repeat(4, minmax(0, 1fr)); margin: 2px 0; }
 .measurement-subheading { margin: 0; color: #344054; font-size: var(--admin-font-caption, 12px); font-weight: 700; }
-.measurement-metrics > div { display: grid; min-width: 0; min-height: 58px; align-content: center; gap: var(--admin-space-1, 4px); padding: 5px 18px; border-left: 1px solid var(--cc-border); }
-.measurement-metrics > div:first-child { padding-left: 0; border-left: 0; }
-.measurement-metrics dt { color: var(--cc-muted); font-size: var(--admin-font-caption, 12px); }
-.measurement-metrics dd { min-width: 0; margin: 0; color: var(--cc-text); font-size: 18px; font-weight: 700; overflow-wrap: anywhere; }
-.measurement-metrics small { color: var(--cc-muted); font-size: var(--admin-font-caption, 11px); font-weight: 500; }
-.measurement-metric--primary dd { color: var(--cc-primary); font-size: 20px; }
-.measurement-metric--warning dd { color: var(--el-color-warning-dark-2); }
 .measurement-declaration { padding-top: var(--admin-space-5, 12px); border-top: 1px solid var(--cc-border); }
 .measurement-declaration h4 { margin: 0 0 var(--admin-space-4, 10px); color: #344054; font-size: var(--admin-font-caption, 12px); font-weight: 700; }
 .measurement-section__heading { display: flex; align-items: flex-start; justify-content: space-between; gap: 18px; margin-bottom: var(--admin-space-6, 16px); }
@@ -947,7 +959,7 @@ defineExpose({ saveDraft, submitForReview, updateWeightEvidence, submissionBlock
 .measurement-section-actions { display: flex; flex-wrap: wrap; justify-content: flex-end; gap: var(--admin-space-3, 8px); }.measurement-section-actions :deep(.el-button) { margin-left: 0; }
 .warehouse-suggestion-form { display: grid; grid-template-columns: repeat(2, minmax(0, 1fr)); gap: 0 var(--admin-space-6, 16px); }.warehouse-suggestion-form :deep(.el-select),.warehouse-suggestion-form :deep(.el-input-number) { width: 100%; }.warehouse-suggestion-form :deep(.el-form-item:last-child) { grid-column: 1 / -1; }.suggestion-preview { display: grid; grid-template-columns: repeat(4, minmax(0, 1fr)); margin: var(--admin-space-1, 4px) 0 0; border: 1px solid var(--cc-border); border-radius: 6px; }.suggestion-preview div { padding: var(--admin-space-5, 12px); border-right: 1px solid var(--cc-border); }.suggestion-preview div:last-child { border-right: 0; }.suggestion-preview dt { color: var(--cc-muted); font-size: var(--admin-font-caption, 11px); }.suggestion-preview dd { margin: 5px 0 0; color: var(--cc-text); font-size: var(--admin-font-body, 13px); font-weight: 650; }
 .measurement-form-grid { display: grid; grid-template-columns: repeat(2, minmax(0, 1fr)); gap: 0 var(--admin-space-6, 16px); }
-.measurement-data-grid { display: grid; grid-template-columns: repeat(5, minmax(0, 1fr)); gap: var(--admin-space-5, 12px); }
+.measurement-data-grid { display: grid; grid-template-columns: repeat(2, minmax(0, 1fr)); gap: var(--admin-space-5, 12px); }
 .measurement-form label { display: flex; min-width: 0; flex-direction: column; gap: 7px; color: #344054; font-size: var(--admin-font-caption, 12px); font-weight: 650; }
 .measurement-form :deep(.el-input-number), .measurement-form :deep(.el-input) { width: 100%; }
 .measurement-data-grid label { display: flex; min-width: 0; flex-direction: column; gap: 5px; color: #344054; font-size: var(--admin-font-caption, 12px); font-weight: 600; }
@@ -982,8 +994,6 @@ defineExpose({ saveDraft, submitForReview, updateWeightEvidence, submissionBlock
  .measurement-form-grid { grid-template-columns: repeat(2, minmax(0, 1fr)); }
  .measurement-data-grid { grid-template-columns: repeat(3, minmax(0, 1fr)); }
  .measurement-row-details { grid-template-columns: repeat(2, minmax(0, 1fr)); }
-  .measurement-metrics { grid-template-columns: repeat(2, minmax(0, 1fr)); }
-  .measurement-metrics > div:nth-child(3) { padding-left: 0; border-left: 0; }
 }

@media (max-width: 720px) {
@@ -1,15 +1,38 @@
+/* Measurement workspace: keep all sections inside the panel's content bounds. */
+.inbound-measurement-workspace-dialog.inbound-density .measurement-summary-section { min-width: 0; margin: 0; padding: var(--admin-space-4, 10px) var(--admin-space-5, 12px); border: 1px solid #cce8df; border-left: 4px solid #20a477; border-radius: 8px; background: #f4fbf8; }
+.inbound-measurement-workspace-dialog.inbound-density .measurement-summary-header { flex-wrap: wrap; align-items: center; gap: var(--admin-space-3, 8px) var(--admin-space-6, 16px); }
+.inbound-measurement-workspace-dialog.inbound-density .measurement-summary-context { flex: 1 1 auto; }
+.inbound-measurement-workspace-dialog.inbound-density .measurement-summary-context p > span { flex-shrink: 0; }
+.inbound-measurement-workspace-dialog.inbound-density .measurement-summary-status { flex-wrap: wrap; }
+.inbound-measurement-workspace-dialog.inbound-density .measurement-items-section { min-width: 0; margin: var(--admin-space-5, 12px) 0 0; padding: var(--admin-space-4, 10px) var(--admin-space-5, 12px); border: 1px solid #eadfc9; border-left: 4px solid #c79643; border-radius: 8px; background: #fffbf4; }
+
+.inbound-measurement-workspace-dialog.inbound-density .measurement-subheading { color: #18795d; font-size: var(--admin-font-section, 14px); }
+.inbound-measurement-workspace-dialog.inbound-density .measurement-declaration { min-width: 0; margin-top: var(--admin-space-3, 8px); padding: var(--admin-space-4, 10px) var(--admin-space-5, 12px); border: 1px solid #d9e2fa; border-left: 4px solid #647fec; border-radius: 8px; background: #f7f9ff; }
+
@media (min-width: 961px) {
  .inbound-density.admin-density-dialog .measurement-dialog-weight { padding-bottom: var(--admin-space-4, 10px); }
-  .inbound-density.admin-density-dialog .measurement-section { padding: var(--admin-space-4, 10px) 0; }
+  .inbound-density.admin-density-dialog .measurement-section { padding-block: var(--admin-space-4, 10px); }
  .inbound-density.admin-density-dialog .measurement-summary-section { gap: var(--admin-space-3, 8px); }
  .inbound-density.admin-density-dialog .measurement-section__heading { align-items: center; margin-bottom: var(--admin-space-3, 8px); }
-  .inbound-density.admin-density-dialog .measurement-metrics { grid-template-columns: repeat(5, minmax(0, 1fr)); }
-  .inbound-density.admin-density-dialog .measurement-metrics > div { min-height: var(--admin-row-height, 36px); padding: var(--admin-space-2, 6px) var(--admin-space-4, 10px); display: flex; align-items: baseline; gap: var(--admin-space-3, 8px); }
-  .inbound-density.admin-density-dialog .measurement-metrics dd { font-size: var(--admin-font-section, 14px); }
-  .inbound-density.admin-density-dialog .measurement-metrics small { font-size: var(--admin-font-caption, 12px); }
  .inbound-density.admin-density-dialog .measurement-data-grid { gap: var(--admin-space-3, 8px) var(--admin-space-5, 12px); }
+  .inbound-measurement-workspace-dialog.inbound-density .measurement-summary-header h4,
+  .inbound-measurement-workspace-dialog.inbound-density .measurement-declaration-header h4 { flex-shrink: 0; margin: 0; }
+  .inbound-measurement-workspace-dialog.inbound-density .measurement-declaration-header { display: flex; align-items: baseline; gap: var(--admin-space-6, 16px); }
+  .inbound-measurement-workspace-dialog.inbound-density .measurement-document-number { display: flex; flex: 1; align-items: baseline; gap: var(--admin-space-3, 8px); }
+  .inbound-measurement-workspace-dialog.inbound-density .measurement-document-number > span { flex-shrink: 0; }
+  .inbound-measurement-workspace-dialog.inbound-density .measurement-document-number strong { min-width: 0; min-height: 0; padding: 0; }
+  .inbound-measurement-workspace-dialog.inbound-density .measurement-items-section .measurement-section__heading { flex-wrap: wrap; gap: var(--admin-space-3, 8px) var(--admin-space-6, 16px); }
+  .inbound-measurement-workspace-dialog.inbound-density .measurement-platform-fields { display: flex; flex: 1 1 520px; align-items: center; flex-wrap: wrap; margin: 0; gap: var(--admin-space-5, 12px); }
+  .inbound-measurement-workspace-dialog.inbound-density .measurement-platform-fields > label,
+  .inbound-measurement-workspace-dialog.inbound-density .measurement-platform-fields > .measurement-readonly-field { display: flex; flex-direction: row; align-items: center; gap: var(--admin-space-3, 8px); }
+  .inbound-measurement-workspace-dialog.inbound-density .measurement-platform-fields > .measurement-goods-name { flex: 1 1 340px; }
+  .inbound-measurement-workspace-dialog.inbound-density .measurement-platform-fields > .measurement-expected-pallets { flex: 0 0 180px; }
+  .inbound-measurement-workspace-dialog.inbound-density .measurement-platform-fields > * > span { flex-shrink: 0; }
+  .inbound-measurement-workspace-dialog.inbound-density .measurement-platform-fields .el-input,
+  .inbound-measurement-workspace-dialog.inbound-density .measurement-platform-fields .el-input-number { min-width: 0; flex: 1; width: auto; }
+  .inbound-measurement-workspace-dialog.inbound-density .measurement-section-actions { margin-left: auto; }
  .inbound-density.admin-density-dialog .measurement-declaration { padding-top: var(--admin-space-3, 8px); }
-  .inbound-density.admin-density-dialog .measurement-declaration h4 { margin-bottom: var(--admin-space-2, 6px); font-size: var(--admin-font-body, 13px); }
+  .inbound-density.admin-density-dialog .measurement-declaration h4 { font-size: var(--admin-font-body, 13px); }
  .inbound-density.admin-density-dialog .measurement-panel > .el-alert { margin: var(--admin-space-3, 8px) 0; }
  .inbound-density.admin-density-dialog .measurement-summary-header span { font-size: var(--admin-font-caption, 12px); }
  .inbound-density.admin-density-dialog .measurement-table .el-table__header th { padding: var(--admin-space-1, 4px) 0; font-size: var(--admin-font-body, 13px); }
@@ -5,7 +5,7 @@ export const inboundRoutes = [
    path: 'inbounds/measurements',
    name: 'inbound-measurements',
    component: () => import('./pages/InboundMeasurementsView.vue'),
-    meta: {
+    meta: { showPageHeading: false,
      title: '订单测量',
      description: '只展示当前可录入或修正测量数据的国内仓订单',
      permission: 'platform:firstleg:inbound:measure:view',
@@ -15,7 +15,7 @@ export const inboundRoutes = [
    path: 'inbounds/measurement-reviews',
    name: 'inbound-measurement-reviews',
    component: () => import('./pages/MeasurementReviewsView.vue'),
-    meta: {
+    meta: { showPageHeading: false,
      title: '测量数据审核',
      description: '处理待审核且当前可审核的国内仓测量数据',
      permission: 'firstleg:inbound:measurement-review',
@@ -0,0 +1,27 @@
+import { flushPromises, shallowMount } from '@vue/test-utils'
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import LoadingListDetailDrawer from './LoadingListDetailDrawer.vue'
+import type { LoadingDetail } from '../api/platformLoadingLists'
+
+afterEach(() => vi.restoreAllMocks())
+
+describe('shared manifest presentation', () => {
+  it.each([undefined, '返回货柜概览'])('keeps print in the common header and emits return for %s', async (backLabel) => {
+    const print = vi.spyOn(window, 'print').mockImplementation(() => {})
+    const wrapper = shallowMount(LoadingListDetailDrawer, {
+      props: { mode: 'confirmed', dense: true, backLabel, canEdit: false, loading: false, error: null,
+        detail: { summary: { planId: '1', warehouseId: '11', loadingListNo: 'LP-TEST', status: 'COMPLETED' }, items: [], histories: [] } as unknown as LoadingDetail },
+      global: { directives: { loading: {} }, stubs: { ElButton: { template: '<button><slot /></button>' } } },
+    })
+    expect(wrapper.classes()).toContain('loading-density')
+    expect(wrapper.get('h1').text()).toBe('装柜清单 · LP-TEST')
+    const button = wrapper.get('.detail-page-header__actions button')
+    expect(button.text()).toBe('打印装柜清单')
+    await button.trigger('click'); await flushPromises()
+    expect(print).toHaveBeenCalledTimes(1)
+    expect(wrapper.get('.detail-page-header__back').text()).toBe(backLabel || '返回列表')
+    await wrapper.get('.detail-page-header__back').trigger('click')
+    expect(wrapper.emitted('back')).toHaveLength(1)
+    wrapper.unmount()
+  })
+})
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import '@/styles/adminDensity.css'
 import { computed, ref, watch } from 'vue'
-import { ArrowLeft, Check, ChevronRight, Pencil } from '@lucide/vue'
+import { ArrowLeft, Check, ChevronRight, Pencil, Printer } from '@lucide/vue'
 import ApiErrorMeta from '@/shared/components/ApiErrorMeta.vue'
 import DataTable, { type DataTableColumn } from '@/shared/components/DataTable.vue'
 import DetailPageLayout from '@/shared/components/DetailPageLayout.vue'
@@ -9,6 +9,7 @@ import LoadErrorState from '@/shared/components/LoadErrorState.vue'
 import StatusBadge from '@/shared/components/StatusBadge.vue'
 import PalletLabelPrintDialog from './PalletLabelPrintDialog.vue'
 import { loadingListStatusLabel } from '../status'
+import { printLoadingList } from '../printLoadingList'
 import type { ApiErrorDetails } from '@/shared/api/http'
 import type { LoadingDetail, LoadingHistory, LoadingItem, LoadingListMode, LoadingListSummary, PreloadSummary } from '../api/platformLoadingLists'

@@ -22,6 +23,7 @@ const props = defineProps<{
  pdaAssigneeSelected?: boolean
  dense?: boolean
  embedded?: boolean
+  backLabel?: string
  canEditTransport?: boolean
  confirmSaving?: boolean
 }>()
@@ -161,12 +163,13 @@ function formatNumber(value?: number | null, digits = 3) {
  <section v-loading="loading" class="loading-detail-content" :class="{ 'admin-density loading-density': mode === 'preload' || dense }" :aria-label="title" :aria-busy="loading">
    <section class="detail-overview" aria-label="清单概览">
      <header class="detail-page-header" :class="{ 'detail-page-header--embedded': embedded }">
-        <el-button link type="primary" class="detail-page-header__back" :class="{ 'density-back': mode === 'preload' || dense }" @click="emit('back')"><ArrowLeft :size="16" />返回列表</el-button>
+        <el-button link type="primary" class="detail-page-header__back" :class="{ 'density-back': mode === 'preload' || dense }" @click="emit('back')"><ArrowLeft :size="16" />{{ backLabel || '返回列表' }}</el-button>
        <div v-if="!embedded" class="detail-page-header__identity">
          <h1>{{ title }}</h1>
-          <p v-if="mode !== 'preload'">查看已完成装柜明细和柜次费用</p>
+          <p v-if="mode !== 'preload'">查看已完成装柜明细和操作历史</p>
        </div>
        <div v-if="detail && summary" class="detail-page-header__actions">
+          <el-button v-if="mode === 'confirmed'" :disabled="loading" @click="printLoadingList"><Printer :size="16" />打印装柜清单</el-button>
          <PalletLabelPrintDialog :dense="mode === 'preload' || dense" v-if="summary.warehouseId" :plan-id="summary.planId" :warehouse-id="summary.warehouseId" :disabled="!summary.containerNo || summary.status === 'EDITING'" />
          <template v-if="canEditItemRemark">
            <el-button v-if="canEditTransport" @click="emit('edit')"><Pencil :size="16" />{{ summary.containerNo ? '纠正集装箱号 / 航次' : '补录集装箱号 / 航次' }}</el-button>
@@ -0,0 +1,55 @@
+import { flushPromises, mount } from '@vue/test-utils'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import LoadingListsView from './LoadingListsView.vue'
+
+const mocks = vi.hoisted(() => ({ get: vi.fn(), list: vi.fn(), can: vi.fn(), push: vi.fn(), replace: vi.fn(), query: {} as Record<string, string> }))
+vi.mock('vue-router', () => ({ useRoute: () => ({ query: mocks.query }), useRouter: () => ({ push: mocks.push, replace: mocks.replace }) }))
+vi.mock('@/core/access/accessPreview', () => ({ useAccessPreviewStore: () => ({ can: mocks.can }) }))
+vi.mock('@/modules/container-loading', () => ({ ContainerSimulationCreate: { template: '<div />' } }))
+vi.mock('@/modules/iam', () => ({ listPlatformTenants: async () => ({ records: [] }) }))
+vi.mock('../api/platformLoadingLists', () => ({ listConfirmedLoadingLists: mocks.list, listPreloadPlans: mocks.list, getConfirmedLoadingList: mocks.get }))
+vi.mock('@/shared/api/http', () => ({ getApiErrorDetails: (cause: Error) => ({ message: cause.message }) }))
+vi.mock('./LoadingListDetailDrawer.vue', () => ({ default: { props: ['detail', 'error'], template: '<div data-testid="detail">{{ detail?.summary.loadingListNo }}{{ error?.message }}</div>' } }))
+
+const rows = [{ planId: '1', warehouseId: '11' }, { planId: '2', warehouseId: '22' }]
+function render() {
+  return mount(LoadingListsView, { props: { mode: 'confirmed' }, global: { stubs: {
+    AdminPage: { template: '<div><slot /></div>' },
+    ListPageLayout: { template: '<div><slot /></div>' },
+    DataTable: { props: ['data'], template: '<div><div v-for="row in data" :key="row.planId"><slot name="actions" :row="row" /></div></div>' },
+    ElButton: { template: '<button><slot /></button>' },
+  } } })
+}
+describe('confirmed manifest navigation', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    mocks.query = {}
+    mocks.can.mockReturnValue(true)
+    mocks.list.mockResolvedValue({ records: rows, total: 2 })
+  })
+  it('opens each manifest on its dedicated detail route with warehouse context', async () => {
+    const wrapper = render(); await flushPromises()
+    await wrapper.findAll('button')[0]!.trigger('click')
+    expect(mocks.push).toHaveBeenLastCalledWith({ name: 'loading-list-detail', params: { planId: '1' }, query: { warehouseId: '11' } })
+    await wrapper.findAll('button')[2]!.trigger('click')
+    expect(mocks.push).toHaveBeenLastCalledWith({ name: 'loading-list-detail', params: { planId: '2' }, query: { warehouseId: '22' } })
+    expect(mocks.get).not.toHaveBeenCalled()
+    expect(wrapper.find('[data-testid="detail"]').exists()).toBe(false)
+  })
+  it('prints through the dedicated detail page', async () => {
+    const wrapper = render(); await flushPromises()
+    await wrapper.findAll('button')[1]!.trigger('click')
+    expect(mocks.push).toHaveBeenCalledWith({ name: 'loading-list-detail', params: { planId: '1' }, query: { warehouseId: '11', print: '1' } })
+    expect(mocks.get).not.toHaveBeenCalled()
+  })
+  it('replaces a list deep link with the dedicated detail route', async () => {
+    mocks.query = { planId: '2', warehouseId: '22' }
+    render(); await flushPromises()
+    expect(mocks.replace).toHaveBeenCalledWith({ name: 'loading-list-detail', params: { planId: '2' }, query: { warehouseId: '22' } })
+  })
+  it('does not fetch manifests without list permission', async () => {
+    mocks.can.mockReturnValue(false)
+    render(); await flushPromises()
+    expect(mocks.list).not.toHaveBeenCalled()
+  })
+})
@@ -6,6 +6,7 @@ const source = readFileSync(resolve(process.cwd(), 'src/modules/loading-lists/co
 const detailSource = readFileSync(resolve(process.cwd(), 'src/modules/loading-lists/components/LoadingListDetailDrawer.vue'), 'utf8')
 const preloadDetailSource = readFileSync(resolve(process.cwd(), 'src/modules/loading-lists/pages/PreloadPlanDetailView.vue'), 'utf8')
 const confirmedDetailSource = readFileSync(resolve(process.cwd(), 'src/modules/loading-lists/pages/ConfirmedLoadingListDetailView.vue'), 'utf8')
+const sharedLoaderSource = readFileSync(resolve(process.cwd(), 'src/modules/loading-lists/useLoadingListDetail.ts'), 'utf8')
 const routesSource = readFileSync(resolve(process.cwd(), 'src/modules/loading-lists/routes.ts'), 'utf8')

 describe('LoadingListsView', () => {
@@ -31,7 +32,7 @@ describe('LoadingListsView', () => {
    expect(source).not.toContain("ElMessage.warning('请先选择仓库')")
    expect(source).not.toContain("'请先选择仓库后查询'")
    expect(preloadDetailSource).toContain('MISSING_WAREHOUSE_CONTEXT')
-    expect(confirmedDetailSource).toContain('MISSING_WAREHOUSE_CONTEXT')
+    expect(sharedLoaderSource).toContain('MISSING_WAREHOUSE_CONTEXT')
  })

  it('uses the shared query and table components while keeping details on route pages', () => {
@@ -63,11 +64,11 @@ describe('LoadingListsView', () => {
    expect(source).not.toContain('confirmed-inline-detail')
    expect(preloadDetailSource).toContain('返回列表')
    expect(preloadDetailSource).toContain('router.back()')
-    expect(confirmedDetailSource).toContain('返回列表')
+    expect(detailSource).toContain("backLabel || '返回列表'")
    expect(confirmedDetailSource).toContain('router.back()')
    expect(confirmedDetailSource).toContain('@media (min-width: 1920px) { .confirmed-loading-detail-page { width: 100%; max-width: none; gap: 12px; } }')
-    expect(routesSource).not.toContain("path: 'loading-lists/:planId'")
-    expect(routesSource).not.toContain("name: 'loading-list-detail'")
+    expect(routesSource).toContain("path: 'loading-lists/:planId'")
+    expect(routesSource).toContain("name: 'loading-list-detail'")
  })

  it('keeps the real transport edit contract in a 620px centered modal on the detail page', () => {
@@ -111,11 +112,11 @@ describe('LoadingListsView', () => {
    expect(source).toContain('useRoute()')
    expect(source).toContain('route.query.planId')
    expect(source).toContain('route.query.warehouseId')
-    expect(source).toContain("router.replace({ name: 'loading-list-detail'")
-    expect(confirmedDetailSource).toContain("result.summary.status !== 'COMPLETED'")
-    expect(confirmedDetailSource).toContain('MODE_STATUS_MISMATCH')
+    expect(source).toContain("await router.replace({ name: 'loading-list-detail'")
+    expect(sharedLoaderSource).toContain("result.summary.status !== 'COMPLETED'")
+    expect(sharedLoaderSource).toContain('MODE_STATUS_MISMATCH')
    expect(confirmedDetailSource).toContain('watch([planId, warehouseId], () => void loadDetail())')
-    expect(confirmedDetailSource).toContain('if (sequence !== loadSequence) return')
+    expect(sharedLoaderSource).toContain('if (request !== sequence) return null')
    expect(preloadDetailSource).toContain('watch([planId, warehouseId], () => {')
  })

@@ -135,15 +136,16 @@ describe('LoadingListsView', () => {
    expect(detailSource).toContain('<StatusBadge :status="loadingListStatusLabel(summary.status)" />')
  })

-  it('uses bordered list actions with a stable 320px layout', () => {
+  it('uses text row actions in the integrated list while retaining detail table styles', () => {
    expect(source).toContain(":class=\"{ 'density-action': isPreload }\"")
    expect(source).toContain(':type="isPreload ? undefined : \'primary\'" :plain="!isPreload"')
    expect(source).not.toContain('<el-button v-if="canView" link')
-    expect(source).toContain("key: 'actions', label: '操作', fixed: 'left', width: 110")
+    expect(source).toContain("key: 'actions', label: '操作', fixed: 'left', width: 150")
    expect(source).toContain('flex-wrap: wrap')
    expect(source).toContain('@media (max-width: 720px)')
    expect(source).toContain('.row-actions { gap: 4px; }')
-    expect(source).toMatch(/:loading="loading"\s+stripe/)
+    expect(source).toContain('row-actions density-actions admin-text-actions')
+    expect(source).toContain('appearance="integrated" :stripe="false"')
    expect(detailSource).toMatch(/:columns="itemColumns"\s+stripe/)
  })

@@ -3,7 +3,7 @@ import '@/styles/adminDensity.css'
 import { computed, onMounted, reactive, ref, watch } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import { ContainerSimulationCreate } from '@/modules/container-loading'
-import { Eye } from '@lucide/vue'
+
 import { useAccessPreviewStore } from '@/core/access/accessPreview'
 import { listPlatformTenants, type PlatformTenantResource } from '@/modules/iam'
 import { getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
@@ -40,6 +40,9 @@ const customers = ref<PlatformTenantResource[]>([])
 const customersLoading = ref(false)
 const query = reactive<QueryModel>({ customerId: '', keyword: '', createdRange: [] })
 const handledDeepLink = ref('')
+function printConfirmed(row: LoadingListSummary) {
+  void router.push({ name: 'loading-list-detail', params: { planId: String(row.planId) }, query: { warehouseId: String(row.warehouseId || ''), print: '1' } })
+}

 const isPreload = computed(() => props.mode === 'preload')
 const title = computed(() => isPreload.value ? '预装清单' : '装柜清单')
@@ -69,7 +72,7 @@ const columns = computed<DataTableColumn[]>(() => isPreload.value ? [
  { key: 'totalGrossWeightKg', label: '总毛重(kg)', width: 90, align: 'right', slotName: 'grossWeight' },
  { key: 'createdAt', label: '创建时间', minWidth: 140, slotName: 'createdAt' },
 ] : [
-  { key: 'actions', label: '操作', fixed: 'left', width: 110, slotName: 'actions', hideable: false, movable: false },
+  { key: 'actions', label: '操作', fixed: 'left', width: 150, slotName: 'actions', hideable: false, movable: false },
  { key: 'loadingListNo', prop: 'loadingListNo', label: '装柜清单号', minWidth: 175 },
  { key: 'containerNo', prop: 'containerNo', label: '集装箱号', minWidth: 145 },
  { key: 'cabinetNo', prop: 'cabinetNo', label: '柜次号', minWidth: 150 },
@@ -182,9 +185,25 @@ onMounted(() => {

 <template>
  <AdminPage>
-  <div class="business-page loading-lists-page" :class="{ 'admin-density': isPreload }">
+  <div class="business-page loading-lists-page admin-density">
    <ListPageLayout :ariaLabel="title">
-      <template #toolbar>
+
+
+
+    <section><DataTable appearance="integrated" :stripe="false" column-settings-mode="show" :results-visible="canList && !error"
+        v-model:page="page"
+        v-model:page-size="pageSize"
+        :data="rows"
+        :columns="columns"
+        :loading="loading"
+        :total="total"
+        :preference-key="`loading-lists-${mode}`"
+        row-key="planId"
+        :empty-text="`暂无符合筛选条件的${title}`"
+        :aria-label="title"
+      >
+        <template #toolbar-start><h1>{{ title }}</h1></template>
+        <template #filters>
    <QueryToolbar
      v-model="query"
      :ariaLabel="`${title}筛选`"
@@ -194,35 +213,21 @@ onMounted(() => {
      @search="search"
    />
      </template>
-
-      <template v-if="!canList || error" #state>
+        <template #notices><template v-if="!canList || error">
        <LoadErrorState v-if="!canList" :title="`无权查看${title}`" message="当前账号缺少该清单的列表权限。" :show-retry="false" />
        <LoadErrorState v-else-if="error" :title="`${title}加载失败`" :message="error.message" :loading="loading" @retry="load">
          <template #details><ApiErrorMeta :details="error" /></template>
        </LoadErrorState>
-      </template>
-    <section v-if="canList && !error" class="surface-panel table-panel">
-      <DataTable
-        v-model:page="page"
-        v-model:page-size="pageSize"
-        :data="rows"
-        :columns="columns"
-        :loading="loading"
-        stripe
-        :total="total"
-        :preference-key="`loading-lists-${mode}`"
-        row-key="planId"
-        :empty-text="`暂无符合筛选条件的${title}`"
-        :aria-label="title"
-      >
+      </template></template>
+
+
        <template #toolbar-actions>
          <ContainerSimulationCreate :dense="isPreload" v-if="canCreate" success-message="模拟柜及预装清单已创建" @created="onSimulationCreated" />
        </template>
-        <template #actions="{ row }">
-          <div class="row-actions" :class="{ 'density-actions': isPreload }">
-            <el-button v-if="canView" :class="{ 'density-action': isPreload }" size="small" :type="isPreload ? undefined : 'primary'" :plain="!isPreload" @click="openDetail(row)"><Eye v-if="!isPreload" :size="15" />查看</el-button>
-          </div>
-        </template>
+        <template #actions="{ row }"><div class="row-actions density-actions admin-text-actions" :class="{ 'density-actions': isPreload }">
+            <el-button v-if="canView" :class="{ 'density-action': isPreload }" size="small" :type="isPreload ? undefined : 'primary'" :plain="!isPreload" @click="openDetail(row)">查看</el-button>
+            <el-button v-if="canView && !isPreload" class="density-action" size="small" @click="printConfirmed(row as LoadingListSummary)">打印</el-button>
+          </div></template>
        <template #customers="{ row }"><LineClampText :content="(row as PreloadSummary).customers.map((item) => item.customerName || '客户信息缺失').join('、')" /></template>
        <template #vesselVoyage="{ row }">{{ (row as PreloadSummary).vesselName || '—' }} / {{ (row as PreloadSummary).voyageNo || '—' }}</template>
        <template #status="{ row }"><StatusBadge :status="loadingListStatusLabel(row.status)" /></template>
@@ -230,8 +235,7 @@ onMounted(() => {
        <template #netWeight="{ row }">{{ formatNumber((row as ConfirmedSummary).totalNetWeightKg) }}</template>
        <template #volume="{ row }">{{ formatNumber(row.totalVolumeCbm) }}</template>
        <template #createdAt="{ row }">{{ formatDateTime(row.createdAt) }}</template>
-      </DataTable>
-    </section>
+      </DataTable></section>
    </ListPageLayout>

  </div>
@@ -11,3 +11,4 @@ export { loadingListStatusLabel } from './status'
 export { default as ContainerFeesPanel } from './components/ContainerFeesPanel.vue'
 export { default as LoadingListDetailDrawer } from './components/LoadingListDetailDrawer.vue'
 export { default as PalletLabelPrintDialog } from './components/PalletLabelPrintDialog.vue'
+export { useLoadingListDetail } from './useLoadingListDetail'
@@ -0,0 +1,65 @@
+import { flushPromises, shallowMount } from '@vue/test-utils'
+import { beforeEach, afterEach, describe, expect, it, vi } from 'vitest'
+import { reactive } from 'vue'
+import ConfirmedLoadingListDetailView from './ConfirmedLoadingListDetailView.vue'
+
+const mocks = vi.hoisted(() => ({ get: vi.fn(), push: vi.fn(), replace: vi.fn(), back: vi.fn(), route: { params: { planId: '1' }, query: { warehouseId: '11' } as Record<string, string> } }))
+vi.mock('vue-router', () => ({ useRoute: () => mocks.route, useRouter: () => mocks }))
+vi.mock('../api/platformLoadingLists', () => ({ getConfirmedLoadingList: mocks.get, getPreloadPlan: vi.fn() }))
+vi.mock('@/shared/api/http', () => ({ getApiErrorDetails: (cause: Error) => ({ message: cause.message }) }))
+
+function render() {
+  return shallowMount(ConfirmedLoadingListDetailView, { global: { stubs: {
+    AdminPage: { template: '<main><slot /></main>' },
+    LoadingListDetailDrawer: { name: 'LoadingListDetailDrawer', props: ['detail', 'error', 'loading'], template: '<section />' },
+  } } })
+}
+const completed = (planId = '1') => ({ summary: { status: 'COMPLETED', planId, loadingListNo: `LIST-${planId}` }, items: [], histories: [] })
+
+describe('confirmed loading list detail page', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    mocks.route = reactive({ params: { planId: '1' }, query: { warehouseId: '11' } })
+    mocks.get.mockResolvedValue(completed())
+    vi.spyOn(window, 'print').mockImplementation(() => {})
+  })
+  afterEach(() => vi.restoreAllMocks())
+  it('loads read-only detail on the dedicated page and returns to the list', async () => {
+    const wrapper = render(); await flushPromises()
+    expect(mocks.get).toHaveBeenCalledWith('1', '11')
+    const detail = wrapper.findComponent({ name: 'LoadingListDetailDrawer' })
+    expect(detail.props('detail')).toEqual(completed())
+    expect(window.print).not.toHaveBeenCalled()
+    vi.spyOn(window.history, 'length', 'get').mockReturnValue(1)
+    detail.vm.$emit('back')
+    expect(mocks.push).toHaveBeenCalledWith({ name: 'loading-lists' })
+    wrapper.unmount()
+  })
+  it('prints only after detail has loaded and removes the print request', async () => {
+    mocks.route.query.print = '1'
+    const wrapper = render(); await flushPromises()
+    expect(window.print).toHaveBeenCalledTimes(1)
+    expect(wrapper.findComponent({ name: 'LoadingListDetailDrawer' }).props('loading')).toBe(false)
+    expect(mocks.replace).toHaveBeenCalledWith({ name: 'loading-list-detail', params: { planId: '1' }, query: { warehouseId: '11' } })
+    wrapper.unmount()
+  })
+  it('keeps failure visible and does not print when loading fails', async () => {
+    mocks.route.query.print = '1'
+    mocks.get.mockRejectedValueOnce(new Error('清单不可用'))
+    const wrapper = render(); await flushPromises()
+    expect(wrapper.findComponent({ name: 'LoadingListDetailDrawer' }).props('error').message).toBe('清单不可用')
+    expect(window.print).not.toHaveBeenCalled()
+    wrapper.unmount()
+  })
+  it('ignores a stale response after switching manifests', async () => {
+    let resolveFirst!: (value: unknown) => void
+    mocks.get.mockImplementationOnce(() => new Promise(resolve => { resolveFirst = resolve }))
+      .mockResolvedValueOnce(completed('2'))
+    const wrapper = render()
+    mocks.route.params.planId = '2'
+    await flushPromises()
+    resolveFirst(completed()); await flushPromises()
+    expect(wrapper.findComponent({ name: 'LoadingListDetailDrawer' }).props('detail')).toEqual(completed('2'))
+    wrapper.unmount()
+  })
+})
@@ -1,49 +1,23 @@
 <script setup lang="ts">
-import { computed, onMounted, ref, watch } from 'vue'
+import { computed, onMounted, watch } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
-import { getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
 import AdminPage from '@/shared/components/AdminPage.vue'
 import LoadingListDetailDrawer from '../components/LoadingListDetailDrawer.vue'
-import {
-  getConfirmedLoadingList,
-  type ConfirmedSummary,
-  type LoadingDetail,
-} from '../api/platformLoadingLists'
+import { useLoadingListDetail } from '../useLoadingListDetail'
+import { printLoadingList } from '../printLoadingList'

 const route = useRoute()
 const router = useRouter()
-const loading = ref(false)
-const detail = ref<LoadingDetail<ConfirmedSummary> | null>(null)
-const error = ref<ApiErrorDetails | null>(null)
-let loadSequence = 0
+const { detail, loading, error, load } = useLoadingListDetail()
 const planId = computed(() => String(route.params.planId || ''))
 const warehouseId = computed(() => typeof route.query.warehouseId === 'string' ? route.query.warehouseId : '')

 async function loadDetail() {
-  const sequence = ++loadSequence
-  detail.value = null
-  if (!planId.value || !warehouseId.value) {
-    loading.value = false
-    error.value = { code: 'MISSING_WAREHOUSE_CONTEXT', message: '该清单缺少所属仓库信息，无法安全查询详情，请返回列表重新进入。' }
-    return
-  }
-  loading.value = true
-  error.value = null
-  try {
-    const result = await getConfirmedLoadingList(planId.value, warehouseId.value)
-    if (sequence !== loadSequence) return
-    if (result.summary.status !== 'COMPLETED') {
-      error.value = { code: 'MODE_STATUS_MISMATCH', message: '该计划尚未形成正式装柜清单，请从预装清单入口查看。' }
-      return
-    }
-    detail.value = result
-  } catch (cause) {
-    if (sequence !== loadSequence) return
-    detail.value = null
-    error.value = getApiErrorDetails(cause, '装柜清单详情加载失败，请稍后重试')
-  } finally {
-    if (sequence === loadSequence) loading.value = false
-  }
+  const result = await load('confirmed', planId.value, warehouseId.value)
+  if (!result || detail.value !== result || route.query.print !== '1') return
+  await printLoadingList()
+  const { print: _print, ...query } = route.query
+  await router.replace({ name: 'loading-list-detail', params: { planId: planId.value }, query })
 }

 function goBack() {
@@ -58,7 +32,7 @@ watch([planId, warehouseId], () => void loadDetail())
 <template>
  <AdminPage>
    <div class="confirmed-loading-detail-page">
-      <LoadingListDetailDrawer
+      <LoadingListDetailDrawer dense
        mode="confirmed"
        :loading="loading"
        :detail="detail"
@@ -0,0 +1,6 @@
+import { nextTick } from 'vue'
+
+export async function printLoadingList() {
+  await nextTick()
+  window.print()
+}
@@ -2,8 +2,10 @@ import { describe, expect, it } from 'vitest'
 import { loadingListRoutes } from './routes'

 describe('loading list routes', () => {
-  it('keeps completed loading lists inside domestic container detail', () => {
+  it('registers the confirmed list with its own read permission', () => {
    expect(loadingListRoutes.map((route) => [route.path, route.meta.permission])).toEqual([
+      ['loading-lists/:planId', 'platform:firstleg:loading-list:list'],
+      ['loading-lists', 'platform:firstleg:loading-list:list'],
      ['loading-plans', 'platform:firstleg:preload:list'],
      ['loading-plans/:planId', 'platform:firstleg:preload:list'],
    ])
@@ -1,11 +1,23 @@
 import type { RouteRecordRaw } from 'vue-router'

 export const loadingListRoutes = [
+  {
+    path: 'loading-lists/:planId',
+    name: 'loading-list-detail',
+    component: () => import('./pages/ConfirmedLoadingListDetailView.vue'),
+    meta: { title: '装柜清单详情', showPageHeading: false, permission: 'platform:firstleg:loading-list:list' },
+  },
+  {
+    path: 'loading-lists',
+    name: 'loading-lists',
+    component: () => import('./pages/ConfirmedLoadingListsView.vue'),
+    meta: { title: '装柜清单', showPageHeading: false, permission: 'platform:firstleg:loading-list:list' },
+  },
  {
    path: 'loading-plans',
    name: 'loading-plans',
    component: () => import('./pages/PreloadPlansView.vue'),
-    meta: {
+    meta: { showPageHeading: false,
      title: '预装清单',
      description: '查看全部仓库拣货中的预装计划、货物明细和操作历史',
      permission: 'platform:firstleg:preload:list',
@@ -0,0 +1,67 @@
+import { effectScope } from 'vue'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { getConfirmedLoadingList, getPreloadPlan } from './api/platformLoadingLists'
+import { useLoadingListDetail } from './useLoadingListDetail'
+
+vi.mock('./api/platformLoadingLists', () => ({ getConfirmedLoadingList: vi.fn(), getPreloadPlan: vi.fn() }))
+const scopes: ReturnType<typeof effectScope>[] = []
+function createLoader() {
+  const scope = effectScope()
+  scopes.push(scope)
+  return scope.run(useLoadingListDetail)!
+}
+const result = (status = 'COMPLETED') => ({ summary: { planId: '1', status }, items: [], histories: [] })
+
+beforeEach(() => vi.resetAllMocks())
+afterEach(() => { scopes.splice(0).forEach(scope => scope.stop()) })
+
+describe('shared loading list data', () => {
+  it('uses the same confirmed data once per plan and warehouse', async () => {
+    vi.mocked(getConfirmedLoadingList).mockResolvedValue(result() as never)
+    const state = createLoader()
+    await state.load('confirmed', '1', '11')
+    await state.load('confirmed', '1', '11')
+    expect(getConfirmedLoadingList).toHaveBeenCalledExactlyOnceWith('1', '11')
+    expect(state.detail.value).toEqual(result())
+    expect(state.loading.value).toBe(false)
+  })
+  it('switches APIs when a preload becomes confirmed and rejects an uncompleted manifest', async () => {
+    vi.mocked(getPreloadPlan).mockResolvedValue(result('LOADING') as never)
+    vi.mocked(getConfirmedLoadingList).mockResolvedValue(result('LOADING') as never)
+    const state = createLoader()
+    await state.load('preload', '1', '11')
+    expect(getPreloadPlan).toHaveBeenCalledExactlyOnceWith('1', '11')
+    await state.load('confirmed', '1', '11')
+    expect(state.detail.value).toBeNull()
+    expect(state.error.value?.code).toBe('MODE_STATUS_MISMATCH')
+  })
+  it('does not request detail without warehouse context', async () => {
+    const state = createLoader()
+    await state.load('confirmed', '1', '')
+    expect(state.error.value?.code).toBe('MISSING_WAREHOUSE_CONTEXT')
+    expect(getConfirmedLoadingList).not.toHaveBeenCalled()
+  })
+  it('supports retry after failure and reload after reset', async () => {
+    vi.mocked(getConfirmedLoadingList).mockRejectedValueOnce(new Error('failure')).mockResolvedValue(result() as never)
+    const state = createLoader()
+    await state.load('confirmed', '1', '11')
+    expect(state.error.value).not.toBeNull()
+    await state.load('confirmed', '1', '11')
+    expect(state.error.value).toBeNull()
+    expect(state.detail.value).toEqual(result())
+    state.reset()
+    await state.load('confirmed', '1', '11')
+    expect(getConfirmedLoadingList).toHaveBeenCalledTimes(3)
+  })
+  it('does not reuse an old plan when its request finishes after switching', async () => {
+    let resolveFirst!: (value: never) => void
+    vi.mocked(getConfirmedLoadingList).mockImplementationOnce(() => new Promise(resolve => { resolveFirst = resolve }))
+      .mockResolvedValueOnce({ ...result(), summary: { planId: '2', status: 'COMPLETED' } } as never)
+    const state = createLoader()
+    const first = state.load('confirmed', '1', '11')
+    await state.load('confirmed', '2', '22')
+    resolveFirst(result() as never)
+    await first
+    expect(state.detail.value?.summary.planId).toBe('2')
+  })
+})
@@ -0,0 +1,53 @@
+import { onScopeDispose, ref } from 'vue'
+import { getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
+import { getConfirmedLoadingList, getPreloadPlan, type LoadingDetail, type LoadingListMode } from './api/platformLoadingLists'
+
+export function useLoadingListDetail(api = { getConfirmedLoadingList, getPreloadPlan }) {
+  const detail = ref<LoadingDetail | null>(null)
+  const loading = ref(false)
+  const error = ref<ApiErrorDetails | null>(null)
+  let sequence = 0
+  let currentKey = ''
+
+  function reset() {
+    ++sequence
+    currentKey = ''
+    detail.value = null
+    loading.value = false
+    error.value = null
+  }
+
+  async function load(mode: LoadingListMode, planId: string, warehouseId: string) {
+    const key = `${mode}:${planId}:${warehouseId}`
+    if (key === currentKey && (detail.value || loading.value)) return detail.value
+    const request = ++sequence
+    currentKey = key
+    detail.value = null
+    error.value = null
+    loading.value = true
+    try {
+      if (!planId || !warehouseId) {
+        error.value = { code: 'MISSING_WAREHOUSE_CONTEXT', message: '该清单缺少计划或所属仓库信息，无法查询详情，请返回重新进入。' }
+        return null
+      }
+      const result = mode === 'confirmed'
+        ? await api.getConfirmedLoadingList(planId, warehouseId)
+        : await api.getPreloadPlan(planId, warehouseId)
+      if (request !== sequence) return null
+      if (mode === 'confirmed' && result.summary.status !== 'COMPLETED') {
+        error.value = { code: 'MODE_STATUS_MISMATCH', message: '该计划尚未形成正式装柜清单，请从预装清单入口查看。' }
+        return null
+      }
+      detail.value = result
+      return detail.value
+    } catch (cause) {
+      if (request === sequence) error.value = getApiErrorDetails(cause, '装柜清单加载失败')
+      return null
+    } finally {
+      if (request === sequence) loading.value = false
+    }
+  }
+
+  onScopeDispose(reset)
+  return { detail, loading, error, load, reset }
+}
@@ -139,12 +139,12 @@ describe('PartnersView real API integration', () => {
    expect(wrapper.text()).not.toContain('往来单位档案')
    expect(wrapper.find('.query-toolbar').exists()).toBe(true)
    expect(wrapper.find('.data-table').exists()).toBe(true)
-    expect(wrapper.find('.table-panel').exists()).toBe(true)
+    expect(wrapper.find('.el-table').exists()).toBe(true)
    expect(wrapper.find('.query-toolbar__actions').text()).not.toContain('新增往来单位')
    expect(wrapper.find('.data-table__business-actions').text()).toContain('新增往来单位')
-    expect(wrapper.find('.data-table__toolbar-start').exists()).toBe(false)
+    expect(wrapper.get('.data-table__toolbar-start h1').text()).toBe('往来单位')
    expect(wrapper.find('.data-table__pagination-left').text()).toContain('平台公共数据 · 共 1 个往来单位')
-    expect(wrapper.find('.list-page-layout__state').exists()).toBe(false)
+    expect(wrapper.find('.data-table__notices').exists()).toBe(false)
    const detailButton = wrapper.findAll('button').find((button) => button.text().trim() === '详情')
    await detailButton?.trigger('click')
    await flushPromises()
@@ -248,8 +248,8 @@ describe('PartnersView real API integration', () => {
    expect(wrapper.text()).not.toContain('Gateway unavailable')
    expect(wrapper.text()).toContain('重新加载')
    expect(wrapper.text()).not.toContain('深圳示例贸易有限公司')
-    expect(wrapper.find('.list-page-layout__state').exists()).toBe(true)
-    expect(wrapper.find('.table-panel').exists()).toBe(false)
+    expect(wrapper.find('.data-table__notices').exists()).toBe(true)
+    expect(wrapper.find('.el-table').exists()).toBe(false)
  })

  it('keeps the latest detail when an older partner request finishes last', async () => {
@@ -373,23 +373,11 @@ onMounted(() => {
 <template>
  <AdminPage as="div" class="partners-page admin-density" spacing="normal">
    <ListPageLayout aria-label="往来单位管理">
-      <template #toolbar>
-        <QueryToolbar v-model="filters" class="surface-panel" ariaLabel="往来单位筛选" :fields="queryFields" preference-key="partners-query" @search="searchPartners" />
-      </template>

-      <template v-if="loadError" #state>
-        <LoadErrorState
-          title="往来单位列表暂时无法加载"
-          :message="loadError.message"
-          :loading="loading"
-          @retry="loadPartners()"
-        >
-          <template #details><ApiErrorMeta :details="loadError" /></template>
-        </LoadErrorState>
-      </template>

-      <section v-if="!loadError" class="surface-panel table-panel" :aria-busy="loading">
-      <DataTable
+
+
+      <section :aria-busy="loading"><DataTable appearance="integrated" :stripe="false" column-settings-mode="show" :results-visible="!loadError"
        v-model:page="page"
        v-model:page-size="pageSize"
        :data="rows"
@@ -402,21 +390,34 @@ onMounted(() => {
        row-key="id"
        empty-text="暂无符合条件的往来单位"
      >
+        <template #toolbar-start><h1>往来单位</h1></template>
+        <template #filters>
+        <QueryToolbar v-model="filters" ariaLabel="往来单位筛选" :fields="queryFields" preference-key="partners-query" @search="searchPartners" />
+      </template>
+        <template #notices><template v-if="loadError">
+        <LoadErrorState
+          title="往来单位列表暂时无法加载"
+          :message="loadError.message"
+          :loading="loading"
+          @retry="loadPartners()"
+        >
+          <template #details><ApiErrorMeta :details="loadError" /></template>
+        </LoadErrorState>
+      </template></template>
+
+
        <template #toolbar-actions><div class="partners-primary-actions"><el-button v-if="access.can('platform:counterparty:import')" :disabled="loading" @click="openImport"><FileUp :size="16" />批量导入</el-button><el-button v-if="access.can('platform:counterparty:create')" type="primary" :disabled="loading" @click="openCreate"><Plus :size="16" />新增往来单位</el-button></div></template>
-        <template #actions="{ row }">
-          <div class="table-actions density-actions">
+        <template #actions="{ row }"><div class="table-actions density-actions row-actions admin-text-actions">
            <el-button data-tone="neutral" class="density-action" size="small" @click="openDetail(row as PlatformPartnerResource)">详情</el-button>
            <el-button data-tone="neutral" class="density-action" v-if="access.can('platform:counterparty:edit')" size="small" :disabled="loading" @click="openEdit(row as PlatformPartnerResource)">编辑</el-button>
            <el-button class="density-action" v-if="access.can('platform:counterparty:status')" size="small" :disabled="loading" :data-tone="(row as PlatformPartnerResource).status === 'ACTIVE' ? 'danger' : 'success'" :loading="statusLoadingIds.has(String((row as PlatformPartnerResource).id))" @click="toggleStatus(row as PlatformPartnerResource)">{{ (row as PlatformPartnerResource).status === 'ACTIVE' ? '停用' : '启用' }}</el-button>
-          </div>
-        </template>
+          </div></template>
        <template #partner="{ row }"><div class="partner-cell"><span><Building2 :size="18" /></span><div><LineClampText :content="(row as PlatformPartnerResource).partnerName" /></div></div></template>
        <template #type="{ row }"><div class="partner-types"><el-tag v-for="type in (row as PlatformPartnerResource).types" :key="type" effect="plain">{{ partnerTypeLabel(type) }}</el-tag></div></template>
        <template #address="{ row }"><div class="partner-address"><MapPin :size="15" /><span>{{ [(row as PlatformPartnerResource).province, (row as PlatformPartnerResource).city, (row as PlatformPartnerResource).district, (row as PlatformPartnerResource).addressLine].filter(Boolean).join(' ') }}</span></div></template>
        <template #status="{ row }"><el-tag :type="(row as PlatformPartnerResource).status === 'ACTIVE' ? 'success' : 'info'" effect="light">{{ (row as PlatformPartnerResource).status === 'ACTIVE' ? '启用' : '停用' }}</el-tag></template>
        <template #pagination-left>平台公共数据 · 共 {{ total }} 个往来单位</template>
-      </DataTable>
-      </section>
+      </DataTable></section>
    </ListPageLayout>

    <AppDrawer
@@ -111,7 +111,7 @@ describe('ExpressCompaniesView query and table migration', () => {
    expect(wrapper.text()).toContain('顺丰速运')
    expect(wrapper.text()).toContain('平台公共数据 · 共 1 家快递公司')
    expect(wrapper.find('.metric-strip').exists()).toBe(false)
-    expect(wrapper.find('.list-page-layout__state').exists()).toBe(false)
+    expect(wrapper.find('.data-table__notices').exists()).toBe(false)
    expect(listPlatformExpressCompanies).toHaveBeenCalledWith(1, 20, '', '')
    expect(wrapper.find('.data-table').text()).not.toContain('轨迹查询模板')
    expect(wrapper.find('.data-table').text()).not.toContain('测试数据')
@@ -121,8 +121,8 @@ describe('ExpressCompaniesView query and table migration', () => {
    vi.mocked(listPlatformExpressCompanies).mockRejectedValueOnce(new Error('Gateway unavailable'))
    const wrapper = await mountView()

-    expect(wrapper.find('.list-page-layout__state').exists()).toBe(true)
-    expect(wrapper.find('.table-panel').exists()).toBe(false)
+    expect(wrapper.find('.data-table__notices').exists()).toBe(true)
+    expect(wrapper.find('.el-table').exists()).toBe(false)
    expect(wrapper.text()).toContain('快递公司加载失败')
    expect(wrapper.text()).not.toContain('Gateway unavailable')
  })
@@ -284,20 +284,10 @@ onMounted(() => {
  <AdminPage class="admin-density">
    <div class="business-page express-company-page">
      <ListPageLayout ariaLabel="快递公司列表">
-        <template #toolbar>
-          <QueryToolbar v-model="filters" class="surface-panel" ariaLabel="快递公司筛选" :fields="queryFields" preference-key="express-companies-query" @search="applyFilters" />
-        </template>
-        <template v-if="loadError" #state>
-    <el-alert type="error" :closable="false" show-icon class="state-alert">
-      <template #title>快递公司加载失败</template>
-      <p>{{ loadError.message }}</p>
-      <ApiErrorMeta :details="loadError" />
-      <el-button size="small" @click="loadExpressCompanies()">重新查询</el-button>
-    </el-alert>
-        </template>

-    <section v-if="!loadError" class="surface-panel table-panel">
-      <DataTable
+
+
+    <section><DataTable appearance="integrated" :stripe="false" column-settings-mode="show" :results-visible="!loadError"
        v-model:page="page"
        v-model:page-size="pageSize"
        :data="rows"
@@ -310,8 +300,22 @@ onMounted(() => {
        row-key="id"
        :empty-text="appliedFilters.keyword.trim() || appliedFilters.status ? '暂无符合筛选条件的快递公司' : '暂无快递公司档案'"
      >
+        <template #toolbar-start><h1>快递公司</h1></template>
+        <template #filters>
+          <QueryToolbar v-model="filters" ariaLabel="快递公司筛选" :fields="queryFields" preference-key="express-companies-query" @search="applyFilters" />
+        </template>
+        <template #notices><template v-if="loadError">
+    <el-alert type="error" :closable="false" show-icon class="state-alert">
+      <template #title>快递公司加载失败</template>
+      <p>{{ loadError.message }}</p>
+      <ApiErrorMeta :details="loadError" />
+      <el-button size="small" @click="loadExpressCompanies()">重新查询</el-button>
+    </el-alert>
+        </template></template>
+
+
        <template #toolbar-actions><div class="table-actions"><el-button v-if="access.can('platform:express:import')" :disabled="loading" @click="openImport"><FileUp :size="16" />批量导入</el-button><el-button v-if="access.can('platform:express:create')" type="primary" :disabled="loading" @click="openCreate"><Plus :size="16" />新增快递公司</el-button></div></template>
-        <template #actions="{ row }">
+        <template #actions="{ row }"><div class="row-actions density-actions admin-text-actions">
          <div v-if="access.can('platform:express:edit') || access.can('platform:express:status')" class="table-actions density-actions">
            <el-button data-tone="neutral" class="density-action"
              v-if="access.can('platform:express:edit')"
@@ -333,7 +337,7 @@ onMounted(() => {
            >{{ (row as PlatformExpressCompanyResource).status === 'ACTIVE' ? '停用' : '启用' }}</el-button>
          </div>
          <span v-else class="muted-value">仅查看</span>
-        </template>
+        </div></template>
        <template #company="{ row }"><div class="express-company-cell"><span><Truck :size="17" /></span><div><strong>{{ (row as PlatformExpressCompanyResource).companyName }}</strong></div></div></template>
        <template #website="{ row }">
          <a v-if="safeHttpUrl((row as PlatformExpressCompanyResource).website)" class="external-link" :href="safeHttpUrl((row as PlatformExpressCompanyResource).website)!" target="_blank" rel="noopener noreferrer">访问官网<ExternalLink :size="13" /></a>
@@ -346,8 +350,7 @@ onMounted(() => {
          </el-empty>
        </template>
        <template #pagination-left="{ total: tableTotal }"><span>平台公共数据 · 共 {{ tableTotal }} 家快递公司</span></template>
-      </DataTable>
-    </section>
+      </DataTable></section>
      </ListPageLayout>

    <BatchImportDialog class="admin-density-dialog"
@@ -5,12 +5,12 @@ export const masterDataRoutes = [
    path: 'master-data/express-companies',
    name: 'express-companies',
    component: () => import('@/modules/master-data/express-companies/pages/ExpressCompaniesView.vue'),
-    meta: { title: '快递公司', description: '查询平台可用的快递公司档案与公开联系信息', permission: 'platform:express:list' },
+    meta: { showPageHeading: false, title: '快递公司', description: '查询平台可用的快递公司档案与公开联系信息', permission: 'platform:express:list' },
  },
  {
    path: 'master-data/counterparties',
    name: 'counterparties',
    component: () => import('@/modules/master-data/counterparties/pages/PartnersView.vue'),
-    meta: { title: '往来单位', description: '维护客户、供应商及客户/供应商双重类型单位档案', permission: 'platform:counterparty:list' },
+    meta: { showPageHeading: false, title: '往来单位', description: '维护客户、供应商及客户/供应商双重类型单位档案', permission: 'platform:counterparty:list' },
  },
 ] satisfies RouteRecordRaw[]
@@ -18,7 +18,12 @@ function search(){page.value===1?void load():page.value=1}
 async function action(row:NotificationTask,type:'cancel'|'retry'){try{await ElMessageBox.confirm(type==='cancel'?'确定取消该消息任务吗？':'确定重试该消息任务吗？',type==='cancel'?'取消任务':'重试任务',{type:'warning',customClass:'admin-density-confirm'});actionId.value=row.id;if(type==='cancel')await cancelTask(row.id);else await retryTask(row.id);ElMessage.success(type==='cancel'?'任务已取消':'任务已提交重试');await load()}catch(e){if(e!=='cancel'&&e!=='close')ElMessage.error(getApiErrorMessage(e,type==='cancel'?'取消失败':'重试失败'))}finally{actionId.value=''}}
 watch([page,pageSize],load);onMounted(()=>{void load();void loadTemplates()})
 </script>
-<template><AdminPage class="admin-density"><ListPageLayout aria-label="消息管理列表"><template #toolbar><QueryToolbar v-model="filters" class="surface-panel" ariaLabel="消息任务筛选" :fields="queryFields" preference-key="notifications-messages-query" @search="search" /></template><template v-if="error" #state><LoadErrorState title="消息任务加载失败" :message="error.message" :loading="loading" @retry="load"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState></template><section v-if="!error" class="surface-panel table-panel"><DataTable v-model:page="page" v-model:page-size="pageSize" :data="result.records" :columns="columns" preference-key="notifications-messages-table" :loading="loading" :total="result.total" row-key="id" empty-text="暂无消息任务"><template #toolbar-actions><el-button v-if="access.can('platform:notification:create')" type="primary" :disabled="!templates.length" @click="composerOpen=true"><Plus :size="16"/>新建消息</el-button></template><template #pagination-left><span>共 {{ result.total }} 个任务</span></template><template #actions="{row}"><div class="density-actions"><el-button class="density-action" data-tone="neutral" @click="openDetail(row as NotificationTask)">查看</el-button><el-button v-if="access.can('platform:notification:task:cancel')&&['CREATED','SCHEDULED'].includes((row as NotificationTask).status)" class="density-action" data-tone="danger" :loading="actionId===(row as NotificationTask).id" @click="action(row as NotificationTask,'cancel')">取消</el-button><el-button v-if="access.can('platform:notification:task:retry')&&['RETRYING','DEAD'].includes((row as NotificationTask).status)" class="density-action" data-tone="neutral" :loading="actionId===(row as NotificationTask).id" @click="action(row as NotificationTask,'retry')">重试</el-button></div></template><template #category="{row}">{{notificationCategoryLabel((row as NotificationTask).category)}}</template><template #scheduledAt="{row}">{{formatDate((row as NotificationTask).scheduledAt)}}</template><template #sentAt="{row}">{{formatDate((row as NotificationTask).sentAt)}}</template><template #status="{row}"><el-tag>{{statusLabel((row as NotificationTask).status)}}</el-tag></template></DataTable></section></ListPageLayout><MessageComposerDialog v-model="composerOpen" :templates="templates" @success="load"/><AppDrawer class="admin-density admin-density-drawer" v-model="detailOpen" title="消息任务详情" size="min(820px, 94vw)" :loading="detailLoading" :show-footer="false" destroy-on-close><LoadErrorState v-if="detailError" title="消息任务详情加载失败" :message="detailError.message" :loading="detailLoading"><template #details><ApiErrorMeta :details="detailError" /></template></LoadErrorState><template v-else-if="detail"><dl class="detail-grid density-fields"><div><dt>任务号</dt><dd>{{detail.taskNo}}</dd></div><div><dt>状态</dt><dd>{{statusLabel(detail.status)}}</dd></div><div><dt>业务分类</dt><dd>{{notificationCategoryLabel(detail.category)}}</dd></div><div><dt>接收人数</dt><dd>{{detail.recipientCount}}</dd></div><div><dt>尝试次数</dt><dd>{{detail.attemptCount}}</dd></div><div><dt>发送时间</dt><dd>{{formatDate(detail.sentAt)}}</dd></div></dl><section v-if="detail.lastError" class="failure-panel" role="alert"><strong>任务失败原因</strong><p>{{detail.lastError}}</p></section><h3 class="recipient-heading">收件人投递明细</h3><el-table :data="detail.recipients" row-key="id" empty-text="暂无收件人明细" size="small"><el-table-column prop="displayName" label="收件人" min-width="150"/><el-table-column label="应用端" width="110"><template #default="{row}">{{notificationAppLabel(row.appCode)}}</template></el-table-column><el-table-column label="投递状态" width="120"><template #default="{row}">{{notificationRecipientStatusLabel(row.status)}}</template></el-table-column><el-table-column label="送达时间" width="180"><template #default="{row}">{{formatDate(row.deliveredAt)}}</template></el-table-column><el-table-column prop="failureReason" label="失败原因" min-width="220"><template #default="{row}">{{row.failureReason||'—'}}</template></el-table-column></el-table></template></AppDrawer></AdminPage></template>
+<template><AdminPage class="admin-density"><ListPageLayout aria-label="消息管理列表"><section><DataTable appearance="integrated" :stripe="false" column-settings-mode="show" :results-visible="!error" v-model:page="page" v-model:page-size="pageSize" :data="result.records" :columns="columns" preference-key="notifications-messages-table" :loading="loading" :total="result.total" row-key="id" empty-text="暂无消息任务">
+        <template #toolbar-start><h1>消息管理</h1></template>
+        <template #filters><QueryToolbar v-model="filters" ariaLabel="消息任务筛选" :fields="queryFields" preference-key="notifications-messages-query" @search="search" /></template>
+        <template #notices><template v-if="error"><LoadErrorState title="消息任务加载失败" :message="error.message" :loading="loading" @retry="load"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState></template></template>
+
+<template #toolbar-actions><el-button v-if="access.can('platform:notification:create')" type="primary" :disabled="!templates.length" @click="composerOpen=true"><Plus :size="16"/>新建消息</el-button></template><template #pagination-left><span>共 {{ result.total }} 个任务</span></template><template #actions="{row}"><div class="density-actions row-actions admin-text-actions"><el-button class="density-action" data-tone="neutral" @click="openDetail(row as NotificationTask)">查看</el-button><el-button v-if="access.can('platform:notification:task:cancel')&&['CREATED','SCHEDULED'].includes((row as NotificationTask).status)" class="density-action" data-tone="danger" :loading="actionId===(row as NotificationTask).id" @click="action(row as NotificationTask,'cancel')">取消</el-button><el-button v-if="access.can('platform:notification:task:retry')&&['RETRYING','DEAD'].includes((row as NotificationTask).status)" class="density-action" data-tone="neutral" :loading="actionId===(row as NotificationTask).id" @click="action(row as NotificationTask,'retry')">重试</el-button></div></template><template #category="{row}">{{notificationCategoryLabel((row as NotificationTask).category)}}</template><template #scheduledAt="{row}">{{formatDate((row as NotificationTask).scheduledAt)}}</template><template #sentAt="{row}">{{formatDate((row as NotificationTask).sentAt)}}</template><template #status="{row}"><el-tag>{{statusLabel((row as NotificationTask).status)}}</el-tag></template></DataTable></section></ListPageLayout><MessageComposerDialog v-model="composerOpen" :templates="templates" @success="load"/><AppDrawer class="admin-density admin-density-drawer" v-model="detailOpen" title="消息任务详情" size="min(820px, 94vw)" :loading="detailLoading" :show-footer="false" destroy-on-close><LoadErrorState v-if="detailError" title="消息任务详情加载失败" :message="detailError.message" :loading="detailLoading"><template #details><ApiErrorMeta :details="detailError" /></template></LoadErrorState><template v-else-if="detail"><dl class="detail-grid density-fields"><div><dt>任务号</dt><dd>{{detail.taskNo}}</dd></div><div><dt>状态</dt><dd>{{statusLabel(detail.status)}}</dd></div><div><dt>业务分类</dt><dd>{{notificationCategoryLabel(detail.category)}}</dd></div><div><dt>接收人数</dt><dd>{{detail.recipientCount}}</dd></div><div><dt>尝试次数</dt><dd>{{detail.attemptCount}}</dd></div><div><dt>发送时间</dt><dd>{{formatDate(detail.sentAt)}}</dd></div></dl><section v-if="detail.lastError" class="failure-panel" role="alert"><strong>任务失败原因</strong><p>{{detail.lastError}}</p></section><h3 class="recipient-heading">收件人投递明细</h3><el-table :data="detail.recipients" row-key="id" empty-text="暂无收件人明细" size="small"><el-table-column prop="displayName" label="收件人" min-width="150"/><el-table-column label="应用端" width="110"><template #default="{row}">{{notificationAppLabel(row.appCode)}}</template></el-table-column><el-table-column label="投递状态" width="120"><template #default="{row}">{{notificationRecipientStatusLabel(row.status)}}</template></el-table-column><el-table-column label="送达时间" width="180"><template #default="{row}">{{formatDate(row.deliveredAt)}}</template></el-table-column><el-table-column prop="failureReason" label="失败原因" min-width="220"><template #default="{row}">{{row.failureReason||'—'}}</template></el-table-column></el-table></template></AppDrawer></AdminPage></template>
 <style scoped>
 .detail-grid.density-fields { grid-template-columns: repeat(2, minmax(0, 1fr)); margin-bottom: var(--admin-space-6); }
 .failure-panel { margin-bottom: var(--admin-space-6); padding: var(--admin-space-5); border: 1px solid #f2b8b5; border-radius: var(--admin-radius); background: #fff7f6; color: #9f2d27; }
@@ -11,4 +11,9 @@ function search(){page.value===1?void load():page.value=1}function create(){edit
 async function changeStatus(row:NotificationTemplate){const target=row.status==='DRAFT'?'ACTIVE':'DISABLED';try{await ElMessageBox.confirm(target==='ACTIVE'?'激活后模板不可再编辑，确定继续吗？':'禁用后首期不可重新启用，确定继续吗？',target==='ACTIVE'?'激活模板':'禁用模板',{type:'warning',customClass:'admin-density-confirm'});actionId.value=row.id;await changeTemplateStatus(row.id,target,row.version);ElMessage.success(target==='ACTIVE'?'模板已激活':'模板已禁用');await load()}catch(e){if(e!=='cancel'&&e!=='close')ElMessage.error(getApiErrorMessage(e,'模板状态变更失败'))}finally{actionId.value=''}}
 watch([page,pageSize],load);onMounted(load)
 </script>
-<template><AdminPage class="admin-density"><ListPageLayout aria-label="消息模板列表"><template #toolbar><QueryToolbar v-model="filters" class="surface-panel" ariaLabel="消息模板筛选" :fields="queryFields" preference-key="notifications-templates-query" @search="search"/></template><template v-if="error" #state><LoadErrorState title="模板加载失败" :message="error.message" :loading="loading" @retry="load"><template #details><ApiErrorMeta :details="error"/></template></LoadErrorState></template><section v-if="!error" class="surface-panel table-panel"><DataTable v-model:page="page" v-model:page-size="pageSize" :data="result.records" :columns="columns" preference-key="notifications-templates-table" :loading="loading" :total="result.total" row-key="id" empty-text="暂无消息模板"><template #toolbar-actions><el-button v-if="access.can('platform:notification:template:create')" type="primary" @click="create"><Plus :size="16"/>新增模板</el-button></template><template #pagination-left><span>共 {{result.total}} 个模板</span></template><template #actions="{row}"><div class="density-actions"><el-button v-if="access.can('platform:notification:template:edit')&&(row as NotificationTemplate).status==='DRAFT'" class="density-action" data-tone="neutral" @click="edit(row as NotificationTemplate)">编辑</el-button><el-button v-if="access.can('platform:notification:template:status')&&(row as NotificationTemplate).status!=='DISABLED'" class="density-action" :data-tone="(row as NotificationTemplate).status==='ACTIVE'?'danger':'success'" :loading="actionId===(row as NotificationTemplate).id" @click="changeStatus(row as NotificationTemplate)">{{(row as NotificationTemplate).status==='DRAFT'?'激活':'禁用'}}</el-button></div></template><template #status="{row}"><el-tag>{{statusLabel((row as NotificationTemplate).status)}}</el-tag></template></DataTable></section></ListPageLayout><TemplateEditorDialog v-model="editorOpen" :template="editing" @success="load"/></AdminPage></template>
+<template><AdminPage class="admin-density"><ListPageLayout aria-label="消息模板列表"><section><DataTable appearance="integrated" :stripe="false" column-settings-mode="show" :results-visible="!error" v-model:page="page" v-model:page-size="pageSize" :data="result.records" :columns="columns" preference-key="notifications-templates-table" :loading="loading" :total="result.total" row-key="id" empty-text="暂无消息模板">
+        <template #toolbar-start><h1>模板管理</h1></template>
+        <template #filters><QueryToolbar v-model="filters" ariaLabel="消息模板筛选" :fields="queryFields" preference-key="notifications-templates-query" @search="search"/></template>
+        <template #notices><template v-if="error"><LoadErrorState title="模板加载失败" :message="error.message" :loading="loading" @retry="load"><template #details><ApiErrorMeta :details="error"/></template></LoadErrorState></template></template>
+
+<template #toolbar-actions><el-button v-if="access.can('platform:notification:template:create')" type="primary" @click="create"><Plus :size="16"/>新增模板</el-button></template><template #pagination-left><span>共 {{result.total}} 个模板</span></template><template #actions="{row}"><div class="density-actions row-actions admin-text-actions"><el-button v-if="access.can('platform:notification:template:edit')&&(row as NotificationTemplate).status==='DRAFT'" class="density-action" data-tone="neutral" @click="edit(row as NotificationTemplate)">编辑</el-button><el-button v-if="access.can('platform:notification:template:status')&&(row as NotificationTemplate).status!=='DISABLED'" class="density-action" :data-tone="(row as NotificationTemplate).status==='ACTIVE'?'danger':'success'" :loading="actionId===(row as NotificationTemplate).id" @click="changeStatus(row as NotificationTemplate)">{{(row as NotificationTemplate).status==='DRAFT'?'激活':'禁用'}}</el-button></div></template><template #status="{row}"><el-tag>{{statusLabel((row as NotificationTemplate).status)}}</el-tag></template></DataTable></section></ListPageLayout><TemplateEditorDialog v-model="editorOpen" :template="editing" @success="load"/></AdminPage></template>
@@ -81,18 +81,21 @@ onMounted(() => void load())
 <template>
  <AdminPage class="admin-density">
    <ListPageLayout aria-label="我的消息列表">
-      <template #toolbar><QueryToolbar v-model="filters" class="surface-panel" ariaLabel="我的消息筛选" :fields="queryFields" preference-key="notifications-inbox-query" @search="search" /></template>
-      <template v-if="error" #state><LoadErrorState title="我的消息加载失败" :message="error.message" :loading="loading" @retry="load"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState></template>
-      <section v-if="!error" class="surface-panel table-panel">
-        <DataTable v-model:page="page" v-model:page-size="pageSize" :data="result.records" :columns="columns" :loading="loading" :total="result.total" row-key="id" empty-text="暂无消息">
+
+
+      <section><DataTable preference-key="notifications-platformnotificationsview" appearance="integrated" :stripe="false" column-settings-mode="show" :results-visible="!error" v-model:page="page" v-model:page-size="pageSize" :data="result.records" :columns="columns" :loading="loading" :total="result.total" row-key="id" empty-text="暂无消息">
+        <template #toolbar-start><h1>我的消息</h1></template>
+        <template #filters><QueryToolbar v-model="filters" ariaLabel="我的消息筛选" :fields="queryFields" preference-key="notifications-inbox-query" @search="search" /></template>
+        <template #notices><template v-if="error"><LoadErrorState title="我的消息加载失败" :message="error.message" :loading="loading" @retry="load"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState></template></template>
+
+
          <template #toolbar-actions><el-button v-if="canReadAll && unreadCount" type="primary" plain :disabled="loading" @click="markAllRead"><CheckCheck :size="16" />全部标为已读</el-button></template>
          <template #pagination-left><span>共 {{ result.total }} 条<span v-if="unreadCount">，未读 {{ unreadCount }} 条</span></span></template>
-          <template #actions="{ row }"><div class="density-actions"><el-button class="density-action" data-tone="neutral" @click="openDetail(row as NotificationInboxItem)">查看</el-button><el-button v-if="canRead && (row as NotificationInboxItem).status === 'UNREAD'" class="density-action" data-tone="neutral" @click="markRead(row as NotificationInboxItem)">标为已读</el-button></div></template>
+          <template #actions="{ row }"><div class="density-actions row-actions admin-text-actions"><el-button class="density-action" data-tone="neutral" @click="openDetail(row as NotificationInboxItem)">查看</el-button><el-button v-if="canRead && (row as NotificationInboxItem).status === 'UNREAD'" class="density-action" data-tone="neutral" @click="markRead(row as NotificationInboxItem)">标为已读</el-button></div></template>
          <template #category="{ row }">{{ notificationCategoryLabel((row as NotificationInboxItem).category) }}</template>
          <template #sentAt="{ row }">{{ formatDate((row as NotificationInboxItem).sentAt) }}</template>
          <template #status="{ row }"><el-tag :type="(row as NotificationInboxItem).status === 'UNREAD' ? 'danger' : 'info'">{{ statusLabel((row as NotificationInboxItem).status) }}</el-tag></template>
-        </DataTable>
-      </section>
+        </DataTable></section>
    </ListPageLayout>
    <AppDrawer class="admin-density admin-density-drawer" v-model="detailOpen" title="消息详情" size="min(680px, 94vw)" :loading="detailLoading" :show-footer="false" destroy-on-close>
      <LoadErrorState v-if="detailError" title="消息详情加载失败" :message="detailError.message" :loading="detailLoading"><template #details><ApiErrorMeta :details="detailError" /></template></LoadErrorState>
@@ -5,18 +5,18 @@ export const notificationRoutes = [
    path: 'notifications',
    name: 'notification-inbox',
    component: () => import('@/modules/notifications/pages/PlatformNotificationsView.vue'),
-    meta: { title: '我的消息', description: '查看当前平台账号的站内消息', permission: 'platform:notification:view' },
+    meta: { showPageHeading: false, title: '我的消息', description: '查看当前平台账号的站内消息', permission: 'platform:notification:view' },
  },
  {
    path: 'notifications/messages',
    name: 'notification-messages',
    component: () => import('@/modules/notifications/pages/MessageManagementView.vue'),
-    meta: { title: '消息管理', description: '创建并管理平台站内消息', permission: 'platform:notification:task:list' },
+    meta: { showPageHeading: false, title: '消息管理', description: '创建并管理平台站内消息', permission: 'platform:notification:task:list' },
  },
  {
    path: 'notifications/templates',
    name: 'notification-templates',
    component: () => import('@/modules/notifications/pages/MessageTemplatesView.vue'),
-    meta: { title: '模板管理', description: '维护平台站内消息模板', permission: 'platform:notification:template:list' },
+    meta: { showPageHeading: false, title: '模板管理', description: '维护平台站内消息模板', permission: 'platform:notification:template:list' },
  },
 ] satisfies RouteRecordRaw[]
@@ -71,19 +71,22 @@ onActivated(() => void load())
 <template>
  <AdminPage as="div" class="ocean-bookings-page admin-density">
    <ListPageLayout aria-label="订舱列表">
-      <template #toolbar><QueryToolbar v-model="query" class="surface-panel" ariaLabel="订舱筛选" :fields="fields" @search="search" /></template>
-      <template v-if="error" #state><LoadErrorState title="订舱列表加载失败" :message="error.message" :loading="loading" @retry="load"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState></template>
-      <section v-if="!error" class="surface-panel table-panel">
-      <DataTable v-model:page="page" v-model:page-size="pageSize" :data="rows" :columns="columns" :loading="loading" :total="total" stripe preference-key="ocean-bookings" aria-label="订舱列表" row-key="id" empty-text="暂无符合筛选条件的订舱">
+
+
+      <section><DataTable appearance="integrated" :stripe="false" column-settings-mode="show" :results-visible="!error" v-model:page="page" v-model:page-size="pageSize" :data="rows" :columns="columns" :loading="loading" :total="total" preference-key="ocean-bookings" aria-label="订舱列表" row-key="id" empty-text="暂无符合筛选条件的订舱">
+        <template #toolbar-start><h1>订舱列表</h1></template>
+        <template #filters><QueryToolbar v-model="query" ariaLabel="订舱筛选" :fields="fields" @search="search" /></template>
+        <template #notices><template v-if="error"><LoadErrorState title="订舱列表加载失败" :message="error.message" :loading="loading" @retry="load"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState></template></template>
+
+
        <template #toolbar-actions><el-button v-if="canCreate" type="primary" @click="createBooking"><Plus :size="16" />新增订舱</el-button></template>
-        <template #actions="{ row }"><div class="table-actions density-actions"><el-button data-tone="primary" class="density-action" size="small" type="primary" plain @click="open(row.id)">{{ row.status === 'DRAFT' ? '编辑' : '查看' }}</el-button><el-tooltip :content="printHint()" placement="top"><span><el-button class="density-action" size="small" plain :disabled="!canPrint" @click="openPrint(row)">打印单据</el-button></span></el-tooltip></div></template>
+        <template #actions="{ row }"><div class="table-actions density-actions row-actions admin-text-actions"><el-button data-tone="primary" class="density-action" size="small" type="primary" plain @click="open(row.id)">{{ row.status === 'DRAFT' ? '编辑' : '查看' }}</el-button><el-tooltip :content="printHint()" placement="top"><span><el-button class="density-action" size="small" plain :disabled="!canPrint" @click="openPrint(row)">打印单据</el-button></span></el-tooltip></div></template>
        <template #vessel="{ row }">{{ row.vesselName || '—' }}<span v-if="row.voyageNo"> / {{ row.voyageNo }}</span></template>
        <template #etd="{ row }">{{ formatDateTime(row.etd) }}</template>
        <template #eta="{ row }">{{ formatDateTime(row.eta) }}</template>
        <template #status="{ row }"><StatusBadge :status="oceanBookingStatusLabel(row.status)" /></template>
        <template #updatedAt="{ row }">{{ formatDateTime(row.updatedAt) }}</template>
-      </DataTable>
-      </section>
+      </DataTable></section>
    </ListPageLayout>
    <OceanBookingPrintDialog v-if="printBooking" v-model="printOpen" :booking-id="printBooking.id" :booking-no="printBooking.bookingNo" :allowed="canPrint" />
  </AdminPage>
@@ -1,2 +1,2 @@
 import type { RouteRecordRaw } from 'vue-router'
-export const oceanBookingRoutes = [{ path: 'ocean-bookings', name: 'ocean-bookings', component: () => import('./pages/OceanBookingsView.vue'), meta: { title: '海运订舱', description: '维护海运订舱申请、船期与放舱状态', permission: 'platform:firstleg:ocean-booking:list' } }, { path: 'ocean-bookings/new', name: 'ocean-booking-create', component: () => import('./pages/OceanBookingDetailView.vue'), meta: { title: '新增订舱', description: '登记线下已确认的真实海运订舱', permission: 'platform:firstleg:ocean-booking:create' } }, { path: 'ocean-bookings/:bookingId', name: 'ocean-booking-detail', component: () => import('./pages/OceanBookingDetailView.vue'), meta: { title: '订舱详情', description: '查看和维护订舱详情', permission: 'platform:firstleg:ocean-booking:list' } }] satisfies RouteRecordRaw[]
+export const oceanBookingRoutes = [{ path: 'ocean-bookings', name: 'ocean-bookings', component: () => import('./pages/OceanBookingsView.vue'), meta: { showPageHeading: false, title: '海运订舱', description: '维护海运订舱申请、船期与放舱状态', permission: 'platform:firstleg:ocean-booking:list' } }, { path: 'ocean-bookings/new', name: 'ocean-booking-create', component: () => import('./pages/OceanBookingDetailView.vue'), meta: { title: '新增订舱', description: '登记线下已确认的真实海运订舱', permission: 'platform:firstleg:ocean-booking:create' } }, { path: 'ocean-bookings/:bookingId', name: 'ocean-booking-detail', component: () => import('./pages/OceanBookingDetailView.vue'), meta: { title: '订舱详情', description: '查看和维护订舱详情', permission: 'platform:firstleg:ocean-booking:list' } }] satisfies RouteRecordRaw[]
@@ -1,5 +1,18 @@
 # 海外业务原型核对矩阵

+## 池来源本土订单承运安排
+
+依据：[内部拼车需求池首版开发契约](../../../../../docs/海外仓业务/内部拼车需求池首版开发契约.md) 第7节及本轮用户授权。
+
+| 页面 | 操作 | 确认承载与实现 |
+| --- | --- | --- |
+| 本土卡车 / 本土散板列表 | 池来源承运安排 | 1080px居中只读摘要，使用列表已有fleetArrangement，打开不增加请求；不显示旧编辑动作 |
+| 本土卡车 / 本土散板旧编辑深链 | 池来源只读 | 保持独立路由，读取原订单详情后仅展示真实安排与只读原因，不提交旧手工流程 |
+| 承运安排 | 关联单据 | 有目标权限才开放车次/排车跳转，否则仅显示业务号；未知签收数量显示“—” |
+| Client本土订单 | 列表摘要 / 原独立详情 | 同一客户订单响应展示承运安排，客户不访问运力池，不提供状态写入 |
+
+独立来源订单保持原承载。本轮视觉按1920×1080内置浏览器验收，自动检查与实际页面证据分别报告。
+
 原型来源：`docs/悦/货代SAAS平台后台/prototype-src/modules/07-overseas-business.html`；按钮函数来源：同原型目录 `prototype-src/app.js`。

 | 页面 | 操作 | 原型证据 | 原型承载方式 | 冻结结论 |
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
ouyangxq	cec1e2d77c	fix(fleet): validate pallet destination identity before capacity confirmation	2026-10-09 11:48:53 +08:00
admin	dd47143d6e	Merge pull request '发布已通过 TEST 回归的 2026-10-08 批次至灰度' (#16 ) from release/test into main	2026-10-08 22:17:40 +08:00
liuyihe	c90a191d83	优化	2026-10-08 20:25:25 +08:00
liuyihe	115461683b	优化	2026-10-08 20:16:19 +08:00
liuyihe	9c70eab606	优化	2026-10-08 18:13:43 +08:00
ouyangxq	5946bdfcf7	Merge branch 'release/test' of http://8.163.30.128:10082/html/admin-web into release/test	2026-10-08 17:08:04 +08:00
ouyangxq	7b0df1db37	优化	2026-10-08 17:08:03 +08:00
liuyihe	73af3affac	restore overseas warehouse navigation entries	2026-10-08 15:52:38 +08:00
liuyihe	3c3a7fcd55	merge admin frontend changes	2026-10-08 15:45:26 +08:00
liuyihe	8fa397bb5e	优化	2026-10-08 15:34:19 +08:00
ouyangxq	cc37a42298	fix(overseas): restore first-leg before and after sailing tabs	2026-10-08 15:12:49 +08:00
ouyangxq	6551b703cb	fix(fleet): align capacity availability and dispatch review navigation	2026-10-08 14:11:54 +08:00
ouyangxq	f24b592705	fix(admin): restore loading list detail page navigation	2026-10-08 13:59:20 +08:00
admin	10da46beab	Merge pull request '恢复装柜清单及货柜海外操作入口' (#15 ) from release/test into main	2026-10-08 11:26:58 +08:00
ouyangxq	d7911ad09d	fix(admin): restore manifest menu and overseas container access	2026-10-08 11:16:58 +08:00
admin	cc5ac2e68a	Merge pull request 'Release internal fleet capacity pool to gray' (#14 ) from release/test into main	2026-10-08 08:13:24 +08:00
ouyangxq	080042d941	test(fleet): verify offer-scoped quote selection and pricing	2026-10-07 23:43:14 +08:00
ouyangxq	9ff2720721	fix(admin): keep fleet arrangement references fully readable	2026-10-07 22:45:49 +08:00
ouyangxq	e4e78796a1	fix(orders): display unknown pooled freight facts without defaults	2026-10-07 19:44:42 +08:00
ouyangxq	ba6d0ff13f	fix(fleet): guard workspace navigation with unsaved pool drafts	2026-10-07 18:53:06 +08:00
ouyangxq	2bc095ecac	fix(fleet): preserve drafts before dialog close and respect dashboard permissions	2026-10-07 18:21:03 +08:00
ouyangxq	2477667c27	feat(fleet): add internal sales capacity pool workflow	2026-10-07 16:46:57 +08:00
admin	e8e7465e4e	Merge pull request '统一司机、车次及出车记录列表样式' (#13 ) from release/test into main	2026-10-07 12:25:14 +08:00
ouyangxq	04e1d7dbfa	fix(admin): unify fleet driver trip and operation list layouts	2026-10-07 12:24:21 +08:00
admin	b4b802a547	Merge pull request '发布当前测试版本至临时灰度环境' (#12 ) from release/test into main	2026-10-07 11:11:52 +08:00
ouyangxq	ca7f6aa414	fix(deploy): support isolated temporary production release	2026-10-07 11:09:41 +08:00
ouyangxq	899978e53d	test(admin): cover late driver detail and history responses	2026-10-05 18:39:25 +08:00
ouyangxq	cb5f0d1bec	feat(fleet): show authoritative trip receivables and receipts on demand	2026-10-05 11:58:16 +08:00
ouyangxq	110c2e0be2	fix(transfer): format optional relabel summary in order detail	2026-10-05 07:28:36 +08:00
ouyangxq	93f193c5d6	feat(transfer): expose stock outbound and durable receipt recovery UI	2026-10-05 06:16:21 +08:00
ouyangxq	578df0f927	fix(overseas): restore pending resource confirmation from original command	2026-10-05 05:40:21 +08:00
ouyangxq	28eb43893a	fix(dispatch): submit and preserve independent loading groups	2026-10-05 03:30:06 +08:00
ouyangxq	058b0778a2	fix(overseas): reuse original resource command after reopening conversion	2026-10-05 02:13:24 +08:00
ouyangxq	ea24496b11	fix(overseas): normalize transfer inventory quantities at API boundary	2026-10-04 22:26:36 +08:00
ouyangxq	939cc11d7b	feat(overseas): select stock transfer sources and follow relabel	2026-10-04 21:19:11 +08:00
ouyangxq	d3a2671fd7	fix(auth): revoke expired admin sessions without restoring login	2026-10-04 19:41:45 +08:00
ouyangxq	cc973c72c0	fix(overseas): expose permission-gated cargo discard review	2026-10-04 16:57:16 +08:00
ouyangxq	1d73a40a07	fix(overseas): synchronize receipt input accessibility with command lock	2026-10-04 12:43:07 +08:00
ouyangxq	a8ff0ef1de	feat(overseas): show return receipt and redispatch history	2026-10-04 10:48:38 +08:00
ouyangxq	2c2e19c4ea	fix(fleet): mount measured controls after record loads	2026-10-04 10:07:45 +08:00
ouyangxq	caf9fd89d4	fix(fleet): show contained operation-record tab panels	2026-10-04 01:48:59 +08:00
ouyangxq	f4d58e669b	fix(drivers): isolate cached detail requests and reject absent route IDs	2026-10-04 01:02:28 +08:00
ouyangxq	5c4a381d87	fix(drivers): refresh cached list and summary when returning from details	2026-10-03 23:44:35 +08:00
ouyangxq	9ec1fb549e	fix(delivery): preserve nullable signed quantity in admin contract	2026-10-03 23:10:44 +08:00
ouyangxq	6df6f6dabc	fix(fleet): refresh negotiated price controls when reopening booking	2026-10-03 20:37:03 +08:00
ouyangxq	60dd86ab88	fix(fleet): leave unknown vehicle fuel consumption empty	2026-10-03 19:41:55 +08:00
ouyangxq	049f895b44	fix(fleet): ignore stale vehicle list responses	2026-10-03 19:04:31 +08:00
ouyangxq	102194460c	fix(fleet): type exception target selection handlers	2026-10-03 18:55:06 +08:00
ouyangxq	4dc497c8ca	feat(fleet): complete exception processing and trip evidence interfaces	2026-10-03 16:40:36 +08:00
ouyangxq	9fa73f50d6	fix(dispatch): preserve return sources when restoring prearrangement drafts	2026-10-03 15:57:53 +08:00
ouyangxq	6a135c3982	fix(fleet): distinguish signed returned and remaining trip cargo	2026-10-03 15:00:10 +08:00
ouyangxq	5641ea0f7e	feat(fleet): select versioned sales quotes and isolate cost drafts	2026-10-03 13:20:35 +08:00
ouyangxq	3440f9dd11	fix(fleet): preserve retry intent and restore inquiry editing	2026-10-03 13:00:32 +08:00
ouyangxq	0b5094dd8f	feat(fleet): connect operations quotes costs and handover workspaces	2026-10-03 12:43:25 +08:00
ouyangxq	863ad5249c	fix: keep schedule form within the dialog body	2026-10-03 11:42:26 +08:00
ouyangxq	8bae21dea2	fix: restore original-container sailing schedule editing	2026-10-03 11:14:11 +08:00
ouyangxq	1a52cc0817	fix(fleet): normalize nullable maintenance fields before editing	2026-10-03 10:56:47 +08:00
ouyangxq	fa82710e6b	fix(fleet): clarify maintenance record remark hint	2026-10-03 10:54:05 +08:00
ouyangxq	8c462cef17	fix(fleet): label missing delivery customer names	2026-10-03 10:33:34 +08:00
ouyangxq	f7b84ea887	feat(fleet): show vehicle delivery and reassignment records	2026-10-03 10:12:55 +08:00
ouyangxq	94b8b8b31c	fix(fleet): fit booking action column to trip stage	2026-10-03 06:27:30 +08:00
ouyangxq	22dcae616c	fix(fleet): show placeholders for unassigned trip fields	2026-10-03 05:02:39 +08:00
ouyangxq	dc35288a1b	feat(fleet): integrate trip management and fee coverage workflows	2026-10-03 04:35:55 +08:00
ouyangxq	bca08f8749	fix(orders): send version and idempotency key for platform cancellation	2026-10-02 23:16:19 +08:00
ouyangxq	678bccd4d1	fix(admin): distinguish linked bookings from missing channel names	2026-10-02 13:39:15 +08:00
ouyangxq	f50850f001	Merge branch 'release/test' of http://8.163.30.128:10082/html/admin-web into release/test	2026-09-30 14:27:41 +08:00
ouyangxq	8c51e9c1cf	优化	2026-09-30 14:01:58 +08:00