fix(pda): display latest APK download QR codes for both apps

release: merge latest TEST admin and align receiving fixtures
优化
2026-11-06 14:42:21 +08:00 · 2026-11-06 14:04:39 +08:00 · 2026-11-06 13:33:14 +08:00 · 2026-11-06 12:52:05 +08:00 · 2026-11-06 12:08:54 +08:00 · 2026-11-06 10:42:39 +08:00
154 changed files with 3519 additions and 676 deletions
@@ -6,6 +6,9 @@ FROM ${NODE_IMAGE} AS build

 WORKDIR /app

+# 为类型检查和打包留出原生内存余量，容器总内存由构建入口限制为 3GiB。
+ENV NODE_OPTIONS=--max-old-space-size=2048
+
 # Corepack 与 pnpm 依赖均通过 npmmirror 下载，避免构建时访问 npm 官方源过慢。
 ENV COREPACK_NPM_REGISTRY=https://registry.npmmirror.com
 ENV NPM_CONFIG_REGISTRY=https://registry.npmmirror.com
@@ -21,9 +24,7 @@ RUN pnpm config set registry https://registry.npmmirror.com && \
 COPY . .
 ARG VITE_CLIENT_WEB_URL
 ENV VITE_CLIENT_WEB_URL=${VITE_CLIENT_WEB_URL}
-# Docker 构建时同机还会运行多项服务，限制 Vitest 并发以避免测试超时。
-# pnpm 会直接把脚本名后的参数传给 Vitest；额外的 `--` 会让 Vitest
-# 把 maxWorkers 当作位置参数，导致并发限制不生效。
+# 类型检查通过后才生成静态产物。
 RUN pnpm build

 # 运行阶段：仅保留构建产物和 Nginx，不包含源码或 node_modules。
@@ -3,6 +3,7 @@ pipeline {
  options {
    timestamps()
    disableConcurrentBuilds()
+    timeout(time: 20, unit: 'MINUTES')
  }
  stages {
    stage('检查测试发布参数') {
@@ -27,8 +28,11 @@ pipeline {
      when { expression { !env.JOB_BASE_NAME?.endsWith('-prod') } }
      steps {
        sh '''set -eu
-          docker compose -f docker-compose.test.yml build --pull=false
-          docker compose -f docker-compose.test.yml up -d --wait --wait-timeout 120
+          sh scripts/build-image.sh --pull=false \
+            --build-arg NODE_IMAGE="${NODE_BASE_IMAGE:-node:22-alpine}" \
+            --build-arg NGINX_IMAGE="${NGINX_BASE_IMAGE:-nginx:1.27-alpine}" \
+            -t "admin-web-test:$IMAGE_TAG" .
+          docker compose -f docker-compose.test.yml up -d --no-build --pull never --wait --wait-timeout 120
          docker compose -f docker-compose.test.yml exec -T admin-web wget -qO- http://127.0.0.1/healthz
        '''
      }
@@ -65,6 +65,8 @@ VITE_CLIENT_WEB_URL=http://localhost:5174

 容器启动通过 `CLIENT_WEB_URL` 生成 `/runtime-config.js`；本地 Vite 使用 `VITE_CLIENT_WEB_URL`。本地构建通过不代表容器或测试环境已发布。真实 HTTP 验收入口为 `pnpm test:phase4:test --environment test --gateway <统一入口>`，凭据通过环境变量传入，仅在取得对应测试写入授权后执行。

+Jenkins 的测试及灰度镜像构建均通过 `scripts/build-image.sh`，Compose 只部署已构建镜像。构建预算及节点要求见[部署指南](../../docs/测试环境Jenkins部署指南.md)。离线回归为 `node --test scripts/build-resource-contract.test.mjs`，本机仍经统一 `local-check.ps1` 入口运行。
+
 认证请求使用 `/api/auth/**`，平台 IAM 请求使用 `/api/platform/v1/iam/**`。登录后只从 JWT 读取平台身份，菜单和操作权限通过当前用户授权接口实时加载，不从 JWT 携带或解析角色权限。企业审核调用 `/reviews`，打开审核详情后按租户调用 `/tenants/{tenantId}/qualifications`；营业执照通过 `/api/platform/v1/files/qualifications/{tenantId}/{fileName}` 携带平台 Token 临时读取，关闭预览后释放本地对象地址。客户端自主注册企业审核通过后继续使用注册账号作为管理员，不展示新凭据；Admin 代建企业并由后端创建管理员时，页面必须展示不可通过遮罩、Esc 或关闭按钮跳过的一次性凭据弹窗，运营人员确认保存后才清除账号密码。平台角色查询、新增、编辑、启停、删除和权限全量保存均已按 `RbacController` 接入真实 `/roles` 契约，角色返回的 `permissionIds` 用于授权回显；系统内置角色及仍被成员使用的角色继续由服务端保护。权限资源查询和新增调用 `/permissions`，尚未提供的权限编辑、删除和启停不会模拟成功。订单与客户真实权限资源只创建 `MENU` 与 `BUTTON`，不创建 `PAGE` 或 `API` 类型。其余业务页面需在对应服务契约确认后逐项替换，生产逻辑不得静默回退到模拟数据。

 仓库管理已接入真实平台 Warehouse API，统一维护国内收货仓、FBA 仓和海外仓，支持按租户筛选、详情、新增、编辑和启停，并在更新时保留后端返回的地址、能力和截单时间等完整字段。停用仓库保留历史数据，但不再提供给新业务选择；订单详情使用下单时保存的仓库编码、名称和地址快照，仓库主数据后续修改不改变历史展示。库存和出入库作业由对应业务模块管理，不在仓库主数据页面中模拟。
@@ -18,7 +18,7 @@
 | 自营销量、库存与数据采集 | `modules/self-operated/AGENTS.md` | 三个入口 `/self-operated/sales`、`/self-operated/inventory`、`/self-operated/collection`；后端 `lastleg-service/selfoperated/analytics/`，正式合同见 `../../docs/自营业务/README.md`。 |
 | 船期日历 | `modules/sailing-calendar/` | 当前日历入口覆盖渠道、周模板、单次船期、收货截止时间和按渠道货量统计；后端按 `firstleg/` 船期接口定位，不读取已归档的货柜开发规划 |
 | 预约管理、预约列表、跨客户同仓预约 | `modules/appointment-calendar/`；入仓单预约沿 `modules/overseas-warehouse/` | 统一规则见 `../../docs/海外仓业务/README.md` 的预约送仓；同仓跨客户共用预约，客户归属在货物明细；到港只读 Firstleg，送仓归 Lastleg |
-| FBA 无匹配价格、人工定价 | `modules/inbounds/fee/api.ts` 的 `createManualInboundQuote`、`types.ts`；页面消费沿 `InboundFeePanel.vue` 核对 | `POST /manual-quote` 提交计费重量、体积、单价、原因和 `Idempotency-Key`；Backend `PlatformFbaPricingController.manualQuote` → `FbaPricingService.manualQuote`，权限 `firstleg:inbound:confirm-send-fee`。仅 FBA、已有实际测量且当前价格未命中时允许，客户已确认费用禁止改价；`MANUAL_QUOTE` 快照允许价格记录与版本为空，不伪造价格簿关联。API 回归 `modules/inbounds/fee/api.test.ts`，不能以 API 存在代替页面接入完成 |
+| FBA 与私人地址人工定价 | `modules/inbounds/fee/api.ts` 的 `createManualInboundQuote`、`types.ts`；页面消费沿 `InboundFeePanel.vue` 核对 | `POST /manual-quote` 提交计费重量、体积、单价、原因和 `Idempotency-Key`；Backend `PlatformFbaPricingController.manualQuote` → `FbaPricingService.manualQuote`，权限 `firstleg:inbound:confirm-send-fee`。要求已有实际测量。FBA 价格未命中及私人地址 PRIVATE 允许人工头程报价，客户已确认费用禁止改价。`MANUAL_QUOTE` 快照允许价格记录与版本为空，不伪造价格簿关联。API 回归 `modules/inbounds/fee/api.test.ts`，不能以 API 存在代替页面接入完成 |
 | PDA版本、APK下载、WGT热更新发布与停发 | `modules/pda-releases/pages/PdaReleasesView.vue`、`modules/pda-releases/api/pdaReleases.ts`、`modules/pda-releases/routes.ts` | 系统菜单 `/system/pda-releases`；列表权限 `platform:pda-release:list`，上传/发布/停发权限 `platform:pda-release:manage`。国内/海外按 `domestic/overseas` 分开查询，上传只创建草稿，发布与停发需确认；管理请求使用国内 HTTP 的 `/platform/v1/files/pda-releases`，后端见 `file/AGENTS.md`，设备安装与重启查对应 PDA 的更新工具 |
 | 客户、企业审核、客户统计 | `modules/customers/` | `iam/`、`auth/`、`file/`、`firstleg/customerstatistics/`；公司联系电话只作企业联系信息，不修改管理员/成员登录手机号且不要求跨企业唯一。审核必填资质仅营业执照与统一社会信用代码；法人身份证选填，可随资质包提交，也可在已有营业执照后单独补传或替换 |
 | 供应商、国内整柜 | `modules/suppliers/`、`modules/domestic-containers/` | Backend `warehouse/` 及对应 OpenAPI |
@@ -20,6 +20,7 @@
    "echarts": "^6.1.0",
    "element-plus": "^2.14.3",
    "pinia": "^4.0.2",
+    "qrcode": "^1.5.4",
    "sortablejs": "^1.15.7",
    "vue": "^3.5.40",
    "vue-echarts": "^8.3.2",
@@ -27,6 +28,7 @@
  },
  "devDependencies": {
    "@types/node": "^24.10.0",
+    "@types/qrcode": "^1.5.6",
    "@types/sortablejs": "^1.15.9",
    "@vitejs/plugin-vue": "^6.0.8",
    "@vue/test-utils": "^2.4.11",
@@ -29,6 +29,9 @@ importers:
      pinia:
        specifier: ^4.0.2
        version: 4.0.2(@vue/devtools-api@8.2.1)(typescript@5.9.3)(vue@3.5.40(typescript@5.9.3))
+      qrcode:
+        specifier: ^1.5.4
+        version: 1.5.4
      sortablejs:
        specifier: ^1.15.7
        version: 1.15.7
@@ -45,6 +48,9 @@ importers:
      '@types/node':
        specifier: ^24.10.0
        version: 24.13.3
+      '@types/qrcode':
+        specifier: ^1.5.6
+        version: 1.5.6
      '@types/sortablejs':
        specifier: ^1.15.9
        version: 1.15.9
@@ -376,6 +382,9 @@ packages:
  '@types/node@24.13.3':
    resolution: {integrity: sha512-Dh8vAsV36ig5wa9OX4pXvMc9D3Veibfw2wix0CUwYODLD8nkj9UsLjASr49nPg+2eKzxhBV+v7L8pXvT4e639Q==}

+  '@types/qrcode@1.5.6':
+    resolution: {integrity: sha512-te7NQcV2BOvdj2b1hCAHzAoMNuj65kNBMz0KBaxM6c3VGBOhU0dURQKOtH8CFNI/dsKkwlv32p26qYQTWoB5bw==}
+
  '@types/sortablejs@1.15.9':
    resolution: {integrity: sha512-7HP+rZGE2p886PKV9c9OJzLBI6BBJu1O7lJGYnPyG3fS4/duUCcngkNCjsLwIMV+WMqANe3tt4irrXHSIe68OQ==}

@@ -567,6 +576,10 @@ packages:
    resolution: {integrity: sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==}
    engines: {node: '>= 0.4'}

+  camelcase@5.3.1:
+    resolution: {integrity: sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==}
+    engines: {node: '>=6'}
+
  chai@6.2.2:
    resolution: {integrity: sha512-NUPRluOfOiTKBKvWPtSD4PhFvWCqOi0BGStNWs57X9js7XGTprSmFoz5F0tWhR4WPjNeR9jXqdC7/UpSJTnlRg==}
    engines: {node: '>=18'}
@@ -575,6 +588,9 @@ packages:
    resolution: {integrity: sha512-TQMmc3w+5AxjpL8iIiwebF73dRDF4fBIieAqGn9RGCWaEVwQ6Fb2cGe31Yns0RRIzii5goJ1Y7xbMwo1TxMplw==}
    engines: {node: '>= 20.19.0'}

+  cliui@6.0.0:
+    resolution: {integrity: sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==}
+
  color-convert@2.0.1:
    resolution: {integrity: sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==}
    engines: {node: '>=7.0.0'}
@@ -629,6 +645,10 @@ packages:
      supports-color:
        optional: true

+  decamelize@1.2.0:
+    resolution: {integrity: sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==}
+    engines: {node: '>=0.10.0'}
+
  decimal.js@10.6.0:
    resolution: {integrity: sha512-YpgQiITW3JXGntzdUmyUR1V812Hn8T1YVXhCu+wO3OpS4eU9l4YdD3qjyiKdV6mvV29zapkMeD390UVEf2lkUg==}

@@ -640,6 +660,9 @@ packages:
    resolution: {integrity: sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==}
    engines: {node: '>=8'}

+  dijkstrajs@1.0.3:
+    resolution: {integrity: sha512-qiSlmBq9+BCdCA/L46dw8Uy93mloxsPSbwnm5yrKn2vMPiy8KyAskTF6zuV/j5BMsmOGZDPs7KjU+mjb670kfA==}
+
  dunder-proto@1.0.1:
    resolution: {integrity: sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==}
    engines: {node: '>= 0.4'}
@@ -719,6 +742,10 @@ packages:
      picomatch:
        optional: true

+  find-up@4.1.0:
+    resolution: {integrity: sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==}
+    engines: {node: '>=8'}
+
  follow-redirects@1.16.0:
    resolution: {integrity: sha512-y5rN/uOsadFT/JfYwhxRS5R7Qce+g3zG97+JrtFZlC9klX/W5hD7iiLzScI4nZqUS7DNUdhPgw4xI8W2LuXlUw==}
    engines: {node: '>=4.0'}
@@ -744,6 +771,10 @@ packages:
  function-bind@1.1.2:
    resolution: {integrity: sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==}

+  get-caller-file@2.0.5:
+    resolution: {integrity: sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==}
+    engines: {node: 6.* || 8.* || >= 10.*}
+
  get-intrinsic@1.3.0:
    resolution: {integrity: sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==}
    engines: {node: '>= 0.4'}
@@ -908,6 +939,10 @@ packages:
    resolution: {integrity: sha512-++gUqRDEvcnN6Zhqrr+y/CkVEHhlrR96vZn3nZZPYzMcBUyBtTKzB9NadClFIsIVSsu+3i9tfk/erqy9kAmt7Q==}
    engines: {node: '>=14'}

+  locate-path@5.0.0:
+    resolution: {integrity: sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==}
+    engines: {node: '>=8'}
+
  lodash-es@4.18.1:
    resolution: {integrity: sha512-J8xewKD/Gk22OZbhpOVSwcs60zhd95ESDwezOFuA3/099925PdHJ7OFHNTGtajL3AlZkykD32HykiMo+BIBI8A==}

@@ -990,6 +1025,18 @@ packages:
    resolution: {integrity: sha512-4a+OsYv9UktOJKE+l1A4OufDgdRF9PifWj+tJnHURo/P+WOxpG4GzUFL9qCalmWauao6ogiG+QvnCovwPoyAWA==}
    engines: {node: '>=12.20.0'}

+  p-limit@2.3.0:
+    resolution: {integrity: sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==}
+    engines: {node: '>=6'}
+
+  p-locate@4.1.0:
+    resolution: {integrity: sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==}
+    engines: {node: '>=8'}
+
+  p-try@2.2.0:
+    resolution: {integrity: sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==}
+    engines: {node: '>=6'}
+
  package-json-from-dist@1.0.1:
    resolution: {integrity: sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==}

@@ -999,6 +1046,10 @@ packages:
  path-browserify@1.0.1:
    resolution: {integrity: sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==}

+  path-exists@4.0.0:
+    resolution: {integrity: sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==}
+    engines: {node: '>=8'}
+
  path-key@3.1.1:
    resolution: {integrity: sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==}
    engines: {node: '>=8'}
@@ -1036,6 +1087,10 @@ packages:
  pkg-types@2.3.1:
    resolution: {integrity: sha512-y+ichcgc2LrADuhLNAx8DFjVfgz91pRxfZdI3UDhxHvcVEZsenLO+7XaU5vOp0u/7V/wZ+plyuQxtrDlZJ+yeg==}

+  pngjs@5.0.0:
+    resolution: {integrity: sha512-40QW5YalBNfQo5yRYmiw7Yz6TKKVr3h6970B2YE+3fQpsWcrbj1PzJgxeJ19DRQjhMbKPIuMY8rFaXc8moolVw==}
+    engines: {node: '>=10.13.0'}
+
  postcss@8.5.23:
    resolution: {integrity: sha512-g50586zr4bZmwFiTlflMu8E0bDTb5I5gertgwAKmsdUlTQIhZtunzUlD1WSzwcVWPoAVpsrA6vlfCD7oXvRwgg==}
    engines: {node: ^10 || ^12 || >=14}
@@ -1051,6 +1106,11 @@ packages:
    resolution: {integrity: sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==}
    engines: {node: '>=6'}

+  qrcode@1.5.4:
+    resolution: {integrity: sha512-1ca71Zgiu6ORjHqFBDpnSMTR2ReToX4l1Au1VFLyVeBTFavzQnv5JxMFr3ukHVKpSrSA2MCk0lNJSykjUfz7Zg==}
+    engines: {node: '>=10.13.0'}
+    hasBin: true
+
  quansync@0.2.11:
    resolution: {integrity: sha512-AifT7QEbW9Nri4tAwR5M/uzpBuqfZf+zwaEM/QkzEjj7NBuFD2rBuy0K3dE+8wltbezDV7JMA0WfnCPYRSYbXA==}

@@ -1058,10 +1118,17 @@ packages:
    resolution: {integrity: sha512-9u/XQ1pvrQtYyMpZe7DXKv2p5CNvyVwzUB6uhLAnQwHMSgKMBR62lc7AHljaeteeHXn11XTAaLLUVZYVZyuRBQ==}
    engines: {node: '>= 20.19.0'}

+  require-directory@2.1.1:
+    resolution: {integrity: sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==}
+    engines: {node: '>=0.10.0'}
+
  require-from-string@2.0.2:
    resolution: {integrity: sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==}
    engines: {node: '>=0.10.0'}

+  require-main-filename@2.0.0:
+    resolution: {integrity: sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==}
+
  rolldown@1.1.5:
    resolution: {integrity: sha512-t9z29cJjXf/vxQ8dyhCSpt6H6aSwHTk8cT5I3iy6SMXuFpk5mB6PL6XfC8PCwrPTx93udwKUm9HRteAlTGBLiA==}
    engines: {node: ^20.19.0 || >=22.12.0}
@@ -1079,6 +1146,9 @@ packages:
    engines: {node: '>=10'}
    hasBin: true

+  set-blocking@2.0.0:
+    resolution: {integrity: sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==}
+
  shebang-command@2.0.0:
    resolution: {integrity: sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==}
    engines: {node: '>=8'}
@@ -1394,6 +1464,9 @@ packages:
    resolution: {integrity: sha512-1to4zXBxmXHV3IiSSEInrreIlu02vUOvrhxJJH5vcxYTBDAx51cqZiKdyTxlecdKNSjj8EcxGBxNf6Vg+945gw==}
    engines: {node: ^20.19.0 || ^22.12.0 || >=24.0.0}

+  which-module@2.0.1:
+    resolution: {integrity: sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==}
+
  which@2.0.2:
    resolution: {integrity: sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==}
    engines: {node: '>= 8'}
@@ -1404,6 +1477,10 @@ packages:
    engines: {node: '>=8'}
    hasBin: true

+  wrap-ansi@6.2.0:
+    resolution: {integrity: sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==}
+    engines: {node: '>=8'}
+
  wrap-ansi@7.0.0:
    resolution: {integrity: sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==}
    engines: {node: '>=10'}
@@ -1419,11 +1496,22 @@ packages:
  xmlchars@2.2.0:
    resolution: {integrity: sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==}

+  y18n@4.0.3:
+    resolution: {integrity: sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==}
+
  yaml@2.9.0:
    resolution: {integrity: sha512-2AvhNX3mb8zd6Zy7INTtSpl1F15HW6Wnqj0srWlkKLcpYl/gMIMJiyuGq2KeI2YFxUPjdlB+3Lc10seMLtL4cA==}
    engines: {node: '>= 14.6'}
    hasBin: true

+  yargs-parser@18.1.3:
+    resolution: {integrity: sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==}
+    engines: {node: '>=6'}
+
+  yargs@15.4.1:
+    resolution: {integrity: sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==}
+    engines: {node: '>=8'}
+
  zrender@6.1.0:
    resolution: {integrity: sha512-oEGMDB6pOP2S6OwRR4PdVv610zrjnA3Bh+JnSG12fYJlBKjtNAoEb5fSUoCOOINlH96I2fU38/A2UpRKs67xYQ==}

@@ -1674,6 +1762,10 @@ snapshots:
    dependencies:
      undici-types: 7.18.2

+  '@types/qrcode@1.5.6':
+    dependencies:
+      '@types/node': 24.13.3
+
  '@types/sortablejs@1.15.9': {}

  '@types/web-bluetooth@0.0.21': {}
@@ -1912,12 +2004,20 @@ snapshots:
      es-errors: 1.3.0
      function-bind: 1.1.2

+  camelcase@5.3.1: {}
+
  chai@6.2.2: {}

  chokidar@5.0.0:
    dependencies:
      readdirp: 5.0.0

+  cliui@6.0.0:
+    dependencies:
+      string-width: 4.2.3
+      strip-ansi: 6.0.1
+      wrap-ansi: 6.2.0
+
  color-convert@2.0.1:
    dependencies:
      color-name: 1.1.4
@@ -1967,12 +2067,16 @@ snapshots:
    dependencies:
      ms: 2.1.3

+  decamelize@1.2.0: {}
+
  decimal.js@10.6.0: {}

  delayed-stream@1.0.0: {}

  detect-libc@2.1.2: {}

+  dijkstrajs@1.0.3: {}
+
  dunder-proto@1.0.1:
    dependencies:
      call-bind-apply-helpers: 1.0.2
@@ -2053,6 +2157,11 @@ snapshots:
    optionalDependencies:
      picomatch: 4.0.5

+  find-up@4.1.0:
+    dependencies:
+      locate-path: 5.0.0
+      path-exists: 4.0.0
+
  follow-redirects@1.16.0(debug@4.4.3):
    optionalDependencies:
      debug: 4.4.3
@@ -2075,6 +2184,8 @@ snapshots:

  function-bind@1.1.2: {}

+  get-caller-file@2.0.5: {}
+
  get-intrinsic@1.3.0:
    dependencies:
      call-bind-apply-helpers: 1.0.2
@@ -2240,6 +2351,10 @@ snapshots:
      pkg-types: 2.3.1
      quansync: 0.2.11

+  locate-path@5.0.0:
+    dependencies:
+      p-locate: 4.1.0
+
  lodash-es@4.18.1: {}

  lodash-unified@1.0.3(@types/lodash-es@4.17.12)(lodash-es@4.18.1)(lodash@4.18.1):
@@ -2303,6 +2418,16 @@ snapshots:

  obug@2.1.4: {}

+  p-limit@2.3.0:
+    dependencies:
+      p-try: 2.2.0
+
+  p-locate@4.1.0:
+    dependencies:
+      p-limit: 2.3.0
+
+  p-try@2.2.0: {}
+
  package-json-from-dist@1.0.1: {}

  parse5@8.0.1:
@@ -2311,6 +2436,8 @@ snapshots:

  path-browserify@1.0.1: {}

+  path-exists@4.0.0: {}
+
  path-key@3.1.1: {}

  path-scurry@1.11.1:
@@ -2346,6 +2473,8 @@ snapshots:
      exsolve: 1.1.0
      pathe: 2.0.3

+  pngjs@5.0.0: {}
+
  postcss@8.5.23:
    dependencies:
      nanoid: 3.3.16
@@ -2358,12 +2487,22 @@ snapshots:

  punycode@2.3.1: {}

+  qrcode@1.5.4:
+    dependencies:
+      dijkstrajs: 1.0.3
+      pngjs: 5.0.0
+      yargs: 15.4.1
+
  quansync@0.2.11: {}

  readdirp@5.0.0: {}

+  require-directory@2.1.1: {}
+
  require-from-string@2.0.2: {}

+  require-main-filename@2.0.0: {}
+
  rolldown@1.1.5:
    dependencies:
      '@oxc-project/types': 0.139.0
@@ -2393,6 +2532,8 @@ snapshots:

  semver@7.8.5: {}

+  set-blocking@2.0.0: {}
+
  shebang-command@2.0.0:
    dependencies:
      shebang-regex: 3.0.0
@@ -2665,6 +2806,8 @@ snapshots:
    transitivePeerDependencies:
      - '@noble/hashes'

+  which-module@2.0.1: {}
+
  which@2.0.2:
    dependencies:
      isexe: 2.0.0
@@ -2674,6 +2817,12 @@ snapshots:
      siginfo: 2.0.0
      stackback: 0.0.2

+  wrap-ansi@6.2.0:
+    dependencies:
+      ansi-styles: 4.3.0
+      string-width: 4.2.3
+      strip-ansi: 6.0.1
+
  wrap-ansi@7.0.0:
    dependencies:
      ansi-styles: 4.3.0
@@ -2690,8 +2839,29 @@ snapshots:

  xmlchars@2.2.0: {}

+  y18n@4.0.3: {}
+
  yaml@2.9.0: {}

+  yargs-parser@18.1.3:
+    dependencies:
+      camelcase: 5.3.1
+      decamelize: 1.2.0
+
+  yargs@15.4.1:
+    dependencies:
+      cliui: 6.0.0
+      decamelize: 1.2.0
+      find-up: 4.1.0
+      get-caller-file: 2.0.5
+      require-directory: 2.1.1
+      require-main-filename: 2.0.0
+      set-blocking: 2.0.0
+      string-width: 4.2.3
+      which-module: 2.0.1
+      y18n: 4.0.3
+      yargs-parser: 18.1.3
+
  zrender@6.1.0:
    dependencies:
      tslib: 2.3.0
@@ -0,0 +1,18 @@
+#!/bin/sh
+set -eu
+
+# 构建前至少保留 1GiB 给业务服务，避免在宿主机内存不足时继续启动构建。
+available_kib=$(awk '$1 == "MemAvailable:" { print $2 }' /proc/meminfo)
+case "$available_kib" in
+  ''|*[!0-9]*) echo 'Cannot read host available memory; build refused.' >&2; exit 69 ;;
+esac
+if [ "$available_kib" -lt 4194304 ]; then
+  echo 'Docker build requires at least 4GiB available host memory; retry after resources recover.' >&2
+  exit 75
+fi
+
+# 当前节点使用 Docker 26 的经典构建器。显式固定后端，确保资源参数实际生效。
+# 限制覆盖每个 RUN 容器，失败时也清理中间容器，超时由宿主机独立终止。
+exec env DOCKER_BUILDKIT=0 timeout --signal=TERM --kill-after=30s 15m \
+  docker build --memory=3g --memory-swap=3g \
+  --cpu-period=100000 --cpu-quota=200000 --force-rm "$@"
@@ -0,0 +1,67 @@
+import assert from 'node:assert/strict'
+import { existsSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs'
+import { tmpdir } from 'node:os'
+import { basename, dirname, join, resolve } from 'node:path'
+import { spawnSync } from 'node:child_process'
+import { fileURLToPath } from 'node:url'
+import test from 'node:test'
+
+const root = fileURLToPath(new URL('../', import.meta.url))
+const wrapper = join(root, 'scripts/build-image.sh')
+const bash = process.platform === 'win32' ? 'C:/Program Files/Git/bin/bash.exe' : 'bash'
+const shellAvailable = process.platform !== 'win32' || existsSync(bash)
+
+// 使用替身验证参数、内存预检和退出码，不启动 Docker 或访问部署环境。
+function runBuild(availableMemory, childStatus = '0') {
+  const directory = mkdtempSync(join(tmpdir(), 'frontend-build-resource-'))
+  try {
+    writeFileSync(join(directory, 'awk'), '#!/bin/sh\nprintf "%s\\n" "$TEST_AVAILABLE_MEMORY"\n', { mode: 0o755 })
+    writeFileSync(join(directory, 'timeout'), '#!/bin/sh\nprintf "%s\\n" watchdog "$@"\nshift 3\nexec "$@"\n', { mode: 0o755 })
+    writeFileSync(join(directory, 'docker'), '#!/bin/sh\nprintf "%s\\n" "builder=$DOCKER_BUILDKIT" "$@"\nexit "$TEST_CHILD_STATUS"\n', { mode: 0o755 })
+    return spawnSync(bash, ['-c',
+      'testbin=$(cd "$1" && pwd); shift; PATH="$testbin:$PATH"; export PATH; exec sh "$@"',
+      'fixture', directory.replaceAll('\\', '/'), wrapper.replaceAll('\\', '/'),
+      '--build-arg', 'VALUE=with space', '-t', 'web:test', '.'], {
+      encoding: 'utf8', timeout: 10000,
+      env: { ...process.env, DOCKER_BUILDKIT: '1', TEST_AVAILABLE_MEMORY: availableMemory, TEST_CHILD_STATUS: childStatus }
+    })
+  } finally {
+    assert.equal(dirname(resolve(directory)), resolve(tmpdir()))
+    rmSync(directory, { recursive: true })
+  }
+}
+
+test('TEST and gray builds share the resource gate and deployment cannot rebuild implicitly', () => {
+  const pipeline = readFileSync(join(root, 'Jenkinsfile'), 'utf8')
+  const production = readFileSync(join(root, 'scripts/deploy-production.sh'), 'utf8')
+  const dockerfile = readFileSync(join(root, 'Dockerfile'), 'utf8')
+  for (const source of [pipeline, production]) {
+    assert.match(source, /sh scripts\/build-image\.sh/)
+    assert.doesNotMatch(source, /docker (?:compose[^\n]* build|build\s)/)
+  }
+  assert.match(pipeline, /timeout\(time: 20, unit: 'MINUTES'\)/)
+  assert.match(pipeline, /up -d --no-build --pull never --wait/)
+  assert.ok(pipeline.includes(`-t "${basename(root)}-test:$IMAGE_TAG"`))
+  assert.match(dockerfile, /^ENV NODE_OPTIONS=--max-old-space-size=2048$/m)
+})
+
+test('build forwards quoted arguments, enforces container budgets and propagates failure', { skip: !shellAvailable }, () => {
+  const result = runBuild('4194304', '23')
+  assert.equal(result.status, 23, result.stderr)
+  assert.match(result.stdout, /watchdog\r?\n--signal=TERM\r?\n--kill-after=30s\r?\n15m\r?\ndocker\r?\nbuild/)
+  assert.match(result.stdout, /builder=0\r?\nbuild/)
+  for (const argument of ['--memory=3g', '--memory-swap=3g', '--cpu-period=100000', '--cpu-quota=200000', '--force-rm']) {
+    assert.ok(result.stdout.split(/\r?\n/).includes(argument), argument)
+  }
+  assert.match(result.stdout, /--build-arg\r?\nVALUE=with space\r?\n-t\r?\nweb:test\r?\n\./)
+  assert.equal(runBuild('8388608').status, 0)
+  assert.equal(runBuild('8388608', '124').status, 124)
+})
+
+test('low or unreadable host memory refuses to start Docker', { skip: !shellAvailable }, () => {
+  for (const [memory, status] of [['4194303', 75], ['', 69], ['unknown', 69]]) {
+    const result = runBuild(memory)
+    assert.equal(result.status, status, result.stderr)
+    assert.equal(result.stdout, '')
+  }
+})
@@ -35,7 +35,7 @@ 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}" \
+sh scripts/build-image.sh --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"
@@ -53,10 +53,10 @@ describe('adminNavigation', () => {
      { title: '财务管理', children: ['海外费用明细', '客户账户', '客户应收应付', '应收款统计表', '客户对账单', '结算单应收', '结算单应付'] },
      { title: '海外仓', children: ['经营总览', '销量分析', '库存分析', '数据采集'] },
      { title: '通用', children: ['费用项目', '汇率管理', '仓库管理', '海外仓报价', '车队报价', '船期价格表', '下载中心', '供应商列表'] },
-      { title: '系统管理', children: ['用户管理', '角色权限', '菜单权限'] },
+      { title: '系统管理', children: ['用户管理', '角色权限', '菜单权限', 'PDA版本'] },
    ])
    expect(visible).toHaveLength(13)
-    expect(visible.flatMap(node => node.children ?? [])).toHaveLength(60)
+    expect(visible.flatMap(node => node.children ?? [])).toHaveLength(61)
    expect(adminNavigation.find((item) => item.key === 'notifications')).toBeUndefined()
  })

@@ -172,6 +172,7 @@ describe('adminNavigation', () => {
    const paths = getNavigationLeaves(filtered).map((item) => item.path)
    expect(paths).toContain('/system/permissions')
    expect(paths).not.toContain('/prototype/finance/profit-report')
+    expect(paths).not.toContain('/system/pda-releases')
    expect(paths).not.toContain('/notifications/messages')
    expect(paths).not.toContain('/customers')
    expect(filtered.map((item) => item.title)).toEqual(['首页数据看板', '系统管理'])
@@ -223,7 +223,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', hidden: true },
+      { key: 'pda-releases', title: 'PDA版本', icon: Download, path: '/system/pda-releases', permission: 'platform:pda-release:list' },
    ],
  },
 ]
@@ -124,13 +124,16 @@ it('preserves real FBA fields and entered values when expanding the create dialo
  expect(creationBody().get('[aria-label="预约保存回执"]').findAll('input, textarea, select')).toHaveLength(0)
  expect(creationBody().text()).toContain('AP-001')
 })
-it('shows every saved server field as readonly text including confirmed offsets and long remarks', async () => {
+it('shows saved dates, confirmed offsets and long remarks without planned time ranges', async () => {
  const saved = { ...batchContext().appointment, plannedDate: '2026-10-26', plannedAt: '2026-10-26T08:00:00', plannedEndAt: '2026-10-26T18:00:00', timezone: 'America/Los_Angeles', appointmentStatus: 'SUCCESS', confirmationNo: 'CONFIRM-001', appointmentAt: '2026-11-01T01:30:00', appointmentEndAt: '2026-11-01T01:45:00', appointmentStartUtc: '2026-11-01T08:30:00Z', appointmentEndUtc: '2026-11-01T09:45:00Z', appointmentRemark: '完整预约备注'.repeat(30) }
  vi.mocked(createSourceAppointment).mockResolvedValue(saved)
  const wrapper = await open(); await create(wrapper)
  await creationBody().findAll('button').find(button => button.text() === '保存预约安排')!.trigger('click'); await flushPromises()
  const receipt = creationBody().get('[aria-label="预约保存回执"]')
-  for (const text of ['AP-001', saved.plannedDate, saved.plannedAt, saved.plannedEndAt, saved.timezone, '已取得对方正式确认', saved.confirmationNo, saved.appointmentAt, saved.appointmentEndAt, '-07:00', '-08:00', saved.appointmentRemark]) expect(receipt.text()).toContain(text)
+  for (const text of ['AP-001', saved.plannedDate, saved.timezone, '已取得对方正式确认', saved.confirmationNo, saved.appointmentAt, saved.appointmentEndAt, '-07:00', '-08:00', saved.appointmentRemark]) expect(receipt.text()).toContain(text)
+  expect(receipt.text()).not.toMatch(/计划开始时段|计划结束时段/)
+  expect(receipt.text()).not.toContain(saved.plannedAt)
+  expect(receipt.text()).not.toContain(saved.plannedEndAt)
  expect(receipt.findAll('input, textarea, select')).toHaveLength(0)
  expect(receipt.text()).not.toMatch(/item-1|customer-a|FBA_APPOINTMENT:1/)
 })
@@ -32,9 +32,9 @@ it('names the missing material and supplements the canonical booking inside the
  const wrapper = render(); await flushPromises()
  expect(resolvePlanningOrder).toHaveBeenCalledWith(lookup)
  expect(wrapper.text()).toContain('IN-TEST'); expect(wrapper.text()).toContain('缺少本票 FBA 货件号或追踪号')
-  expect(wrapper.text()).toContain('不能代替货件号'); expect(wrapper.text()).not.toContain(source.orderId)
+  expect(wrapper.text()).not.toContain(source.orderId)
  await wrapper.findAll('button').find(button => button.text() === '在此补齐资料')!.trigger('click'); await flushPromises()
-  expect((wrapper.get('input[type=number]').element as HTMLInputElement).value).toBe('20')
+  expect(wrapper.find('input[type=number]').exists()).toBe(false)
  await wrapper.get('form').trigger('submit'); await flushPromises()
  expect(saveCargoVerification).not.toHaveBeenCalled()
  await wrapper.get('textarea[aria-label="本票货件号"]').setValue('FBA-TEST')
@@ -44,6 +44,22 @@ it('names the missing material and supplements the canonical booking inside the
  expect(wrapper.text()).toContain('资料齐全，无需重复填写')
  expect(wrapper.emitted('ready')?.at(-1)).toEqual([true]); wrapper.unmount()
 })
+it('allows missing or changed quantities to be verified before saving shipment references', async () => {
+  for (const cargo of [
+    { ...context, effectivePackages: null },
+    { ...context, sourceChanged: true },
+  ]) {
+    vi.mocked(getCargoVerification).mockResolvedValue(cargo)
+    vi.mocked(saveCargoVerification).mockClear()
+    const wrapper = render(); await flushPromises()
+    await wrapper.findAll('button').find(button => button.text() === '在此补齐资料')!.trigger('click'); await flushPromises()
+    await wrapper.get('input[type=number]').setValue('20')
+    await wrapper.get('textarea[aria-label="本票货件号"]').setValue('FBA-TEST')
+    await wrapper.get('form').trigger('submit'); await flushPromises()
+    expect(saveCargoVerification).toHaveBeenCalledWith(source, expect.objectContaining({ packageCount: 20, shipmentReferences: ['FBA-TEST'] }))
+    wrapper.unmount()
+  }
+})
 it('leaves pending arrangements lazy and reads only when formal confirmation is selected', async () => {
  const wrapper = render(false); await flushPromises()
  expect(resolvePlanningOrder).not.toHaveBeenCalled()
@@ -66,7 +66,6 @@ onBeforeUnmount(() => { ++generation; unregister?.() })
  <section v-show="active || editing" class="density-dialog-section" aria-label="正式确认前的货物资料" :aria-busy="loading">
    <h3 class="density-dialog-section__title">正式确认前：核对本次送仓货物</h3>
    <el-button :disabled="loading || !!editing || disabled" :loading="loading" @click="load">重新核对资料</el-button>
-    <p>本票总箱数用于校验预约货量；FBA 货件号或追踪号用于识别送的是哪批货。外部约号只代表仓库的预约确认号，不能代替货件号。</p>
    <LoadErrorState v-if="error" title="货物资料未核对" :message="error.message" :loading="loading" @retry="load"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState>
    <table class="density-table"><thead><tr><th>操作</th><th>入仓码 / 外接登记号</th><th>本票总箱数</th><th>FBA 货件号 / 追踪号</th><th>需要补充的资料</th></tr></thead><tbody>
      <tr v-for="row in rows" :key="key(row)">
@@ -129,7 +129,6 @@ onBeforeUnmount(() => { ++generation; ++selectionGeneration; ++destinationsReque
        <table class="density-table"><tbody>
          <tr><th scope="row">系统单号</th><td>{{ created.appointmentNo || '—' }}</td><th scope="row">目的仓时区</th><td>{{ created.timezone || '待核实' }}</td></tr>
          <tr><th scope="row">计划送仓日期</th><td>{{ createdForm.plannedDate || '—' }}</td><th scope="row">本次登记</th><td>{{ ({ PENDING: '等待对方确认', SUCCESS: '已取得对方正式确认', FAILED: '未约成', CANCELLED: '已取消' })[createdForm.appointmentStatus] }}</td></tr>
-          <tr><th scope="row">计划开始时段</th><td>{{ createdForm.plannedAt || '—' }}</td><th scope="row">计划结束时段</th><td>{{ createdForm.plannedEndAt || '—' }}</td></tr>
          <tr><th scope="row">外部约号</th><td colspan="3">{{ createdForm.confirmationNo || '—' }}</td></tr>
          <tr v-if="createdForm.appointmentAt || createdForm.appointmentEndAt"><th scope="row">对方确认开始时间</th><td>{{ createdForm.appointmentAt || '—' }}</td><th scope="row">对方确认结束时间</th><td>{{ createdForm.appointmentEndAt || '—' }}</td></tr>
          <tr v-if="createdForm.startOffset || createdForm.endOffset"><th scope="row">确认开始时差</th><td>{{ createdForm.startOffset || '—' }}</td><th scope="row">确认结束时差</th><td>{{ createdForm.endOffset || '—' }}</td></tr>
@@ -59,14 +59,13 @@ onMounted(() => load())
 <template>
  <section aria-label="货物核实资料">
    <h3>{{ confirmation ? '补齐本票送仓资料' : '核实货物资料' }}<InlineHelp title="核实资料说明"><p>未约成也可保存；只用于预约核实，保留原订单资料。</p></InlineHelp></h3>
-    <p v-if="confirmation">请向客户或货物负责人取得本票完整的 FBA 货件号或追踪号，每行一个；不要填写预约外部约号。下方保存只补充货物资料，完成后还需保存预约安排。</p>
    <LoadErrorState v-if="error" title="核实资料读取失败" :message="error.message" :loading="loading" @retry="load(true)"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState>
    <p v-if="loading">正在读取货物资料…</p>
    <template v-if="context">
-      <dl class="cargo-facts"><dt>原票</dt><dd>{{ context.source.inboundCode || context.source.bookingNo || '—' }}</dd><dt>目的仓</dt><dd>{{ context.source.destinationWarehouseCode || '—' }}</dd><dt>原箱数</dt><dd>{{ context.source.packages ?? '待核实' }}</dd><template v-if="!confirmation"><dt>已分配</dt><dd>{{ context.allocatedPackages }} 箱<span v-if="context.unknownAllocationCount">；另有 {{ context.unknownAllocationCount }} 项数量未知</span></dd><dt>可分配</dt><dd>{{ context.availablePackages ?? '待核实' }}</dd></template></dl>
+      <dl v-if="!confirmation" class="cargo-facts"><dt>原票</dt><dd>{{ context.source.inboundCode || context.source.bookingNo || '—' }}</dd><dt>目的仓</dt><dd>{{ context.source.destinationWarehouseCode || '—' }}</dd><dt>原箱数</dt><dd>{{ context.source.packages ?? '待核实' }}</dd><dt>已分配</dt><dd>{{ context.allocatedPackages }} 箱<span v-if="context.unknownAllocationCount">；另有 {{ context.unknownAllocationCount }} 项数量未知</span></dd><dt>可分配</dt><dd>{{ context.availablePackages ?? '待核实' }}</dd></dl>
      <p v-if="context.sourceChanged" role="alert">原货源已变化，请核对当前原票和已分配量后重新保存。</p><p v-for="reason in context.blockReasons" :key="reason" role="status">{{ reason }}</p>
      <form class="density-form work-form appointment-native-form" @submit.prevent="save"><fieldset :disabled="!canWrite || loading || !!error || saving || !!pending">
-        <label>{{ confirmation ? '本票核实总箱数（必填）' : '核实箱数（可暂不填）' }}<input v-model="form.packages" type="number" min="1" step="1" aria-label="核实箱数" class="workbench-input"></label>
+        <label v-if="!confirmation || context.effectivePackages == null || context.sourceChanged">{{ confirmation ? '本票核实总箱数（必填）' : '核实箱数（可暂不填）' }}<input v-model="form.packages" type="number" min="1" step="1" aria-label="核实箱数" class="workbench-input"></label>
        <label>本票货件号 / 追踪号（每行一个）<textarea v-model="form.references" rows="4" aria-label="本票货件号" class="workbench-input" /></label>
        <label>核实说明<textarea v-model="form.remark" maxlength="1000" rows="2" class="workbench-input" /></label>
      </fieldset><p v-if="!canWrite">当前仅可查看核实资料；需核实权限及有效货源资格才能保存。</p>
@@ -63,7 +63,7 @@ onMounted(load)
        </tbody></table>
        <p v-for="field in visibleMissingFields" :key="field" role="status" class="density-dialog-note">{{ workReason(field) }}</p>
      </section>
-      <FbaAppointmentFields continuous hide-confirmation-times ref="appointmentFields" :sources="sources.map(source => ({ ...source, destinationKey: source.destinationKey || undefined }))" @confirmation-ready="confirmationReady = $event" :model="form" :timezone="preview.destinationTimezone" :disabled="!writable || loading || saving || !!pending" />
+      <FbaAppointmentFields continuous date-only ref="appointmentFields" :sources="sources.map(source => ({ ...source, destinationKey: source.destinationKey || undefined }))" @confirmation-ready="confirmationReady = $event" :model="form" :timezone="preview.destinationTimezone" :disabled="!writable || loading || saving || !!pending" />
      <LoadErrorState v-if="saveError" title="预约尚未创建" :message="saveError.message" :show-retry="false"><template #details><ApiErrorMeta :details="saveError" /></template></LoadErrorState>
      <div class="density-actions density-actions--footer"><el-button type="primary" :disabled="!writable || loading" :loading="saving" @click="save">{{ pending ? '重试本次创建' : '保存预约安排' }}</el-button></div>
    </template>
@@ -43,12 +43,15 @@ describe('LoginView authentication lifecycle', () => {
    expect(loginSource).not.toContain('demo-tip')
  })

-  it('uses the shared blue-white theme and preserves the existing compact brand layout', () => {
+  it('preserves the dark brand panel and white login card independently of workbench typography', () => {
    expect(loginSource).toContain("import '@/styles/adminWorkbench.css'")
    expect(loginSource).toContain('class="login-page admin-workbench"')
-    expect(loginSource).toContain('<h1 class="workbench-title">柏悦物流管理后台</h1>')
-    expect(loginSource).toContain('class="login-mobile-brand workbench-brand-mark"')
-    expect(loginSource).toContain('class="login-card workbench-panel"')
+    expect(loginSource).toContain('<h1>柏悦物流管理后台</h1>')
+    expect(loginSource).toContain('class="login-mobile-brand"')
+    expect(loginSource).toContain('class="login-card"')
+    expect(loginSource).toContain('--login-brand-background: #172a46')
+    expect(loginSource).toContain('background: var(--login-brand-background); color: #fff;')
+    expect(loginSource).not.toMatch(/class="[^"]*workbench-(?:title|heading|panel|brand-mark)/)
    expect(loginSource).toContain('class="login-error workbench-notice workbench-tone" data-tone="rose"')
    expect(loginSource).toContain('aria-label="平台员工登录"')
    expect(loginSource).toContain('label-position="top" size="large"')
@@ -57,23 +57,23 @@ async function submit() {
 <template>
  <div class="login-page admin-workbench">
    <section class="login-intro">
-      <div class="login-brand workbench-brand-mark"><img class="login-brand-logo" :src="baiyueLogoWhite" alt="柏悦物流" /></div>
-      <div class="workbench-heading">
-        <h1 class="workbench-title">柏悦物流管理后台</h1>
-        <p class="login-intro-copy workbench-note">平台内部运营与管理系统</p>
+      <div class="login-brand"><img class="login-brand-logo" :src="baiyueLogoWhite" alt="柏悦物流" /></div>
+      <div>
+        <h1>柏悦物流管理后台</h1>
+        <p class="login-intro-copy">平台内部运营与管理系统</p>
      </div>
-      <div class="login-security-note workbench-meta">
+      <div class="login-security-note">
        <ShieldCheck :size="22" aria-hidden="true" />
        <span>平台内部系统，请使用授权账号登录</span>
      </div>
    </section>

    <section class="login-panel">
-      <div class="login-card workbench-panel">
-        <div class="login-mobile-brand workbench-brand-mark"><img :src="baiyueLogoWhite" alt="柏悦物流" /></div>
-        <div class="login-card-icon workbench-icon"><LockKeyhole :size="24" aria-hidden="true" /></div>
-        <h2 class="workbench-title">登录管理后台</h2>
-        <p class="workbench-note">使用平台内部员工账号登录</p>
+      <div class="login-card">
+        <div class="login-mobile-brand"><img :src="baiyueLogoWhite" alt="柏悦物流" /></div>
+        <div class="login-card-icon"><LockKeyhole :size="24" aria-hidden="true" /></div>
+        <h2>登录管理后台</h2>
+        <p>使用平台内部员工账号登录</p>
        <el-form ref="formRef" :model="form" :rules="rules" label-position="top" size="large" aria-label="平台员工登录" @submit.prevent="submit">
          <el-form-item label="账号" prop="account" required>
            <el-input v-model.trim="form.account" placeholder="请输入账号" :prefix-icon="UserRound" autocomplete="username" maxlength="100" autofocus />
@@ -92,17 +92,20 @@ async function submit() {
 </template>

 <style scoped>
-.login-page { display: grid; min-width: 0; min-height: 100svh; grid-template-columns: minmax(420px, 1.05fr) minmax(420px, .95fr); background: var(--workbench-surface); color: var(--workbench-text); }
-.login-intro { display: flex; min-width: 0; flex-direction: column; justify-content: space-between; padding: 46px clamp(42px, 7vw, 100px); }
-.login-brand { display: flex; width: fit-content; min-height: 64px; align-items: center; padding: 8px 20px; }
+/* Brand layout is local to login; workbench styles only supply shared controls and errors. */
+.login-page { --login-brand-background: #172a46; display: grid; min-width: 0; min-height: 100svh; grid-template-columns: minmax(420px, 1.05fr) minmax(420px, .95fr); background: var(--cc-surface); color: var(--cc-text); }
+.login-intro { display: flex; min-width: 0; flex-direction: column; justify-content: space-between; padding: 46px clamp(42px, 7vw, 100px); background: var(--login-brand-background); color: #fff; }
+.login-brand { display: flex; width: fit-content; min-height: 64px; align-items: center; }
 .login-brand-logo { display: block; width: 205px; height: 64px; object-fit: contain; object-position: left center; }
-.login-intro h1 { max-width: 560px; }
-.login-intro-copy { max-width: 560px; }
+.login-intro h1 { max-width: 560px; margin: 16px 0 14px; font-size: 40px; line-height: 1.2; overflow-wrap: anywhere; }
+.login-intro-copy { max-width: 560px; margin: 0; color: #cbd5e1; font-size: 15px; line-height: 1.7; overflow-wrap: anywhere; }
+.login-security-note { display: flex; align-items: center; gap: 10px; color: #cbd5e1; font-size: 13px; line-height: 1.6; }
 .login-security-note > svg { flex: 0 0 auto; }
-.login-panel { display: grid; min-width: 0; place-items: center; padding: 48px; background: var(--workbench-surface-tint); }
-.login-card.workbench-panel { width: min(410px, 100%); min-width: 0; padding: 32px; }
-.login-card h2 { margin-top: 22px; }
-.login-card > p { margin: 8px 0 30px; }
+.login-panel { display: grid; min-width: 0; place-items: center; padding: 48px; background: var(--cc-surface-muted); }
+.login-card { width: min(410px, 100%); min-width: 0; padding: 32px; border: 1px solid var(--cc-border); border-radius: var(--cc-radius-lg); background: var(--cc-surface); box-shadow: var(--cc-shadow-md); }
+.login-card-icon { display: grid; width: 48px; height: 48px; place-items: center; border-radius: var(--cc-radius-lg); background: var(--workbench-accent-soft); color: var(--workbench-primary); }
+.login-card h2 { margin: 22px 0 8px; font-size: 28px; line-height: 1.3; overflow-wrap: anywhere; }
+.login-card > p { margin: 0 0 30px; color: var(--cc-muted); font-size: 14px; line-height: 1.6; overflow-wrap: anywhere; }
 .login-mobile-brand { display: none; }
 .login-submit { width: 100%; min-height: 44px; }
 .login-submit :deep(> span) { display: flex; align-items: center; gap: 8px; }
@@ -114,14 +117,14 @@ async function submit() {
  .login-page { grid-template-columns: 1fr; }
  .login-intro { display: none; }
  .login-panel { align-items: start; padding: 24px; }
-  .login-card.workbench-panel { width: min(440px, 100%); margin: auto; padding: 28px; }
-  .login-mobile-brand { display: flex; width: fit-content; min-height: 52px; align-items: center; margin-bottom: 28px; padding: 8px 16px; }
+  .login-card { width: min(440px, 100%); margin: auto; padding: 28px; }
+  .login-mobile-brand { display: flex; width: fit-content; min-height: 52px; align-items: center; margin-bottom: 28px; padding: 8px 16px; border-radius: var(--cc-radius-lg); background: var(--login-brand-background); }
  .login-mobile-brand img { display: block; width: 154px; height: 48px; object-fit: contain; object-position: left center; }
 }

@media (max-width: 360px) {
  .login-panel { padding: 12px; }
-  .login-card.workbench-panel { padding: 20px; }
+  .login-card { padding: 20px; }
  .login-mobile-brand { margin-bottom: 24px; }
 }
 </style>
@@ -69,6 +69,22 @@ function buttonTexts(wrapper: Awaited<ReturnType<typeof render>>) {
 }

 describe('ContainerCustomsPanel', () => {
+  it('locks pre-entry uploads after customer confirmation before broker execution', async () => {
+    const value = customs('DECLARING', true)
+    value.documents[0]!.receiptStatus = 'CONFIRMED'
+    api.get.mockResolvedValue(value)
+    const wrapper = mount(ContainerCustomsPanel, {
+      props: { loadingPlanId: value.loadingPlanId, canList: true, canManage: true, departureState: 'WAITING_OTHER_GATES' },
+      global: { plugins: [ElementPlus] },
+    })
+    await flushPromises()
+    expect(wrapper.text()).toContain('客户已确认预录单，待发送报关行执行')
+    for (const label of ['选择预录单', '提交预录单']) {
+      expect(wrapper.findAll('button').find(button => button.text() === label)?.attributes('disabled')).toBeDefined()
+    }
+    expect(wrapper.findAll('button').find(button => button.text() === '发送报关行执行')?.attributes('disabled')).toBeUndefined()
+    wrapper.unmount()
+  })
  beforeEach(() => {
    vi.clearAllMocks()
    api.getDeclarationBatches.mockResolvedValue([])
@@ -264,7 +280,7 @@ describe('ContainerCustomsPanel', () => {
    await flushPromises()
    await wrapper.findAll('button').find(button => button.text() === '提交预录单')!.trigger('click')
    await flushPromises()
-    expect(api.upload).toHaveBeenCalledWith(document.documentId, selected, 7)
+    expect(api.upload).not.toHaveBeenCalled()
    wrapper.unmount()
  })

@@ -71,6 +71,7 @@ const allBuy = computed(() => customs.value?.hasActualCargo === true && customs.
 const brokerSubmission = computed(() => customs.value?.brokerSubmission || null)
 const brokerSubmitted = computed(() => Boolean(customs.value?.brokerSubmittedAt))
 const allReceiptsConfirmed = computed(() => Boolean(customs.value?.documents.length) && customs.value?.documents.every((document) => document.receipt && document.receiptStatus === 'CONFIRMED') === true)
+const receiptUploadLocked = computed(() => brokerSubmitted.value || customs.value?.documents.some((document) => document.receiptStatus === 'CONFIRMED') === true)
 const openDeclarationBatch = computed(() => declarationBatches.value.find((item) => ['READY', 'SUBMITTED', 'ACKNOWLEDGED', 'RESULT_PENDING'].includes(item.status)) || null)
 const statusText: Record<ContainerCustomsStatus, string> = {
  WAITING_CUSTOMER_DOCUMENTS: '待客户补齐退税资料', READY_TO_START: '可开始报关', DECLARING: '报关中', COMPLETED: '报关已完成',
@@ -85,7 +86,7 @@ function formatDateTime(value: string | null | undefined) {
  return Number.isNaN(date.getTime()) ? value : date.toLocaleString('zh-CN', { hour12: false })
 }
 function selectReceipt(upload: UploadFile) {
-  if (!props.canManage || customs.value?.status !== 'DECLARING' || !brokerSubmission.value || brokerSubmitted.value) return
+  if (!props.canManage || customs.value?.status !== 'DECLARING' || !brokerSubmission.value || receiptUploadLocked.value || actionLoading.value) return
  receiptFile.value = upload.raw || null
  actionError.value = null
 }
@@ -186,7 +187,7 @@ async function start() {
 }

 async function uploadReceipt() {
-  if (!props.canManage || customs.value?.status !== 'DECLARING' || !brokerSubmission.value || brokerSubmitted.value) return
+  if (!props.canManage || customs.value?.status !== 'DECLARING' || !brokerSubmission.value || receiptUploadLocked.value || actionLoading.value) return
  const selected = receiptFile.value
  if (!selected) { ElMessage.warning('请选择对应的预录单'); return }
  const documents = customs.value.documents
@@ -325,12 +326,12 @@ onMounted(load)
        <div class="workbench-evidence"><table class="compact-table density-table"><thead><tr><th>客户</th><th>订单号</th><th>入仓码</th></tr></thead><tbody><tr v-for="item in missingInbounds" :key="item.inboundId"><td>{{ item.customerName }}</td><td>{{ item.orderNo }}</td><td>{{ item.inboundCode }}</td></tr></tbody></table></div>
      </div>
      <div v-if="customs.documents.length" class="compact-table-wrap">
-        <div class="documents-heading"><h3>已冻结退税资料、预录单与完税文件</h3><div v-if="canManage && customs.status === 'DECLARING'" class="document-actions density-actions"><el-upload :disabled="!brokerSubmission || brokerSubmitted" :auto-upload="false" :limit="1" :show-file-list="false" :on-change="selectReceipt"><el-button class="density-action" size="small" :disabled="!brokerSubmission || brokerSubmitted">{{ !brokerSubmission ? '首次发送后上传预录单' : '选择预录单' }}</el-button></el-upload><span v-if="receiptFile" class="selected-receipt" :title="receiptFile.name">{{ receiptFile.name }}</span><el-button data-tone="primary" class="density-action" size="small" type="primary" :disabled="!brokerSubmission || brokerSubmitted || !receiptFile" :loading="actionLoading" @click="uploadReceipt">提交预录单</el-button></div></div>
+        <div class="documents-heading"><h3>已冻结退税资料、预录单与完税文件</h3><div v-if="canManage && customs.status === 'DECLARING'" class="document-actions density-actions"><el-upload :disabled="actionLoading || !brokerSubmission || receiptUploadLocked" :auto-upload="false" :limit="1" :show-file-list="false" :on-change="selectReceipt"><el-button class="density-action" size="small" :disabled="actionLoading || !brokerSubmission || receiptUploadLocked">{{ !brokerSubmission ? '首次发送后上传预录单' : '选择预录单' }}</el-button></el-upload><span v-if="receiptFile" class="selected-receipt" :title="receiptFile.name">{{ receiptFile.name }}</span><el-button data-tone="primary" class="density-action" size="small" type="primary" :disabled="actionLoading || !brokerSubmission || receiptUploadLocked || !receiptFile" :loading="actionLoading" @click="uploadReceipt">提交预录单</el-button></div></div>
        <div class="workbench-evidence"><table class="compact-table document-table density-table"><thead><tr><th>操作</th><th>关联入仓码</th><th>报关行状态</th><th>客户退税资料</th><th>预录单</th><th>真实报关完税文件</th><th>客户</th><th>预录单情况</th></tr></thead><tbody>
          <tr v-for="document in customs.documents" :key="document.documentId">
            <td><div v-if="canManage && customs.status === 'DECLARING'" class="document-actions density-actions"><el-upload :disabled="!brokerSubmitted" :auto-upload="false" :limit="1" :show-file-list="false" :on-change="(upload: UploadFile) => selectFinal(document.documentId, upload)"><el-button class="density-action" size="small" :disabled="!brokerSubmitted">{{ document.finalDocument ? '覆盖完税文件' : '上传完税文件' }}</el-button></el-upload><el-button data-tone="primary" class="density-action" size="small" type="primary" :disabled="!brokerSubmitted || !finalFiles[document.documentId]" :loading="actionLoading" @click="uploadFinal(document)">提交</el-button></div><span v-else class="readonly-label">只读</span></td>
            <td>{{ document.inboundCodes.join('、') || '—' }}</td>
-            <td>{{ brokerSubmitted ? '已发送报关行执行' : brokerSubmission ? '已首次发送，等待预录单确认' : '待首次发送报关行' }}</td>
+            <td>{{ brokerSubmitted ? '已发送报关行执行' : document.receiptStatus === 'CONFIRMED' ? '客户已确认预录单，待发送报关行执行' : brokerSubmission ? '已首次发送，等待预录单确认' : '待首次发送报关行' }}</td>
            <td><div class="file-cell"><span :title="document.source.fileName">{{ document.source.fileName }}</span><el-button class="density-action" type="primary" :loading="downloadingKey === `source:${document.documentId}`" :aria-label="`下载客户退税资料 ${document.source.fileName}`" @click="downloadFile(document, 'source')">下载</el-button></div></td>
            <td><div v-if="document.receipt" class="file-cell"><span :title="document.receipt.fileName">{{ document.receipt.fileName }}</span><el-button class="density-action" type="primary" :loading="downloadingKey === `receipt:${document.documentId}`" :aria-label="`下载预录单 ${document.receipt.fileName}`" @click="downloadFile(document, 'receipt')">下载</el-button></div><span v-else>未上传</span></td><td><div v-if="document.finalDocument" class="file-cell"><span :title="document.finalDocument.fileName">{{ document.finalDocument.fileName }}</span><el-button class="density-action" type="primary" :loading="downloadingKey === `final:${document.documentId}`" :aria-label="`下载报关完税文件 ${document.finalDocument.fileName}`" @click="downloadFile(document, 'final')">下载</el-button></div><span v-else>未上传</span></td><td>{{ documentCustomers(document) }}</td><td>{{ document.receipt ? (document.receiptStatus === 'CONFIRMED' ? '客户已确认预录单' : document.receiptStatus === 'REJECTED' ? '客户已打回预录单' : '待客户确认预录单') : '待上传预录单' }}</td>
          </tr>
@@ -65,15 +65,16 @@ describe('ContainerDetailView empty return', () => {
    expect(value).toBe('2026-10-23（默认推算）')
    expect(value).not.toContain('00:00')
  })
-  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')
+  it.each(['DOMESTIC', 'OVERSEAS'] as const)('keeps voyage information without the temporary schedule maintenance entry in %s', async (workbench) => {
+    vi.mocked(getContainer).mockResolvedValue({ ...base, vesselName: 'VESSEL', voyageNo: 'V2', currentPortScheduleId: 'S1', estimatedSailingAt: '2026-11-05T10:55:00', estimatedPortArrivalAt: '2026-11-08T00:00:00' } as never)
+    const wrapper = await mountDetail(workbench)
+    const section = wrapper.get('[aria-labelledby="container-voyage-heading"]')
+    expect(section.text()).toContain('船名航次信息')
+    expect(section.text()).toContain('VESSEL / V2')
+    expect(section.text()).toContain('2026-11-05 10:55')
+    expect(section.text()).toContain('2026-11-08 00:00')
+    expect(wrapper.findComponent({ name: 'ContainerPortSchedulePanel' }).exists()).toBe(false)
+    expect(section.text()).not.toContain('船期维护与历史')
  })
  beforeEach(() => {
    routeState.query = {}
@@ -16,7 +16,7 @@ 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, ContainerPortSchedulePanel } from '@/modules/port-schedules'
+import { CarrierScheduleQueryPanel } from '@/modules/port-schedules'
 import { ContainerFeesPanel, useLoadingListDetail, LoadingListDetailDrawer, PalletLabelPrintDialog, type LoadingListMode } from '@/modules/loading-lists'
 import {
  getContainerOutboundDispatch,
@@ -498,6 +498,7 @@ async function saveDocument() {
  } catch (cause) {
    const details = getApiErrorDetails(cause, `${documentTitle.value}上传失败`)
    if (details.code === 'A0409') try { overview.value = await getContainerOverview(containerId.value) } catch { /* 保留原并发错误证据 */ }
+    console.error('[Container document upload] failed', details)
    documentError.value = details
  }
  finally { documentSaving.value = false }
@@ -578,6 +579,7 @@ async function uploadClearance() {
    if (details.code === 'A0409') {
      try { await refreshOverviewDocument('DESTINATION_CLEARANCE') } catch { /* 保留原并发错误证据 */ }
    }
+    console.error('[Destination clearance upload] failed', details)
    clearanceError.value = details
  }
  finally { clearanceSaving.value = false }
@@ -646,7 +648,7 @@ onMounted(async () => {
      </section>

      <section v-show="activeTab === 'overview'" class="detail-section workbench-panel is-compact" aria-labelledby="container-voyage-heading">
-        <header class="detail-section__heading"><h2 id="container-voyage-heading">船名航次信息</h2><ContainerPortSchedulePanel :container="detail" @saved="load" /></header>
+        <header class="detail-section__heading"><h2 id="container-voyage-heading">船名航次信息</h2></header>
        <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 hide-technical-details :cabinet-no="detail.cabinetNo" :container-no="detail.containerNo" :key="carrierRefreshKey" :ocean-booking-id="detail.oceanBookingId" :container-booking-id="detail.id" :warehouse-timeline="overview?.timeline || []" /></div>
      </section>
@@ -686,9 +688,9 @@ onMounted(async () => {

    <OceanBookingLinkDialog v-model="oceanBookingLinkOpen" :container="detail" @linked="load" />
    <AppDialog class="container-detail-dialog admin-density-dialog admin-workbench is-dialog" v-model="emptyReturnOpen" :title="containerDialogTitle('确认还柜', detail)" width="min(520px, calc(100vw - 28px))" :confirm-text="emptyReturnPending ? '重试本次还空登记' : '确认还柜'" :before-close="closeEmptyReturn" :confirm-loading="emptyReturnSaving" :confirm-disabled="!emptyReturnAt || !canRecordEmptyReturn" @confirm="confirmEmptyReturn"><el-alert title="提交后货柜将进入已还柜状态，请核对实际还柜时间。" type="warning" :closable="false" show-icon /><el-form class="density-form density-form--flush-end" label-position="top" :disabled="emptyReturnSaving || !!emptyReturnPending"><el-form-item label="实际还柜当地时间" required><el-date-picker v-model="emptyReturnAt" type="datetime" value-format="YYYY-MM-DDTHH:mm:ss" placeholder="请选择实际还柜时间" /></el-form-item><el-form-item label="备注"><el-input v-model="emptyReturnReason" type="textarea" :rows="3" maxlength="500" show-word-limit /></el-form-item></el-form><LoadErrorState v-if="emptyReturnError" compact title="确认还柜失败" :message="emptyReturnError.message" :show-retry="false"><template #details><ApiErrorMeta :details="emptyReturnError" /></template></LoadErrorState></AppDialog>
-    <AppDialog class="container-detail-dialog admin-density-dialog admin-workbench is-dialog" v-model="documentOpen" :title="containerDialogTitle(documentTitle, detail)" width="min(520px, calc(100vw - 28px))" :show-confirm="!!documentError && !!documentFile" confirm-text="重试上传" :confirm-loading="documentSaving" :confirm-disabled="!documentFile" @confirm="saveDocument"><section class="density-dialog-section"><el-form class="density-form density-form--flush-end" label-position="top"><el-form-item><el-upload :disabled="documentSaving" :key="documentUploadKey" :auto-upload="false" :limit="1" :on-change="selectDocumentFile" :on-remove="removeDocumentFile"><el-button :loading="documentSaving" :aria-label="`选择${documentTitle}文件`"><FileUp :size="16" />选择文件</el-button><template v-if="selectedDocument" #tip><div class="el-upload__tip">上传新文件将替换当前资料并保留历史。</div></template></el-upload></el-form-item></el-form></section><LoadErrorState v-if="documentError" compact title="资料上传失败" :message="documentError.message" :show-retry="false"><template #details><ApiErrorMeta :details="documentError" /></template></LoadErrorState></AppDialog>
+    <AppDialog class="container-detail-dialog admin-density-dialog admin-workbench is-dialog" v-model="documentOpen" :title="containerDialogTitle(documentTitle, detail)" width="min(520px, calc(100vw - 28px))" :show-confirm="!!documentError && !!documentFile" confirm-text="重试上传" :confirm-loading="documentSaving" :confirm-disabled="!documentFile" @confirm="saveDocument"><section class="density-dialog-section"><el-form class="density-form density-form--flush-end" label-position="top"><el-form-item><el-upload :disabled="documentSaving" :key="documentUploadKey" :auto-upload="false" :limit="1" :on-change="selectDocumentFile" :on-remove="removeDocumentFile"><el-button :loading="documentSaving" :aria-label="`选择${documentTitle}文件`"><FileUp :size="16" />选择文件</el-button><template v-if="selectedDocument" #tip><div class="el-upload__tip">上传新文件将替换当前资料并保留历史。</div></template></el-upload></el-form-item></el-form></section><LoadErrorState v-if="documentError" compact title="资料上传失败" :message="documentError.message" :show-retry="false"></LoadErrorState></AppDialog>
    <AppDialog class="container-detail-dialog admin-density-dialog admin-workbench is-dialog" v-model="exceptionOpen" :title="containerDialogTitle(exceptionTitle, detail)" width="min(520px, calc(100vw - 28px))" :confirm-text="overview?.exception.active ? '确认取消' : '确认标记'" :confirm-loading="exceptionSaving" :confirm-disabled="!exceptionReason.trim()" @confirm="saveException"><el-alert :title="overview?.exception.active ? '取消备注为必填项，提交后将保留历史记录。' : '异常原因将同步记录在货柜详情和操作日志中。'" :type="overview?.exception.active ? 'warning' : 'error'" :closable="false" /><el-form class="density-form density-form--flush-end" label-position="top"><el-form-item :label="overview?.exception.active ? '取消备注' : '异常原因'" required><el-input v-model="exceptionReason" type="textarea" :rows="4" maxlength="500" show-word-limit /></el-form-item></el-form><LoadErrorState v-if="exceptionError" compact title="异常处理失败" :message="exceptionError.message" :show-retry="false" /></AppDialog>
-    <AppDialog class="container-detail-dialog admin-density-dialog admin-workbench is-dialog" v-model="clearanceOpen" :title="containerDialogTitle('目的港清关资料', detail)" width="min(520px, calc(100vw - 28px))" :loading="clearanceLoading" :show-confirm="false" :confirm-loading="clearanceSaving" :confirm-disabled="!clearanceFile" @confirm="uploadClearance"><el-alert v-if="clearanceDocument?.completedAt" type="success" :closable="false" :title="`目的港清关已完成：${clearanceDocument.fileName}`" /><template v-else><section class="density-dialog-section"><el-form class="density-form density-form--flush-end" label-position="top"><el-form-item><el-upload :key="clearanceUploadKey" :disabled="clearanceSaving || clearanceLoading" :auto-upload="false" :limit="1" :on-change="selectClearanceFile" :on-remove="removeClearanceFile"><el-button :loading="clearanceSaving" aria-label="选择目的港清关资料文件"><FileUp :size="16" />选择文件</el-button></el-upload></el-form-item></el-form></section></template><LoadErrorState v-if="clearanceError" compact title="目的港清关资料操作失败" :message="clearanceError.message" :show-retry="false"><template #details><ApiErrorMeta :details="clearanceError" /></template></LoadErrorState><template #footer="{ close }"><div class="density-actions density-actions--footer"><el-button :disabled="clearanceSaving" @click="close">取消</el-button><el-button v-if="clearanceDocument && !clearanceDocument.completedAt" :disabled="clearanceLoading" type="success" plain :loading="clearanceSaving" @click="completeClearance">确认目的港清关完成</el-button><el-button v-if="clearanceError && clearanceFile && !clearanceDocument?.completedAt" type="primary" :loading="clearanceSaving" :disabled="clearanceLoading" @click="uploadClearance">重试上传</el-button></div></template></AppDialog>
+    <AppDialog class="container-detail-dialog admin-density-dialog admin-workbench is-dialog" v-model="clearanceOpen" :title="containerDialogTitle('目的港清关资料', detail)" width="min(520px, calc(100vw - 28px))" :loading="clearanceLoading" :show-confirm="false" :confirm-loading="clearanceSaving" :confirm-disabled="!clearanceFile" @confirm="uploadClearance"><el-alert v-if="clearanceDocument?.completedAt" type="success" :closable="false" :title="`目的港清关已完成：${clearanceDocument.fileName}`" /><template v-else><section class="density-dialog-section"><el-form class="density-form density-form--flush-end" label-position="top"><el-form-item><el-upload :key="clearanceUploadKey" :disabled="clearanceSaving || clearanceLoading" :auto-upload="false" :limit="1" :on-change="selectClearanceFile" :on-remove="removeClearanceFile"><el-button :loading="clearanceSaving" aria-label="选择目的港清关资料文件"><FileUp :size="16" />选择文件</el-button></el-upload></el-form-item></el-form></section></template><LoadErrorState v-if="clearanceError" compact title="目的港清关资料操作失败" :message="clearanceError.message" :show-retry="false"></LoadErrorState><template #footer="{ close }"><div class="density-actions density-actions--footer"><el-button :disabled="clearanceSaving" @click="close">取消</el-button><el-button v-if="clearanceDocument && !clearanceDocument.completedAt" :disabled="clearanceLoading" type="success" plain :loading="clearanceSaving" @click="completeClearance">确认目的港清关完成</el-button><el-button v-if="clearanceError && clearanceFile && !clearanceDocument?.completedAt" type="primary" :loading="clearanceSaving" :disabled="clearanceLoading" @click="uploadClearance">重试上传</el-button></div></template></AppDialog>
    <AppDialog class="container-detail-dialog admin-density-dialog admin-workbench is-dialog" v-model="directOpen" :title="containerDialogTitle('直送卸货登记', detail)" width="1080px" fullscreenable :show-confirm="canWriteDirect && !!directSelected && !directSelected.actualAt" :confirm-text="directPending ? '重试本次登记' : '确认本票卸货'" :confirm-loading="directSaving" :confirm-disabled="directLoading || !!directError" :before-close="closeDirect" @confirm="saveDirect">

      <LoadErrorState v-if="directError" title="直送卸货清单读取失败" :message="directError.message" :loading="directLoading" @retry="loadDirect"><template #details><ApiErrorMeta :details="directError" /></template></LoadErrorState>
@@ -245,6 +245,7 @@ const allColumns: DataTableColumn[] = [
  { key: 'exceptionActive', label: '异常', width: 90, formatter: (row: ContainerBookingResource) => row.exceptionActive ? '异常' : '正常', afterColumn: 'containerNo' },
  { key: 'planNo', prop: 'planNo', label: '装柜清单号', minWidth: 165, formatter: (row: ContainerBookingResource) => row.planNo || '—' },
  { key: 'cabinetNo', label: '柜次号', minWidth: 180, slotName: 'cabinet' },
+  { key: 'createdAt', label: '创建时间', width: 165, formatter: (row: ContainerBookingResource) => formatTime(row.createdAt), afterColumn: 'cabinetNo' },
  { key: 'pickupCode', label: 'PU码', minWidth: 140, formatter: (row: ContainerBookingResource) => row.pickupCode || '—' },
  { key: 'oceanBooking', label: '真实订舱', minWidth: 170, slotName: 'oceanBooking' },
  { key: 'warehouseName', prop: 'warehouseName', label: '装柜仓库', minWidth: 160 },
@@ -267,8 +268,8 @@ const allColumns: DataTableColumn[] = [
  { key: 'estimatedPortArrivalAt', label: '预计到港', minWidth: 160, slotName: 'estimatedPortArrivalAt' },
  { key: 'actualPortArrivalAt', label: '实际到港', minWidth: 160, slotName: 'actualPortArrivalAt' },
 ]
-const domesticColumnKeys = new Set(['actions', 'containerNo', 'planNo', 'planStatus', 'exceptionActive', 'cabinetNo', 'oceanBooking', 'warehouseName', 'channelGroupCode', 'channelName', 'billOfLadingNo', 'route', 'containerType', 'capacity', 'vessel', 'shippingCompanyName', 'loadingAt', 'estimatedSailingAt'])
-const overseasColumnKeys = new Set(['actions', 'emptyReturnWarning', 'containerNo', 'cabinetNo', 'destinationClearanceDocumentStatus', 'deliveryOrderDocumentStatus', 'pickupCode', 'terminalTruckingCompany', 'pickupAppointmentAt', 'actualPickupAt', 'estimatedEmptyReturnAt', 'actualEmptyReturnAt', 'billOfLadingNo', 'route', 'vessel', 'actualSailingAt', 'estimatedPortArrivalAt', 'actualPortArrivalAt'])
+const domesticColumnKeys = new Set(['actions', 'containerNo', 'planNo', 'planStatus', 'exceptionActive', 'cabinetNo', 'createdAt', 'oceanBooking', 'warehouseName', 'channelGroupCode', 'channelName', 'billOfLadingNo', 'route', 'containerType', 'capacity', 'vessel', 'shippingCompanyName', 'loadingAt', 'estimatedSailingAt'])
+const overseasColumnKeys = new Set(['actions', 'emptyReturnWarning', 'containerNo', 'cabinetNo', 'createdAt', 'destinationClearanceDocumentStatus', 'deliveryOrderDocumentStatus', 'pickupCode', 'terminalTruckingCompany', 'pickupAppointmentAt', 'actualPickupAt', 'estimatedEmptyReturnAt', 'actualEmptyReturnAt', 'billOfLadingNo', 'route', 'vessel', 'actualSailingAt', 'estimatedPortArrivalAt', 'actualPortArrivalAt'])
 const columns = computed(() => allColumns
  .filter((column) => (isDomestic.value ? domesticColumnKeys : overseasColumnKeys).has(String(column.key)))
  // 国内同时展示查看、运输信息、装柜流程和更多菜单，须为四个入口预留空间。
@@ -60,7 +60,7 @@ function setFee(overrides: Partial<FinanceFeeSourceDetail> = {}) {
  vi.mocked(api.listFinanceFeeSources).mockResolvedValue({ records: [current], total: 1, pages: 1 })
  vi.mocked(api.getFinanceFeeSource).mockResolvedValue(current)
 }
-async function mountPage(kind: 'arap' | 'statements') {
+async function mountPage(kind: 'arap' | 'statements', cachedWorkspace = false) {
  const router = createRouter({ history: createMemoryHistory(), routes: [
    { path: '/finance/customer-arap', name: 'finance-customer-arap', component: FinanceCustomerArapView },
    { path: '/finance/customer-arap/:feeSourceId', name: 'finance-customer-arap-detail', component: FinanceCustomerArapView },
@@ -69,7 +69,10 @@ async function mountPage(kind: 'arap' | 'statements') {
  ] })
  await router.push(kind === 'arap' ? '/finance/customer-arap' : '/finance/customer-statements')
  await router.isReady()
-  const wrapper = mount(kind === 'arap' ? FinanceCustomerArapView : FinanceCustomerStatementsView, { attachTo: document.body, global: { plugins: [ElementPlus, router] } })
+  const component = cachedWorkspace
+    ? { template: '<router-view v-slot="{ Component, route }"><keep-alive><component :is="Component" :key="route.name" /></keep-alive></router-view>' }
+    : kind === 'arap' ? FinanceCustomerArapView : FinanceCustomerStatementsView
+  const wrapper = mount(component, { attachTo: document.body, global: { plugins: [ElementPlus, router] } })
  await flushPromises()
  return { wrapper, router }
 }
@@ -99,17 +102,6 @@ async function fillCreation(dialog: VueWrapper, selected = false) {
  await flushPromises()
  await dialog.get('textarea').setValue('测试备注')
 }
-async function openAdjustment() {
-  const { wrapper, router } = await mountPage('statements')
-  await rowClick(wrapper, '调整')
-  return { wrapper, router, dialog: activeDialog(wrapper) }
-}
-async function fillAdjustment(dialog: VueWrapper) {
-  await dialog.get('textarea[placeholder="请输入整体调整原因"]').setValue(' 整体调整 ')
-  await dialog.get('.el-table__body-wrapper input[type="checkbox"]').setValue(true)
-  dialog.getComponent({ name: 'ElInputNumber' }).vm.$emit('update:modelValue', 88.12)
-  await dialog.get('.el-table__body-wrapper input[placeholder="请输入明细说明"]').setValue(' 行说明 ')
-}
 enableAutoUnmount(afterEach)
 beforeEach(() => {
  vi.resetAllMocks()
@@ -233,6 +225,30 @@ describe('fee source and statement native dialogs', () => {
    await click(dialog, '确定')
    expect(api.createReconciliationStatement).toHaveBeenCalledWith(expect.objectContaining({ generationMode: 'SELECTED', feeSourceIds: [fee.feeSourceId] }))
  })
+  it.each([false, true])('opens selected statement generation directly from arap with a cached statement page=%s', async cached => {
+    setFee({ reviewStatus: 'APPROVED' })
+    const { wrapper, router } = await mountPage(cached ? 'statements' : 'arap', true)
+    const cachedPage = cached ? wrapper.getComponent(FinanceCustomerStatementsView).element : null
+    if (cached) {
+      await click(wrapper, '生成对账单')
+      await click(activeDialog(wrapper), '取消')
+      await router.push({ name: 'finance-customer-arap' })
+      await flushPromises()
+    }
+    await wrapper.get('.el-table__body-wrapper input[type="checkbox"]').setValue(true)
+    await click(wrapper, '生成所选对账单')
+
+    const page = wrapper.getComponent(FinanceCustomerStatementsView)
+    if (cachedPage) expect(page.element).toBe(cachedPage)
+    const dialog = activeDialog(wrapper)
+    expect(dialog.props('title')).toBe('生成客户对账单')
+    expect(dialog.getComponent({ name: 'ElRadioGroup' }).props('modelValue')).toBe('SELECTED')
+    expect(dialog.findAllComponents({ name: 'ElSelect' })[0]!.props('modelValue')).toBe(String(customer.id))
+    expect(dialog.findAllComponents({ name: 'ElDatePicker' }).map(item => item.props('modelValue'))).toEqual(['2026-10-01', '2026-10-01'])
+    expect(dialog.get('.selected-source-summary').text()).toContain('已选 1 笔，合计 100.00 CNY')
+    expect(router.currentRoute.value.query).toEqual({})
+    expect(api.createReconciliationStatement).not.toHaveBeenCalled()
+  })
  it('preserves customer and period validation before creating', async () => {
    const { dialog } = await openCreate()
    await click(dialog, '确定')
@@ -271,48 +287,14 @@ describe('fee source and statement native dialogs', () => {
    expect((dialog.get('textarea').element as HTMLTextAreaElement).value).toBe('测试备注')
    expect(dialog.props('modelValue')).toBe(true)
  })
-  it('keeps all adjustment rows in the main dialog flow with plain statement facts', async () => {
-    vi.mocked(api.getReconciliationStatement).mockResolvedValue({ ...detail, lines: Array.from({ length: 13 }, (_, index) => ({ ...detail.lines[0]!, statementLineId: 'line-' + index, feeItemName: '费用' + (index + 1) })) })
-    const { dialog } = await openAdjustment()
-    expect(dialog.props('width')).toContain('900px')
-    expect(dialog.props('title')).toContain(statement.billNo)
-    expect(dialog.find('[data-tone="summary"] input').exists()).toBe(false)
-    expect(dialog.getComponent({ name: 'ElTable' }).props('maxHeight')).toBeUndefined()
-    expect(dialog.findAll('.el-table__body-wrapper tr')).toHaveLength(13)
-    expect(dialog.get('.el-table__body-wrapper').text()).toContain('费用13')
-  })
-  it('saves only checked lines with full IDs and the freshly loaded version', async () => {
-    const { dialog } = await openAdjustment()
-    await fillAdjustment(dialog)
-    await dialog.get('button[aria-label="展开全屏"]').trigger('click')
-    await click(dialog, '确定')
-    expect(api.actionReconciliationStatement).toHaveBeenCalledWith(statement.id, { action: 'ADJUST', reason: '整体调整', expectedVersion: 8, adjustmentLines: [{ statementLineId: '9223372036854775011', adjustedAmount: 88.12, reason: '行说明' }] })
-  })
-  it('requires an overall reason, selection and each selected line reason', async () => {
-    const { dialog } = await openAdjustment()
-    await click(dialog, '确定')
+  it.each(['APPROVED', 'ISSUED', 'PAID'])('does not offer adjustment or void after statement approval: %s', async status => {
+    vi.mocked(api.listFinanceStatements).mockResolvedValue([{ ...statement, status }])
+    const { wrapper } = await mountPage('statements')
+    const labels = wrapper.findAll('.el-table__body-wrapper button').map(button => button.text().trim())
+    expect(labels).toContain('详情')
+    expect(labels).not.toContain('调整')
+    expect(labels).not.toContain('作废')
    expect(api.actionReconciliationStatement).not.toHaveBeenCalled()
-    await dialog.get('textarea').setValue('整体调整')
-    await click(dialog, '确定')
-    expect(api.actionReconciliationStatement).not.toHaveBeenCalled()
-    await dialog.get('.el-table__body-wrapper input[type="checkbox"]').setValue(true)
-    await click(dialog, '确定')
-    expect(api.actionReconciliationStatement).not.toHaveBeenCalled()
-  })
-  it('locks adjustment rows and retains their state with visible failure diagnostics', async () => {
-    const pending = deferred<FinanceReconciliationDetail>()
-    vi.mocked(api.actionReconciliationStatement).mockReturnValue(pending.promise)
-    const { dialog } = await openAdjustment()
-    await fillAdjustment(dialog)
-    await click(dialog, '确定')
-    expect(dialog.props('showClose')).toBe(false)
-    expect(dialog.get('.el-table__body-wrapper input[type="checkbox"]').attributes('disabled')).toBeDefined()
-    pending.reject(failure())
-    await flushPromises()
-    expect(dialog.getComponent(OperationErrorToast).props('details')).toMatchObject({ message: '测试拒绝操作', requestId: 'finance-dialog-test' })
-    expect((dialog.get('.el-table__body-wrapper input[type="checkbox"]').element as HTMLInputElement).checked).toBe(true)
-    expect((dialog.get('.el-table__body-wrapper input[placeholder="请输入明细说明"]').element as HTMLInputElement).value).toBe(' 行说明 ')
-    expect(dialog.props('modelValue')).toBe(true)
  })
  it.each([
    ['驳回', 'PENDING_REVIEW', 'REJECT'], ['作废', 'DRAFT', 'VOID'], ['重开', 'REJECTED', 'REOPEN'],
@@ -576,7 +576,7 @@ onBeforeUnmount(clearVoucherPreview)
          <tr><th scope="row">原消费金额</th><td>{{ money(refundSource?.entry.amount) }}</td></tr>
        </tbody></table></section>
        <el-alert title="退款会生成独立流水并关联原消费；累计可退金额以服务端校验为准。" type="info" :closable="false" />
-        <div v-if="refundError"><el-alert :title="refundError.message" type="error" :closable="false" /><ApiErrorMeta :details="refundError" /></div>
+        <el-alert v-if="refundError" :title="refundError.message" type="error" :closable="false" />
        <section class="density-dialog-section workbench-evidence" data-tone="work" aria-label="退款登记"><el-form class="density-form" label-position="left" label-width="100px" :disabled="refundSaving"><table class="density-table density-table--editable"><tbody>
          <tr><td><el-form-item label="退款金额" required><el-input v-model="refundForm.amount" inputmode="decimal" placeholder="请输入退款金额" /></el-form-item></td></tr>
          <tr><td><el-form-item label="退款说明" required><el-input v-model="refundForm.reason" type="textarea" :rows="3" maxlength="500" show-word-limit placeholder="请填写退款说明" /></el-form-item></td></tr>
@@ -1,8 +1,9 @@
 import { readFileSync } from 'node:fs'
 import { resolve } from 'node:path'
+import { defineComponent, h, KeepAlive, type VNode } from 'vue'
 import ElementPlus from 'element-plus'
 import { createPinia, setActivePinia } from 'pinia'
-import { createMemoryHistory, createRouter } from 'vue-router'
+import { createMemoryHistory, createRouter, RouterView } from 'vue-router'
 import { enableAutoUnmount, flushPromises, mount } from '@vue/test-utils'
 import { afterAll, afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import { useAccessPreviewStore } from '@/core/access/accessPreview'
@@ -11,7 +12,7 @@ import { ApiResponseError } from '@/shared/api/http'
 import { createPlatformExportTask } from '@/modules/downloads'
 import { listPlatformTenants } from '@/modules/iam'
 import { showExportTaskCreatedDialog } from '@/shared/components/exportTaskCreatedDialog'
-import { createReconciliationStatement, getReconciliationStatement, listFinanceFeeSources, listFinanceStatements } from '../api/finance'
+import { actionReconciliationStatement, createReconciliationStatement, getReconciliationStatement, listFinanceFeeSources, listFinanceStatements } from '../api/finance'
 import type { FinanceFeeSourceSummary, FinanceReconciliationDetail, FinanceStatementReadModel } from '../types'
 import FinanceCustomerStatementsView from './FinanceCustomerStatementsView.vue'

@@ -53,7 +54,7 @@ const eligibleFeeSource: FinanceFeeSourceSummary = {
  sourceStatus: 'AVAILABLE', statementGenerated: false, status: 'AVAILABLE', createdAt: '2026-08-15',
 }

-async function mountPage(permissions = ['platform:finance:customer-statement:list'], initialPath = '/finance/customer-statements') {
+async function mountPage(permissions = ['platform:finance:customer-statement:list'], initialPath = '/finance/customer-statements', cached = false) {
  const pinia = createPinia(); setActivePinia(pinia)
  const auth = useAuthStore(); auth.token = 'token'; auth.permissions = permissions
  useAccessPreviewStore().initializeAfterLogin()
@@ -63,7 +64,10 @@ async function mountPage(permissions = ['platform:finance:customer-statement:lis
    { path: '/downloads', name: 'download-center', component: { template: '<div>下载中心</div>' } },
  ] })
  await router.push(initialPath); await router.isReady()
-  const wrapper = mount(FinanceCustomerStatementsView, { attachTo: document.body, global: { plugins: [pinia, ElementPlus, router] } })
+  const cachedPage = defineComponent({ setup: () => () => h(RouterView, {}, {
+    default: ({ Component }: { Component: VNode }) => h(KeepAlive, {}, { default: () => Component }),
+  }) })
+  const wrapper = mount(cached ? cachedPage : FinanceCustomerStatementsView, { attachTo: document.body, global: { plugins: [pinia, ElementPlus, router] } })
  await flushPromises()
  return { wrapper, router }
 }
@@ -72,6 +76,29 @@ enableAutoUnmount(afterEach)
 afterAll(() => vi.unstubAllGlobals())

 describe('FinanceCustomerStatementsView', () => {
+  it('omits reopening voided and rejected statements and ignores stale reopen commands', async () => {
+    vi.mocked(listFinanceStatements).mockResolvedValue([{ ...statement, status: 'VOIDED' }, { ...statement, id: '502', status: 'REJECTED' }])
+    const { wrapper } = await mountPage(['platform:finance:customer-statement:list', 'platform:finance:reconciliation:void'])
+    const page = wrapper.vm as unknown as { handleStatementAction(command: string, row: FinanceStatementReadModel): void }
+    expect(wrapper.text()).not.toContain('重开')
+    page.handleStatementAction('reopen', { ...statement, status: 'VOIDED' })
+    await flushPromises()
+    expect(actionReconciliationStatement).not.toHaveBeenCalled()
+  })
+
+  it('keeps statement rows visible and shows only the business error after a failed action', async () => {
+    const draft = { ...statement, status: 'DRAFT' }
+    vi.mocked(listFinanceStatements).mockResolvedValue([draft])
+    vi.mocked(actionReconciliationStatement).mockRejectedValueOnce(new ApiResponseError('费用已生成新的对账单', 'FIN_409', 409, null, 'REQUEST-FAIL', 'TRACE-FAIL'))
+    const { wrapper } = await mountPage(['platform:finance:customer-statement:list', 'platform:finance:reconciliation:create'])
+    const page = wrapper.vm as unknown as { handleStatementAction(command: string, row: FinanceStatementReadModel): void }
+    page.handleStatementAction('submit', draft)
+    await flushPromises()
+    expect(wrapper.text()).toContain('费用已生成新的对账单')
+    expect(wrapper.text()).toContain('REC-501')
+    expect(wrapper.text()).not.toMatch(/REQUEST-FAIL|TRACE-FAIL|客户对账单加载失败/)
+  })
+
  beforeEach(() => {
    vi.stubGlobal('ResizeObserver', ResizeObserverStub)
    vi.stubGlobal('localStorage', memoryStorage())
@@ -121,6 +148,25 @@ describe('FinanceCustomerStatementsView', () => {
    expect(wrapper.find('[aria-label="支付历史"]').isVisible()).toBe(true)
  })

+  it('shows overseas procurement as the source type in statement detail fee lines', async () => {
+    vi.mocked(getReconciliationStatement).mockResolvedValue({
+      ...detail,
+      lines: ['开箱费', '提柜-额外费用'].map((feeItemName, index) => ({
+        ...detail.lines[0]!, statementLineId: `procurement-line-${index}`, sourceType: 'OVERSEAS_PROCUREMENT_FEE',
+        sourceNo: 'CG-TEST-001', feeItemName,
+      })),
+    })
+    const { wrapper } = await mountPage(['platform:finance:customer-statement:list'], '/finance/customer-statements/501')
+    const table = wrapper.get('[aria-label="客户对账单账单明细"]')
+    const rows = table.findAll('.el-table__body tbody tr')
+    expect(rows).toHaveLength(2)
+    expect(rows.map(row => row.findAll('td')[1]!.text())).toEqual(['海外采购费用', '海外采购费用'])
+    expect(table.text()).toContain('CG-TEST-001')
+    expect(table.text()).toContain('开箱费')
+    expect(table.text()).toContain('提柜-额外费用')
+    expect(table.text()).not.toMatch(/未知来源类型|OVERSEAS_PROCUREMENT_FEE/)
+  })
+
  it('collapses advanced criteria without losing values and resets hidden filters', async () => {
    const { wrapper } = await mountPage()
    const vm = wrapper.vm as unknown as { filters: Record<string, unknown>; appliedFilters: Record<string, unknown> }
@@ -160,31 +206,33 @@ describe('FinanceCustomerStatementsView', () => {
    expect(source).toContain('<RowActions text-actions :actions="statementActions(row as FinanceStatementReadModel)"')
  })

-  it('keeps three available row actions visible with primary and danger semantics', async () => {
+  it.each(['APPROVED', 'ISSUED', 'PAID'])('hides adjustment and void for reviewed statement %s even with write permissions', async status => {
+    vi.mocked(listFinanceStatements).mockResolvedValue([{ ...statement, status, customerConfirmationStatus: 'PENDING_CONFIRM' }])
    const { wrapper } = await mountPage([
-      'platform:finance:customer-statement:list',
-      'platform:finance:reconciliation:adjust',
-      'platform:finance:reconciliation:void',
+      'platform:finance:customer-statement:list', 'platform:finance:reconciliation:adjust', 'platform:finance:reconciliation:void',
    ])
-    const actionButtons = [...document.querySelectorAll('button')].filter((button) => ['详情', '调整', '作废'].includes(button.textContent?.trim() || ''))
-    const detailButton = actionButtons.find((button) => button.textContent?.trim() === '详情')
-    const adjustButton = actionButtons.find((button) => button.textContent?.trim() === '调整')
-    const voidButton = actionButtons.find((button) => button.textContent?.trim() === '作废')
-    expect(new Set(actionButtons.map((button) => button.textContent?.trim()))).toEqual(new Set(['详情', '调整', '作废']))
-    expect(detailButton?.classList).toContain('el-button--small')
-    expect(detailButton?.classList).toContain('density-action')
-    expect(detailButton?.getAttribute('data-tone')).toBe('neutral')
-    expect(adjustButton?.classList).toContain('density-action')
-    expect(voidButton?.getAttribute('data-tone')).toBe('danger')
-
-    const vm = wrapper.vm as unknown as { actionBusy: boolean; adjustBusy: boolean }
-    vm.actionBusy = true
-    vm.adjustBusy = true
-    await flushPromises()
-    expect(adjustButton?.hasAttribute('disabled')).toBe(true)
-    expect(voidButton?.hasAttribute('disabled')).toBe(true)
+    const labels = wrapper.findAll('.el-table__body-wrapper button').map(button => button.text().trim())
+    expect(labels).toContain('详情')
+    expect(labels).not.toContain('调整')
+    expect(labels).not.toContain('作废')
  })

+  it.each(['DRAFT', 'PENDING_REVIEW'])('keeps void before approval with the independent permission: %s', async status => {
+    vi.mocked(listFinanceStatements).mockResolvedValue([{ ...statement, status }])
+    const { wrapper } = await mountPage(['platform:finance:customer-statement:list', 'platform:finance:reconciliation:void'])
+    const button = wrapper.findAll('.el-table__body-wrapper button').find(item => item.text().trim() === '作废')!
+    expect(button.attributes('data-tone')).toBe('danger')
+    const vm = wrapper.vm as unknown as { actionBusy: boolean }
+    vm.actionBusy = true
+    await flushPromises()
+    expect(button.attributes('disabled')).toBeDefined()
+  })
+
+  it('does not offer void without permission even before approval', async () => {
+    vi.mocked(listFinanceStatements).mockResolvedValue([{ ...statement, status: 'DRAFT' }])
+    const { wrapper } = await mountPage()
+    expect(wrapper.findAll('.el-table__body-wrapper button').map(button => button.text().trim())).not.toContain('作废')
+  })
  it('keeps the payment history in the desktop detail layout without duplicating a card container', async () => {
    const { wrapper } = await mountPage()
    const vm = wrapper.vm as unknown as { openDetail(row: FinanceStatementReadModel): Promise<void> }
@@ -224,10 +272,6 @@ describe('FinanceCustomerStatementsView', () => {
    expect(text).toContain('2026-08-14 03:27')
    expect(text).not.toContain('2026-08-14T03:27:34Z')

-    await (wrapper.vm as unknown as { openAdjustment(row: FinanceStatementReadModel): Promise<void> }).openAdjustment(internalStatement)
-    await flushPromises()
-    expect(document.body.textContent).toContain('调整客户对账单')
-    expect(document.body.textContent).toContain('运费')
  })

  it('filters hydrated statements by status, bill number, container, period, settlement and payment date', async () => {
@@ -373,6 +417,67 @@ describe('FinanceCustomerStatementsView', () => {
    expect(router.currentRoute.value).toMatchObject({ name: 'finance-customer-statement-detail', params: { statementId: '502' } })
  })

+  const selectedCreatePermissions = ['platform:finance:customer-statement:list', 'platform:finance:customer-arap:list', 'platform:finance:reconciliation:create', 'platform:customer:list']
+  const selectedCreatePath = '/finance/customer-statements?createMode=SELECTED&customerId=10001&feeSourceIds=42&periodStart=2026-08-15&periodEnd=2026-08-15'
+  type SourcePage = Awaited<ReturnType<typeof listFinanceFeeSources>>
+
+  it.each(['success', 'failure'] as const)('ignores a late %s after leaving a reactivated statement page', async (outcome) => {
+    const { wrapper, router } = await mountPage(selectedCreatePermissions, '/finance/customer-statements', true)
+    const pageVm = wrapper.getComponent(FinanceCustomerStatementsView).vm as unknown as {
+      createOpen: boolean; createSourcesError: unknown; createSourcesLoading: boolean
+    }
+    await router.push('/downloads'); await flushPromises()
+    let resolve!: (value: SourcePage) => void, reject!: (reason: Error) => void
+    vi.mocked(listFinanceFeeSources).mockImplementationOnce(() => new Promise((yes, no) => { resolve = yes; reject = no }))
+    await router.push(selectedCreatePath); await flushPromises()
+    expect(listFinanceFeeSources).toHaveBeenCalledTimes(1)
+    const replace = vi.spyOn(router, 'replace')
+    await router.push('/downloads'); await flushPromises()
+    if (outcome === 'success') resolve({ records: [eligibleFeeSource], total: 2, pages: 2 })
+    else reject(new Error('旧候选查询失败'))
+    await flushPromises()
+    expect(router.currentRoute.value.name).toBe('download-center')
+    expect(replace).not.toHaveBeenCalled()
+    expect(pageVm.createOpen).toBe(false)
+    expect(pageVm.createSourcesError).toBeNull()
+    expect(pageVm.createSourcesLoading).toBe(false)
+    expect(listFinanceFeeSources).toHaveBeenCalledTimes(1)
+  })
+
+  it('opens the current selection after reactivation without letting an older response reopen it', async () => {
+    const { wrapper, router } = await mountPage(selectedCreatePermissions, '/finance/customer-statements', true)
+    const pageVm = wrapper.getComponent(FinanceCustomerStatementsView).vm as unknown as {
+      createOpen: boolean; createForm: { feeSourceIds: string[] }; createSourceOptions: FinanceFeeSourceSummary[]
+    }
+    await router.push('/downloads'); await flushPromises()
+    let resolve!: (value: SourcePage) => void
+    vi.mocked(listFinanceFeeSources).mockImplementationOnce(() => new Promise(yes => { resolve = yes }))
+    await router.push(selectedCreatePath); await flushPromises()
+    await router.push('/downloads'); await flushPromises()
+    vi.mocked(listFinanceFeeSources).mockResolvedValue({ records: [{ ...eligibleFeeSource, feeSourceId: '43' }], total: 1, pages: 1 })
+    await router.push(selectedCreatePath.replace('feeSourceIds=42', 'feeSourceIds=43')); await flushPromises()
+    expect(pageVm.createOpen).toBe(true)
+    expect(pageVm.createForm.feeSourceIds).toEqual(['43'])
+    const replace = vi.spyOn(router, 'replace')
+    resolve({ records: [eligibleFeeSource], total: 1, pages: 1 }); await flushPromises()
+    expect(replace).not.toHaveBeenCalled()
+    expect(pageVm.createForm.feeSourceIds).toEqual(['43'])
+    expect(pageVm.createSourceOptions.map(item => item.feeSourceId)).toEqual(['43'])
+  })
+
+  it('does not open or navigate after the statement page is unmounted during candidate loading', async () => {
+    const { wrapper, router } = await mountPage(selectedCreatePermissions, '/finance/customer-statements', true)
+    await router.push('/downloads'); await flushPromises()
+    let resolve!: (value: SourcePage) => void
+    vi.mocked(listFinanceFeeSources).mockImplementationOnce(() => new Promise(yes => { resolve = yes }))
+    await router.push(selectedCreatePath); await flushPromises()
+    const replace = vi.spyOn(router, 'replace')
+    wrapper.unmount()
+    resolve({ records: [eligibleFeeSource], total: 1, pages: 1 }); await flushPromises()
+    expect(replace).not.toHaveBeenCalled()
+    expect(document.body.textContent).not.toContain('对账单生成设置')
+  })
+
  it('keeps the generation dialog open with a customer-friendly message when no billable fees exist', async () => {
    const permissions = ['platform:finance:customer-statement:list', 'platform:finance:reconciliation:create', 'platform:customer:list']
    const { wrapper } = await mountPage(permissions)
@@ -2,7 +2,7 @@
 import '@/styles/adminWorkbench.css'
 import '@/styles/adminDensity.css'
 import '../financeDensity.css'
-import { computed, onMounted, ref, watch } from 'vue'
+import { computed, onActivated, onBeforeUnmount, onDeactivated, onMounted, ref, watch } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { ArrowLeft, Download, Plus, SlidersHorizontal } from '@lucide/vue'
@@ -29,15 +29,6 @@ import { actionReconciliationStatement, createReconciliationStatement, getReconc
 import { financeBillStatusOptions, financeSourceTypeLabel, financeStatusLabel, financeStatusTone } from '../status'
 import type { FinanceFeeSourceSummary, FinanceReconciliationDetail, FinanceStatementReadModel, ReconciliationActionPayload } from '../types'

-interface AdjustmentRow {
-  selected: boolean
-  statementLineId: string
-  feeItemName: string
-  originalAmount: number
-  adjustedAmount: number
-  reason: string
-}
-
 type StatementRow = Omit<FinanceStatementReadModel, 'creditDays' | 'settled'> & {
  periodStart: string
  periodEnd: string
@@ -61,6 +52,7 @@ const page = ref(1)
 const pageSize = ref(20)
 const loading = ref(false)
 const error = ref<ApiErrorDetails | null>(null)
+const actionError = ref('')
 const customerError = ref<ApiErrorDetails | null>(null)
 const selectedId = ref('')
 const detail = ref<FinanceReconciliationDetail | null>(null)
@@ -85,12 +77,9 @@ const createForm = ref({
  remark: '',
 })
 let createSourceLoadSequence = 0
-const adjustOpen = ref(false)
-const adjustBusy = ref(false)
-const adjustError = ref<ApiErrorDetails | null>(null)
-const adjustStatement = ref<FinanceStatementReadModel | null>(null)
-const adjustReason = ref('')
-const adjustLines = ref<AdjustmentRow[]>([])
+let selectedCreateGeneration = 0
+let pageActive = true
+let initialLoadCompleted = false

 const canView = computed(() => access.can('platform:finance:customer-statement:list'))
 const canListCustomers = computed(() => access.can('platform:customer:list'))
@@ -100,7 +89,6 @@ const canCreate = computed(() => access.can('platform:finance:reconciliation:cre
 const activeCustomers = computed(() => customers.value.filter((item) => item.status === 'ACTIVE'))
 const canReview = computed(() => access.can('platform:finance:reconciliation:review'))
 const canIssue = computed(() => access.can('platform:finance:reconciliation:issue'))
-const canAdjust = computed(() => access.can('platform:finance:reconciliation:adjust'))
 const canVoid = computed(() => access.can('platform:finance:reconciliation:void'))
 const canExport = computed(() => access.can('platform:finance:customer-statement:export') && access.can('platform:download:list'))
 const canGenerate = computed(() => canCreate.value && canListCustomers.value)
@@ -276,6 +264,7 @@ async function load(model?: QueryModel) {
  detail.value = null
  detailCache.clear()
  error.value = null
+  actionError.value = ''
  loading.value = true
  try {
    const statements = await listFinanceStatements(String(appliedFilters.value.customerId || '').trim() || undefined)
@@ -407,6 +396,7 @@ function defaultCreateForm() {

 function openCreate() {
  if (!canListCustomers.value) return ElMessage.warning('缺少客户列表权限，无法选择客户生成对账单')
+  invalidateCreateLoads()
  createForm.value = defaultCreateForm()
  createSourceOptions.value = []
  createSourcesError.value = null
@@ -440,6 +430,7 @@ async function loadEligibleCreateSources(preferredIds: string[] = createForm.val
        businessDateFrom: createForm.value.periodStart,
        businessDateTo: createForm.value.periodEnd,
      })
+      if (sequence !== createSourceLoadSequence) return
      records.push(...result.records)
      pages = Math.max(1, result.pages)
      currentPage += 1
@@ -467,7 +458,9 @@ function queryText(value: unknown) {
 }

 async function openSelectedCreateFromRoute() {
-  if (route.name !== 'finance-customer-statements' || queryText(route.query.createMode) !== 'SELECTED') return
+  if (!pageActive || route.name !== 'finance-customer-statements' || queryText(route.query.createMode) !== 'SELECTED') return
+  const generation = ++selectedCreateGeneration
+  const sourcePath = route.fullPath
  if (!canGenerate.value || !canSelectSources.value) {
    ElMessage.warning('缺少客户或费用来源权限，无法生成所选对账单')
    return
@@ -484,8 +477,12 @@ async function openSelectedCreateFromRoute() {
    ElMessage.warning('带入费用所属客户当前不可用，请重新选择费用')
    return
  }
+  createError.value = null
  createForm.value = { generationMode: 'SELECTED', customerId, periodStart, periodEnd, feeSourceIds: [], remark: '' }
  await loadEligibleCreateSources(feeSourceIds)
+  // 带入候选只属于当前激活页面及本次路由，旧响应不能重新打开弹框或覆盖用户导航。
+  if (!pageActive || generation !== selectedCreateGeneration || route.fullPath !== sourcePath
+    || !canGenerate.value || !canSelectSources.value) return
  createOpen.value = true
  await router.replace({ name: 'finance-customer-statements' })
 }
@@ -521,32 +518,21 @@ async function createStatement() {
 }

 async function performAction(row: FinanceStatementReadModel, actionName: ReconciliationActionPayload['action']) {
-  const title = ({ REJECT: '驳回对账单', VOID: '作废对账单', REOPEN: '重开对账单' } as Partial<Record<ReconciliationActionPayload['action'], string>>)[actionName] || '对账单操作'
-  const reason = ['REJECT', 'VOID', 'REOPEN'].includes(actionName)
+  const title = ({ REJECT: '驳回对账单', VOID: '作废对账单' } as Partial<Record<ReconciliationActionPayload['action'], string>>)[actionName] || '对账单操作'
+  const reason = ['REJECT', 'VOID'].includes(actionName)
    ? await ElMessageBox.prompt('请输入操作原因', `${title} · ${row.billNo || '—'}`, { customClass: 'admin-density-confirm admin-workbench', inputType: 'textarea', inputPattern: /\S+/, inputErrorMessage: '操作原因不能为空', confirmButtonText: '确认', cancelButtonText: '取消' }).then((result) => result.value).catch(() => null)
    : undefined
  if (reason === null) return
+  actionError.value = ''
  actionBusy.value = true
  try {
    await actionReconciliationStatement(row.id, { action: actionName, expectedVersion: row.version, ...(reason ? { reason } : {}) })
    ElMessage.success('对账单状态已更新')
    await load(appliedFilters.value)
-  } catch (cause) { error.value = getApiErrorDetails(cause, '对账单操作失败') }
+  } catch (cause) { actionError.value = getApiErrorMessage(cause, '对账单操作失败') }
  finally { actionBusy.value = false }
 }

-async function openAdjustment(row: FinanceStatementReadModel) {
-  adjustError.value = null
-  adjustBusy.value = true
-  try {
-    const current = await fetchDetail(row.id, true)
-    adjustStatement.value = { ...row, version: current.version }
-    adjustReason.value = ''
-    adjustLines.value = current.lines.flatMap((line) => line.statementLineId ? [{ selected: false, statementLineId: line.statementLineId, feeItemName: line.feeItemName, originalAmount: line.amount, adjustedAmount: line.amount, reason: '' }] : [])
-    adjustOpen.value = true
-  } catch (cause) { error.value = getApiErrorDetails(cause, '调整明细加载失败') }
-  finally { adjustBusy.value = false }
-}
 function statementActions(row: FinanceStatementReadModel): RowActionItem[] {
  return [
    { key: 'detail', label: '详情', priority: 300, disabled: loading.value },
@@ -554,52 +540,54 @@ function statementActions(row: FinanceStatementReadModel): RowActionItem[] {
    { key: 'approve', label: '通过', priority: 250, tone: 'warning', visible: row.status === 'PENDING_REVIEW' && canReview.value, loading: actionBusy.value },
    { key: 'reject', label: '驳回', priority: 200, tone: 'danger', visible: row.status === 'PENDING_REVIEW' && canReview.value, loading: actionBusy.value },
    { key: 'issue', label: '出账', priority: 200, visible: row.status === 'APPROVED' && canIssue.value, loading: actionBusy.value },
-    { key: 'adjust', label: '调整', priority: 200, visible: row.status === 'ISSUED' && canAdjust.value, loading: adjustBusy.value },
-    { key: 'reopen', label: '重开', priority: 150, visible: ['REJECTED', 'VOIDED'].includes(String(row.status)) && canVoid.value, loading: actionBusy.value },
-    { key: 'void', label: '作废', tone: 'danger', divided: true, visible: ['DRAFT', 'PENDING_REVIEW', 'APPROVED', 'ISSUED'].includes(String(row.status)) && canVoid.value, loading: actionBusy.value },
+    { key: 'void', label: '作废', tone: 'danger', divided: true, visible: ['DRAFT', 'PENDING_REVIEW'].includes(String(row.status)) && canVoid.value, loading: actionBusy.value },
  ]
 }
 function handleStatementAction(command: string, row: FinanceStatementReadModel) {
+  if (!statementActions(row).some(item => item.key === command && item.visible !== false)) return
  if (command === 'detail') void openDetail(row)
-  else if (command === 'adjust') void openAdjustment(row)
  else {
    const actions: Record<string, ReconciliationActionPayload['action']> = {
-      submit: 'SUBMIT', approve: 'APPROVE', reject: 'REJECT', issue: 'ISSUE', reopen: 'REOPEN', void: 'VOID',
+      submit: 'SUBMIT', approve: 'APPROVE', reject: 'REJECT', issue: 'ISSUE', void: 'VOID',
    }
    const action = actions[command]
    if (action) void performAction(row, action)
  }
 }

-async function submitAdjustment() {
-  if (adjustBusy.value) return
-  const statement = adjustStatement.value
-  const selected = adjustLines.value.filter((line) => line.selected)
-  if (!statement || !adjustReason.value.trim() || !selected.length) return ElMessage.warning('请填写调整原因并至少选择一条明细')
-  if (selected.some((line) => line.adjustedAmount <= 0 || !line.reason.trim())) return ElMessage.warning('请填写所选明细的新金额和调整说明')
-  adjustBusy.value = true
-  adjustError.value = null
-  try {
-    await actionReconciliationStatement(statement.id, {
-      action: 'ADJUST', reason: adjustReason.value.trim(), expectedVersion: statement.version,
-      adjustmentLines: selected.map((line) => ({ statementLineId: line.statementLineId, adjustedAmount: line.adjustedAmount, reason: line.reason.trim() })),
-    })
-    adjustOpen.value = false
-    ElMessage.success('对账单调整已保存')
-    await load(appliedFilters.value)
-    await openDetail(statement)
-  } catch (cause) { adjustError.value = getApiErrorDetails(cause, '对账单调整失败'); error.value = adjustError.value }
-  finally { adjustBusy.value = false }
+function invalidateCreateLoads() {
+  selectedCreateGeneration += 1
+  createSourceLoadSequence += 1
+  createSourcesLoading.value = false
+}
+
+function deactivateCreateLoads() {
+  pageActive = false
+  invalidateCreateLoads()
 }

 onMounted(async () => {
-  if (canListCustomers.value) await loadCustomers()
+  await (canListCustomers.value ? loadCustomers() : undefined)
+  initialLoadCompleted = true
  await openSelectedCreateFromRoute()
 })
+onActivated(() => {
+  pageActive = true
+  if (initialLoadCompleted) void openSelectedCreateFromRoute()
+})
+onDeactivated(deactivateCreateLoads)
+onBeforeUnmount(deactivateCreateLoads)
+watch(() => route.name, (name) => {
+  if (name !== 'finance-customer-statements') invalidateCreateLoads()
+}, { flush: 'sync' })
 watch(
  () => [createOpen.value, createForm.value.generationMode, createForm.value.customerId, createForm.value.periodStart, createForm.value.periodEnd],
-  ([open, mode]) => {
-    if (!open || mode !== 'SELECTED') return
+  ([open, mode], [wasOpen]) => {
+    if (!open) {
+      if (wasOpen === true) invalidateCreateLoads()
+      return
+    }
+    if (mode !== 'SELECTED') return
    void loadEligibleCreateSources()
  },
 )
@@ -700,7 +688,7 @@ watch(detailRouteId, (statementId) => {
      <section class="workbench-table is-page-surface"><DataTable appearance="integrated" 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 id="statement-query-filters" v-model="filters" ariaLabel="客户对账单筛选" :fields="visibleFields" :available-fields="fields" :loading="loading" preference-key="finance-statements-query" :search-on-clear="false" :search-on-reset="false" @search="load" @reset="resetFilters"><template #actions><el-button :aria-expanded="showAdvancedFilters" aria-controls="statement-query-filters" @click="showAdvancedFilters = !showAdvancedFilters"><SlidersHorizontal :size="16" />{{ showAdvancedFilters ? '收起筛选' : '高级筛选' }}</el-button></template></QueryToolbar></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 #notices><el-alert v-if="actionError" :title="actionError" type="error" :closable="false" role="alert" /><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>
@@ -744,16 +732,7 @@ watch(detailRouteId, (statementId) => {
      </section>
    </AppDialog>

-    <AppDialog class="admin-density-dialog admin-workbench is-dialog" v-model="adjustOpen" :title="`调整客户对账单 · ${adjustStatement?.billNo || '—'}`" width="min(900px, 96vw)" fullscreenable :confirm-loading="adjustBusy" @confirm="submitAdjustment">
-      <OperationErrorToast :details="adjustError" />
-      <el-form class="density-form density-dialog-sections" label-position="left" label-width="110px" :disabled="adjustBusy">
-        <section v-if="adjustStatement" class="density-dialog-section workbench-evidence" data-tone="summary" aria-label="当前对账单"><h3 class="density-dialog-section__title">当前对账单</h3><table class="density-table statement-dialog-facts"><tbody><tr><th scope="row">对账单号</th><td>{{ adjustStatement.billNo || '—' }}</td><th scope="row">客户</th><td>{{ customerDisplayName(adjustStatement.customerId, adjustStatement.customerName) }}</td></tr></tbody></table></section>
-        <section class="density-dialog-section" data-tone="work" aria-label="对账单调整登记"><h3 class="density-dialog-section__title">调整登记</h3><div class="statement-adjust-editor">
-          <div class="workbench-evidence"><table class="density-table density-table--editable"><tbody><tr><td><el-form-item label="整体调整原因"><el-input v-model="adjustReason" type="textarea" maxlength="500" show-word-limit placeholder="请输入整体调整原因" /></el-form-item></td></tr></tbody></table></div>
-          <div class="workbench-table"><el-table :data="adjustLines" size="small" border stripe row-key="statementLineId"><el-table-column label="选择" width="64"><template #default="{ row }"><el-checkbox v-model="row.selected" :aria-label="`选择${row.feeItemName || '费用明细'}`" /></template></el-table-column><el-table-column prop="feeItemName" label="费用项目" min-width="150" show-overflow-tooltip /><el-table-column prop="originalAmount" label="原金额(CNY)" width="130" /><el-table-column label="新金额(CNY)" width="180"><template #default="{ row }"><el-input-number v-model="row.adjustedAmount" :min="0.01" :precision="2" placeholder="请输入新金额" /></template></el-table-column><el-table-column label="明细说明" min-width="220"><template #default="{ row }"><el-input v-model="row.reason" maxlength="500" placeholder="请输入明细说明" /></template></el-table-column></el-table></div>
-        </div></section>
-      </el-form>
-    </AppDialog>
+
  </AdminPage>
 </template>

@@ -761,10 +740,8 @@ watch(detailRouteId, (statementId) => {
 .finance-statements-page { min-width: 0; }
 :deep(.el-select), :deep(.el-date-editor) { width: 100%; }
 .selected-source-summary { width: 100%; margin-top: var(--admin-space-2); text-align: right; }
-.statement-create-table, .statement-dialog-facts { table-layout: fixed; }
+.statement-create-table { table-layout: fixed; }
 .statement-create-table td:not([colspan]) { width: 50%; }
-.statement-dialog-facts th { width: var(--admin-label-width); }
-.statement-adjust-editor { display: grid; gap: var(--admin-space-5); }
 .statement-detail-page { min-width: 0; width: 100%; margin: 0 auto; overflow: hidden; }
 .statement-summary-section { padding: var(--admin-space-4) var(--admin-space-6); border-bottom: 1px solid var(--workbench-border); }
 .statement-outstanding { color: var(--el-color-warning-dark-2); }
@@ -132,7 +132,7 @@ describe('formal settlement download-center exports', () => {
    expect(router.currentRoute.value.name).toBe('download-center')
  })

-  it('uses the payable detail type without a direction parameter', async () => {
+  it('removes the payable detail export while retaining list exports', async () => {
    vi.mocked(getFinanceSettlement).mockResolvedValueOnce({ ...detail, id: '801', settlementNo: 'AP-801', direction: 'PAYABLE' })
    vi.mocked(createPlatformExportTask).mockResolvedValueOnce({ taskName: '应付结算单详情', taskNo: 'EXP-DETAIL-2' } as never)
    const router = testRouter()
@@ -143,9 +143,8 @@ describe('formal settlement download-center exports', () => {

    await (wrapper.vm as unknown as { exportDetail(): Promise<void> }).exportDetail()

-    expect(createPlatformExportTask).toHaveBeenCalledWith({
-      exportType: 'FINANCE_PAYABLE_SETTLEMENT_DETAIL', format: 'XLSX', taskName: '应付结算单详情', parameters: { settlementId: '801' },
-    })
+    expect(wrapper.find('.finance-detail-actions').text()).not.toContain('导出')
+    expect(createPlatformExportTask).not.toHaveBeenCalled()
  })

  it('hides export actions unless both export and download-list permissions are present', async () => {
@@ -90,6 +90,7 @@ const receiptValidationError = ref<string | null>(null)
 const receiptError = ref<ApiErrorDetails | null>(null)
 const receiptForm = ref({ receivedDate: new Date().toISOString().slice(0, 10), amount: 0, paymentMethod: 'BANK_TRANSFER' as 'BANK_TRANSFER' | 'CASH' | 'OTHER', remark: '' })
 const actionBusy = ref(false)
+const actionError = ref<ApiErrorDetails | null>(null)
 const exportSubmitting = ref(false)

 const createPermission = computed(() => props.kind === 'receivable' ? 'platform:finance:settlement-ar:create' : 'platform:finance:settlement-ap:create')
@@ -130,7 +131,7 @@ const paginatedRows = computed(() => {
  const start = (page.value - 1) * pageSize.value
  return filteredRows.value.slice(start, start + pageSize.value)
 })
-const totals = computed(() => filteredRows.value.reduce((result, row) => ({
+const totals = computed(() => filteredRows.value.filter(row => row.status !== 'VOIDED').reduce((result, row) => ({
  amount: result.amount + totalAmount(row),
  paid: result.paid + paidAmount(row),
  outstanding: result.outstanding + row.outstandingAmount,
@@ -344,6 +345,7 @@ watch(() => createForm.value.supplierId, () => {
  if (createForm.value.customerId) void refreshCreateDependencies(createForm.value.customerId).catch(reportCreateSourceError)
 })

+// 待客户确认的对账单生成应收前，提醒操作员确认后再继续。
 async function submitCreate() {
  if (createBusy.value) return
  const customerId = String(createForm.value.customerId || '')
@@ -353,6 +355,14 @@ async function submitCreate() {
  createBusy.value = true
  error.value = null
  try {
+    const statement = statementOptions.value.find((item) => item.id === createForm.value.reconciliationStatementId)
+    if (props.kind === 'receivable' && statement?.customerConfirmationStatus === 'PENDING_CONFIRMATION') {
+      const confirmed = await ElMessageBox.confirm('客户暂未确认!', '生成应收结算单', {
+        customClass: 'admin-density-confirm admin-workbench', type: 'warning',
+        confirmButtonText: '继续生成', cancelButtonText: '取消',
+      }).then(() => true).catch(() => false)
+      if (!confirmed) return
+    }
    if (props.kind === 'receivable') await createReceivableSettlement({ reconciliationStatementId: createForm.value.reconciliationStatementId, currency: 'CNY' })
    else await createPayableSettlement({ customerId, supplierId: createForm.value.supplierId, feeSourceIds: createForm.value.feeSourceIds, dueDate: createForm.value.dueDate, currency: 'CNY' })
    createOpen.value = false
@@ -459,12 +469,19 @@ async function performAction(row: SettlementRow, action: 'VOID' | 'REOPEN') {
  }).then((result) => result.value.trim()).catch(() => null)
  if (reason === null) return
  actionBusy.value = true
+  actionError.value = null
  try {
    await actionFinanceSettlement(row.id, { action, reason, expectedVersion: row.version })
    ElMessage.success(action === 'VOID' ? '结算单已作废' : '结算单已重开')
    if (detailMode.value) await loadDetail(row.id)
    else await load()
-  } catch (cause) { error.value = getApiErrorDetails(cause, `${action === 'VOID' ? '作废' : '重开'}结算单失败`) }
+  } catch (cause) {
+    const details = getApiErrorDetails(cause, `${action === 'VOID' ? '作废' : '重开'}结算单失败`)
+    if (props.kind === 'receivable' && action === 'REOPEN' && details.message === '原对账单已生成其他有效应收结算单') {
+      details.message = '已有新的应收单，无法重开'
+    }
+    actionError.value = details
+  }
  finally { actionBusy.value = false }
 }

@@ -509,7 +526,7 @@ async function createSettlementExport(detailId?: string) {
 }

 function exportRows() { return createSettlementExport() }
-function exportDetail() { return detail.value ? createSettlementExport(detail.value.id) : undefined }
+function exportDetail() { return props.kind === 'receivable' && detail.value ? createSettlementExport(detail.value.id) : undefined }

 onMounted(() => {
  if (canListCustomers.value) void loadCustomers()
@@ -524,10 +541,11 @@ onMounted(() => {
    <OperationErrorToast v-if="createOpen || paymentOpen" :details="error" />
    <OperationErrorToast :message="receiptValidationError" />
    <OperationErrorToast :details="receiptError" />
+    <OperationErrorToast :details="actionError" />
    <el-result v-if="!canView" icon="warning" :title="`无权访问${title}`" sub-title="请联系管理员开通结算单查看权限" />
    <DetailPageLayout v-else-if="detailMode" class="settlement-detail-page surface-panel finance-density-detail workbench-panel is-flush is-page-surface" :aria-label="`${title}详情`">
      <template #header><div class="density-detail-header"><div class="density-detail-heading"><el-button link class="density-back" aria-label="返回列表" @click="backToList"><ArrowLeft :size="16" />返回列表</el-button><h1 class="density-detail-title">{{ detail?.settlementNo || '—' }}</h1><StatusBadge v-if="detail" :status="financeStatusLabel(detail.status)" /></div><div class="finance-detail-actions">
-          <el-button v-if="detail && canExport" :loading="exportSubmitting" :disabled="exportSubmitting" @click="exportDetail"><Download :size="15" />导出</el-button>
+          <el-button v-if="kind === 'receivable' && detail && canExport" :loading="exportSubmitting" :disabled="exportSubmitting" @click="exportDetail"><Download :size="15" />导出</el-button>
          <el-button v-if="detail && canReceive && ['ISSUED','PARTIALLY_PAID'].includes(detail.status)" type="primary" :loading="receiptBusy" @click="openReceiptFromDetail"><HandCoins :size="15" />部分收款</el-button>
          <el-button v-if="detail && canPay && ['ISSUED','PARTIALLY_PAID'].includes(detail.status)" type="primary" @click="openPaymentFromDetail"><CreditCard :size="15" />部分付款</el-button>
          <el-button v-if="detail && canVoid && detail.status === 'ISSUED'" type="danger" :loading="actionBusy" @click="performAction(detailActionRow(), 'VOID')"><XCircle :size="15" />作废</el-button>
@@ -674,7 +692,7 @@ onMounted(() => {
    </template>

    <AppDialog class="admin-density-dialog admin-workbench is-dialog" v-model="createOpen" :title="`生成${title}`" width="min(600px, 94vw)" fullscreenable :confirm-loading="createBusy" @confirm="submitCreate">
-      <section class="density-dialog-section workbench-evidence" data-tone="work" aria-label="结算单生成设置"><h3 class="density-dialog-section__title">生成设置</h3>
+      <section class="density-dialog-section workbench-evidence" aria-label="结算单生成设置"><h3 class="density-dialog-section__title">生成设置</h3>
        <el-form class="density-form" label-position="left" label-width="120px" :disabled="createBusy"><table class="density-table density-table--editable"><tbody>
          <tr><td><el-form-item label="客户"><el-select v-model="createForm.customerId" filterable placeholder="请选择客户"><el-option v-for="item in activeCustomers" :key="String(item.id)" :label="item.tenantName" :value="String(item.id)" /></el-select></el-form-item></td></tr>
          <tr><td><el-form-item label="币种"><span>CNY</span></el-form-item></td></tr>
@@ -95,7 +95,7 @@ describe('finance G3/G4 page operations', () => {
    vi.mocked(createFinanceReceipt).mockReset().mockResolvedValue({ id: '801', customerId: '10001', customerName: '客户A', receivedDate: '2026-08-11', amount: 300, currency: 'CNY', paymentMethod: 'BANK_TRANSFER', voucherFileIds: ['9001'], allocationCount: 1 })
  })

-  it('loads frozen G3 detail and submits multiple selected adjustment lines', async () => {
+  it('keeps issued statement history readable and ignores stale adjustment or void commands', async () => {
    const pinia = piniaWithPermissions(['platform:finance:customer-statement:list', 'platform:finance:reconciliation:adjust'])
    const router = createRouter({ history: createMemoryHistory(), routes: [
      { path: '/finance/customer-statements', name: 'finance-customer-statements', component: FinanceCustomerStatementsView },
@@ -105,26 +105,17 @@ describe('finance G3/G4 page operations', () => {
    const wrapper = mount(FinanceCustomerStatementsView, { attachTo: document.body, global: { plugins: [pinia, ElementPlus, router] } })
    await flushPromises()
    const vm = wrapper.vm as unknown as {
-      openAdjustment(row: FinanceStatementReadModel): Promise<void>
-      submitAdjustment(): Promise<void>
-      adjustReason: string
-      adjustLines: Array<{ selected: boolean; adjustedAmount: number; reason: string }>
+      openDetail(row: FinanceStatementReadModel): Promise<void>
+      handleStatementAction(command: string, row: FinanceStatementReadModel): void
    }
-
-    await vm.openAdjustment(statement)
-    vm.adjustReason = '账期复核调整'
-    vm.adjustLines[0]!.selected = true; vm.adjustLines[0]!.adjustedAmount = 90; vm.adjustLines[0]!.reason = '运费更正'
-    vm.adjustLines[1]!.selected = true; vm.adjustLines[1]!.adjustedAmount = 180; vm.adjustLines[1]!.reason = '操作费更正'
-    await vm.submitAdjustment()
-
+    vm.handleStatementAction('adjust', statement)
+    vm.handleStatementAction('void', statement)
+    await flushPromises()
+    expect(actionReconciliationStatement).not.toHaveBeenCalled()
+    await vm.openDetail(statement)
+    await flushPromises()
    expect(getReconciliationStatement).toHaveBeenCalledWith('501')
-    expect(actionReconciliationStatement).toHaveBeenCalledWith('501', {
-      action: 'ADJUST', reason: '账期复核调整', expectedVersion: 3,
-      adjustmentLines: [
-        { statementLineId: '601', adjustedAmount: 90, reason: '运费更正' },
-        { statementLineId: '602', adjustedAmount: 180, reason: '操作费更正' },
-      ],
-    })
+    expect(wrapper.text()).toContain(statement.billNo)
  }, 15_000)

  it('loads AR linkage, uploads a voucher and allocates a real receipt to its statement', async () => {
@@ -72,6 +72,15 @@ enableAutoUnmount(afterEach)
 afterAll(() => vi.unstubAllGlobals())

 describe('Finance G3/G4 views', () => {
+  it('excludes voided settlements from totals while retaining them in the list', async () => {
+    vi.mocked(listFinancePayableSettlements).mockResolvedValue([
+      payable,
+      { ...payable, id: '702', settlementNo: 'AP-VOIDED', status: 'VOIDED', payableAmount: 50, outstandingAmount: 50 },
+    ])
+    const wrapper = await mountWithAccess(FinanceFormalSettlementPage, ['platform:finance:settlement-ap:list'], { kind: 'payable' })
+    expect(wrapper.findAll('.workbench-metric-value strong').map(item => item.text())).toEqual(['¥200.00', '¥0.00', '¥200.00'])
+    expect(wrapper.text()).toContain('AP-VOIDED')
+  })
  beforeEach(() => {
    vi.stubGlobal('ResizeObserver', ResizeObserverStub)
    vi.stubGlobal('localStorage', memoryStorage())
@@ -101,16 +110,14 @@ describe('Finance G3/G4 views', () => {
    expect(actionReconciliationStatement).not.toHaveBeenCalled()
  })

-  it('submits every selected adjustment line with the detail version', async () => {
-    const wrapper = await mountWithAccess(FinanceCustomerStatementsView, ['platform:finance:customer-statement:list', 'platform:finance:reconciliation:adjust'])
-    const vm = wrapper.vm as unknown as { openAdjustment(row: FinanceStatementReadModel): Promise<void>; submitAdjustment(): Promise<void>; adjustReason: string; adjustLines: Array<{ selected: boolean; adjustedAmount: number; reason: string }> }
-    await vm.openAdjustment(statement)
-    vm.adjustReason = '月末核对更正'
-    vm.adjustLines.forEach((line, index) => { line.selected = true; line.adjustedAmount = index === 0 ? 90 : 180; line.reason = `明细${index + 1}更正` })
-    await vm.submitAdjustment()
-    expect(actionReconciliationStatement).toHaveBeenCalledWith('501', { action: 'ADJUST', reason: '月末核对更正', expectedVersion: 3, adjustmentLines: [{ statementLineId: '601', adjustedAmount: 90, reason: '明细1更正' }, { statementLineId: '602', adjustedAmount: 180, reason: '明细2更正' }] })
+  it('keeps an issued statement read-only with legacy adjustment permission', async () => {
+    const wrapper = await mountWithAccess(FinanceCustomerStatementsView, ['platform:finance:customer-statement:list', 'platform:finance:reconciliation:adjust', 'platform:finance:reconciliation:void'])
+    const labels = wrapper.findAll('.el-table__body-wrapper button').map(button => button.text().trim())
+    expect(labels).toContain('详情')
+    expect(labels).not.toContain('调整')
+    expect(labels).not.toContain('作废')
+    expect(actionReconciliationStatement).not.toHaveBeenCalled()
  })
-
  it('creates a payable settlement and registers a voucher-backed payment', async () => {
    const wrapper = await mountWithAccess(FinanceFormalSettlementPage, ['platform:finance:settlement-ap:list', 'platform:finance:settlement-ap:create', 'platform:finance:payment:create'], { kind: 'payable' })
    const vm = wrapper.vm as unknown as { load(model: Record<string, string>): Promise<void>; openCreate(): Promise<void>; submitCreate(): Promise<void>; openPayment(row: FinancePayableSettlement): void; submitPayment(): Promise<void>; createForm: { customerId: string; supplierId: string; dueDate: string; feeSourceIds: string[] }; paymentFile: File | null; paymentForm: { amount: number; transactionDate: string; method: 'BANK_TRANSFER'; referenceNo: string; remark: string } }
@@ -1,8 +1,51 @@
 import { readFileSync } from 'node:fs'
 import { resolve } from 'node:path'
-import { describe, expect, it } from 'vitest'
+import ElementPlus from 'element-plus'
+import { enableAutoUnmount, flushPromises, mount } from '@vue/test-utils'
+import { createMemoryHistory, createRouter } from 'vue-router'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { listPlatformTenants } from '@/modules/iam'
+import { getReceivableStatistics } from '../api/finance'
+import type { ReceivableStatisticsResult } from '../types'
+import FinanceReceivableStatisticsView from './FinanceReceivableStatisticsView.vue'
+
+const can = vi.hoisted(() => vi.fn((_permission: string) => true))
+vi.mock('@/core/access/accessPreview', () => ({ useAccessPreviewStore: () => ({ can }) }))
+vi.mock('@/modules/iam', () => ({ listPlatformTenants: vi.fn() }))
+vi.mock('@/modules/downloads', () => ({ createPlatformExportTask: vi.fn() }))
+vi.mock('@/shared/components/exportTaskCreatedDialog', () => ({ showExportTaskCreatedDialog: vi.fn() }))
+vi.mock('../api/finance', () => ({ getReceivableStatistics: vi.fn() }))

 const page = readFileSync(resolve(process.cwd(), 'src/modules/finance/pages/FinanceReceivableStatisticsView.vue'), 'utf8')
+const statistics: ReceivableStatisticsResult = {
+  statisticsMonth: '2026-10', currency: 'CNY', totalReceivable: '2600', totalReceived: '2550', totalOutstanding: '50',
+  totalCustomers: 2, page: 1, pageSize: 20,
+  records: [
+    { customerId: '10001', customerName: '客户A', currency: 'CNY', totalReceivable: '2400', totalReceived: '2400', totalOutstanding: '0' },
+    { customerId: '10002', customerName: '客户 10002', currency: 'CNY', totalReceivable: '200', totalReceived: '150', totalOutstanding: '50' },
+  ],
+}
+
+async function mountPage() {
+  const router = createRouter({ history: createMemoryHistory(), routes: [
+    { path: '/finance/receivable-statistics', name: 'finance-receivable-statistics', component: FinanceReceivableStatisticsView },
+    { path: '/other', name: 'other-page', component: { template: '<div>其他页面</div>' } },
+  ] })
+  await router.push('/finance/receivable-statistics')
+  await router.isReady()
+  const wrapper = mount(FinanceReceivableStatisticsView, { attachTo: document.body, global: { plugins: [ElementPlus, router] } })
+  await flushPromises()
+  return { wrapper, router }
+}
+
+enableAutoUnmount(afterEach)
+beforeEach(() => {
+  can.mockReturnValue(true)
+  vi.stubGlobal('ResizeObserver', class { observe() {} unobserve() {} disconnect() {} })
+  vi.mocked(listPlatformTenants).mockResolvedValue({ records: [{ id: '10002', tenantName: '客户B', status: 'ACTIVE' } as never], page: 1, size: 200, total: 1, pages: 1 })
+  vi.mocked(getReceivableStatistics).mockResolvedValue(statistics)
+})
+afterEach(() => { vi.restoreAllMocks(); vi.unstubAllGlobals(); document.body.innerHTML = '' })

 describe('receivable statistics page', () => {
  it('renders only the approved CNY derived metrics and current-filter actions', () => {
@@ -25,4 +68,47 @@ describe('receivable statistics page', () => {
    expect(page).toContain('当前月份暂无应收数据')
    expect(page).toContain(':loading="loading"')
  })
+
+  it('prints an isolated report with all five columns, the loaded month and server totals', async () => {
+    const print = vi.spyOn(window, 'print').mockImplementation(() => {})
+    const { wrapper } = await mountPage()
+    const report = document.body.querySelector(':scope > .receivable-statistics-print')!
+    expect(report).not.toBeNull()
+    expect(report.querySelector('h1')?.textContent).toBe('应收款统计表')
+    expect(report.textContent).toContain('统计月份：2026-10')
+    expect([...report.querySelectorAll('thead th')].map(cell => cell.textContent)).toEqual(['应收单位', '币种', '应收总额(CNY)', '已收合计(CNY)', '余额未收(CNY)'])
+    expect([...report.querySelectorAll('tbody tr')].map(row => [...row.querySelectorAll('td')].map(cell => cell.textContent))).toEqual([
+      ['客户A', 'CNY', '2,400.00', '2,400.00', '0.00'],
+      ['客户B', 'CNY', '200.00', '150.00', '50.00'],
+    ])
+    expect([...report.querySelectorAll('tfoot td')].map(cell => cell.textContent)).toEqual(['2,600.00', '2,550.00', '50.00'])
+    expect(report.querySelector('button, input, .finance-metric-grid, .data-table__pagination')).toBeNull()
+    expect(page).toContain(':global(body:has(> .receivable-statistics-print) > :not(.receivable-statistics-print)) { display: none !important; }')
+    expect(page).toContain('width: 100%; border-collapse: collapse; table-layout: fixed;')
+    await wrapper.findAll('button').find(button => button.text() === '打印')!.trigger('click')
+    expect(print).toHaveBeenCalledOnce()
+  })
+
+  it('removes the print report when a cached statistics page is no longer the active route', async () => {
+    const { router } = await mountPage()
+    expect(document.querySelector('.receivable-statistics-print')).not.toBeNull()
+    await router.push('/other')
+    await flushPromises()
+    expect(document.querySelector('.receivable-statistics-print')).toBeNull()
+    await router.push('/finance/receivable-statistics')
+    await flushPromises()
+    expect(document.querySelector('.receivable-statistics-print')).not.toBeNull()
+  })
+
+  it.each(['loading', 'error', 'no-permission'])('does not print unavailable statistics: %s', async state => {
+    if (state === 'loading') vi.mocked(getReceivableStatistics).mockReturnValueOnce(new Promise(() => {}))
+    if (state === 'error') vi.mocked(getReceivableStatistics).mockRejectedValueOnce(new Error('不可用'))
+    if (state === 'no-permission') can.mockReturnValue(false)
+    const print = vi.spyOn(window, 'print').mockImplementation(() => {})
+    const { wrapper } = await mountPage()
+    const vm = wrapper.vm as unknown as { printCurrent(): void }
+    expect(document.querySelector('.receivable-statistics-print')).toBeNull()
+    vm.printCurrent()
+    expect(print).not.toHaveBeenCalled()
+  })
 })
@@ -5,7 +5,7 @@ import '../financeDensity.css'
 import { computed, onMounted, ref } from 'vue'
 import { CircleCheck, Clock3, Download, Printer, RotateCcw, Search, Wallet } from '@lucide/vue'
 import { ElMessage } from 'element-plus'
-import { useRouter } from 'vue-router'
+import { useRoute, useRouter } from 'vue-router'
 import { useAccessPreviewStore } from '@/core/access/accessPreview'
 import { createPlatformExportTask } from '@/modules/downloads'
 import { listPlatformTenants, type PlatformTenantResource } from '@/modules/iam'
@@ -21,6 +21,7 @@ import type { ReceivableStatisticsResult, ReceivableStatisticsRow } from '../typ
 const now = new Date()
 const defaultMonth = `${now.getFullYear()}-${String(now.getMonth() + 1).padStart(2, '0')}`
 const access = useAccessPreviewStore()
+const route = useRoute()
 const router = useRouter()
 const month = ref(defaultMonth)
 const customerId = ref('')
@@ -33,6 +34,7 @@ const error = ref<ApiErrorDetails | null>(null)
 const result = ref<ReceivableStatisticsResult | null>(null)

 const canView = computed(() => access.can('platform:finance:receivable-statistics:list'))
+const canPrint = computed(() => route.name === 'finance-receivable-statistics' && canView.value && !loading.value && !error.value && Boolean(result.value))
 const canExport = computed(() => access.can('platform:finance:receivable-statistics:export') && access.can('platform:download:list'))
 const rows = computed<ReceivableStatisticsRow[]>(() => result.value?.records ?? [])
 const customerNameById = computed(() => new Map(customers.value.map((item) => [String(item.id), item.tenantName])))
@@ -65,7 +67,7 @@ async function loadCustomers() {

 function search() { page.value = 1; void load() }
 function reset() { month.value = defaultMonth; customerId.value = ''; page.value = 1; void load() }
-function printCurrent() { window.print() }
+function printCurrent() { if (canPrint.value) window.print() }
 function statisticsRowKey(row: ReceivableStatisticsRow) { return `${row.customerId}:${row.customerName}` }
 function displayCustomerName(value: unknown) {
  const row = value as ReceivableStatisticsRow
@@ -116,12 +118,30 @@ onMounted(() => { void loadCustomers(); void load() })
      </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 #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 #toolbar-actions><div class="report-actions"><el-button :disabled="!canPrint" @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></div>
    </template>
  </AdminPage>
+  <Teleport to="body">
+    <section v-if="canPrint && result" class="receivable-statistics-print" aria-label="应收款统计打印报表">
+      <header>
+        <h1>应收款统计表</h1>
+        <p>统计月份：{{ result.statisticsMonth }} · 币种：CNY</p>
+      </header>
+      <table>
+        <colgroup><col class="print-customer-column" /><col class="print-currency-column" /><col /><col /><col /></colgroup>
+        <thead><tr><th scope="col">应收单位</th><th scope="col">币种</th><th scope="col">应收总额(CNY)</th><th scope="col">已收合计(CNY)</th><th scope="col">余额未收(CNY)</th></tr></thead>
+        <tbody>
+          <tr v-for="row in rows" :key="statisticsRowKey(row)"><td>{{ displayCustomerName(row) }}</td><td>{{ row.currency }}</td><td>{{ money(row.totalReceivable) }}</td><td>{{ money(row.totalReceived) }}</td><td>{{ money(row.totalOutstanding) }}</td></tr>
+          <tr v-if="!rows.length"><td colspan="5">当前月份暂无应收数据</td></tr>
+        </tbody>
+        <tfoot><tr><th scope="row" colspan="2">统计汇总</th><td>{{ money(result.totalReceivable) }}</td><td>{{ money(result.totalReceived) }}</td><td>{{ money(result.totalOutstanding) }}</td></tr></tfoot>
+      </table>
+      <p>数据第 {{ result.page }} 页 · 共 {{ result.totalCustomers }} 家应收单位</p>
+    </section>
+  </Teleport>
 </template>

 <style scoped>
@@ -133,10 +153,21 @@ 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; }
+.receivable-statistics-print { display: none; }
@media print {
-  .statistics-query, :deep(.data-table__toolbar), :deep(.data-table__pagination) { display: none !important; }
-  .receivable-statistics-page { gap: 10px; padding: 0; color: #000; }
-  .workbench-table > :deep(.data-table) { border-radius: var(--admin-radius); box-shadow: none; }
-  .finance-metric-grid > article, .statistics-table { border-color: #999; box-shadow: none; break-inside: avoid; }
+  :global(body:has(> .receivable-statistics-print) > :not(.receivable-statistics-print)) { display: none !important; }
+  :global(body:has(> .receivable-statistics-print)) { min-width: 0; height: auto; margin: 0; overflow: visible; background: #fff; }
+  .receivable-statistics-print { display: block; width: 100%; color: #000; font: 10pt/1.5 Arial, 'Microsoft YaHei', sans-serif; }
+  .receivable-statistics-print h1 { margin: 0 0 8pt; text-align: center; font-size: 18pt; }
+  .receivable-statistics-print p { margin: 8pt 0; }
+  .receivable-statistics-print table { width: 100%; border-collapse: collapse; table-layout: fixed; }
+  .receivable-statistics-print col { width: 18%; }
+  .receivable-statistics-print .print-customer-column { width: 38%; }
+  .receivable-statistics-print .print-currency-column { width: 8%; }
+  .receivable-statistics-print th, .receivable-statistics-print td { padding: 5pt; border: 1px solid #999; text-align: left; overflow-wrap: anywhere; }
+  .receivable-statistics-print tbody td:nth-child(n+3), .receivable-statistics-print thead th:nth-child(n+3), .receivable-statistics-print tfoot td { text-align: right; font-variant-numeric: tabular-nums; }
+  .receivable-statistics-print thead { display: table-header-group; }
+  .receivable-statistics-print tfoot { display: table-row-group; font-weight: 700; }
+  .receivable-statistics-print tr { break-inside: avoid; }
 }
 </style>
@@ -2,7 +2,7 @@ import { createRequire } from 'node:module'
 import { enableAutoUnmount, flushPromises, mount, type VueWrapper } from '@vue/test-utils'
 import { createMemoryHistory, createRouter } from 'vue-router'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { ElMessageBox } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
 import { ApiResponseError } from '@/shared/api/http'
 import OperationErrorToast from '@/shared/components/OperationErrorToast.vue'
 import { preferenceStorageKey } from '@/shared/utils/uiLayoutPreference'
@@ -157,6 +157,21 @@ describe('formal settlement native dialogs', () => {
    await click(dialog, '确定')
    expect(api.createReceivableSettlement).toHaveBeenCalledWith({ reconciliationStatementId: statement.id, currency: 'CNY' })
  })
+  it.each([true, false])('warns before creating receivables from an unconfirmed statement (continue=%s)', async (proceed) => {
+    vi.mocked(api.listFinanceStatements).mockResolvedValue([{ ...statement, customerConfirmationStatus: 'PENDING_CONFIRMATION' }])
+    const confirmation = vi.spyOn(ElMessageBox, 'confirm')
+    if (proceed) confirmation.mockResolvedValue('confirm')
+    else confirmation.mockRejectedValue('cancel')
+    const { dialog } = await openCreate('receivable')
+    const selects = dialog.findAllComponents({ name: 'ElSelect' })
+    selects[0]!.vm.$emit('update:modelValue', String(customer.id))
+    await flushPromises()
+    selects[1]!.vm.$emit('update:modelValue', statement.id)
+    await click(dialog, '确定')
+    expect(confirmation).toHaveBeenCalledWith('客户暂未确认!', '生成应收结算单', expect.objectContaining({ type: 'warning' }))
+    expect(api.createReceivableSettlement).toHaveBeenCalledTimes(proceed ? 1 : 0)
+    if (!proceed) expect(dialog.props('modelValue')).toBe(true)
+  })
  it('keeps active suppliers and excludes directly paid or locked payable sources', async () => {
    const { dialog } = await openCreate('payable')
    const selects = dialog.findAllComponents({ name: 'ElSelect' })
@@ -295,4 +310,46 @@ describe('formal settlement native dialogs', () => {
    expect(prompt).toHaveBeenCalledWith('请输入操作原因', expect.stringContaining(current.settlementNo), expect.objectContaining({ customClass: 'admin-density-confirm admin-workbench', inputPattern: /\S+/ }))
    expect(api.actionFinanceSettlement).toHaveBeenCalledWith(current.id, { action, reason: '测试原因', expectedVersion: current.version })
  })
+  it('shows a concise reopen conflict message and retains both the voided and replacement receivables', async () => {
+    const voided = { ...ar, status: 'VOIDED' }
+    const replacement = { ...ar, id: '9223372036854775012', settlementNo: 'AR202610200002' }
+    vi.mocked(api.listFinanceReceivableSettlements).mockResolvedValue([voided, replacement])
+    vi.mocked(api.actionFinanceSettlement).mockRejectedValue(new ApiResponseError(
+      '原对账单已生成其他有效应收结算单', 'FIN_409', 409, null, 'reopen-test-request', 'reopen-test-trace',
+    ))
+    vi.spyOn(ElMessageBox, 'prompt').mockResolvedValue(Object.assign('confirm', { value: '测试重开', action: 'confirm' as const }))
+    const message = vi.spyOn(ElMessage, 'error')
+    const wrapper = await mountPage('receivable')
+
+    for (let attempt = 1; attempt <= 2; attempt += 1) {
+      await click(wrapper, '重开', '.el-table__body-wrapper button')
+      expect(message).toHaveBeenCalledTimes(attempt)
+      expect(message).toHaveBeenLastCalledWith({ message: '已有新的应收单，无法重开', showClose: true, duration: 4500 })
+    }
+
+    expect(api.actionFinanceSettlement).toHaveBeenLastCalledWith(ar.id, { action: 'REOPEN', reason: '测试重开', expectedVersion: ar.version })
+    expect(errorDetails(wrapper)).toMatchObject({ message: '已有新的应收单，无法重开', code: 'FIN_409', requestId: 'reopen-test-request', traceId: 'reopen-test-trace' })
+    const list = wrapper.get('.el-table__body-wrapper')
+    expect(list.text()).toContain(voided.settlementNo)
+    expect(list.text()).toContain(replacement.settlementNo)
+    expect(wrapper.text()).not.toContain('加载失败')
+    expect(wrapper.text()).not.toContain('reopen-test-request')
+    expect(wrapper.text()).not.toContain('reopen-test-trace')
+  })
+  it.each([
+    ['receivable', 'VOID', 'ISSUED'], ['receivable', 'REOPEN', 'VOIDED'],
+    ['payable', 'VOID', 'ISSUED'], ['payable', 'REOPEN', 'VOIDED'],
+  ] as const)('retains the %s list and original diagnostics when %s fails', async (kind, action, status) => {
+    const current = kind === 'receivable' ? ar : ap
+    if (kind === 'receivable') vi.mocked(api.listFinanceReceivableSettlements).mockResolvedValue([{ ...ar, status }])
+    else vi.mocked(api.listFinancePayableSettlements).mockResolvedValue([{ ...ap, status }])
+    vi.mocked(api.actionFinanceSettlement).mockRejectedValue(failure())
+    vi.spyOn(ElMessageBox, 'prompt').mockResolvedValue(Object.assign('confirm', { value: '测试原因', action: 'confirm' as const }))
+    const wrapper = await mountPage(kind)
+    await click(wrapper, action === 'VOID' ? '作废' : '重开', '.el-table__body-wrapper button')
+
+    expect(errorDetails(wrapper)).toMatchObject({ message: '测试操作失败', code: 'TEST_REJECTED', requestId: 'settlement-test-request' })
+    expect(wrapper.get('.el-table__body-wrapper').text()).toContain(current.settlementNo)
+    expect(wrapper.text()).not.toContain('加载失败')
+  })
 })
@@ -52,6 +52,21 @@ describe('finance status presentation', () => {
    expect(financeOperationActionLabel('NEW_ACTION')).toBe('未知操作')
  })

+  it.each([
+    ['OVERSEAS_INBOUND_FEE', '海外入仓费用'],
+    ['OVERSEAS_PROCUREMENT_FEE', '海外采购费用'],
+    ['OVERSEAS_TRUCK_FEE', '本土卡车费用'],
+    ['OVERSEAS_LOOSEBOARD_FEE', '本土散板费用'],
+    ['OVERSEAS_WAREHOUSE_FEE', '海外仓服务费'],
+    ['OVERSEAS_CONTAINER_FEE', '海外柜子费用'],
+    ['OVERSEAS_ORDER_FEE', '尾程订单费用'],
+    ['OVERSEAS_DELIVERY_FEE', '尾程派送费用'],
+    ['OVERSEAS_RELABEL_FEE', '换标费用'],
+  ])('labels the current overseas fee source %s consistently', (code, label) => {
+    expect(financeSourceTypeLabel(code)).toBe(label)
+    expect(financeSourceTypeLabel(` ${code.toLowerCase()} `)).toBe(label)
+  })
+
  it('uses review-status values for the customer AR/AP review filter', () => {
    expect(financeArapStatusOptions).toEqual([
      { label: '草稿', value: 'DRAFT' },
@@ -60,6 +60,11 @@ export function financeStatusTone(status: unknown): FinanceStatusTone {

 const financeSourceTypeLabels: Record<string, string> = {
  INBOUND_FEE: '入库费用', ORDER_FEE: '订单费用', CONTAINER_FEE: '装柜费用', CONTAINER_COST: '整柜成本', MANUAL_COST: '人工成本', STORAGE_FEE: '仓储费用',
+  OVERSEAS_INBOUND_FEE: '海外入仓费用', OVERSEAS_PROCUREMENT_FEE: '海外采购费用',
+  OVERSEAS_TRUCK_FEE: '本土卡车费用', OVERSEAS_LOOSEBOARD_FEE: '本土散板费用',
+  OVERSEAS_WAREHOUSE_FEE: '海外仓服务费', OVERSEAS_CONTAINER_FEE: '海外柜子费用',
+  OVERSEAS_ORDER_FEE: '尾程订单费用', OVERSEAS_DELIVERY_FEE: '尾程派送费用',
+  OVERSEAS_RELABEL_FEE: '换标费用',
 }
 const financeBusinessTypeLabels: Record<string, string> = {
  RECONCILIATION_CREATED: '生成对账单',
@@ -15,7 +15,7 @@
 | 测量数据审核 | `pages/MeasurementReviewsView.vue`、`review/MeasurementReviewPanel.vue`；`inbounds/measurement-reviews` | `review/api.ts`；`firstleg/service/MeasurementReviewService.java`、`firstleg/service/InitialInboundPricingService.java` |
 | 称重图片、OCR 与库位槽状态 | `weight/components/WeightOcrPanel.vue`、`weight/components/WeightImageThumbnail.vue` | `weight/api/weightOcr.ts`；`firstleg/service/MeasurementLocationOccupationService.java`、`firstleg/service/MeasurementSubmissionService.java` |
 | 入库单列表、摘要与历史 | `pages/InboundOrdersView.vue`、`core/InboundSummaryPanel.vue`、`core/InboundHistoryPanel.vue`；`inbounds` | `core/api.ts`、`core/types.ts`；`firstleg/service/InboundOrderQueryService.java` |
-| FBA 人工定价（无匹配价格） | `fee/InboundFeePanel.vue` | `fee/api.ts` 的 `/manual-quote`；`firstleg/service/FbaPricingService.java` |
+| FBA 与私人地址人工定价 | `fee/InboundFeePanel.vue` | `fee/api.ts` 的 `/manual-quote`；`firstleg/service/FbaPricingService.java` |
 | 一件代发托盘打印 | `core/DropshipPalletPrintPanel.vue` | `core/api.ts`；`print/`；仅一件代发订单展示 |

 ## 关键边界
@@ -23,7 +23,7 @@
 - 客户四档箱规与默认算法（`ADD/MULTIPLY`）的规则正文在详细索引维护；本模块只按 `../dimension-config/` 消费，保存后以外箱尺寸、体积重和计费基数只认服务端返回值，页面不独立重算。
 - 费用确认的实际箱数、毛重和体积取值口径以详细索引“入库、测量”节（`actualMeasurementRows`）为准，本文件不复制该规则。
 - 称重卡片只展示服务端 `locationCode/slotStatus/sharedOverflow`，不渲染或推导整票预留引导；删除图片须提示该槽位仍归本票保留，不按图片下标推导托盘或库位。
- 人工定价仅 FBA、已有实际测量且价格未命中时开放，客户已确认费用禁止改价；`MANUAL_QUOTE` 不伪造价格簿关联。
+- 人工定价要求已有实际测量。FBA 在价格未命中时开放，私人地址 PRIVATE 使用人工头程报价。客户已确认费用禁止改价，`MANUAL_QUOTE` 保留人工报价来源。
 - 扣货与解除、凭证下载走 `../unified-orders/` 与 `../inbounds/` 的正式入口，本模块不另建凭证链路。

 ## 验证
@@ -25,7 +25,8 @@ describe('InboundTaskList measurement scope', () => {
    expect(toolbar).toContain('</h1></slot>')
    expect(filters).toContain('<QueryToolbar')
    expect(filters).not.toContain('name="status-tabs"')
-    expect(source).toContain('<template v-if="isReview && access.can(actionPermission)" #toolbar-actions>')
+    expect(source).toContain('<template #toolbar-actions>')
+    expect(source).toContain('v-if="isReview && access.can(actionPermission)" type="success"')
  })

  it('supports selecting only pending measurement reviews for batch approval', () => {
@@ -39,7 +39,7 @@ const props = defineProps<{
  title?: string
  taskLoader?: (pagination: { page: number; size: number }) => Promise<InboundPageResult>
 }>()
-const emit = defineEmits<{ changed: [] }>()
+const emit = defineEmits<{ changed: []; selectionChange: [rows: InboundOrderSummary[]] }>()
 const router = useRouter()
 const access = useAccessPreviewStore()
 const reviewPanelRef = ref<InstanceType<typeof MeasurementReviewPanel> | null>(null)
@@ -169,7 +169,7 @@ async function loadOptions() {
 }

 async function loadTasks() {
-  selectedReviewRows.value = []
+  handleReviewSelectionChange([])
  const serial = ++requestSerial
  loading.value = true
  loadError.value = null
@@ -270,6 +270,7 @@ async function handleTaskChanged() {

 function handleReviewSelectionChange(rows: InboundOrderSummary[]) {
  selectedReviewRows.value = rows.filter((row) => row.measureReviewStatus === 'PENDING')
+  emit('selectionChange', selectedReviewRows.value)
 }

 async function batchApproveMeasurements() {
@@ -399,8 +400,9 @@ onBeforeUnmount(() => { disposed = true; requestSerial += 1; optionsRequestSeria
      </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 #toolbar-actions>
+            <el-button v-if="isReview && access.can(actionPermission)" type="success" :loading="batchReviewLoading" :disabled="loading || !selectedReviewRows.length" @click="batchApproveMeasurements"><CircleCheckBig :size="16" />批量审核通过<span v-if="selectedReviewRows.length">（{{ selectedReviewRows.length }}）</span></el-button>
+            <slot name="toolbar-actions" :loading="loading || batchReviewLoading" />
          </template>
          <template #pagination-left>当前显示 {{ result.records.length }} 条 · 共 {{ result.total }} 条</template>
          <template #actions="{ row }"><div class="row-actions density-actions admin-text-actions">
@@ -164,6 +164,7 @@ onBeforeUnmount(() => {
          :key="`fee-${revision}`"
          :tenant-id="customerId"
          :inbound-id="inboundId"
+          :destination-type="detail.summary.destinationType"
          @changed="handleDomainChanged"
        />
      </el-tab-pane>
@@ -4,18 +4,24 @@ import { resolve } from 'node:path'
 import { createPinia, setActivePinia } from 'pinia'
 import { enableAutoUnmount, flushPromises, mount } from '@vue/test-utils'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { ElMessageBox } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
 import { ApiResponseError } from '@/shared/api/http'
 import { useAccessPreviewStore } from '@/core/access/accessPreview'
 import { useAuthStore } from '@/core/auth/auth'
 import {
  adjustPublishedInboundFee,
+  calculateInboundFee,
  confirmInboundFee,
+  createManualInboundQuote,
  getLatestInboundFee,
+  previewInboundFee,
  sendInboundFee,
 } from './api'
 import type { InboundFeeSnapshot } from './types'
 import InboundFeePanel from './InboundFeePanel.vue'
+import { getInboundMeasurement } from '../measurement/api'
+
+vi.mock('../measurement/api', () => ({ getInboundMeasurement: vi.fn() }))

 vi.mock('./api', async () => {
  const actual = await vi.importActual<typeof import('./api')>('./api')
@@ -23,6 +29,9 @@ vi.mock('./api', async () => {
    ...actual,
    getLatestInboundFee: vi.fn(),
    adjustPublishedInboundFee: vi.fn(),
+    calculateInboundFee: vi.fn(),
+    createManualInboundQuote: vi.fn(),
+    previewInboundFee: vi.fn(),
    confirmInboundFee: vi.fn(),
    sendInboundFee: vi.fn(),
  }
@@ -66,11 +75,11 @@ function mountPanel(permissions = [
  'firstleg:fba-pricing:adjust',
  'firstleg:fba-pricing:confirm',
  'firstleg:inbound:send-fee',
-]) {
+], extraProps: { destinationType?: string | null } = {}) {
  const pinia = setupPermissions(permissions)
  return mount(InboundFeePanel, {
    attachTo: document.body,
-    props: { customerId: '10001', inboundId: '88' },
+    props: { customerId: '10001', inboundId: '88', ...extraProps },
    global: { plugins: [pinia, ElementPlus] },
  })
 }
@@ -83,6 +92,85 @@ describe('InboundFeePanel', () => {
    vi.mocked(adjustPublishedInboundFee).mockResolvedValue({ ...snapshot, feeVersion: 3, feeNo: 'FBAF-88-3' })
    vi.mocked(confirmInboundFee).mockResolvedValue({ ...snapshot, feeStatus: 'CONFIRMED', confirmedAt: '2026-08-04T10:01:00', sentAt: null })
    vi.mocked(sendInboundFee).mockResolvedValue(snapshot)
+    vi.mocked(previewInboundFee).mockResolvedValue({ chargeableQuantity: 64.128, chargeUnit: 'KG',
+      currency: 'CNY', priceMatched: false } as Awaited<ReturnType<typeof previewInboundFee>>)
+  })
+
+  it('saves a private-address manual quote through the existing fee dialog', async () => {
+    vi.mocked(getLatestInboundFee).mockRejectedValueOnce(new ApiResponseError('费用快照不存在', 'A0404', 404))
+    vi.mocked(getInboundMeasurement).mockResolvedValue({
+      items: [{ totalWeightKg: 70.5, totalVolumeCbm: 0.384 }],
+      actualNetWeightKg: 62.5, actualGrossWeightKg: 70.5, actualVolumeCbm: 0.384,
+    } as Awaited<ReturnType<typeof getInboundMeasurement>>)
+    vi.mocked(createManualInboundQuote).mockRejectedValueOnce(new Error('网络暂时不可用'))
+      .mockResolvedValue({ ...snapshot, feeStatus: 'CALCULATED', rateCode: 'MANUAL_QUOTE' })
+    const wrapper = mountPanel(['firstleg:fba-pricing:view', 'firstleg:inbound:confirm-send-fee'], { destinationType: 'PRIVATE' })
+    await flushPromises()
+    ;[...document.querySelectorAll<HTMLButtonElement>('button')]
+      .find(button => button.textContent?.includes('人工头程报价'))!.click()
+    await flushPromises()
+    const save = [...document.querySelectorAll<HTMLButtonElement>('button')]
+      .find(button => button.textContent?.includes('保存人工报价'))!
+    expect(document.body.textContent).toContain('64.128 KG')
+    expect(document.querySelectorAll('.trial-source-grid input[type="radio"]')).toHaveLength(2)
+    expect(save.disabled).toBe(true)
+    const price = document.querySelector<HTMLInputElement>('input[aria-label="人工单价"]')!
+    price.value = '1.5'
+    price.dispatchEvent(new Event('input', { bubbles: true }))
+    price.dispatchEvent(new Event('change', { bubbles: true }))
+    const reason = document.querySelector<HTMLTextAreaElement>('textarea[aria-label="报价原因"]')!
+    reason.value = '私人地址测试报价'
+    reason.dispatchEvent(new Event('input', { bubbles: true }))
+    await flushPromises()
+    expect(save.disabled).toBe(false)
+    save.click()
+    await flushPromises()
+    expect(wrapper.emitted('changed')).toBeUndefined()
+    const originalKey = vi.mocked(createManualInboundQuote).mock.calls[0]![3]
+    save.click()
+    await flushPromises()
+    expect(createManualInboundQuote).toHaveBeenCalledWith('10001', '88', {
+      selectedWeightKg: 62.5, selectedVolumeCbm: 0.384, unitPrice: 1.5, reason: '私人地址测试报价',
+    }, expect.any(String))
+    expect(calculateInboundFee).not.toHaveBeenCalled()
+    expect(createManualInboundQuote).toHaveBeenCalledTimes(2)
+    expect(vi.mocked(createManualInboundQuote).mock.calls[1]![3]).toBe(originalKey)
+    expect(wrapper.emitted('changed')).toHaveLength(1)
+  })
+
+  it('requires the manual quote permission for private-address pricing', async () => {
+    mountPanel(['firstleg:fba-pricing:view', 'firstleg:fba-pricing:calculate'], { destinationType: 'PRIVATE' })
+    await flushPromises()
+    expect([...document.querySelectorAll('button')].some(button => button.textContent?.includes('人工头程报价'))).toBe(false)
+  })
+
+  it('allows retrying a failed server quantity preview before a private quote', async () => {
+    vi.mocked(getInboundMeasurement).mockResolvedValue({
+      items: [{ totalWeightKg: 70.5, totalVolumeCbm: 0.384 }],
+      actualNetWeightKg: 62.5, actualGrossWeightKg: 70.5, actualVolumeCbm: 0.384,
+    } as Awaited<ReturnType<typeof getInboundMeasurement>>)
+    vi.mocked(previewInboundFee).mockRejectedValueOnce(new Error('计费量暂时不可读'))
+    mountPanel(['firstleg:fba-pricing:view', 'firstleg:inbound:confirm-send-fee'], { destinationType: 'PRIVATE' })
+    await flushPromises()
+    ;[...document.querySelectorAll<HTMLButtonElement>('button')]
+      .find(button => button.textContent?.includes('人工头程报价'))!.click()
+    await flushPromises()
+    const save = [...document.querySelectorAll<HTMLButtonElement>('button')]
+      .find(button => button.textContent?.includes('保存人工报价'))!
+    expect(save.disabled).toBe(true)
+    ;[...document.querySelectorAll<HTMLButtonElement>('button')]
+      .find(button => button.textContent?.includes('刷新计费量'))!.click()
+    await flushPromises()
+    expect(previewInboundFee).toHaveBeenCalledTimes(2)
+    expect(document.body.textContent).toContain('64.128 KG')
+    expect(createManualInboundQuote).not.toHaveBeenCalled()
+  })
+
+  it('keeps confirmed private-address fees locked for repricing', async () => {
+    vi.mocked(getLatestInboundFee).mockResolvedValue({ ...snapshot, customerConfirmationStatus: 'CONFIRMED' })
+    mountPanel(['firstleg:fba-pricing:view', 'firstleg:inbound:confirm-send-fee'], { destinationType: 'PRIVATE' })
+    await flushPromises()
+    expect([...document.querySelectorAll('button')].some(button => button.textContent?.includes('人工头程报价'))).toBe(false)
  })

  it('shows the immutable calculation basis, versions, amount, and timestamps', async () => {
@@ -279,6 +367,7 @@ describe('InboundFeePanel', () => {

  it('confirms and then sends a calculated fee through the implemented backend transitions', async () => {
    vi.mocked(getLatestInboundFee).mockResolvedValue({ ...snapshot, feeStatus: 'CALCULATED', confirmedAt: null, sentAt: null })
+    vi.mocked(getInboundMeasurement).mockRejectedValue(new ApiResponseError('无测量查看权限', 'A0403', 403))
    vi.spyOn(ElMessageBox, 'confirm').mockResolvedValue(undefined as never)
    const wrapper = mountPanel()
    await flushPromises()
@@ -291,10 +380,47 @@ describe('InboundFeePanel', () => {
    await wrapper.get('[data-testid="send-fee-button"]').trigger('click')
    await flushPromises()
    expect(sendInboundFee).toHaveBeenCalledWith('10001', '88', expect.stringMatching(/^fee-send-/))
+    expect(getInboundMeasurement).not.toHaveBeenCalled()
    expect(wrapper.emitted('changed')).toHaveLength(2)
    expect(wrapper.find('[data-testid="send-fee-button"]').exists()).toBe(false)
  })

+  it.each(['confirm', 'push'])('shows the backend review rejection for the %s entry point without sending', async (entry) => {
+    const message = '测量数据尚未审核通过，请先完成测量审核后再确认费用'
+    const showError = vi.spyOn(ElMessage, 'error')
+    vi.spyOn(ElMessageBox, 'confirm').mockResolvedValue(undefined as never)
+    vi.mocked(getLatestInboundFee).mockResolvedValue({ ...snapshot, feeStatus: 'CALCULATED' })
+    vi.mocked(confirmInboundFee).mockRejectedValue(new ApiResponseError(message, 'A0409', 200))
+    const wrapper = mountPanel()
+    await flushPromises()
+    const button = entry === 'confirm'
+      ? wrapper.get('[data-testid="confirm-fee-button"]')
+      : wrapper.findAll('button').find(button => button.text().includes('确认推送费用'))!
+    await button.trigger('click')
+    await flushPromises()
+    expect(confirmInboundFee).toHaveBeenCalledTimes(1)
+    expect(sendInboundFee).not.toHaveBeenCalled()
+    expect(getInboundMeasurement).not.toHaveBeenCalled()
+    expect(showError).toHaveBeenCalledWith(expect.objectContaining({ message }))
+    expect(wrapper.find('[data-testid="send-fee-button"]').exists()).toBe(false)
+  })
+
+  it('shows the backend review rejection when sending an already confirmed fee', async () => {
+    const message = '测量数据尚未审核通过，请先完成测量审核后再发送客户'
+    const showError = vi.spyOn(ElMessage, 'error')
+    vi.spyOn(ElMessageBox, 'confirm').mockResolvedValue(undefined as never)
+    vi.mocked(getLatestInboundFee).mockResolvedValue({ ...snapshot, feeStatus: 'CONFIRMED' })
+    vi.mocked(sendInboundFee).mockRejectedValue(new ApiResponseError(message, 'A0409', 200))
+    const wrapper = mountPanel()
+    await flushPromises()
+    await wrapper.get('[data-testid="send-fee-button"]').trigger('click')
+    await flushPromises()
+    expect(sendInboundFee).toHaveBeenCalledTimes(1)
+    expect(getInboundMeasurement).not.toHaveBeenCalled()
+    expect(wrapper.emitted('changed')).toBeUndefined()
+    expect(showError).toHaveBeenCalledWith(expect.objectContaining({ message }))
+  })
+
  it('does not expose fee transitions without their independent permissions', async () => {
    vi.mocked(getLatestInboundFee).mockResolvedValue({ ...snapshot, feeStatus: 'CALCULATED', confirmedAt: null, sentAt: null })
    const wrapper = mountPanel(['firstleg:fba-pricing:view', 'firstleg:fba-pricing:adjust'])
@@ -304,6 +430,20 @@ describe('InboundFeePanel', () => {
    expect(wrapper.find('[data-testid="send-fee-button"]').exists()).toBe(false)
  })

+  it('confirms and publishes without requiring measurement-view permission', async () => {
+    vi.spyOn(ElMessageBox, 'confirm').mockResolvedValue(undefined as never)
+    vi.mocked(getLatestInboundFee).mockResolvedValue({ ...snapshot, feeStatus: 'CALCULATED' })
+    vi.mocked(getInboundMeasurement).mockRejectedValue(new ApiResponseError('无测量查看权限', 'A0403', 403))
+    const wrapper = mountPanel(['firstleg:fba-pricing:view', 'firstleg:fba-pricing:confirm', 'firstleg:inbound:send-fee'])
+    await flushPromises()
+    await wrapper.findAll('button').find(button => button.text().includes('确认推送费用'))!.trigger('click')
+    await flushPromises()
+    expect(confirmInboundFee).toHaveBeenCalledWith('10001', '88', expect.stringMatching(/^fee-confirm-/))
+    expect(sendInboundFee).toHaveBeenCalledWith('10001', '88', expect.stringMatching(/^fee-send-/))
+    expect(getInboundMeasurement).not.toHaveBeenCalled()
+    expect(wrapper.emitted('changed')).toHaveLength(1)
+  })
+
  it('submits a reasoned adjustment and emits the refreshed snapshot', async () => {
    vi.mocked(getLatestInboundFee).mockResolvedValue({ ...snapshot, feeStatus: 'CALCULATED' })
    const wrapper = mountPanel()
@@ -19,12 +19,14 @@ import {
  adjustPublishedInboundFee,
  calculateInboundFee,
  confirmInboundFee,
+  createManualInboundQuote,
  createFeeActionIdempotencyKey,
  createFeeAdjustmentIdempotencyKey,
  getLatestInboundFee,
+  previewInboundFee,
  sendInboundFee,
 } from './api'
-import type { AdjustPublishedInboundFeeRequest, InboundFeeSnapshot } from './types'
+import type { AdjustPublishedInboundFeeRequest, InboundFeePreview, InboundFeeSnapshot } from './types'
 import { getInboundMeasurement } from '../measurement/api'
 import type { InboundMeasurementDetail } from '../measurement/types'

@@ -32,6 +34,7 @@ const props = defineProps<{
  customerId?: string
  tenantId?: string
  inboundId: string
+  destinationType?: string | null
  compact?: boolean
  displayOnly?: boolean
 }>()
@@ -55,7 +58,17 @@ const adjustOpen = ref(false)
 const trialOpen = ref(false)
 const trialLoading = ref(false)
 const measurement = ref<InboundMeasurementDetail | null>(null)
-const trial = reactive({ weightSource: 'ACTUAL', volumeSource: 'ACTUAL' })
+const trial = reactive({
+  weightSource: 'ACTUAL',
+  volumeSource: 'ACTUAL',
+  unitPrice: undefined as number | undefined,
+  reason: '',
+})
+let manualQuoteIdempotencyKey = ''
+let manualQuoteFingerprint = ''
+const trialPreview = ref<InboundFeePreview | null>(null)
+const trialPreviewLoading = ref(false)
+let trialPreviewSerial = 0
 const adjustFormRef = ref<FormInstance>()
 let loadSequence = 0
 let adjustmentFingerprint = ''
@@ -84,6 +97,24 @@ const canAdjust = computed(() => access.can('firstleg:fba-pricing:adjust'))
 const canConfirm = computed(() => access.can('firstleg:fba-pricing:confirm'))
 const canSend = computed(() => access.can('firstleg:inbound:send-fee'))
 const canCalculate = computed(() => access.can('firstleg:fba-pricing:calculate'))
+const isPrivateAddress = computed(() => props.destinationType === 'PRIVATE')
+const pricingHelp = computed(() => isPrivateAddress.value ? {
+  workflow: '私人地址完成测量审核后，请先进行人工头程报价，再确认预装。',
+  quantity: '计费量按客户计费方式和实际测量确定，人工填写单价，金额以服务端快照为准。',
+} : {
+  workflow: '测量审核完成后，系统会自动生成初算费用，人工确认后发布。',
+  quantity: '实际重量与体积重量取大后计费，金额以服务端快照为准。',
+})
+const canManualQuote = computed(() => access.can('firstleg:inbound:confirm-send-fee'))
+const canRunTrial = computed(() => isPrivateAddress.value
+  ? canManualQuote.value && snapshot.value?.customerConfirmationStatus !== 'CONFIRMED'
+  : canCalculate.value)
+const manualQuoteValid = computed(() => !isPrivateAddress.value || (
+  Boolean(measurement.value?.items.length) && Number(trialPreview.value?.chargeableQuantity) > 0
+  && !trialPreviewLoading.value && Number(trial.unitPrice) > 0
+  && Number.isFinite(Number(trial.unitPrice)) && trial.reason.trim().length >= 2
+  && trial.reason.trim().length <= 500
+))
 const customerContextId = computed(() => props.customerId || props.tenantId || '')
 const normalizedInboundId = computed(() => {
  const identifier = String(props.inboundId ?? '').trim()
@@ -107,12 +138,13 @@ const sourceOptions = computed(() => {
  if (!value) return []
  const itemWeight = value.items.reduce((sum, item) => sum + Number(item.totalWeightKg || 0), 0)
  const itemVolume = value.items.reduce((sum, item) => sum + Number(item.totalVolumeCbm || 0), 0)
-  return [
+  const options = [
    { value: 'CUSTOMER', label: '客户下单数据', weight: Number(value.originalGrossWeightKg || 0), volume: Number(value.originalVolumeCbm || 0) },
    { value: 'OUTER', label: '外箱规数据', weight: itemWeight, volume: itemVolume },
    { value: 'ACTUAL', label: '实际测量数据', weight: Number(value.actualNetWeightKg || value.actualGrossWeightKg || 0), volume: Number(value.actualVolumeCbm || 0) },
    { value: 'WAREHOUSE', label: '仓库建议数据', weight: itemWeight, volume: itemVolume },
  ]
+  return isPrivateAddress.value ? options.filter(item => item.value === 'ACTUAL') : options
 })

 function feeStatusInfo(status?: string) {
@@ -229,20 +261,72 @@ function openAdjustment() {

 async function openTrial() {
  trialLoading.value = true
-  try { measurement.value = await getInboundMeasurement(customerContextId.value, normalizedInboundId.value); trial.weightSource = 'ACTUAL'; trial.volumeSource = 'ACTUAL'; trialOpen.value = true }
+  adjustmentError.value = null
+  try {
+    measurement.value = await getInboundMeasurement(customerContextId.value, normalizedInboundId.value)
+    trial.weightSource = 'ACTUAL'
+    trial.volumeSource = 'ACTUAL'
+    trial.unitPrice = undefined
+    trial.reason = ''
+    manualQuoteIdempotencyKey = ''
+    manualQuoteFingerprint = ''
+    trialOpen.value = true
+    await loadTrialPreview()
+  }
  catch (error) { ElMessage.error(getApiErrorDetails(error, '测量数据加载失败，无法试算').message) }
  finally { trialLoading.value = false }
 }

+async function loadTrialPreview() {
+  if (!isPrivateAddress.value) return
+  adjustmentError.value = null
+  const serial = ++trialPreviewSerial
+  trialPreview.value = null
+  trialPreviewLoading.value = false
+  const weight = sourceOptions.value.find(item => item.value === trial.weightSource)
+  const volume = sourceOptions.value.find(item => item.value === trial.volumeSource)
+  if (!weight?.weight || !volume?.volume) return
+  trialPreviewLoading.value = true
+  try {
+    const result = await previewInboundFee(customerContextId.value, normalizedInboundId.value, {
+      selectedWeightKg: weight.weight, selectedVolumeCbm: volume.volume,
+      weightSource: weight.value, volumeSource: volume.value, selectedUnitPrice: null,
+    })
+    if (serial === trialPreviewSerial) trialPreview.value = result
+  } catch (error) {
+    if (serial === trialPreviewSerial) adjustmentError.value = getApiErrorDetails(error, '计费量读取失败，请重试')
+  } finally {
+    if (serial === trialPreviewSerial) trialPreviewLoading.value = false
+  }
+}
+
 async function submitTrial() {
+  if (!canRunTrial.value || !manualQuoteValid.value) return
  const weight = sourceOptions.value.find((item) => item.value === trial.weightSource)
  const volume = sourceOptions.value.find((item) => item.value === trial.volumeSource)
  if (!weight?.weight || !volume?.volume) { ElMessage.warning('所选重量或体积没有有效数据'); return }
+  adjustmentError.value = null
  trialLoading.value = true
  try {
-    const result = await calculateInboundFee(customerContextId.value, normalizedInboundId.value, { selectedWeightKg: weight.weight, selectedVolumeCbm: volume.volume, weightSource: weight.value, volumeSource: volume.value }, createFeeActionIdempotencyKey('calculate'))
-    snapshot.value = result; trialOpen.value = false; emit('changed', result); ElMessage.success('费用试算已更新')
-  } catch (error) { adjustmentError.value = getApiErrorDetails(error, '费用试算失败') }
+    const selection = { selectedWeightKg: weight.weight, selectedVolumeCbm: volume.volume }
+    let result: InboundFeeSnapshot
+    if (isPrivateAddress.value) {
+      const request = { ...selection, unitPrice: Number(trial.unitPrice), reason: trial.reason.trim() }
+      const fingerprint = JSON.stringify([customerContextId.value, normalizedInboundId.value, request])
+      if (!manualQuoteIdempotencyKey || fingerprint !== manualQuoteFingerprint) {
+        manualQuoteFingerprint = fingerprint
+        manualQuoteIdempotencyKey = createFeeActionIdempotencyKey('manual')
+      }
+      result = await createManualInboundQuote(customerContextId.value, normalizedInboundId.value, request, manualQuoteIdempotencyKey)
+    } else {
+      result = await calculateInboundFee(customerContextId.value, normalizedInboundId.value,
+        { ...selection, weightSource: weight.value, volumeSource: volume.value }, createFeeActionIdempotencyKey('calculate'))
+    }
+    snapshot.value = result
+    trialOpen.value = false
+    emit('changed', result)
+    ElMessage.success(isPrivateAddress.value ? '人工报价已保存' : '费用试算已更新')
+  } catch (error) { adjustmentError.value = getApiErrorDetails(error, isPrivateAddress.value ? '人工报价失败' : '费用试算失败') }
  finally { trialLoading.value = false }
 }

@@ -382,11 +466,11 @@ defineExpose({ reload: loadFee })
 <template>
  <section class="inbound-fee-panel admin-workbench" :aria-busy="loading" aria-labelledby="inbound-fee-title">
    <header class="fee-heading" :class="{ 'fee-heading--compact': compact }">
-      <h3 v-if="compact" id="inbound-fee-title" class="fee-heading-title--compact">头程自动初算 <InlineHelp title="计费说明"><p>测量审核完成后，系统会自动生成初算费用；人工确认后才发布。</p><p>实际重量与体积重量取大后计费，金额以服务端快照为准。</p></InlineHelp></h3>
+      <h3 v-if="compact" id="inbound-fee-title" class="fee-heading-title--compact">{{ isPrivateAddress ? '头程人工报价' : '头程自动初算' }} <InlineHelp title="计费说明"><p>{{ pricingHelp.workflow }}</p><p>{{ pricingHelp.quantity }}</p></InlineHelp></h3>
      <div v-else class="fee-heading-copy">
        <span class="fee-heading-icon" aria-hidden="true"><CircleDollarSign :size="20" /></span>
        <div>
-          <h3 id="inbound-fee-title">入库费用快照 <InlineHelp title="计费说明"><p>测量审核完成后，系统会自动生成初算费用；人工确认后才发布。</p><p>实际重量与体积重量取大后计费，金额以服务端快照为准。</p></InlineHelp></h3>
+          <h3 id="inbound-fee-title">入库费用快照 <InlineHelp title="计费说明"><p>{{ pricingHelp.workflow }}</p><p>{{ pricingHelp.quantity }}</p></InlineHelp></h3>
        </div>
      </div>
      <div class="fee-heading-actions">
@@ -401,12 +485,12 @@ defineExpose({ reload: loadFee })
          ><RefreshCw :size="16" :class="{ 'is-spinning': loading }" /></el-button>
        </el-tooltip>
        <el-button
-          v-if="!displayOnly && canCalculate"
+          v-if="!displayOnly && canRunTrial"
          type="primary"
          plain
          :loading="trialLoading"
          @click="openTrial"
-        ><CircleDollarSign :size="16" />费用试算</el-button>
+        ><CircleDollarSign :size="16" />{{ isPrivateAddress ? '人工头程报价' : '费用试算' }}</el-button>
        <el-button
          v-if="!displayOnly && canAdjust && adjustmentEligible"
          data-testid="adjust-fee-button"
@@ -439,12 +523,33 @@ defineExpose({ reload: loadFee })
      </div>
    </header>

-    <AppDialog class="admin-workbench is-dialog" v-model="trialOpen" title="头程费用试算" width="min(760px, calc(100vw - 28px))" :confirm-loading="trialLoading" confirm-text="开始试算" @confirm="submitTrial">
+    <AppDialog
+      class="admin-workbench is-dialog"
+      v-model="trialOpen"
+      :title="isPrivateAddress ? '私人地址头程报价' : '头程费用试算'"
+      width="min(760px, calc(100vw - 28px))"
+      :confirm-loading="trialLoading"
+      :confirm-disabled="!canRunTrial || !manualQuoteValid"
+      :confirm-text="isPrivateAddress ? '保存人工报价' : '开始试算'"
+      @confirm="submitTrial"
+    >

      <div class="trial-source-grid">
-        <section><h4>计费重量（单选）<InlineHelp title="试算取值说明"><p>重量和体积各选择一项；默认选择实际测量数据。</p></InlineHelp></h4><el-radio-group v-model="trial.weightSource"><el-radio v-for="item in sourceOptions" :key="`weight-${item.value}`" :value="item.value" :disabled="item.weight <= 0"><span>{{ item.label }}</span><strong>{{ formatNumber(item.weight) }} KG</strong></el-radio></el-radio-group></section>
-        <section><h4>计费体积（单选）</h4><el-radio-group v-model="trial.volumeSource"><el-radio v-for="item in sourceOptions" :key="`volume-${item.value}`" :value="item.value" :disabled="item.volume <= 0"><span>{{ item.label }}</span><strong>{{ formatNumber(item.volume, 6) }} CBM</strong></el-radio></el-radio-group></section>
+        <section><h4>计费重量（单选）<InlineHelp title="试算取值说明"><p>重量和体积各选择一项；默认选择实际测量数据。</p></InlineHelp></h4><el-radio-group v-model="trial.weightSource" @change="loadTrialPreview"><el-radio v-for="item in sourceOptions" :key="`weight-${item.value}`" :value="item.value" :disabled="item.weight <= 0"><span>{{ item.label }}</span><strong>{{ formatNumber(item.weight) }} KG</strong></el-radio></el-radio-group></section>
+        <section><h4>计费体积（单选）</h4><el-radio-group v-model="trial.volumeSource" @change="loadTrialPreview"><el-radio v-for="item in sourceOptions" :key="`volume-${item.value}`" :value="item.value" :disabled="item.volume <= 0"><span>{{ item.label }}</span><strong>{{ formatNumber(item.volume, 6) }} CBM</strong></el-radio></el-radio-group></section>
      </div>
+      <el-form v-if="isPrivateAddress" label-position="top" class="adjustment-form" :disabled="trialLoading">
+        <el-form-item label="服务端计费量">
+          <span>{{ trialPreview ? `${formatNumber(trialPreview.chargeableQuantity, 6)} ${trialPreview.chargeUnit}` : '—' }}</span>
+          <el-button link :loading="trialPreviewLoading" @click="loadTrialPreview">刷新计费量</el-button>
+        </el-form-item>
+        <el-form-item :label="`人工单价（CNY / ${trialPreview?.chargeUnit || '—'}）`" required>
+          <el-input-number v-model="trial.unitPrice" aria-label="人工单价" :min="0.0001" :max="999999999999.9999" :precision="4" controls-position="right" placeholder="请输入人工单价" />
+        </el-form-item>
+        <el-form-item label="报价原因" required>
+          <el-input v-model="trial.reason" aria-label="报价原因" type="textarea" :rows="3" maxlength="500" show-word-limit placeholder="请输入报价原因，至少2个字" />
+        </el-form-item>
+      </el-form>
    </AppDialog>

    <el-alert v-if="!canView" type="warning" :closable="false" show-icon>
@@ -471,7 +576,7 @@ defineExpose({ reload: loadFee })
      <el-button size="small" @click="loadFee()">重新加载</el-button>
    </el-alert>

-    <el-empty v-else-if="notFound" :image-size="64" description="尚未生成费用快照">
+    <el-empty v-else-if="notFound" :image-size="64" :description="isPrivateAddress ? '私人地址待人工头程报价' : '尚未生成费用快照'">
    </el-empty>

    <div v-else-if="snapshot" class="fee-content">
@@ -545,7 +650,7 @@ defineExpose({ reload: loadFee })
            <dl>
              <div><dt>起运仓</dt><dd>{{ snapshot.originWarehouseName }}</dd></div>
              <div><dt>渠道</dt><dd>{{ snapshot.channelCode }}</dd></div>
-              <div><dt>FBA 目的仓</dt><dd>{{ snapshot.destinationCode }}</dd></div>
+              <div><dt>{{ isPrivateAddress ? '目的地' : 'FBA 目的仓' }}</dt><dd>{{ isPrivateAddress ? '私人地址' : snapshot.destinationCode || '—' }}</dd></div>
              <div><dt>价格有效期</dt><dd>{{ formatDateTime(snapshot.rateEffectiveFrom) }} 至 {{ formatDateTime(snapshot.rateEffectiveTo) }}</dd></div>
            </dl>
          </section>
@@ -425,7 +425,7 @@ describe('InboundMeasurementPanel', () => {
  it('preserves the hidden actual goods name without overriding declaration facts', async () => {
    const wrapper = await mountPanel()
    expect(wrapper.text()).not.toContain('实际品名')
-    await wrapper.find('input[aria-label="仓库修改外箱长"]').setValue('55')
+    await wrapper.get('input[aria-label="仓库修改外箱长"]').setValue('55')
    const save = wrapper.findAll('button').find((button) => button.text().includes('保存测量数据'))
    await save?.trigger('click')
    await flushPromises()
@@ -442,6 +442,60 @@ describe('InboundMeasurementPanel', () => {
    expect(payload).not.toHaveProperty('originalVolumeCbm')
  })

+  it('preserves a 255-character goods name without exposing correction controls', async () => {
+    const actualGoodsName = '品'.repeat(255)
+    vi.mocked(getInboundMeasurement).mockResolvedValueOnce(measurement({ actualGoodsName }))
+    const wrapper = await mountPanel()
+    expect(wrapper.find('input[aria-label="实际品名"]').exists()).toBe(false)
+    await wrapper.get('input[aria-label="仓库修改外箱长"]').setValue('55')
+    await wrapper.findAll('button').find(button => button.text().includes('保存测量数据'))!.trigger('click')
+    await flushPromises()
+    expect(saveInboundMeasurementDraft).toHaveBeenCalledWith('10001', '7001', expect.objectContaining({ actualGoodsName }))
+  })
+
+  it('blocks an overlong or cleared goods name and keeps its correction editable until a successful retry', async () => {
+    const actualGoodsName = '品'.repeat(256)
+    vi.mocked(getInboundMeasurement)
+      .mockResolvedValueOnce(measurement({ actualGoodsName }))
+      .mockResolvedValueOnce(measurement({ actualGoodsName: '精简后的品名', version: 3 }))
+    vi.mocked(saveInboundMeasurementDraft).mockRejectedValueOnce(new ApiResponseError('资料保存失败', 'S0503'))
+    const wrapper = await mountPanel()
+    const input = () => wrapper.get<HTMLInputElement>('input[aria-label="实际品名"]')
+    const save = () => wrapper.findAll('button').find(button => button.text().includes('保存测量数据'))!
+    expect(input().element.value).toBe(actualGoodsName)
+    expect(wrapper.get('.measurement-panel__footer').text()).toContain('实际品名超过255字')
+    await save().trigger('click'); await flushPromises()
+    expect(saveInboundMeasurementDraft).not.toHaveBeenCalled()
+    await (wrapper.vm as unknown as { submitForReview(): Promise<void> }).submitForReview()
+    expect(submitInboundMeasurement).not.toHaveBeenCalled()
+
+    await input().setValue('')
+    await save().trigger('click'); await flushPromises()
+    expect(saveInboundMeasurementDraft).not.toHaveBeenCalled()
+    expect(wrapper.get('.measurement-panel__footer').text()).toContain('请填写精简后的实际品名')
+
+    await input().setValue('  精简后的品名  ')
+    expect(wrapper.find('input[aria-label="实际品名"]').exists()).toBe(true)
+    expect(wrapper.get('.measurement-declaration').text()).toContain('蓝牙音箱')
+    await save().trigger('click'); await flushPromises()
+    expect(saveInboundMeasurementDraft).toHaveBeenCalledWith('10001', '7001', expect.objectContaining({ actualGoodsName: '精简后的品名' }))
+    expect(input().element.value).toBe('  精简后的品名  ')
+    expect(wrapper.emitted('saved')).toBeUndefined()
+
+    await save().trigger('click'); await flushPromises()
+    expect(saveInboundMeasurementDraft).toHaveBeenCalledTimes(2)
+    expect(updateConfirmedPackageCount).not.toHaveBeenCalled()
+    expect(wrapper.find('input[aria-label="实际品名"]').exists()).toBe(false)
+    expect(wrapper.emitted('saved')).toHaveLength(1)
+  })
+
+  it('does not expose goods name correction without measurement edit permission', async () => {
+    vi.mocked(getInboundMeasurement).mockResolvedValueOnce(measurement({ actualGoodsName: '品'.repeat(256) }))
+    const wrapper = await mountPanel(['platform:firstleg:inbound:measure:view'])
+    expect(wrapper.find('input[aria-label="实际品名"]').exists()).toBe(false)
+    expect(saveInboundMeasurementDraft).not.toHaveBeenCalled()
+  })
+
  it('allows saving one warehouse outer dimension against the measured sequence', async () => {
    const wrapper = await mountPanel()
    expect(wrapper.text()).toContain('001')
@@ -149,12 +149,21 @@ const packageCountDifference = computed(() => expectedPackageCount.value == null
 const packageCountMatched = computed(() => packageCountDifference.value === null || packageCountDifference.value === 0)
 const hasConfirmedWeightResult = computed(() => confirmedWeightAvailable.value)
 const isDropship = computed(() => detail.value?.fulfillmentType === 'ONE_CLICK_DROPSHIP')
+// 以服务端原值决定修正入口，避免输入缩短后立即收起；保存成功重读后才隐藏。
+const needsGoodsNameCorrection = computed(() => (detail.value?.actualGoodsName?.trim().length ?? 0) > 255)
+const goodsNameCorrectionError = computed(() => {
+  const length = form.actualGoodsName.trim().length
+  if (length > 255) return '实际品名超过255字，请先精简后再保存'
+  if (needsGoodsNameCorrection.value && !length) return '请填写精简后的实际品名，最多255字'
+  return ''
+})
 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 maySubmit = computed(() => canSubmit.value && submitEditableProcess.value && Boolean(form.measurementId) && packageCountMatched.value && hasConfirmedWeightResult.value && expectedPalletCountValid.value && !goodsNameCorrectionError.value && !loading.value && !saving.value)
 const submissionBlockReason = computed(() => {
  if (!canSubmit.value || !detail.value || loading.value) return ''
  if (detail.value.processStatus === 'PREPARING') return '订单尚待客服审核，审核通过后才能提交测量审核'
  if (!submitEditableProcess.value) return `当前${processStatusLabel(detail.value.processStatus)}，不能提交测量审核`
+  if (goodsNameCorrectionError.value) return goodsNameCorrectionError.value
  if (!form.measurementId) return hasConfirmedWeightResult.value ? '请先完成箱规测量并保存测量数据' : '请先完成箱规测量，并上传确认至少一张称重图片'
  if (!hasConfirmedWeightResult.value) return '即使只有一箱，也必须上传并确认至少一张称重图片后才能提交审核'
  if (!packageCountMatched.value) return '确认箱数合计必须与订单总箱数一致后才能提交审核'
@@ -416,6 +425,7 @@ async function reloadLatest() {
 function validateDraft() {
  const errors: Record<string, string[]> = {}
  const general: string[] = []
+  if (goodsNameCorrectionError.value) general.push(goodsNameCorrectionError.value)
  if (!form.items.length) general.push('请至少保留一条实际扫描箱测量记录')
  if (isDropship.value && (!Number.isInteger(form.expectedPalletCount) || Number(form.expectedPalletCount) < 1 || Number(form.expectedPalletCount) > 1000)) general.push('一件代发预计托数必须是 1 至 1,000 的整数')
  else if (isDropship.value && Number(form.expectedPalletCount) > confirmedPackageCount.value) general.push('一件代发预计托数不能超过实测箱数')
@@ -736,7 +746,7 @@ defineExpose({ saveDraft, submitForReview, updateWeightEvidence, submissionBlock
              <p v-for="warning in measurementDeviationWarnings" :key="warning.key">{{ warning.text }}</p>
            </el-alert>

-            <div class="workbench-evidence"><table class="measurement-comparison" aria-label="客户申报与平台实测对比">
+            <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">
@@ -748,7 +758,7 @@ defineExpose({ saveDraft, submitForReview, updateWeightEvidence, submissionBlock
                  </td>
                </tr>
              </tbody>
-            </table></div>
+            </table>
            <div class="measurement-extra-facts">
              <span>货物净重 <strong>{{ formatNumber(detail.actualNetWeightKg) }}</strong> kg</span>
              <span>计费材积重 <strong>{{ formatNumber(detail.volumeWeightKg) }}</strong> kg</span>
@@ -782,7 +792,8 @@ defineExpose({ saveDraft, submitForReview, updateWeightEvidence, submissionBlock
            <div class="measurement-section__heading">
              <div><h3>平台实测箱规</h3></div>

-              <div v-if="isDropship" class="measurement-data-grid measurement-platform-fields">
+              <div v-if="isDropship || (needsGoodsNameCorrection && mayMaintain)" class="measurement-data-grid measurement-platform-fields">
+                <label v-if="needsGoodsNameCorrection && mayMaintain" class="measurement-goods-name"><span>实际品名（最多255字）</span><el-input v-model="form.actualGoodsName" aria-label="实际品名" placeholder="请精简汇总品名后保存" maxlength="255" show-word-limit :disabled="saving" /></label>
                <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>
@@ -927,9 +938,9 @@ defineExpose({ saveDraft, submitForReview, updateWeightEvidence, submissionBlock
 <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(--workbench-border); text-align: left; overflow-wrap: anywhere; font-variant-numeric: tabular-nums; }
-.measurement-comparison thead th { background: var(--cc-list-table-header-bg); color: var(--cc-list-table-header-text); }
-.measurement-comparison thead th:nth-child(2) { background: #f7f9ff; color: #465fc4; }
-.measurement-comparison thead th:nth-child(3) { background: var(--admin-surface, #fff); color: #18795d; }
+.measurement-comparison thead th { background: var(--admin-label-bg); color: var(--workbench-text); }
+.measurement-comparison thead th:nth-child(2) { background: var(--admin-dialog-source-bg); color: #465fc4; }
+.measurement-comparison thead th:nth-child(3) { background: var(--admin-dialog-summary-bg); color: #18795d; }
 .measurement-comparison__difference { color: var(--el-color-danger-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(--workbench-muted); font-size: var(--admin-font-caption, 12px); }
 .measurement-extra-facts strong { color: var(--workbench-text); }
@@ -1,14 +1,15 @@
-/* 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 var(--cc-border); border-radius: var(--admin-dialog-section-radius); background: var(--admin-surface, #fff); }
+/* Approved measurement-only palette; shared dialog styling must preserve these sections and gutters. */
+.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 var(--admin-dialog-summary-border); border-left: 4px solid #20a477; border-radius: var(--admin-dialog-section-radius); background: var(--admin-dialog-summary-bg); }
 .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 var(--cc-border); border-radius: var(--admin-dialog-section-radius); background: var(--admin-surface, #fff); }
+.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 var(--admin-dialog-work-border); border-left: 4px solid #c79643; border-radius: var(--admin-dialog-section-radius); background: var(--admin-dialog-work-bg); }

 .inbound-measurement-workspace-dialog.inbound-density .measurement-deviation-alert { background: var(--admin-surface, #fff); }
 .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 var(--admin-dialog-source-border); border-radius: var(--admin-dialog-section-radius); background: var(--admin-dialog-source-bg); }
+.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 var(--admin-dialog-source-border); border-left: 4px solid #647fec; border-radius: var(--admin-dialog-section-radius); background: var(--admin-dialog-source-bg); }
+.inbound-measurement-workspace-dialog.inbound-density .measurement-declaration-table th.el-table__cell { background: var(--admin-label-bg); color: var(--workbench-muted); }

@media (min-width: 961px) {
  .inbound-density.admin-density-dialog .measurement-dialog-weight { padding-bottom: var(--admin-space-4, 10px); }
@@ -19,9 +20,6 @@
  .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,
@@ -226,7 +226,7 @@ onMounted(() => {
          <ContainerSimulationCreate :dense="isPreload" v-if="canCreate" success-message="模拟柜及预装清单已创建" @created="onSimulationCreated" />
        </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" :class="{ 'density-action': isPreload }" size="small" :type="isPreload ? undefined : 'primary'" :plain="!isPreload" @click="openDetail(row)">{{ isPreload ? '编辑' : '查看' }}</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>
@@ -1,5 +1,16 @@
 # 海外业务原型核对矩阵

+## 2026-11-02 海外自动仓租计算过程
+
+依据：本轮用户确认“退货余一箱仍计一托、沿用现有阶梯”，以及“海外自动计算的仓租展示费用计算过程”。沿用既有费用详情、审核和调价弹框，按 Admin 高密度规范的正文分区与表格规则展示，不改变入口、权限及资金动作。
+
+| 直接消费者 | 操作与现有承载 | 本次实现与核对 | 验收 |
+|---|---|---|---|
+| OverseasFeesView | 海外费用管理的费用详情弹框 | StorageRentFeeDetails 展示冻结快照的计租基数、原库龄、已计费日、逐档天数×基数×单价、小计及汇率换算 | 定向回归通过；待人工 1920×1080、100% 截图确认 |
+| BusinessOrderFees | 退货、废弃、换标等业务单费用详情弹框 | 复用相同计算过程；旧比例费用明确保留原计费口径，缺少依据不猜算 | 定向回归通过；待人工截图确认 |
+| StorageRentFeeActions | 业务单仓租审核、调价弹框 | 原计算过程保持可见；调整金额不改写原快照 | 定向回归通过；待人工截图确认 |
+| StorageRentPanel | 仓租库存的原批次详情弹框 | 出库计租基数优先采用费用快照，新整托费用不再展示件数分摊的零点几托 | 定向回归通过；待人工截图确认 |
+
 采购样品履约的当前操作与页面承载以[采购订单样品履约流程变更需求第 10.6 节](../../../../../docs/海外仓业务/采购订单样品履约流程变更需求.md#106-平台页面实施核对矩阵)为准。下表采购旧五分区和通用编辑仅保留原型定位；当前详情使用履约聚合数据，独立编辑只维护内部备注，节点写入使用各自权限和命令。

 本土散板列表、本土卡车新增/编辑共用`../overseas-master-data/index.ts`公开的`TransportRouteDialog`。字段来源、原型证据和缺值处理唯一见[运输路线地图](../overseas-master-data/PROTOTYPE_MATRIX.md#运输路线地图)。按已有起终点规划，不写订单、不使用固定演示、不采集GPS。
@@ -2,8 +2,15 @@ import { http, unwrapApiResponse, type ApiEnvelope } from '@/shared/api/http'

 export interface FeePage<T> { records: T[]; page: number; size: number; total: number; pages: number }
 export type OverseasFeeDirection = 'RECEIVABLE' | 'PAYABLE'
+export interface StorageRentCalculation {
+  sourceBusinessNo: string | null; batchNo: string | null; ruleCode: 'RETURN_PALLET' | 'RETURN_SHARE' | 'TRANSIT'
+  billingQuantity: number; billingUnit: 'PALLET' | 'CBM'; storageDays: number; previouslyChargedDays: number
+  tiers: Array<{ startDay: number; endDay: number; days: number; unitPrice: number; amount: number }>
+  calculatedAmount: number
+}
 export interface OverseasFee {
  storageRent?: { outboundNo: string; outboundAt: string; calculatedAmount: number; chargedAmount: number | null;
+    calculations?: StorageRentCalculation[]
    lines: Array<{ lotId: string; inboundAt: string; quantity: number; days: number; calculatedAmount: number;
      sourceBusinessType?: string | null; sourceBusinessNo?: string | null; batchNo?: string | null }> } | null
  id: string; sourceFeeId: string; sourceVersion: number; customerId: string; customerName: string
@@ -152,10 +152,10 @@ describe('platform overseas business API adapter', () => {
  })

  it('supports looseboard list/detail/create and PUT update', async () => {
-    const detail = { summary: looseboardSummary, originAddress: null, destinationAddress: null, remark: null, createdBy: '7', histories: [] }
+    const detail = { summary: looseboardSummary, originAddress: null, destinationAddress: null, remark: null, createdBy: '7', histories: [], dispatchNos: ['PC-1', 'PC-2'] }
    overseas.get.mockResolvedValueOnce(envelope({ records: [looseboardSummary], page: 1, size: 20, total: 1, pages: 1 })).mockResolvedValueOnce(envelope(detail))
    expect((await listLocalLooseboardOrders({ status: 'PENDING_ACCEPTANCE' })).records[0]?.id).toBe('9007199254741005')
-    expect((await getLocalLooseboardOrder('LB-1', '10003')).status).toBe('PENDING_ACCEPTANCE')
+    expect(await getLocalLooseboardOrder('LB-1', '10003')).toMatchObject({ status: 'PENDING_ACCEPTANCE', dispatchNos: ['PC-1', 'PC-2'] })
    const create = { productName: '家居用品', estimatedPalletCount: 2, originContactName: 'A', originContactPhone: '1', destinationContactName: 'B', destinationContactPhone: '2', pickupAt: '2026-10-20T09:30:00', deliveryAt: '2026-10-20T15:45:00', origin: 'LA', destination: 'ONT', packageCount: 8, totalWeightKg: 80.5, totalVolumeCbm: 3.2, idempotencyKey: 'HTTP-20260824-MARKER-looseboard' }
    overseas.post.mockResolvedValue(envelope(detail)); await createLocalLooseboardOrder('9007199254742001', create)
    expect(overseas.post).toHaveBeenCalledWith('/platform/v1/last-leg/local-looseboard-orders', create, { params: { customerId: '9007199254742001' } })
@@ -180,7 +180,7 @@ describe('platform overseas business API adapter', () => {

  it('preserves unknown pool pallet service and product name in list and detail responses', async () => {
    const summary = { ...looseboardSummary, palletRequired: null, productName: null }
-    overseas.get.mockResolvedValueOnce(envelope({ records: [summary], total: 1, page: 1, size: 20, pages: 1 })).mockResolvedValueOnce(envelope({ summary, histories: [] }))
+    overseas.get.mockResolvedValueOnce(envelope({ records: [summary], total: 1, page: 1, size: 20, pages: 1 })).mockResolvedValueOnce(envelope({ summary, histories: [], dispatchNos: [] }))
    expect((await listLocalLooseboardOrders({})).records[0]).toMatchObject({ palletRequired: null, productName: null })
    expect(await getLocalLooseboardOrder('LB-1', '10003')).toMatchObject({ palletRequired: null, productName: null })
    expect(overseas.get).toHaveBeenCalledTimes(2)
@@ -27,7 +27,7 @@ interface TruckDetailPayload {
 interface LooseboardSummaryPayload extends Omit<LocalLooseboardOrder, 'id' | 'budgetAmount' | 'totalWeightKg' | 'totalVolumeCbm'> { id: Numeric; budgetAmount?: Numeric | null; totalWeightKg: Numeric; totalVolumeCbm: Numeric }
 interface LooseboardDetailPayload {
  summary: LooseboardSummaryPayload; originAddress?: string | null; destinationAddress?: string | null
-  remark?: string | null; createdBy?: string | null; histories?: OverseasBusinessHistory[]
+  remark?: string | null; createdBy?: string | null; histories?: OverseasBusinessHistory[]; dispatchNos: string[]
 }

 function normalizePage<TPayload, TResult>(payload: PagePayload<TPayload>, normalize: (value: TPayload) => TResult): OverseasBusinessPage<TResult> {
@@ -49,8 +49,9 @@ function truckDetail(value: TruckDetailPayload): LocalTransportDetail {
 function looseboardSummary(value: LooseboardSummaryPayload): LocalLooseboardOrder {
  return { ...value, id: String(value.id), totalWeightKg: String(value.totalWeightKg), totalVolumeCbm: String(value.totalVolumeCbm), budgetAmount: value.budgetAmount == null ? null : String(value.budgetAmount) }
 }
+/** 详情保留按原单查询的全部排车，不依赖车队预订摘要。 */
 function looseboardDetail(value: LooseboardDetailPayload): LocalLooseboardDetail {
-  return { ...looseboardSummary(value.summary), originAddress: value.originAddress || null, destinationAddress: value.destinationAddress || null, remark: value.remark || null, createdBy: value.createdBy || null, histories: value.histories || [] }
+  return { ...looseboardSummary(value.summary), originAddress: value.originAddress || null, destinationAddress: value.destinationAddress || null, remark: value.remark || null, createdBy: value.createdBy || null, histories: value.histories || [], dispatchNos: value.dispatchNos }
 }

 export async function listOverseasPurchaseCustomerOptions(keyword = '', limit = 200) {
@@ -155,3 +156,8 @@ export async function updateLocalLooseboardOrder(orderNo: string, customerId: st
  const response = await http.put<ApiEnvelope<LooseboardDetailPayload>, ApiEnvelope<LooseboardDetailPayload>>(`${looseboardBasePath}/${encodeURIComponent(orderNo)}`, payload, { params: { customerId } })
  return looseboardDetail(unwrapApiResponse(response))
 }
+
+export async function reviewLocalLooseboardOrder(orderNo: string, customerId: string, payload: {version: number; decision: 'APPROVE' | 'REJECT'; idempotencyKey: string; remark?: string}) {
+  const response = await http.post<ApiEnvelope<LooseboardDetailPayload>, ApiEnvelope<LooseboardDetailPayload>>(`${looseboardBasePath}/${encodeURIComponent(orderNo)}/review`, payload, { params: { customerId } })
+  return looseboardDetail(unwrapApiResponse(response))
+}
@@ -15,6 +15,7 @@ export interface StorageRentLot {
  settledAmount?: number; chargeCount?: number; settledChargeCount?: number
 }
 export interface StorageRentCharge {
+  billingQuantity?: number | null; billingUnit?: string | null
  id: string; outboundNo: string; businessNo: string; quantity: number; storageDays: number
  originalAmount: number; currency: string; settlementAmount: number; currencyRate: number; status: string
  createdAt: string; outboundAt: string
@@ -188,17 +188,17 @@ describe('单据费用操作', () => {
    await flushPromises(); await click(dialog, '保存')
    expect(api.createOverseasFee).not.toHaveBeenCalled()
  })
-  it('blocks automatic storage rent from manual addition', async () => {
+  it('allows manual storage rent using the normal fee submission', async () => {
    vi.mocked(api.listOverseasFeeItems).mockResolvedValue([{ feeCode: 'FEE_TYPE_077', feeTypeName: '仓储费', defaultPrice: null }])
    const wrapper = await mountPage()
    await click(wrapper, '新增费用')
    const dialog = activeDialog(wrapper)
    const select = dialog.findAllComponents({ name: 'ElSelect' })[0]!
-    expect(select.findAllComponents({ name: 'ElOption' })).toHaveLength(0)
+    expect(select.findAllComponents({ name: 'ElOption' })).toHaveLength(1)
    select.vm.$emit('update:modelValue', 'FEE_TYPE_077')
    dialog.getComponent({ name: 'ElInputNumber' }).vm.$emit('update:modelValue', 10)
    await flushPromises(); await click(dialog, '保存')
-    expect(api.createOverseasFee).not.toHaveBeenCalled()
+    expect(api.createOverseasFee).toHaveBeenCalledWith(expect.objectContaining({ feeItemCode: 'FEE_TYPE_077', amount: 10 }), expect.any(String))
  })
  it('includes verified related orders but rejects another customer and keeps adjustment on the original order', async () => {
    const related = { ...business, businessId: 'return-1', businessType: 'RETURN_ORDER' }
@@ -270,6 +270,20 @@ describe('单据费用操作', () => {
    expect(dialog.text()).toContain('审核状态')
    expect(dialog.findAll('button').some(button => button.text().trim() === '审核')).toBe(false)
  })
+  it.each([['ADJUST', '调整'], ['VOID', '作废']] as const)('does not execute %s after the fee was approved elsewhere', async (action, label) => {
+    const pending = { ...fee, allowedActions: [action] }
+    const approved = { ...fee, reviewStatus: 'APPROVED', allowedActions: ['ADJUST', 'VOID'] }
+    vi.mocked(api.listBusinessOverseasFees).mockResolvedValueOnce({ records: [pending], total: 1, page: 1, size: 20, pages: 1 })
+      .mockResolvedValue({ records: [approved], total: 1, page: 1, size: 20, pages: 1 })
+    vi.mocked(api.getOverseasFee).mockResolvedValue(approved)
+    const wrapper = await mountPage()
+    await click(wrapper, label, '.el-table__body-wrapper button')
+    expect(api.actOnOverseasFee).not.toHaveBeenCalled()
+    expect(wrapper.findAllComponents(AppDialog).some(component => component.props('modelValue'))).toBe(false)
+    const buttons = wrapper.findAll('.el-table__body-wrapper button').map(button => button.text().trim())
+    expect(buttons).not.toContain('调整')
+    expect(buttons).not.toContain('作废')
+  })
  it('voids with the freshly loaded version and a required reason', async () => {
    vi.mocked(api.listBusinessOverseasFees).mockResolvedValue({ records: [{ ...fee, allowedActions: ['VOID'] }], total: 1, page: 1, size: 20, pages: 1 })
    vi.mocked(api.getOverseasFee).mockResolvedValue({ ...fee, sourceVersion: 5, allowedActions: ['VOID'] })
@@ -0,0 +1,43 @@
+<script setup lang="ts">
+import { ref, watch } from 'vue'
+import { ElMessage } from 'element-plus'
+import AppDialog from '@/shared/components/AppDialog.vue'
+import LoadErrorState from '@/shared/components/LoadErrorState.vue'
+import ApiErrorMeta from '@/shared/components/ApiErrorMeta.vue'
+import { getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
+import { getLocalLooseboardOrder, reviewLocalLooseboardOrder } from '../api/platformOverseasBusiness'
+import type { LocalLooseboardDetail, LocalLooseboardOrder } from '../types'
+const open = defineModel<boolean>({default: false})
+const props = defineProps<{order: LocalLooseboardOrder | null}>()
+const emit = defineEmits<{saved: []}>()
+const detail = ref<LocalLooseboardDetail | null>(null), busy = ref(false), loading = ref(false), error = ref<ApiErrorDetails | null>(null)
+const decision = ref<'APPROVE' | 'REJECT'>('APPROVE'), remark = ref('')
+let generation = 0
+async function load() {
+  if (!props.order) return
+  const current=++generation; loading.value=true; detail.value=null; error.value=null
+  try { const value=await getLocalLooseboardOrder(props.order.orderNo,props.order.customerId); if(current===generation)detail.value=value }
+  catch(cause) { if(current===generation)error.value=getApiErrorDetails(cause,'散板订单读取失败') }
+  finally { if(current===generation)loading.value=false }
+}
+async function submit() {
+  if (!detail.value || busy.value) return
+  if (decision.value==='REJECT' && !remark.value.trim()) { ElMessage.warning('请填写驳回原因'); return }
+  busy.value=true; error.value=null
+  try {
+    await reviewLocalLooseboardOrder(detail.value.orderNo,detail.value.customerId,{version:detail.value.version,decision:decision.value,remark:remark.value.trim() || undefined,idempotencyKey:crypto.randomUUID()})
+    ElMessage.success(decision.value==='APPROVE'?'审核通过，已生成关联收货任务':'订单已驳回'); open.value=false; emit('saved')
+  } catch(cause) { error.value=getApiErrorDetails(cause,'散板审核失败'); await load().catch(()=>undefined); error.value=getApiErrorDetails(cause,'散板审核失败') }
+  finally { busy.value=false }
+}
+watch(open,value=>{if(value){decision.value='APPROVE';remark.value='';void load()}else generation++})
+</script>
+<template><AppDialog v-model="open" title="审核本土散板订单" width="680px" class="admin-density-dialog admin-workbench" :confirm-loading="busy" :confirm-disabled="loading || !detail || detail.status !== 'PENDING_ACCEPTANCE'" lock-while-submitting @confirm="submit">
+  <LoadErrorState v-if="error" title="审核暂未完成" :message="error.message" @retry="load"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState>
+  <el-form v-if="detail" label-position="top" :disabled="busy" class="density-form">
+    <el-form-item label="订单号">{{detail.orderNo}}</el-form-item>
+    <el-form-item label="入仓方式">{{detail.deliveryMode==='WAREHOUSE_PICKUP'?'仓库上门取货':detail.deliveryMode==='DELIVERY_TO_WAREHOUSE'?'送货到仓':'未填写，需先编辑补齐'}}</el-form-item>
+    <el-form-item label="审核结果"><el-radio-group v-model="decision"><el-radio value="APPROVE">通过</el-radio><el-radio value="REJECT">驳回</el-radio></el-radio-group></el-form-item>
+    <el-form-item label="审核意见" :required="decision==='REJECT'"><el-input v-model="remark" type="textarea" maxlength="1000" :rows="3" /></el-form-item>
+  </el-form>
+</AppDialog></template>
@@ -32,8 +32,7 @@ let optionSequence = 0
 let savedFingerprint = '', requestKey = ''
 let openedBusinessKey = ''
 const businessKey = () => props.business ? `${props.business.businessType}:${props.business.businessId}:${props.business.customerId}` : ''
-const automaticRentCode = 'FEE_TYPE_077'
-const manualItems = computed(() => props.items.filter(item => item.feeCode !== automaticRentCode))
+const manualItems = computed(() => props.items)
 const hasExistingItem = computed(() => !!props.fee && manualItems.value.some(item => item.feeCode === props.fee?.feeItemCode))
 async function loadOptions(keyword = '') {
  if (props.business) return
@@ -90,7 +89,6 @@ const sourceTypes: Record<string, string> = {
 const selectableTypes = Object.keys(sourceTypes)
 async function save() {
  if (!access.can(feePermissions.edit) || saving.value || optionsLoading.value || !await formRef.value?.validate().catch(() => false)) return
-  if (form.feeItemCode === automaticRentCode) { ElMessage.error('仓租自动计算，请勿手动添加'); return }
  const order = selected.value
  if (!order) { ElMessage.error('请重新选择业务订单'); return }
  if (existingLoading.value || existingError.value) { ElMessage.warning(existingError.value || '正在核对已有费用'); return }
@@ -132,7 +130,7 @@ async function save() {
      <div class="fee-editor-grid">
        <el-form-item v-if="!business" label="业务类型" prop="businessType"><el-select v-model="form.businessType" :disabled="!!fee" @change="changeBusinessType"><el-option v-for="type in selectableTypes" :key="type" :value="type" :label="businessLabels[type]" /></el-select></el-form-item>
        <el-form-item v-if="!business" label="业务订单" prop="businessId"><el-select v-model="form.businessId" filterable remote :remote-method="loadOptions" :loading="optionsLoading" :disabled="!!fee" placeholder="搜索订单号"><el-option v-for="row in options" :key="row.businessId" :value="row.businessId" :label="`${row.businessNo} · ${row.customerName}`" /></el-select></el-form-item>
-        <el-form-item label="费用项目" prop="feeItemCode"><el-select v-model="form.feeItemCode" filterable><el-option v-if="fee && fee.feeItemCode !== automaticRentCode && !hasExistingItem" :value="fee.feeItemCode" :label="fee.feeItemName" /><el-option v-for="item in manualItems" :key="item.feeCode" :value="item.feeCode" :label="item.feeTypeName" /></el-select></el-form-item>
+        <el-form-item label="费用项目" prop="feeItemCode"><el-select v-model="form.feeItemCode" filterable><el-option v-if="fee && !hasExistingItem" :value="fee.feeItemCode" :label="fee.feeItemName" /><el-option v-for="item in manualItems" :key="item.feeCode" :value="item.feeCode" :label="item.feeTypeName" /></el-select></el-form-item>
        <el-form-item label="币种"><el-select v-model="form.currency"><el-option label="美元 USD" value="USD" /><el-option label="人民币 CNY" value="CNY" /></el-select></el-form-item>
        <el-form-item label="金额" prop="amount"><el-input-number v-model="form.amount" :min="0" :max="999999999.99" :precision="2" :controls="false" /></el-form-item>
        <el-form-item v-if="(props.fee?.direction || 'RECEIVABLE') === 'RECEIVABLE'" label="结算方式"><el-select v-model="form.settlementMode" clearable placeholder="按业务默认规则"><el-option label="推送结算(账期)" value="BILL" /><el-option label="余额扣费" value="WALLET" /></el-select></el-form-item>
@@ -24,7 +24,7 @@ function render(status = 'RECEIVING', permissions = ['receive-overseas', 'ship-c
 }
 beforeEach(() => { vi.clearAllMocks(); beforeOutbound.mockResolvedValue(null); vi.mocked(submitProcurementWorkflow).mockResolvedValue(workflow()) })
 describe('simplified procurement operations', () => {
-  it('allows a rejected purchase to be resubmitted without uploading photos and clears the old reason after success', async () => {
+  it('allows a rejected purchase to be resubmitted without uploading photos and hides the old reason after success', async () => {
    const wrapper = render()
    const rejected = { ...workflow(), rejectionReason: '请核对', photosNeedUpdate: true, receipts: [
      { id: 'r-1', quantity: 2, fileIds: ['old-1'], receivedAt: '' },
@@ -39,8 +39,32 @@ describe('simplified procurement operations', () => {
    expect(uploadProcurementFile).not.toHaveBeenCalled()
    expect(submitProcurementWorkflow).toHaveBeenCalledWith('OP-1', '1001', 'request-confirmation', { version: 4, idempotencyKey: expect.any(String) })
    expect(wrapper.emitted('changed')).toHaveLength(1)
-    await wrapper.setProps({ workflow: { ...rejected, status: 'WAIT_CUSTOMER_CONFIRM', version: 5, rejectionReason: null, photosNeedUpdate: false } })
+    await wrapper.setProps({ workflow: { ...rejected, status: 'WAIT_CUSTOMER_CONFIRM', version: 5 } })
    expect(wrapper.text()).not.toContain('客户驳回原因')
+    expect(wrapper.text()).not.toContain('请核对')
+    await wrapper.setProps({ workflow: { ...rejected, status: 'CONFIRMED', version: 6 } })
+    expect(wrapper.text()).not.toContain('客户驳回原因')
+    expect(wrapper.text()).not.toContain('请核对')
+  })
+  it('hides the previous rejection after receipt photos are updated and shows a new rejection again', async () => {
+    const wrapper = render()
+    const rejected = { ...workflow(), rejectionReason: '照片不清晰', photosNeedUpdate: true, receipts: [
+      { id: 'r-1', quantity: 2, fileIds: ['old-1'], receivedAt: '' },
+      { id: 'r-2', quantity: 3, fileIds: ['old-2'], receivedAt: '' },
+    ] }
+    await wrapper.setProps({ workflow: rejected })
+    expect(wrapper.text()).toContain('照片不清晰')
+
+    await wrapper.setProps({ workflow: { ...rejected, version: 5, rejectionReason: null, photosNeedUpdate: true } })
+    expect(wrapper.text()).not.toContain('客户驳回原因')
+    expect(wrapper.text()).not.toContain('照片不清晰')
+    expect(wrapper.findAll('button').some(button => button.text() === '重新上传照片')).toBe(true)
+
+    await wrapper.setProps({ workflow: { ...rejected, version: 6, rejectionReason: null, photosNeedUpdate: false } })
+    expect(wrapper.findAll('button').some(button => button.text() === '重新上传照片')).toBe(false)
+
+    await wrapper.setProps({ workflow: { ...rejected, version: 7, rejectionReason: '请补拍完整商品' } })
+    expect(wrapper.text()).toContain('请补拍完整商品')
  })
  it('accepts the first and subsequent receipt batches using the remaining purchase quantity', async () => {
    const wrapper = render()
@@ -101,14 +101,14 @@ const fileName = (id: string) => props.detail.files.find(file => file.fileId ===
 </script>
 <template>
  <section class="procurement-workflow">
-    <el-alert v-if="workflow.rejectionReason" title="客户驳回原因" :description="workflow.rejectionReason" type="warning" :closable="false" show-icon />
+    <el-alert v-if="workflow.status === 'RECEIVING' && workflow.rejectionReason" title="客户驳回原因" :description="workflow.rejectionReason" type="warning" :closable="false" show-icon />
    <div class="density-actions">
      <template v-if="workflow.status === 'RECEIVING'"><el-button type="primary" :disabled="!can('receive-overseas') || workflow.receivedQuantity >= detail.customerView.order.purchaseQuantity" @click="begin('receipts')">登记收货</el-button><el-button :disabled="!can('receive-overseas') || !workflow.receivedQuantity" @click="begin('request-confirmation')">采购完成</el-button></template>
      <el-button v-if="['CONFIRMED', 'IN_TRANSIT', 'DELIVERING'].includes(workflow.status)" type="primary" :loading="checkingFees" :disabled="!can('ship-customer') || workflow.availableQuantity < 1" @click="begin('outbounds')">创建出库单</el-button>
    </div>
    <el-text v-if="permissionHint" type="warning" role="status">{{ permissionHint }}</el-text>
    <dl class="density-fields inventory"><div><dt>累计收货</dt><dd>{{ workflow.receivedQuantity }}</dd></div><div><dt>采购库存</dt><dd>{{ workflow.stockQuantity }}</dd></div><div><dt>出库处理中</dt><dd>{{ workflow.reservedQuantity }}</dd></div><div><dt>可出库</dt><dd>{{ workflow.availableQuantity }}</dd></div></dl>
-    <h3>收货记录</h3><DataTable :data="workflow.receipts" :columns="receiptColumns" row-key="id" empty-text="暂无收货记录"><template #files="{ row }"><el-button v-if="row.id && workflow.status === 'RECEIVING' && workflow.rejectionReason && can('receive-overseas')" link type="primary" @click="begin('receipt-photos', row as ProcurementWorkflowReceipt)">重新上传照片</el-button><el-button v-for="id in row.fileIds" :key="id" :disabled="!!downloading" link type="primary" @click="emit('download', id)">{{ fileName(id) }}</el-button></template></DataTable>
+    <h3>收货记录</h3><DataTable :data="workflow.receipts" :columns="receiptColumns" row-key="id" empty-text="暂无收货记录"><template #files="{ row }"><el-button v-if="row.id && workflow.status === 'RECEIVING' && (workflow.rejectionReason || workflow.photosNeedUpdate) && can('receive-overseas')" link type="primary" @click="begin('receipt-photos', row as ProcurementWorkflowReceipt)">重新上传照片</el-button><el-button v-for="id in row.fileIds" :key="id" :disabled="!!downloading" link type="primary" @click="emit('download', id)">{{ fileName(id) }}</el-button></template></DataTable>
    <h3>出库单</h3><DataTable :data="workflow.outbounds" :columns="outboundColumns" row-key="id" empty-text="暂无出库单"><template #actions="{ row }"><template v-if="row.status === 'IN_TRANSIT'"><el-button :disabled="!can('ship-customer')" link type="primary" @click="begin('edit-outbound', row as ProcurementOutbound)">编辑</el-button><el-button :disabled="!can('ship-customer')" link type="danger" @click="begin('cancel', row as ProcurementOutbound)">取消</el-button><el-button :disabled="!can('ship-customer')" link type="primary" @click="begin('dispatch', row as ProcurementOutbound)">开始派送</el-button></template><el-button v-if="row.status === 'DELIVERING'" :disabled="!can('ship-customer')" link type="primary" @click="begin('complete', row as ProcurementOutbound)">上传签收凭证</el-button></template><template #files="{ row }"><el-button v-for="id in row.fileIds" :key="id" :disabled="!!downloading" link type="primary" @click="emit('download', id)">{{ fileName(id) }}</el-button></template></DataTable>
    <AppDialog v-model="open" class="admin-density-dialog admin-workbench is-dialog" :title="title" width="580px" confirm-text="确认" :confirm-loading="saving" :confirm-disabled="uploading" @confirm="save">
      <el-form :model="form" class="density-form density-form--outlined" label-position="top" :disabled="saving">
@@ -0,0 +1,52 @@
+import { createRequire } from 'node:module'
+import { enableAutoUnmount, flushPromises, mount } from '@vue/test-utils'
+import { afterEach, beforeEach, expect, it, vi } from 'vitest'
+import type { OverseasFee, StorageRentCalculation } from '../api/overseasFees'
+import StorageRentFeeDetails from './StorageRentFeeDetails.vue'
+
+const { default: ElementPlus } = createRequire(import.meta.url)('element-plus') as typeof import('element-plus')
+enableAutoUnmount(afterEach)
+beforeEach(() => vi.stubGlobal('ResizeObserver', class { observe() {} unobserve() {} disconnect() {} }))
+afterEach(() => vi.unstubAllGlobals())
+const calculation: StorageRentCalculation = {
+  sourceBusinessNo: 'TH202611020001', batchNo: 'RB1', ruleCode: 'RETURN_PALLET', billingQuantity: 1, billingUnit: 'PALLET',
+  storageDays: 40, previouslyChargedDays: 10, calculatedAmount: 50,
+  tiers: [{ startDay: 11, endDay: 30, days: 20, unitPrice: 1.5, amount: 30 }, { startDay: 31, endDay: 40, days: 10, unitPrice: 2, amount: 20 }],
+}
+function fee(calculations?: StorageRentCalculation[]) {
+  return { originalCurrency: 'USD', currency: 'CNY', originalAmount: 50, amount: 500, exchangeRate: 10,
+    storageRent: { outboundNo: 'OUT1', outboundAt: '2026-11-02T12:00:00Z', calculatedAmount: 50, chargedAmount: null,
+      lines: [{ lotId: '1', inboundAt: '2026-09-24T12:00:00Z', quantity: 1, days: 40, calculatedAmount: 50 }], calculations },
+  } as OverseasFee
+}
+it('explains whole pallet tiers and skips previously charged days in every fee detail consumer', async () => {
+  const wrapper = mount(StorageRentFeeDetails, { props: { fee: fee([calculation]) }, global: { plugins: [ElementPlus] } })
+  await flushPromises()
+  expect(wrapper.text()).toContain('余一箱仍计一托')
+  expect(wrapper.text()).toContain('此前已计费10 天')
+  expect(wrapper.text()).toContain('20 天 × 1 托 × USD 1.5 = USD 30')
+  expect(wrapper.text()).toContain('10 天 × 1 托 × USD 2 = USD 20')
+  expect(wrapper.text()).toContain('USD 50.00 × 10 = CNY 500.00')
+  expect(wrapper.text()).toContain('本批次计算金额：USD 50')
+})
+it('shows transit volume and free tier calculations with the saved currency', async () => {
+  const transit: StorageRentCalculation = { ...calculation, ruleCode: 'TRANSIT', billingUnit: 'CBM', billingQuantity: 0.8,
+    storageDays: 10, previouslyChargedDays: 0, calculatedAmount: 1.92,
+    tiers: [{ startDay: 1, endDay: 7, days: 7, unitPrice: 0, amount: 0 }, { startDay: 8, endDay: 10, days: 3, unitPrice: 0.8, amount: 1.92 }] }
+  const wrapper = mount(StorageRentFeeDetails, { props: { fee: fee([transit]) }, global: { plugins: [ElementPlus] } })
+  await flushPromises()
+  expect(wrapper.text()).toContain('7 天 × 0.8 CBM × USD 0 = USD 0')
+  expect(wrapper.text()).toContain('3 天 × 0.8 CBM × USD 0.8 = USD 1.92')
+})
+it('distinguishes historical fractional pricing from new whole pallet pricing', async () => {
+  const historical: StorageRentCalculation = { ...calculation, ruleCode: 'RETURN_SHARE', billingQuantity: 0.5625,
+    storageDays: 1, previouslyChargedDays: 0, calculatedAmount: 0.84375,
+    tiers: [{ startDay: 1, endDay: 1, days: 1, unitPrice: 1.5, amount: 0.84375 }] }
+  const wrapper = mount(StorageRentFeeDetails, { props: { fee: fee([historical]) }, global: { plugins: [ElementPlus] } })
+  await flushPromises()
+  expect(wrapper.text()).toContain('历史费用：按原托份额计费')
+  expect(wrapper.text()).toContain('1 天 × 0.5625 托 × USD 1.5 = USD 0.84375')
+  await wrapper.setProps({ fee: fee([]) })
+  expect(wrapper.text()).toContain('未保存完整计算依据')
+  expect(wrapper.text()).not.toContain('1 天 × 0.5625')
+})
@@ -4,6 +4,8 @@ import type { OverseasFee } from '../api/overseasFees'
 import { feeMoney } from '../overseasFeePresentation'
 import { storageRentSourceType, storageRentTime } from '../storageRentPresentation'
 defineProps<{ fee: OverseasFee }>()
+const number = (value: number) => new Intl.NumberFormat('zh-CN', { maximumFractionDigits: 12 }).format(Number(value))
+const unit = (value: string) => value === 'PALLET' ? '托' : 'CBM'
 </script>
 <template>
  <section v-if="fee.storageRent" aria-label="仓租计费明细">
@@ -13,6 +15,7 @@ defineProps<{ fee: OverseasFee }>()
      <el-descriptions-item label="原计算金额">{{ feeMoney(fee.storageRent.calculatedAmount, fee.originalCurrency) }}</el-descriptions-item>
      <el-descriptions-item label="应扣金额">{{ feeMoney(fee.amount, fee.currency) }}</el-descriptions-item>
      <el-descriptions-item label="实扣金额">{{ feeMoney(fee.storageRent.chargedAmount, fee.currency) }}</el-descriptions-item>
+      <el-descriptions-item v-if="fee.exchangeRate != null" label="结算换算">{{ feeMoney(fee.originalAmount, fee.originalCurrency) }} × {{ number(fee.exchangeRate) }} = {{ feeMoney(fee.amount, fee.currency) }}</el-descriptions-item>
    </el-descriptions>
    <el-table :data="fee.storageRent.lines" border empty-text="暂无计租批次">
      <el-table-column label="来源类型" min-width="130"><template #default="{ row }">{{ storageRentSourceType(row.sourceBusinessType) }}</template></el-table-column>
@@ -20,8 +23,29 @@ defineProps<{ fee: OverseasFee }>()
      <el-table-column label="入库批次" min-width="160"><template #default="{ row }">{{ row.batchNo || '—' }}</template></el-table-column>
      <el-table-column label="入库时间" min-width="170"><template #default="{ row }">{{ storageRentTime(row.inboundAt) }}</template></el-table-column>
      <el-table-column prop="quantity" label="本次出库数量" width="130" />
-      <el-table-column prop="days" label="计租天数" width="100" />
+      <el-table-column prop="days" label="库龄天数" width="100" />
      <el-table-column label="原计算仓租" min-width="130"><template #default="{ row }">{{ feeMoney(row.calculatedAmount, fee.originalCurrency) }}</template></el-table-column>
    </el-table>
+    <h4>仓租计算过程</h4>
+    <template v-if="fee.storageRent.calculations?.length">
+      <div v-for="(calculation, index) in fee.storageRent.calculations" :key="index">
+        <el-descriptions :column="2" border class="density-descriptions overseas-fee-descriptions">
+          <el-descriptions-item label="来源单号">{{ calculation.sourceBusinessNo || '—' }}</el-descriptions-item>
+          <el-descriptions-item label="入库批次">{{ calculation.batchNo || '—' }}</el-descriptions-item>
+          <el-descriptions-item label="计费口径">{{ calculation.ruleCode === 'RETURN_PALLET' ? '按原托整托计费，余一箱仍计一托' : calculation.ruleCode === 'RETURN_SHARE' ? '历史费用：按原托份额计费' : '按本次出库体积计费' }}</el-descriptions-item>
+          <el-descriptions-item label="计租数量">{{ number(calculation.billingQuantity) }} {{ unit(calculation.billingUnit) }}</el-descriptions-item>
+          <el-descriptions-item label="累计库龄">{{ calculation.storageDays }} 天</el-descriptions-item>
+          <el-descriptions-item label="此前已计费">{{ calculation.previouslyChargedDays }} 天</el-descriptions-item>
+        </el-descriptions>
+        <el-table :data="calculation.tiers" border empty-text="本计租日已计费，本次不重复收费" aria-label="仓租阶梯计算">
+          <el-table-column label="计费区间" min-width="130"><template #default="{ row }">第 {{ row.startDay }}–{{ row.endDay }} 天</template></el-table-column>
+          <el-table-column label="单价" min-width="160"><template #default="{ row }">{{ fee.originalCurrency }} {{ number(row.unitPrice) }}/{{ unit(calculation.billingUnit) }}/天</template></el-table-column>
+          <el-table-column label="计算过程" min-width="300"><template #default="{ row }">{{ row.days }} 天 × {{ number(calculation.billingQuantity) }} {{ unit(calculation.billingUnit) }} × {{ fee.originalCurrency }} {{ number(row.unitPrice) }} = {{ fee.originalCurrency }} {{ number(row.amount) }}</template></el-table-column>
+        </el-table>
+        <p>本批次计算金额：{{ fee.originalCurrency }} {{ number(calculation.calculatedAmount) }}</p>
+      </div>
+      <p>各阶梯按原始精度累加，仓租合计四舍五入至 2 位小数；计价采用生成费用时保存的报价。</p>
+    </template>
+    <p v-else>该笔费用未保存完整计算依据，暂无法展示计算过程。</p>
  </section>
 </template>
@@ -28,6 +28,19 @@ beforeEach(() => {
 afterEach(() => { vi.restoreAllMocks(); vi.unstubAllGlobals(); document.body.innerHTML = '' })

 describe('仓租列表服务端契约', () => {
+  it('uses the whole pallet billing basis from the charge snapshot when only one box leaves', async () => {
+    vi.mocked(api.getStorageRentLot).mockResolvedValue({ lot: { ...lot, businessType: 'RETURN_ORDER', billingUnit: 'PALLET', originalQuantity: 16 },
+      charges: [{ id: '3', outboundNo: 'OUT1', businessNo: 'CD1', quantity: 1, storageDays: 1, originalAmount: 1.5,
+        currency: 'USD', settlementAmount: 15, currencyRate: 10, status: 'PENDING_REVIEW', createdAt: '', outboundAt: '', billingQuantity: 1, billingUnit: 'PALLET' }] })
+    const wrapper = mount(StorageRentPanel, { attachTo: document.body, props: { customers: [] }, global: { plugins: [ElementPlus] } })
+    await flushPromises()
+    await wrapper.findAll('.el-table__body-wrapper button').find(button => button.text().trim() === '详情')!.trigger('click')
+    await flushPromises()
+    const dialog = document.body.querySelector('[role="dialog"]')!
+    expect(dialog.textContent).toContain('本次计租基数')
+    expect(dialog.textContent).toContain('1 托')
+    expect(dialog.textContent).not.toContain('0.0625 托')
+  })
  it('shows storage age and remaining quantity and traces each half pallet without financial actions', async () => {
    const returned = { ...lot, businessType: 'RETURN_ORDER', businessNo: 'TH1', quantityUnit: 'PIECE', originalQuantity: 6, remainingQuantity: 2, billingQuantity: 1.5, billingUnit: 'PALLET', status: 'IN_STOCK', generatedAmounts: [{ currency: 'USD', amount: 1.5 }], settledAmount: 10, chargeCount: 2, settledChargeCount: 2 }
    vi.mocked(api.listStorageRentLots).mockResolvedValue({ records: [returned], total: 1, page: 1, size: 20, pages: 1 })
@@ -39,7 +39,7 @@ const chargeColumns = computed<DataTableColumn[]>(() => [
  { prop: 'outboundNo', label: '出库批次', minWidth: 170 },
  { prop: 'businessNo', label: '出库业务单号', minWidth: 170 },
  { prop: 'quantity', label: '出库数量', width: 105, align: 'right', formatter: (row: { quantity: number }) => `${row.quantity} ${unitLabels[detail.value?.lot.quantityUnit || ''] || ''}`.trim() }, { prop: 'storageDays', label: '计租天数', width: 100, align: 'right' },
-  { key: 'billingShare', label: '本次计租份额', width: 120, formatter: (row: StorageRentCharge) => detail.value ? storageRentBillingShare(row.quantity, detail.value.lot) : '—' },
+  { key: 'billingShare', label: '本次计租基数', width: 120, formatter: (row: StorageRentCharge) => detail.value ? storageRentBillingShare(row.quantity, detail.value.lot, row) : '—' },
  { prop: 'outboundAt', label: '出库时间', minWidth: 165, formatter: (row: { outboundAt: string }) => storageRentTime(row.outboundAt) },
 ])
 let sequence = 0
@@ -1,7 +1,8 @@
 <script setup lang="ts">
 import '@/styles/adminWorkbench.css'
 import '@/styles/adminDensity.css'
-import { computed, ref } from 'vue'
+import { computed, ref, onMounted, watch } from 'vue'
+import { listPlatformWarehouses, type PlatformWarehouseResource } from '@/modules/warehouses'
 import type { FormInstance } from 'element-plus'
 import FormSection from '@/shared/components/FormSection.vue'
 import { transportDemandRules, type TransportDemandForm, type TransportDemandKind } from '../transportDemandForm'
@@ -16,7 +17,20 @@ const props = withDefaults(defineProps<{
 }>(), { disabled: false, submitting: false, canSubmit: true, editing: false })
 const emit = defineEmits<{ submit: []; cancel: [] }>()
 const formRef = ref<FormInstance>()
+const warehouses = ref<PlatformWarehouseResource[]>([]), warehouseError = ref('')
+async function loadWarehouses() {
+  if (props.kind !== 'looseboard') return
+  try { warehouses.value = (await listPlatformWarehouses({page: 1, size: 200, warehouseType: 'OVERSEAS', status: 'ACTIVE'})).records; warehouseError.value = '' }
+  catch (cause) { warehouseError.value = cause instanceof Error ? cause.message : '仓库读取失败' }
+}
+function chooseWarehouse() {
+  const warehouse = warehouses.value.find(row => String(row.id) === String(props.model.operatingWarehouseId))
+  props.model.deliveryContactName = warehouse?.contactName || ''; props.model.deliveryContactPhone = warehouse?.contactPhone || ''
+}
+onMounted(loadWarehouses)
+watch([() => props.model.operatingWarehouseId, warehouses], chooseWarehouse, { immediate: true })
 const rules = computed(() => transportDemandRules(props.kind, props.model))
+const isTruck = computed(() => props.kind === 'truck')
 defineExpose({
  validate: () => formRef.value?.validate() ?? Promise.resolve(false),
  clearValidate: (fields?: string | string[]) => formRef.value?.clearValidate(fields),
@@ -26,26 +40,40 @@ defineExpose({
 <template>
  <el-form ref="formRef" class="transport-demand-form admin-density admin-workbench density-form" :model="model" :rules="rules" label-position="top" :disabled="disabled || submitting">
    <slot name="customer" />
+    <FormSection v-if="kind === 'looseboard'" class="density-form-section" title="入仓安排">
+      <div class="transport-demand-grid">
+        <el-form-item v-if="kind === 'looseboard' && model.destinationType === 'PRIVATE'" label="目的地邮编" prop="destinationPostalCode"><el-input v-model.trim="model.destinationPostalCode" maxlength="32" /></el-form-item>
+        <el-form-item class="transport-demand-wide" label="送货方式" prop="deliveryMode"><el-radio-group v-model="model.deliveryMode"><el-radio-button value="DELIVERY_TO_WAREHOUSE">送货到仓</el-radio-button><el-radio-button value="WAREHOUSE_PICKUP">仓库上门取货</el-radio-button></el-radio-group></el-form-item>
+        <el-form-item label="收货仓库" prop="operatingWarehouseId"><el-select v-model="model.operatingWarehouseId" filterable placeholder="请选择收货仓库"><el-option v-for="warehouse in warehouses" :key="String(warehouse.id)" :value="String(warehouse.id)" :label="warehouse.warehouseName" /></el-select><span v-if="warehouseError" role="alert">{{ warehouseError }} <el-button link @click="loadWarehouses">重试</el-button></span></el-form-item>
+        <template v-if="model.deliveryMode === 'DELIVERY_TO_WAREHOUSE'">
+          <el-form-item label="到仓联系人" prop="deliveryContactName"><el-input v-model="model.deliveryContactName" readonly placeholder="随收货仓库带出，未维护请联系仓库" /></el-form-item>
+          <el-form-item label="到仓联系电话" prop="deliveryContactPhone"><el-input v-model="model.deliveryContactPhone" readonly placeholder="随收货仓库带出，未维护请联系仓库" /></el-form-item>
+          <el-form-item label="预计到货时间" prop="estimatedArrivalAt"><el-date-picker v-model="model.estimatedArrivalAt" type="datetime" value-format="YYYY-MM-DDTHH:mm:ss" format="YYYY-MM-DD HH:mm" /></el-form-item>
+          <el-form-item label="物流跟踪号" prop="trackingNo"><el-input v-model.trim="model.trackingNo" maxlength="255" /></el-form-item>
+        </template>
+      </div>
+    </FormSection>
+
    <FormSection class="density-form-section" title="运输信息">
      <div class="transport-demand-grid">
-        <el-form-item v-if="kind === 'truck'" class="transport-demand-wide" label="车辆类型" prop="vehicleType">
+        <el-form-item v-if="isTruck" class="transport-demand-wide" label="车辆类型" prop="vehicleType">
          <el-select v-model="model.vehicleType" placeholder="请选择车辆类型"><el-option label="15拖" value="PALLET_15" /><el-option label="30拖" value="PALLET_30" /></el-select>
        </el-form-item>
-        <el-form-item :label="kind === 'truck' ? 'B点取货地' : '起运地'" prop="origin"><el-input v-model.trim="model.origin" maxlength="255" placeholder="城市 / 港口 / 州" /></el-form-item>
-        <el-form-item :label="kind === 'truck' ? 'C点送达地' : '目的地'" prop="destination"><el-input v-model.trim="model.destination" maxlength="255" placeholder="城市 / 州" /></el-form-item>
-        <el-form-item :label="kind === 'truck' ? 'B点联系人' : '起运地联系人'" prop="originContactName"><el-input v-model.trim="model.originContactName" maxlength="128" /></el-form-item>
-        <el-form-item :label="kind === 'truck' ? 'C点联系人' : '目的地联系人'" prop="destinationContactName"><el-input v-model.trim="model.destinationContactName" maxlength="128" /></el-form-item>
-        <el-form-item :label="kind === 'truck' ? 'B点联系电话' : '起运地联系电话'" prop="originContactPhone"><el-input v-model.trim="model.originContactPhone" type="tel" maxlength="128" /></el-form-item>
-        <el-form-item :label="kind === 'truck' ? 'C点联系电话' : '目的地联系电话'" prop="destinationContactPhone"><el-input v-model.trim="model.destinationContactPhone" type="tel" maxlength="128" /></el-form-item>
-        <el-form-item :label="kind === 'truck' ? 'B点取货地址' : '起运详细地址'"><el-input v-model.trim="model.originAddress" maxlength="500" /></el-form-item>
-        <el-form-item :label="kind === 'truck' ? 'C点送达地址' : '目的详细地址'"><el-input v-model.trim="model.destinationAddress" maxlength="500" /></el-form-item>
+        <el-form-item v-if="isTruck || model.deliveryMode === 'WAREHOUSE_PICKUP'" :label="isTruck ? 'B点取货地' : '起运地'" prop="origin"><el-input v-model.trim="model.origin" maxlength="255" placeholder="城市 / 港口 / 州" /></el-form-item>
+        <el-form-item :label="isTruck ? 'C点送达地' : '目的地'" prop="destination"><el-input v-model.trim="model.destination" maxlength="255" placeholder="城市 / 州" /></el-form-item>
+        <el-form-item v-if="isTruck || model.deliveryMode === 'WAREHOUSE_PICKUP'" :label="isTruck ? 'B点联系人' : '起运地联系人'" prop="originContactName"><el-input v-model.trim="model.originContactName" maxlength="128" /></el-form-item>
+        <el-form-item :label="isTruck ? 'C点联系人' : '目的地联系人'" prop="destinationContactName"><el-input v-model.trim="model.destinationContactName" maxlength="128" /></el-form-item>
+        <el-form-item v-if="isTruck || model.deliveryMode === 'WAREHOUSE_PICKUP'" :label="isTruck ? 'B点联系电话' : '起运地联系电话'" prop="originContactPhone"><el-input v-model.trim="model.originContactPhone" type="tel" maxlength="128" /></el-form-item>
+        <el-form-item :label="isTruck ? 'C点联系电话' : '目的地联系电话'" prop="destinationContactPhone"><el-input v-model.trim="model.destinationContactPhone" type="tel" maxlength="128" /></el-form-item>
+        <el-form-item v-if="isTruck || model.deliveryMode === 'WAREHOUSE_PICKUP'" :label="isTruck ? 'B点取货地址' : '起运详细地址'" prop="originAddress"><el-input v-model.trim="model.originAddress" maxlength="500" /></el-form-item>
+        <el-form-item :label="isTruck ? 'C点送达地址' : '目的详细地址'" prop="destinationAddress"><el-input v-model.trim="model.destinationAddress" maxlength="500" /></el-form-item>
      </div>
    </FormSection>
    <FormSection class="density-form-section" title="货物信息">
      <div class="transport-demand-grid" :class="kind === 'looseboard' ? 'transport-demand-cargo-four' : 'transport-demand-cargo-three'">
        <el-form-item v-if="kind === 'looseboard'" label="商品名称"><el-input v-model.trim="model.productName" maxlength="255" /></el-form-item>
        <el-form-item v-if="kind === 'looseboard'" label="预计托数" prop="estimatedPalletCount"><el-input-number v-model="model.estimatedPalletCount" :min="0" :precision="0" controls-position="right" /></el-form-item>
-        <el-form-item v-if="kind === 'truck'" label="托数" prop="estimatedPalletCount"><el-input-number v-model="model.estimatedPalletCount" :min="1" :precision="0" controls-position="right" /></el-form-item>
+        <el-form-item v-if="isTruck" label="托数" prop="estimatedPalletCount"><el-input-number v-model="model.estimatedPalletCount" :min="1" :precision="0" controls-position="right" /></el-form-item>
        <el-form-item label="总重量 (kg)" prop="totalWeightKg"><el-input-number v-model="model.totalWeightKg" :min="0" :precision="3" controls-position="right" /></el-form-item>
        <el-form-item label="总体积 (m³)" prop="totalVolumeCbm"><el-input-number v-model="model.totalVolumeCbm" :min="0" :precision="6" controls-position="right" /></el-form-item>
        <el-form-item v-if="kind === 'looseboard'" label="件数" prop="packageCount"><el-input-number v-model="model.packageCount" :min="0" :precision="0" controls-position="right" /></el-form-item>
@@ -58,8 +86,8 @@ defineExpose({
          <el-select v-model="model.currency" aria-label="预算币种" placeholder="请选择预算币种"><el-option label="USD" value="USD" /><el-option label="CNY" value="CNY" /></el-select>
        </div></el-form-item>
        <div />
-        <el-form-item :label="kind === 'truck' ? 'B点取货时间' : '取货时间'" prop="pickupAt"><el-date-picker v-model="model.pickupAt" type="datetime" format="YYYY-MM-DD HH:mm" time-format="HH:mm" value-format="YYYY-MM-DDTHH:mm:ss" placeholder="请选择取货日期和时间" @change="formRef?.validateField('deliveryAt').catch(() => undefined)" /></el-form-item>
-        <el-form-item :label="kind === 'truck' ? 'C点送达时间' : '送货时间'" prop="deliveryAt"><el-date-picker v-model="model.deliveryAt" type="datetime" format="YYYY-MM-DD HH:mm" time-format="HH:mm" value-format="YYYY-MM-DDTHH:mm:ss" placeholder="请选择送货日期和时间" /></el-form-item>
+        <el-form-item :label="isTruck ? 'B点取货时间' : '取货时间'" prop="pickupAt"><el-date-picker v-model="model.pickupAt" type="datetime" format="YYYY-MM-DD HH:mm" time-format="HH:mm" value-format="YYYY-MM-DDTHH:mm:ss" placeholder="请选择取货日期和时间" @change="formRef?.validateField('deliveryAt').catch(() => undefined)" /></el-form-item>
+        <el-form-item :label="isTruck ? 'C点送达时间' : '送货时间'" prop="deliveryAt"><el-date-picker v-model="model.deliveryAt" type="datetime" format="YYYY-MM-DD HH:mm" time-format="HH:mm" value-format="YYYY-MM-DDTHH:mm:ss" placeholder="请选择送货日期和时间" /></el-form-item>
        <el-form-item class="transport-demand-wide" label="备注"><el-input v-model="model.remark" type="textarea" :rows="3" maxlength="1000" show-word-limit /></el-form-item>
      </div>
    </FormSection>
@@ -3,7 +3,6 @@ import '@/styles/adminWorkbench.css'
 import { computed, reactive, ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import AppDialog from '@/shared/components/AppDialog.vue'
-import ApiErrorMeta from '@/shared/components/ApiErrorMeta.vue'
 import { useAccessPreviewStore } from '@/core/access/accessPreview'
 import { useUnsavedWorkRegistration } from '@/core/unsaved-work/useUnsavedWorkRegistration'
 import { getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
@@ -105,12 +104,12 @@ async function submit() {
  </div>
  <AppDialog v-model="open" class="admin-density-dialog admin-workbench is-dialog" :title="active ? truckCommandLabels[active] : '单据操作'" width="680px" :confirm-text="'确认提交'" :confirm-type="active === 'cancel' || (review && form.decision === 'REJECT') ? 'danger' : 'primary'" :confirm-loading="saving" :confirm-disabled="!active || !commands.includes(active)" @confirm="submit">
    <template v-if="active">
-      <p>{{ detail.orderNo }} · {{ truckCommandHints[active] }}</p>
+      <p v-if="active !== 'review' && active !== 'arrange'">{{ detail.orderNo }} · {{ truckCommandHints[active] }}</p>
      <el-alert v-if="validationError" :title="validationError" type="warning" :closable="false" role="alert" />
-      <div v-if="error" role="alert"><el-alert :title="error.message" type="error" :closable="false" /><ApiErrorMeta :details="error" /><p>可修改后重新提交；如提示版本冲突，请关闭弹框并刷新订单，核对最新状态及操作记录。</p></div>
+      <el-alert v-if="error" :title="error.message" type="error" :closable="false" role="alert" />
      <el-form :model="form" label-width="130px" :disabled="saving || !!pending" @submit.prevent="submit">
        <el-form-item v-if="review" label="审核结果"><el-radio-group v-model="form.decision"><el-radio value="APPROVE">通过</el-radio><el-radio value="REJECT">拒绝</el-radio></el-radio-group></el-form-item>
-        <el-form-item v-if="active === 'arrange' || (active === 'review' && form.decision === 'APPROVE')" label="调度仓库" required><el-select v-model="form.warehouseId" placeholder="选择 A 海外仓" filterable><el-option v-for="warehouse in warehouses" :key="String(warehouse.id)" :label="`${warehouse.warehouseName}（${warehouse.warehouseCode}）`" :value="String(warehouse.id)" /></el-select></el-form-item>
+        <el-form-item v-if="active === 'arrange' || (active === 'review' && form.decision === 'APPROVE')" label="调度仓库" required><el-select v-model="form.warehouseId" placeholder="" filterable><el-option v-for="warehouse in warehouses" :key="String(warehouse.id)" :label="`${warehouse.warehouseName}（${warehouse.warehouseCode}）`" :value="String(warehouse.id)" /></el-select></el-form-item>
        <template v-if="active === 'receive-pallets'">
          <el-form-item label="累计实收托数" required><el-input-number v-model="form.actualPalletCount" :min="Math.max(1, detail.receivedPalletCount)" :precision="0" /></el-form-item>
          <el-form-item label="实收件数"><el-input-number v-model="form.packageCount" :min="0" :precision="0" /></el-form-item>
@@ -48,7 +48,8 @@ describe('overseas business real contract pages', () => {
    const purchaseEdit = read('pages/PurchaseOrderEditView.vue'); const transportList = read('pages/TransportOrdersView.vue'); const transportForm = read('pages/TransportOrderFormView.vue')
    expect(purchaseEdit).toContain('useUnsavedWorkRegistration')
    expect(transportForm).toContain('useUnsavedWorkRegistration')
-    expect(transportList).toContain("row.status === 'PENDING_ACCEPTANCE'")
+    expect(transportList).not.toContain("isLooseboard.value ? row.status === 'PENDING_ACCEPTANCE'")
+    expect(transportList).toContain("!isLooseboard.value && !row.fleetArrangement && row.status === 'PENDING_REVIEW'")
    expect(transportList).toContain("row.status === 'PENDING_REVIEW'")
    expect(transportForm).toContain("form.status === 'PENDING_ACCEPTANCE'")
    expect(transportForm).toContain("form.status === 'PENDING_REVIEW'")
@@ -25,5 +25,5 @@ export interface FleetArrangement {

 export const poolOrderStatusLabels: Record<string, string> = {
  WAITING_INBOUND: '待入仓', RECEIVING: '收货中', WAITING_CONSOLIDATION: '待合托',
-  PENDING_DISPATCH: '待派车', IN_TRANSIT: '运输中', COMPLETED: '已完成', CANCELLED: '已取消',
+  PENDING_DISPATCH: '待派车', IN_TRANSIT: '派送中', COMPLETED: '已完成', CANCELLED: '已取消',
 }
@@ -0,0 +1,17 @@
+import { describe, expect, it } from 'vitest'
+import { statusLabel, statusTone } from './procurementPresentation'
+import { availableTruckCommands, truckStatusLabels } from './truckWorkflow'
+
+describe('异步下单资金门禁', () => {
+  it.each(['FUNDING_PENDING', 'FUNDING_FAILED'] as const)('资金状态 %s 不开放卡车审核或排车', status => {
+    expect(availableTruckCommands({ status, fleetArrangement: null })).toEqual([])
+    expect(truckStatusLabels[status]).toBe(status === 'FUNDING_PENDING' ? '订单受理中' : '订单处理失败')
+  })
+  it('采购清晰区分订单受理中、失败和待审核', () => {
+    expect(statusLabel('FUNDING_PENDING')).toBe('订单受理中')
+    expect(statusLabel('FUNDING_FAILED')).toBe('订单处理失败')
+    expect(statusTone('FUNDING_FAILED')).toBe('danger')
+    expect(statusLabel('PENDING_REVIEW')).toBe('待审核')
+    expect(availableTruckCommands({ status: 'PENDING_REVIEW', fleetArrangement: null })).toContain('review')
+  })
+})
@@ -13,6 +13,17 @@ const fee = (overrides: Partial<OverseasFee> = {}): OverseasFee => ({

 })
 describe('海外费用动作资格', () => {
+  it.each(['DRAFT', 'PENDING'])('审核前按服务端资格和独立权限展示调整、作废：%s', reviewStatus => {
+    const pending = fee({ reviewStatus, allowedActions: ['ADJUST', 'VOID', 'APPROVE', 'REJECT'] })
+    expect(feeActions(pending, () => true).map(row => row.key)).toEqual(['DETAIL', 'ADJUST', 'VOID', 'REVIEW'])
+    expect(feeActions(pending, permission => permission === feePermissions.edit).map(row => row.key)).toEqual(['DETAIL', 'ADJUST'])
+    expect(feeActions(pending, permission => permission === feePermissions.review).map(row => row.key)).toEqual(['DETAIL', 'VOID', 'REVIEW'])
+    expect(feeActions(fee({ reviewStatus }), () => true).map(row => row.key)).toEqual(['DETAIL'])
+  })
+  it.each(['BILL', 'WALLET'])('审核通过后即使旧白名单仍包含调整、作废也不展示：%s', collectionMode => {
+    const approved = fee({ reviewStatus: 'APPROVED', collectionMode, walletStatus: collectionMode === 'WALLET' ? 'SETTLED' : 'NOT_REQUIRED', allowedActions: ['ADJUST', 'VOID'] })
+    expect(feeActions(approved, () => true).map(row => row.key)).toEqual(['DETAIL'])
+  })
  it('明确时区的同一时刻显示一致，旧无时区时间不猜测转换', () => {
    expect(feeTime('2026-10-23T10:43:25Z')).toBe(feeTime('2026-10-23T18:43:25+08:00'))
    const date = new Date('2026-10-23T10:43:25Z')
@@ -79,6 +79,7 @@ export function feeActions(fee: OverseasFee, can: (permission: string) => boolea
  const closed = fee.reviewStatus === 'REJECTED' || ['VOIDED', 'SUPERSEDED', 'CANCELLED'].includes(fee.sourceStatus)
  const canReview = can(feePermissions.review)
  const visibleActions = fee.allowedActions.filter(action => action in actionLabels && !['APPROVE', 'REJECT', 'CANCEL'].includes(action))
+    .filter(action => !['ADJUST', 'VOID'].includes(action) || ['DRAFT', 'PENDING'].includes(fee.reviewStatus))
    .filter(action => !closed || ['RETRY_RELEASE', 'RETRY_FUNDING_DELIVERY'].includes(action))
    .filter(action => can(['VOID'].includes(action) ? feePermissions.review : feePermissions.edit))
    .map(action => ({ key: action, label: actionLabels[action]!, priority: 20,
@@ -1,7 +1,7 @@
 import ElementPlus from 'element-plus'
 import { enableAutoUnmount, flushPromises, mount } from '@vue/test-utils'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { reactive } from 'vue'
+import { reactive, ref } from 'vue'
 import { ApiResponseError } from '@/shared/api/http'
 import BusinessDocumentFees from '../components/BusinessDocumentFees.vue'
 import { getLocalLooseboardOrder } from '../api/platformOverseasBusiness'
@@ -9,6 +9,8 @@ import type { LocalLooseboardDetail } from '../types'
 import LooseboardOrderDetailView from './LooseboardOrderDetailView.vue'

 const routing = vi.hoisted(() => ({ push: vi.fn(), route: { params: { orderId: 'LB-TEST' }, query: { customerId: '9007199254741999' } as Record<string, string> } }))
+const permissions = vi.hoisted(() => ({ can: vi.fn(() => false) }))
+vi.mock('@/core/access/accessPreview', () => ({ useAccessPreviewStore: () => permissions }))
 vi.mock('vue-router', () => ({ useRoute: () => routing.route, useRouter: () => ({ push: routing.push }) }))
 vi.mock('../api/platformOverseasBusiness', () => ({ getLocalLooseboardOrder: vi.fn() }))

@@ -21,7 +23,7 @@ function order(overrides: Partial<LocalLooseboardDetail> = {}): LocalLooseboardD
    pickupAt: '2026-10-20T09:30:00', deliveryAt: '2026-10-20T15:45:00', packageCount: 20,
    totalWeightKg: '100', totalVolumeCbm: '2', budgetAmount: '500', currency: 'USD',
    status: 'PENDING_ACCEPTANCE', version: 1, remark: '运输备注', createdBy: '7',
-    createdAt: '2026-10-20T08:00:00', updatedAt: '2026-10-20T08:00:00', histories: [], ...overrides,
+    createdAt: '2026-10-20T08:00:00', updatedAt: '2026-10-20T08:00:00', histories: [], dispatchNos: [], ...overrides,
  }
 }
 function mountDetail() {
@@ -31,11 +33,49 @@ function mountDetail() {
 enableAutoUnmount(afterEach)
 beforeEach(() => {
  vi.clearAllMocks()
+  permissions.can.mockReturnValue(false)
  routing.route = reactive({ params: { orderId: 'LB-TEST' }, query: { customerId: '9007199254741999' } })
  vi.mocked(getLocalLooseboardOrder).mockResolvedValue(order())
 })

 describe('looseboard document fees', () => {
+  it('shows all actual dispatches without a fleet booking and links only with dispatch permission', async () => {
+    vi.mocked(getLocalLooseboardOrder).mockResolvedValue(order({ dispatchNos: ['PC-1', 'PC-2'] }))
+    const wrapper = mountDetail(); await flushPromises()
+    expect(wrapper.find('.looseboard-dispatches').text()).toContain('PC-1')
+    expect(wrapper.find('.looseboard-dispatches').text()).toContain('PC-2')
+    expect(wrapper.find('.looseboard-dispatches button').exists()).toBe(false)
+    permissions.can.mockReturnValue(true)
+    await wrapper.findAll('button').find(button => button.text() === '刷新订单')!.trigger('click')
+    await flushPromises()
+    const links = wrapper.findAll('.looseboard-dispatches button')
+    expect(links).toHaveLength(2)
+    await links[1]!.trigger('click')
+    expect(routing.push).toHaveBeenCalledWith({ name: 'overseas-dispatch-detail', params: { dispatchNo: 'PC-2' } })
+  })
+
+  it('identifies a looseboard order that has not been dispatched', async () => {
+    const wrapper = mountDetail(); await flushPromises()
+    expect(wrapper.text()).toContain('排车单号')
+    expect(wrapper.text()).toContain('暂未排车')
+  })
+
+  it('refreshes the current status when returning to a cached document tab', async () => {
+    const visible = ref(true)
+    vi.mocked(getLocalLooseboardOrder).mockResolvedValueOnce(order({ status: 'WAITING_INBOUND' }))
+      .mockResolvedValueOnce(order({ status: 'PENDING_DISPATCH' }))
+    const wrapper = mount({ components: { LooseboardOrderDetailView }, setup: () => ({ visible }),
+      template: '<KeepAlive><LooseboardOrderDetailView v-if="visible" /></KeepAlive>',
+    }, { global: { plugins: [ElementPlus], stubs: { BusinessDocumentFees: true, FleetArrangementSummary: true, DataTable: true } } })
+    await flushPromises()
+    expect(getLocalLooseboardOrder).toHaveBeenCalledTimes(1)
+    expect(wrapper.find('.status-badge').text()).toBe('待入仓')
+    visible.value = false; await flushPromises()
+    visible.value = true; await flushPromises()
+    expect(getLocalLooseboardOrder).toHaveBeenCalledTimes(2)
+    expect(wrapper.find('.status-badge').text()).toBe('待派车')
+  })
+
  it('loads the customer scoped document and passes its exact identity to fees', async () => {
    const wrapper = mountDetail(); await flushPromises()
    expect(getLocalLooseboardOrder).toHaveBeenCalledWith('LB-TEST', '9007199254741999')
@@ -1,8 +1,9 @@
 <script setup lang="ts">
 import '@/styles/adminWorkbench.css'
 import '@/styles/adminDensity.css'
-import { computed, ref, watch } from 'vue'
+import { computed, onActivated, ref, watch } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
+import { useAccessPreviewStore } from '@/core/access/accessPreview'
 import { ArrowLeft } from '@lucide/vue'
 import AdminPage from '@/shared/components/AdminPage.vue'
 import DetailPageLayout from '@/shared/components/DetailPageLayout.vue'
@@ -14,17 +15,19 @@ import { getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
 import { getLocalLooseboardOrder } from '../api/platformOverseasBusiness'
 import BusinessDocumentFees from '../components/BusinessDocumentFees.vue'
 import FleetArrangementSummary from '../components/FleetArrangementSummary.vue'
+import TransferPickupProgressPanel from '@/modules/overseas-warehouse/components/TransferPickupProgressPanel.vue'
 import { poolOrderStatusLabels } from '../fleetArrangement'
 import type { LocalLooseboardDetail, OverseasBusinessHistory } from '../types'

 const route = useRoute(), router = useRouter()
+const access = useAccessPreviewStore()
 const orderNo = computed(() => typeof route.params.orderId === 'string' ? route.params.orderId : '')
 const customerId = computed(() => typeof route.query.customerId === 'string' ? route.query.customerId : '')
 const detail = ref<LocalLooseboardDetail | null>(null), loading = ref(false)
 const error = ref<ApiErrorDetails | null>(null)
 let requestSequence = 0
 const dateTime = (value: string | null | undefined) => value ? value.replace('T', ' ').slice(0, 16) : '—'
-const statusLabels: Record<string, string> = { PENDING_ACCEPTANCE: '待接单', DISPATCHED: '已派车', ...poolOrderStatusLabels }
+const statusLabels: Record<string, string> = { FUNDING_PENDING: '资金处理中', FUNDING_FAILED: '资金冻结失败', PENDING_ACCEPTANCE: '待接单', DISPATCHED: '已派车', ...poolOrderStatusLabels }
 const statusLabel = (value: string | null) => value ? statusLabels[value] || value : '—'
 const fields = computed(() => detail.value ? [
  ['客户编号', detail.value.customerId], ['商品名称', detail.value.productName], ['预计托数', detail.value.estimatedPalletCount],
@@ -58,6 +61,12 @@ async function load() {
  finally { if (sequence === requestSequence) loading.value = false }
 }
 watch([orderNo, customerId], load, { immediate: true })
+// 首次由路由加载；缓存标签重新打开时读取PDA和排车已推进的最新状态。
+let activatedOnce = false
+onActivated(() => {
+  if (activatedOnce) void load()
+  activatedOnce = true
+})
 </script>

 <template>
@@ -73,7 +82,11 @@ watch([orderNo, customerId], load, { immediate: true })
    <el-skeleton v-else-if="loading" :rows="8" animated />
    <template v-else-if="detail">
      <section v-if="detail.fleetArrangement" class="looseboard-detail-section"><FleetArrangementSummary :arrangement="detail.fleetArrangement" /></section>
-      <section class="looseboard-detail-section"><h2>订单资料</h2><el-descriptions class="density-descriptions" :column="3" border><el-descriptions-item v-for="[label, value] in fields" :key="String(label)" :label="String(label)">{{ value ?? '—' }}</el-descriptions-item></el-descriptions></section>
+      <section v-if="detail.deliveryMode === 'WAREHOUSE_PICKUP' && detail.transferNo" class="looseboard-detail-section"><el-alert title="上门取货需在对应取货排车的作业节点上传取货及到仓资料。" type="info" :closable="false" /><TransferPickupProgressPanel :transfer-no="detail.transferNo" :customer-id="detail.customerId" /></section>
+      <section class="looseboard-detail-section"><h2>订单资料</h2><el-descriptions class="density-descriptions" :column="3" border>
+        <el-descriptions-item label="排车单号" :span="3"><div v-if="detail.dispatchNos.length" class="looseboard-dispatches"><template v-for="dispatchNo in detail.dispatchNos" :key="dispatchNo"><el-button v-if="access.can('platform:overseas-warehouse:dispatch:list')" link type="primary" @click="router.push({ name: 'overseas-dispatch-detail', params: { dispatchNo } })">{{ dispatchNo }}</el-button><span v-else>{{ dispatchNo }}</span></template></div><span v-else>暂未排车</span></el-descriptions-item>
+        <el-descriptions-item v-for="[label, value] in fields" :key="String(label)" :label="String(label)">{{ value ?? '—' }}</el-descriptions-item>
+      </el-descriptions></section>
      <section class="looseboard-detail-section"><BusinessDocumentFees business-type="LOCAL_LOOSEBOARD" :business-no="detail.orderNo" :customer-id="detail.customerId" :business-id="detail.id" /></section>
      <section class="looseboard-detail-section"><h2>操作记录</h2><div class="workbench-table"><DataTable :data="detail.histories" :columns="historyColumns" empty-text="暂无操作记录" /></div></section>
    </template>
@@ -84,4 +97,5 @@ watch([orderNo, customerId], load, { immediate: true })
 .looseboard-detail-header { flex-wrap: wrap; }
 .looseboard-detail-header .density-detail-heading { flex: 1; }
 .looseboard-detail-section { margin-bottom: var(--admin-space-6); }
+.looseboard-dispatches { display: flex; flex-wrap: wrap; gap: var(--admin-space-2); overflow-wrap: anywhere; }
 </style>
@@ -9,6 +9,7 @@ import { ApiResponseError } from '@/shared/api/http'
 import { useAccessPreviewStore } from '@/core/access/accessPreview'
 import { useAuthStore } from '@/core/auth/auth'
 import { listPlatformTenants } from '@/modules/iam'
+import { listPlatformWarehouses } from '@/modules/warehouses'
 import type { PlatformProcurement } from '../procurementTypes'
 import { downloadProcurementFile } from '../api/procurementCommands'
 import { submitProcurementCommand } from '../api/procurementCommands'
@@ -32,6 +33,10 @@ const purchaseDetailSource = readFileSync(resolve(process.cwd(), 'src/modules/ov
 const routing = vi.hoisted(() => ({ push: vi.fn(), route: { params: {} as Record<string, string>, query: {} as Record<string, string> } }))
 vi.mock('vue-router', () => ({ useRoute: () => routing.route, useRouter: () => ({ push: routing.push }) }))
 vi.mock('@/modules/iam', () => ({ listPlatformTenants: vi.fn() }))
+vi.mock('@/modules/warehouses', async importOriginal => ({
+  ...await importOriginal<typeof import('@/modules/warehouses')>(),
+  listPlatformWarehouses: vi.fn(),
+}))
 vi.mock('../api/procurementWorkflow', () => ({ getProcurementWorkflow: vi.fn(), submitProcurementWorkflow: vi.fn() }))
 vi.mock('../api/procurementCommands', async importOriginal => ({
  ...await importOriginal<typeof import('../api/procurementCommands')>(),
@@ -61,7 +66,11 @@ const procurementDetail = (): PlatformProcurement => ({
 const truck: LocalTransportOrder = { fleetArrangement: null, id: '9007199254740995', customerId: '10002', orderNo: 'TK-200', vehicleType: 'PALLET_15', origin: 'Long Beach', destination: 'Ontario', palletCount: 2, packageCount: 20, receivedPalletCount: 0, allocatedPalletCount: 0, shippedPalletCount: 0, totalWeightKg: '1200.000', totalVolumeCbm: '16.500', budgetAmount: '850.00', currency: 'USD', originContactName: 'Bob', originContactPhone: '10010', destinationContactName: 'Alice', destinationContactPhone: '10020', pickupAt: '2026-08-28T09:30:00', deliveryAt: '2026-08-28T15:45:00', status: 'PENDING_REVIEW', version: 1, createdAt: '2026-08-01T10:00:00', updatedAt: '2026-08-02T10:00:00' }
 const truckDetail: LocalTransportDetail = { ...truck, originAddress: 'Pier A', destinationAddress: 'Warehouse B', remark: null, createdBy: '7', pallets: [], histories: [] }
 const looseboard: LocalLooseboardOrder = { fleetArrangement: null, id: '9007199254740997', customerId: '10003', orderNo: 'LB-300', palletRequired: 'YES', transportType: 'WAREHOUSE_TO_WAREHOUSE', origin: 'LA', destination: 'ONT', productName: '家居用品', estimatedPalletCount: 2, packageCount: 8, totalWeightKg: '80.5', totalVolumeCbm: '3.2', budgetAmount: '50.00', currency: 'USD', originContactName: '发货人', originContactPhone: '1', destinationContactName: '收货人', destinationContactPhone: '2', pickupAt: '2026-10-20T09:30:00', deliveryAt: '2026-10-20T15:45:00', status: 'PENDING_ACCEPTANCE', version: 0, createdAt: '2026-08-01T10:00:00', updatedAt: '2026-08-01T10:00:00' }
-const looseboardDetail: LocalLooseboardDetail = { ...looseboard, originAddress: null, destinationAddress: null, remark: null, createdBy: '7', histories: [] }
+const looseboardDetail: LocalLooseboardDetail = {
+  ...looseboard, originAddress: null, destinationAddress: 'Delivery street', remark: null, createdBy: '7', histories: [], dispatchNos: [],
+  operatingWarehouseId: '20001', destinationPostalCode: '90001', deliveryContactName: '送仓联系人',
+  deliveryContactPhone: '555-0100', estimatedArrivalAt: '2026-10-20T08:00:00',
+}
 const arrangement: FleetArrangement = { sourceType: 'FLEET_CAPACITY_OFFER', businessType: 'US_TRUCK', businessOrderNo: 'TR-200', bookingNo: 'FB-TEST', tripNo: 'TRIP-TEST', plannedDepartureAt: null, originWarehouseName: '我仓', destinationLabel: 'ONT8', deliveryMode: 'SELF_DELIVERY', deliveryInstructions: null, fulfillmentStage: 'WAITING_INBOUND', stageOccurredAt: null, agreedFreightAmount: null, currency: 'USD', incomingNo: null, dispatchNo: null, deliveryNo: null, signedPackages: null, unsignedPackages: null, returnedPackages: null, exceptionSummary: null, readOnlyReason: '池来源订单按实际运输履约推进' }

 function activatePermissions() { const pinia = createPinia(); setActivePinia(pinia); const auth = useAuthStore(); auth.token = 'test-token'; auth.user = { id: '7', name: '测试操作员', account: 'tester', roles: [] }; auth.permissions = ['platform:overseas-business:purchase:list', 'platform:overseas-business:purchase:edit', 'platform:overseas-business:purchase:review', 'platform:overseas-business:truck:list', 'platform:overseas-business:truck:create', 'platform:overseas-business:truck:edit', 'platform:overseas-business:looseboard:list', 'platform:overseas-business:looseboard:create', 'platform:overseas-business:looseboard:edit']; useAccessPreviewStore().initializeAfterLogin(); return pinia }
@@ -106,6 +115,7 @@ describe('overseas business mounted pages', () => {
    vi.mocked(listUsTruckOrders).mockReset().mockResolvedValue({ records: [truck], page: 1, size: 20, total: 1, pages: 1 }); vi.mocked(getUsTruckOrder).mockReset().mockResolvedValue(truckDetail); vi.mocked(createUsTruckOrder).mockReset().mockResolvedValue(truckDetail); vi.mocked(updateUsTruckOrder).mockReset().mockResolvedValue(truckDetail)
    vi.mocked(listLocalLooseboardOrders).mockReset().mockResolvedValue({ records: [looseboard], page: 1, size: 20, total: 1, pages: 1 }); vi.mocked(getLocalLooseboardOrder).mockReset().mockResolvedValue(looseboardDetail); vi.mocked(createLocalLooseboardOrder).mockReset().mockResolvedValue(looseboardDetail); vi.mocked(updateLocalLooseboardOrder).mockReset().mockResolvedValue(looseboardDetail)
    vi.mocked(listPlatformTenants).mockReset().mockResolvedValue({ records: [{ id: '10001', tenantName: '可选客户', status: 'ACTIVE' } as never], page: 1, size: 200, total: 1, pages: 1 })
+    vi.mocked(listPlatformWarehouses).mockReset().mockResolvedValue({ records: [{ id: '20001', warehouseName: '洛杉矶收货仓', warehouseType: 'OVERSEAS', status: 'ACTIVE', contactName: '送仓联系人', contactPhone: '555-0100' } as never], page: 1, size: 200, total: 1, pages: 1 })
  })


@@ -151,7 +161,7 @@ describe('overseas business mounted pages', () => {
    expect(document.body.textContent).toContain('池来源订单按实际运输履约推进')
    expect(document.body.textContent).toContain('FB-TEST'); expect(document.body.textContent).toContain('— / — / —')
    expect(listUsTruckOrders).toHaveBeenCalledOnce(); expect(getUsTruckOrder).not.toHaveBeenCalled()
-    const dialog = wrapper.findComponent(AppDialog)
+    const dialog = wrapper.findAllComponents(AppDialog).find(item => item.props('title') === '承运安排')!
    await dialog.findAll('.app-dialog__footer button').find(button => button.text() === '关闭')!.trigger('click'); await flushPromises()
    expect(dialog.props('modelValue')).toBe(false)
  })
@@ -238,6 +248,27 @@ describe('overseas business mounted pages', () => {
  })

  it('mounts procurement list with customer candidates and real data', async () => { const wrapper = mountPage(PurchaseOrdersView); await flushPromises(); expect(listOverseasPurchaseCustomerOptions).toHaveBeenCalled(); expect(listOverseasPurchases).toHaveBeenCalledWith({ page: 1, size: 20, customerId: '', orderNo: '', purchaseCategory: '', productName: '', status: '' }); expect(wrapper.text()).toContain('OP-100'); expect(wrapper.text()).toContain('收货中'); expect(wrapper.text()).toContain('2026-08-01 10:00') })
+  it.each([
+    { status: 'REJECTED' as const, label: '已拒绝' },
+    { status: 'CANCELLED' as const, label: '已取消' },
+  ])('filters procurement orders by $status and resets to all statuses', async ({ status, label }) => {
+    vi.mocked(listOverseasPurchases).mockResolvedValue({ records: [{ ...purchase, status }], page: 1, size: 20, total: 1, pages: 1 })
+    const wrapper = mountPage(PurchaseOrdersView)
+    await flushPromises()
+    const statusSelect = wrapper.findAllComponents({ name: 'ElSelect' }).find(select => select.props('placeholder') === '全部状态')!
+    expect(statusSelect.findAllComponents({ name: 'ElOption' }).map(option => ({ value: option.props('value'), label: option.props('label') }))).toEqual(expect.arrayContaining([
+      { value: 'REJECTED', label: '已拒绝' }, { value: 'CANCELLED', label: '已取消' },
+    ]))
+    statusSelect.vm.$emit('update:modelValue', status)
+    await wrapper.vm.$nextTick()
+    await wrapper.findAll('button').find(button => button.text() === '查询')!.trigger('click')
+    await flushPromises()
+    expect(listOverseasPurchases).toHaveBeenLastCalledWith(expect.objectContaining({ status }))
+    expect(wrapper.find('.el-table__body .el-tag').text()).toBe(label)
+    await wrapper.findAll('button').find(button => button.text() === '重置')!.trigger('click')
+    await flushPromises()
+    expect(listOverseasPurchases).toHaveBeenLastCalledWith(expect.objectContaining({ status: '' }))
+  })
  it('reviews pending procurement from the list, submits rejection as remark, and omits edit', async () => {
    vi.mocked(listOverseasPurchases).mockResolvedValue({ records: [{ ...purchase, status: 'PENDING_REVIEW' }], page: 1, size: 20, total: 1, pages: 1 })
    const wrapper = mountPage(PurchaseOrdersView); await flushPromises()
@@ -384,9 +415,10 @@ describe('overseas business mounted pages', () => {
    const labels = wrapper.findAll('.el-form-item__label').map(item => item.text())
    const routeLabels = domain === 'truck'
      ? ['B点取货地', 'C点送达地', 'B点联系人', 'C点联系人', 'B点联系电话', 'C点联系电话', 'B点取货地址', 'C点送达地址']
-      : ['起运地', '目的地', '起运地联系人', '目的地联系人', '起运地联系电话', '目的地联系电话', '起运详细地址', '目的详细地址']
+      : ['目的地邮编', '送货方式', '收货仓库', '到仓联系人', '到仓联系电话', '预计到货时间', '物流跟踪号', '目的地']
    expect(labels.slice(0, domain === 'truck' ? 10 : 9)).toEqual(['客户', ...(domain === 'truck' ? ['车辆类型'] : []), ...routeLabels])
-    Object.assign(model, { vehicleType: 'PALLET_15', estimatedPalletCount: domain === 'truck' ? 2 : 0, origin: ' LA ', destination: ' ONT ', originContactName: ' 发货人 ', originContactPhone: ' 1 ', destinationContactName: ' 收货人 ', destinationContactPhone: ' 2 ', pickupAt: '2026-10-20T09:30:45', deliveryAt: '2026-10-20T15:45:12', budgetAmount: domain === 'truck' ? 100 : 0, currency: 'CNY' })
+    Object.assign(model, { vehicleType: 'PALLET_15', estimatedPalletCount: domain === 'truck' ? 2 : 0, origin: ' LA ', destination: ' ONT ', originAddress: ' Pickup street ', destinationAddress: ' Delivery street ', originContactName: ' 发货人 ', originContactPhone: ' 1 ', destinationContactName: ' 收货人 ', destinationContactPhone: ' 2 ', pickupAt: '2026-10-20T09:30:45', deliveryAt: '2026-10-20T15:45:12', budgetAmount: domain === 'truck' ? 100 : 0, currency: 'CNY' })
+    if (domain === 'looseboard') Object.assign(model, { deliveryMode: 'WAREHOUSE_PICKUP', operatingWarehouseId: '20001', destinationPostalCode: '90001', packageCount: 1 })
    const submit = wrapper.findAll('button').find(button => button.text() === '提交订单')!
    await submit.trigger('click'); await flushPromises()
    expect(createUsTruckOrder).not.toHaveBeenCalled(); expect(createLocalLooseboardOrder).not.toHaveBeenCalled()
@@ -402,25 +434,29 @@ describe('overseas business mounted pages', () => {
  })

  it('mounts truck list with enabled create and supported types', async () => { const wrapper = mountPage(TransportOrdersView, { domain: 'truck' }); await flushPromises(); expect(listUsTruckOrders).toHaveBeenCalled(); expect(wrapper.text()).toContain('TK-200'); expect(wrapper.text()).toContain('15拖'); expect(wrapper.text()).toContain('2026-08-01 10:00'); expect(wrapper.findAll('button').find((button) => button.text().includes('新增订单'))?.attributes('disabled')).toBeUndefined() })
-  it('opens the requested truck review from the list using its customer scope', async () => {
+  it('shows a truck detail entry instead of review and edit and keeps its customer scope', async () => {
    const wrapper = mountPage(TransportOrdersView, { domain: 'truck' }); await flushPromises()
    const auth = useAuthStore(); auth.permissions.push('platform:overseas-business:truck:status')
    await wrapper.vm.$nextTick()
-    const review = wrapper.findAll('button').find(button => button.text() === '审核')
-    expect(review).toBeDefined(); await review!.trigger('click'); await flushPromises()
+    const actions = wrapper.findAll('.el-table__body-wrapper button')
+    expect(actions.map(button => button.text())).toContain('详情')
+    expect(actions.map(button => button.text())).not.toContain('审核')
+    expect(actions.map(button => button.text())).not.toContain('编辑')
+    await actions.find(button => button.text() === '详情')!.trigger('click'); await flushPromises()
    expect(routing.push).toHaveBeenCalledWith({ name: 'overseas-business-truck-detail', params: { orderId: 'TK-200' }, query: { customerId: '10002' } })
  })
  it('renders truck load failure without samples', async () => { vi.mocked(listUsTruckOrders).mockRejectedValue(new Error('hidden')); const wrapper = mountPage(TransportOrdersView, { domain: 'truck' }); await flushPromises(); expect(wrapper.text()).toContain('本土卡车订单加载失败'); expect(wrapper.text()).not.toContain('TK-200') })
  it('loads and submits pending-review truck edit', async () => { routing.route.params = { orderId: 'TK-200' }; routing.route.query = { customerId: '10002' }; const wrapper = mountPage(TransportOrderFormView, { domain: 'truck' }); await flushPromises(); await wrapper.findAll('button').find((button) => button.text().includes('保存修改'))?.trigger('click'); await flushPromises(); expect(getUsTruckOrder).toHaveBeenCalledWith('TK-200', '10002'); expect(updateUsTruckOrder).toHaveBeenCalledWith('TK-200', '10002', expect.objectContaining({ version: 1, vehicleType: 'PALLET_15', originContactName: 'Bob', destinationContactName: 'Alice', pickupAt: '2026-08-28T09:30:00' })) })
  it('keeps truck edit form and version unchanged after a 409', async () => { routing.route.params = { orderId: 'TK-200' }; routing.route.query = { customerId: '10002' }; vi.mocked(updateUsTruckOrder).mockRejectedValue(new ApiResponseError('订单版本冲突', 'B0409', 409)); const wrapper = mountPage(TransportOrderFormView, { domain: 'truck' }); await flushPromises(); const destination = wrapper.find('input[placeholder="城市 / 州"]'); await destination.setValue('Ontario-MARKER-EDIT'); await wrapper.findAll('button').find((button) => button.text().includes('保存修改'))?.trigger('click'); await flushPromises(); expect(updateUsTruckOrder).toHaveBeenCalledWith('TK-200', '10002', expect.objectContaining({ version: 1, destination: 'Ontario-MARKER-EDIT' })); expect((destination.element as HTMLInputElement).value).toBe('Ontario-MARKER-EDIT'); expect(document.body.textContent).toContain('订单版本冲突'); expect(routing.push).not.toHaveBeenCalled() })
  it('mounts truck create with explicit customer selector and enabled submit', async () => { const wrapper = mountPage(TransportOrderFormView, { domain: 'truck' }); await flushPromises(); expect(listPlatformTenants).toHaveBeenCalledWith({ page: 1, size: 200, status: 'ACTIVE' }); expect(wrapper.text()).toContain('客户信息'); expect(wrapper.text()).toContain('请选择客户'); expect(wrapper.findAll('button').find((button) => button.text().includes('提交订单'))?.attributes('disabled')).toBeUndefined() })
-  it('reuses one idempotency key and preserves truck create input after retries fail', async () => { vi.mocked(createUsTruckOrder).mockRejectedValue(new ApiResponseError('temporary failure', 'S0500', 500)); const wrapper = mountPage(TransportOrderFormView, { domain: 'truck' }); await flushPromises(); const selects = wrapper.findAllComponents({ name: 'ElSelect' }); selects[0].vm.$emit('update:modelValue', '10001'); selects[1].vm.$emit('update:modelValue', 'PALLET_30'); const model = wrapper.findComponent({ name: 'ElForm' }).props('model'); Object.assign(model, { estimatedPalletCount: 2, budgetAmount: 100 }); const origin = wrapper.find('input[placeholder="城市 / 港口 / 州"]'); const destination = wrapper.find('input[placeholder="城市 / 州"]'); await origin.setValue('LA-MARKER'); await destination.setValue('ONT-MARKER'); for (const label of ['B点联系人', 'C点联系人', 'B点联系电话', 'C点联系电话']) await wrapper.findAll('.el-form-item').find(item => item.text().startsWith(label))!.find('input').setValue(label.includes('电话') ? '+1-555-0100' : '联系人'); await wrapper.findAll('.el-form-item').find((item) => item.text().startsWith('总重量'))!.find('input').setValue('100'); await wrapper.findAll('.el-form-item').find((item) => item.text().startsWith('总体积'))!.find('input').setValue('2.5'); wrapper.findAllComponents({ name: 'ElDatePicker' })[0].vm.$emit('update:modelValue', '2026-08-31T09:30:00'); wrapper.findAllComponents({ name: 'ElDatePicker' })[1].vm.$emit('update:modelValue', '2026-08-31T15:45:00'); await wrapper.vm.$nextTick(); const submit = wrapper.findAll('button').find((button) => button.text().includes('提交订单')); await submit?.trigger('click'); await flushPromises(); await submit?.trigger('click'); await flushPromises(); expect(createUsTruckOrder).toHaveBeenCalledTimes(2); const keys = vi.mocked(createUsTruckOrder).mock.calls.map((call) => call[1].idempotencyKey); expect(keys[0]).toBeTruthy(); expect(keys[1]).toBe(keys[0]); expect((origin.element as HTMLInputElement).value).toBe('LA-MARKER'); expect((destination.element as HTMLInputElement).value).toBe('ONT-MARKER'); expect(document.body.textContent).toContain('服务暂时不可用'); expect(routing.push).not.toHaveBeenCalled() })
+  it('reuses one idempotency key and preserves truck create input after retries fail', async () => { vi.mocked(createUsTruckOrder).mockRejectedValue(new ApiResponseError('temporary failure', 'S0500', 500)); const wrapper = mountPage(TransportOrderFormView, { domain: 'truck' }); await flushPromises(); const selects = wrapper.findAllComponents({ name: 'ElSelect' }); selects[0].vm.$emit('update:modelValue', '10001'); selects[1].vm.$emit('update:modelValue', 'PALLET_30'); const model = wrapper.findComponent({ name: 'ElForm' }).props('model'); Object.assign(model, { estimatedPalletCount: 2, budgetAmount: 100, originAddress: 'Pickup street', destinationAddress: 'Delivery street' }); const origin = wrapper.find('input[placeholder="城市 / 港口 / 州"]'); const destination = wrapper.find('input[placeholder="城市 / 州"]'); await origin.setValue('LA-MARKER'); await destination.setValue('ONT-MARKER'); for (const label of ['B点联系人', 'C点联系人', 'B点联系电话', 'C点联系电话']) await wrapper.findAll('.el-form-item').find(item => item.text().startsWith(label))!.find('input').setValue(label.includes('电话') ? '+1-555-0100' : '联系人'); await wrapper.findAll('.el-form-item').find((item) => item.text().startsWith('总重量'))!.find('input').setValue('100'); await wrapper.findAll('.el-form-item').find((item) => item.text().startsWith('总体积'))!.find('input').setValue('2.5'); wrapper.findAllComponents({ name: 'ElDatePicker' })[0].vm.$emit('update:modelValue', '2026-08-31T09:30:00'); wrapper.findAllComponents({ name: 'ElDatePicker' })[1].vm.$emit('update:modelValue', '2026-08-31T15:45:00'); await wrapper.vm.$nextTick(); const submit = wrapper.findAll('button').find((button) => button.text().includes('提交订单')); await submit?.trigger('click'); await flushPromises(); await submit?.trigger('click'); await flushPromises(); expect(createUsTruckOrder).toHaveBeenCalledTimes(2); const keys = vi.mocked(createUsTruckOrder).mock.calls.map((call) => call[1].idempotencyKey); expect(keys[0]).toBeTruthy(); expect(keys[1]).toBe(keys[0]); expect((origin.element as HTMLInputElement).value).toBe('LA-MARKER'); expect((destination.element as HTMLInputElement).value).toBe('ONT-MARKER'); expect(document.body.textContent).toContain('服务暂时不可用'); expect(routing.push).not.toHaveBeenCalled() })
  it('loads the real looseboard list', async () => { const wrapper = mountPage(TransportOrdersView, { domain: 'looseboard' }); await flushPromises(); expect(listLocalLooseboardOrders).toHaveBeenCalledWith({ page: 1, size: 20, orderNo: '', routeKeyword: '', status: '' }); expect(wrapper.text()).toContain('LB-300'); expect(wrapper.text()).toContain('待接单'); expect(wrapper.text()).toContain('2026-08-01 10:00'); expect(listUsTruckOrders).not.toHaveBeenCalled() })
  it('loads and submits pending-acceptance looseboard edit with PUT adapter', async () => { routing.route.params = { orderId: 'LB-300' }; routing.route.query = { customerId: '10003' }; const wrapper = mountPage(TransportOrderFormView, { domain: 'looseboard' }); await flushPromises(); await wrapper.findAll('button').find((button) => button.text().includes('保存修改'))?.trigger('click'); await flushPromises(); expect(getLocalLooseboardOrder).toHaveBeenCalledWith('LB-300', '10003'); expect(updateLocalLooseboardOrder).toHaveBeenCalledWith('LB-300', '10003', expect.objectContaining({ version: 0, estimatedPalletCount: 2 })) })
  it('requires split contacts and both local times, rejecting reversed times', async () => {
    const wrapper = mountPage(TransportOrderFormView, { domain: 'looseboard' }); await flushPromises()
    const model = wrapper.findComponent({ name: 'ElForm' }).props('model')
    Object.assign(model, { customerId: '10001', originContactName: 'A', originContactPhone: '1', destinationContactName: 'B', destinationContactPhone: '2', origin: 'LA', destination: 'ONT', productName: '家居用品', estimatedPalletCount: 3, packageCount: 8, totalWeightKg: 80, totalVolumeCbm: 1.8, deliveryAt: '2026-10-20T11:30:00' })
+    Object.assign(model, { deliveryMode: 'WAREHOUSE_PICKUP', operatingWarehouseId: '20001', destinationPostalCode: '90001', originAddress: 'Pickup street', destinationAddress: 'Delivery street', budgetAmount: 50 })
    await wrapper.vm.$nextTick()
    const save = wrapper.findAll('button').find(button => button.text().includes('提交订单'))!
    await save.trigger('click'); await flushPromises()
@@ -438,7 +474,31 @@ describe('overseas business mounted pages', () => {
  })
  it('keeps looseboard edit form and version unchanged after a 409', async () => { routing.route.params = { orderId: 'LB-300' }; routing.route.query = { customerId: '10003' }; vi.mocked(updateLocalLooseboardOrder).mockRejectedValue(new ApiResponseError('订单版本冲突', 'B0409', 409)); const wrapper = mountPage(TransportOrderFormView, { domain: 'looseboard' }); await flushPromises(); const destination = wrapper.find('input[placeholder="城市 / 州"]'); await destination.setValue('ONT-MARKER-EDIT'); await wrapper.findAll('button').find((button) => button.text().includes('保存修改'))?.trigger('click'); await flushPromises(); expect(updateLocalLooseboardOrder).toHaveBeenCalledWith('LB-300', '10003', expect.objectContaining({ version: 0, destination: 'ONT-MARKER-EDIT' })); expect((destination.element as HTMLInputElement).value).toBe('ONT-MARKER-EDIT'); expect(document.body.textContent).toContain('订单版本冲突'); expect(routing.push).not.toHaveBeenCalled() })
  it('mounts looseboard create without a detail route or pending notice', async () => { const wrapper = mountPage(TransportOrderFormView, { domain: 'looseboard' }); await flushPromises(); expect(wrapper.text()).toContain('客户信息'); expect(wrapper.text()).toContain('请选择客户'); expect(wrapper.text()).not.toContain('接口能力待后端补齐'); expect(wrapper.findAll('button').find((button) => button.text().includes('提交订单'))?.attributes('disabled')).toBeUndefined() })
-  it('reuses one idempotency key and preserves looseboard create input after retries fail', async () => { vi.mocked(createLocalLooseboardOrder).mockRejectedValue(new ApiResponseError('temporary failure', 'S0500', 500)); const wrapper = mountPage(TransportOrderFormView, { domain: 'looseboard' }); await flushPromises(); const selects = wrapper.findAllComponents({ name: 'ElSelect' }); selects[0].vm.$emit('update:modelValue', '10001'); for (const label of ['起运地联系人', '目的地联系人', '起运地联系电话', '目的地联系电话']) await wrapper.findAll('.el-form-item').find(item => item.text().startsWith(label))!.find('input').setValue(label.includes('电话') ? '1' : '联系人'); const dates = wrapper.findAllComponents({ name: 'ElDatePicker' }); dates[0].vm.$emit('update:modelValue', '2026-10-20T09:30:00'); dates[1].vm.$emit('update:modelValue', '2026-10-20T15:45:00'); const origin = wrapper.find('input[placeholder="城市 / 港口 / 州"]'); const destination = wrapper.find('input[placeholder="城市 / 州"]'); await origin.setValue('LA-MARKER'); await destination.setValue('ONT-MARKER'); await wrapper.findAll('.el-form-item').find((item) => item.text().startsWith('总重量'))!.find('input').setValue('80'); await wrapper.findAll('.el-form-item').find((item) => item.text().startsWith('总体积'))!.find('input').setValue('1.8'); await wrapper.vm.$nextTick(); const submit = wrapper.findAll('button').find((button) => button.text().includes('提交订单')); await submit?.trigger('click'); await flushPromises(); await submit?.trigger('click'); await flushPromises(); expect(createLocalLooseboardOrder).toHaveBeenCalledTimes(2); const keys = vi.mocked(createLocalLooseboardOrder).mock.calls.map((call) => call[1].idempotencyKey); expect(keys[0]).toBeTruthy(); expect(keys[1]).toBe(keys[0]); expect((origin.element as HTMLInputElement).value).toBe('LA-MARKER'); expect((destination.element as HTMLInputElement).value).toBe('ONT-MARKER'); expect(routing.push).not.toHaveBeenCalled() })
+  it('reuses one idempotency key and preserves looseboard create input after retries fail', async () => {
+    vi.mocked(createLocalLooseboardOrder).mockRejectedValue(new ApiResponseError('temporary failure', 'S0500', 500))
+    const wrapper = mountPage(TransportOrderFormView, { domain: 'looseboard' }); await flushPromises()
+    const model = wrapper.findComponent({ name: 'ElForm' }).props('model')
+    Object.assign(model, {
+      customerId: '10001', deliveryMode: 'WAREHOUSE_PICKUP', operatingWarehouseId: '20001', destinationPostalCode: '90001',
+      originAddress: 'Pickup street', destinationAddress: 'Delivery street', budgetAmount: 50,
+      productName: '家居用品', packageCount: 1, estimatedPalletCount: 1,
+      originContactName: '发货人', originContactPhone: '1', destinationContactName: '收货人', destinationContactPhone: '2',
+      pickupAt: '2026-10-20T09:30:00', deliveryAt: '2026-10-20T15:45:00', totalWeightKg: 80, totalVolumeCbm: 1.8,
+    })
+    await wrapper.vm.$nextTick()
+    const origin = wrapper.find('input[placeholder="城市 / 港口 / 州"]')
+    const destination = wrapper.find('input[placeholder="城市 / 州"]')
+    await origin.setValue('LA-MARKER'); await destination.setValue('ONT-MARKER')
+    const submit = wrapper.findAll('button').find(button => button.text().includes('提交订单'))!
+    await submit.trigger('click'); await flushPromises()
+    await submit.trigger('click'); await flushPromises()
+    expect(createLocalLooseboardOrder).toHaveBeenCalledTimes(2)
+    const keys = vi.mocked(createLocalLooseboardOrder).mock.calls.map(call => call[1].idempotencyKey)
+    expect(keys[0]).toBeTruthy(); expect(keys[1]).toBe(keys[0])
+    expect((origin.element as HTMLInputElement).value).toBe('LA-MARKER')
+    expect((destination.element as HTMLInputElement).value).toBe('ONT-MARKER')
+    expect(routing.push).not.toHaveBeenCalled()
+  })
  it.each([true, false])('opens only the matching pool order read-only arrangement: %s', matching => {
    routing.route.query = { orderNo: truck.orderNo, fleetSource: 'inquiry', fleetOfferNo: 'FO-1', fleetBookingNo: matching ? arrangement.bookingNo : 'FB-OTHER' }
    vi.mocked(listUsTruckOrders).mockResolvedValue({ records: [{ ...truck, fleetArrangement: arrangement }], page: 1, size: 20, total: 1, pages: 1 })
@@ -453,3 +513,4 @@ describe('overseas business mounted pages', () => {
  })

 })
+
@@ -60,7 +60,7 @@ async function load() {
    if (isLooseboard.value) {
      const detail = await getLocalLooseboardOrder(orderId.value, routeCustomerId.value)
      fleetArrangement.value = detail.fleetArrangement
-      Object.assign(form, { customerId: detail.customerId, orderNo: detail.orderNo, productName: detail.productName || '', estimatedPalletCount: detail.estimatedPalletCount ?? 0, origin: detail.origin, destination: detail.destination, originAddress: detail.originAddress || '', destinationAddress: detail.destinationAddress || '', originContactName: detail.originContactName || '', originContactPhone: detail.originContactPhone || '', destinationContactName: detail.destinationContactName || '', destinationContactPhone: detail.destinationContactPhone || '', packageCount: detail.packageCount, totalWeightKg: Number(detail.totalWeightKg), totalVolumeCbm: Number(detail.totalVolumeCbm), budgetAmount: detail.budgetAmount == null ? undefined : Number(detail.budgetAmount), currency: detail.currency, pickupAt: detail.pickupAt || '', deliveryAt: detail.deliveryAt || '', remark: detail.remark || '', status: detail.status, version: detail.version })
+      Object.assign(form, { deliveryMode: detail.deliveryMode || 'DELIVERY_TO_WAREHOUSE', operatingWarehouseId: detail.operatingWarehouseId || '', destinationType: detail.destinationType || 'PRIVATE', destinationPostalCode: detail.destinationPostalCode || '', deliveryContactName: detail.deliveryContactName || '', deliveryContactPhone: detail.deliveryContactPhone || '', estimatedArrivalAt: detail.estimatedArrivalAt || '', trackingNo: detail.trackingNo || '', customerId: detail.customerId, orderNo: detail.orderNo, productName: detail.productName || '', estimatedPalletCount: detail.estimatedPalletCount ?? 0, origin: detail.origin, destination: detail.destination, originAddress: detail.originAddress || '', destinationAddress: detail.destinationAddress || '', originContactName: detail.originContactName || '', originContactPhone: detail.originContactPhone || '', destinationContactName: detail.destinationContactName || '', destinationContactPhone: detail.destinationContactPhone || '', packageCount: detail.packageCount, totalWeightKg: Number(detail.totalWeightKg), totalVolumeCbm: Number(detail.totalVolumeCbm), budgetAmount: detail.budgetAmount == null ? undefined : Number(detail.budgetAmount), currency: detail.currency, pickupAt: detail.pickupAt || '', deliveryAt: detail.deliveryAt || '', remark: detail.remark || '', status: detail.status, version: detail.version })
    } else {
      const detail = await getUsTruckOrder(orderId.value, routeCustomerId.value)
      fleetArrangement.value = detail.fleetArrangement
@@ -5,9 +5,11 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import { useAuthStore } from '@/core/auth/auth'
 import { useAccessPreviewStore } from '@/core/access/accessPreview'
 import RowActions from '@/shared/components/RowActions.vue'
+import QueryToolbar from '@/shared/components/QueryToolbar.vue'
+import type { DataTableColumn } from '@/shared/components/DataTable.vue'
 import { listLocalLooseboardOrders, listUsTruckOrders } from '../api/platformOverseasBusiness'
 import { overseasBusinessPermissions as permissions } from '../permissions'
-import type { LocalLooseboardOrder } from '../types'
+import type { LocalLooseboardOrder, LocalTransportOrder } from '../types'
 import TransportOrdersView from './TransportOrdersView.vue'

 const routing = vi.hoisted(() => ({ push: vi.fn(), route: { query: {} } }))
@@ -30,7 +32,7 @@ function mountList(domain: 'truck' | 'looseboard', edit = false) {
  auth.permissions = [permissions.truckList, permissions.looseboardList, ...(edit ? [permissions.looseboardEdit] : [])]
  useAccessPreviewStore().initializeAfterLogin()
  return mount(TransportOrdersView, { props: { domain }, global: { plugins: [pinia, ElementPlus], stubs: {
-    DataTable: { props: ['data'], template: '<div><div v-for="row in data" :key="row.id"><slot name="actions" :row="row" /></div></div>' },
+    DataTable: { name: 'DataTable', props: ['data', 'columns'], template: '<div><slot name="filters" /><div v-for="row in data" :key="row.id"><span v-for="column in columns" :key="column.key" :data-column="column.key">{{ column.prop ? row[column.prop] : \'\' }}</span><slot name="actions" :row="row" /></div></div>' },
    AppDialog: true,
  } } })
 }
@@ -43,6 +45,15 @@ beforeEach(() => {
 })

 describe('transport document entry', () => {
+  it.each(['truck', 'looseboard'] as const)('limits retired status filters only in truck mode (%s)', async domain => {
+    const wrapper = mountList(domain); await flushPromises()
+    const status = wrapper.findComponent(QueryToolbar).props('fields').find(field => field.key === 'status')!
+    const values = status.options!.map(option => option.value)
+    expect(values.includes('WAITING_CONSOLIDATION')).toBe(domain === 'looseboard')
+    if (domain === 'truck') for (const value of ['WAITING_INBOUND', 'RECEIVING', 'PALLET_OVERAGE_REVIEW', 'PARTIALLY_ALLOCATED', 'ALLOCATED', 'PENDING_DISPATCH']) expect(values).not.toContain(value)
+    else expect(values).toContain('WAITING_INBOUND')
+    expect(status.options!.find(option => option.value === 'IN_TRANSIT')?.label).toBe('派送中')
+  })
  it('lets list-only users open looseboard details without edit permission', async () => {
    const wrapper = mountList('looseboard'); await flushPromises()
    const actions = wrapper.findComponent(RowActions)
@@ -52,7 +63,7 @@ describe('transport document entry', () => {
    expect(routing.push).toHaveBeenCalledWith({ name: 'overseas-business-looseboard-detail', params: { orderId: 'LB-TEST' }, query: { customerId: '9007199254741999' } })
  })

-  it('preserves the permitted looseboard edit entry alongside its detail', async () => {
+  it('lets authorized users complete missing receiving information before review', async () => {
    const wrapper = mountList('looseboard', true); await flushPromises()
    const actions = wrapper.findComponent(RowActions)
    expect(actions.text()).toContain('编辑')
@@ -65,4 +76,34 @@ describe('transport document entry', () => {
    expect(listUsTruckOrders).toHaveBeenCalledOnce()
    expect(listLocalLooseboardOrders).not.toHaveBeenCalled()
  })
+
+  it('displays truck pallet counts instead of the unused package count', async () => {
+    const truck: LocalTransportOrder = {
+      id: '9007199254741001', customerId: '9007199254741999', orderNo: 'TR-TEST', fleetArrangement: null,
+      vehicleType: 'PALLET_15', origin: 'LA', destination: 'ONT', palletCount: 3, packageCount: 0,
+      receivedPalletCount: 0, allocatedPalletCount: 0, shippedPalletCount: 0,
+      totalWeightKg: '100', totalVolumeCbm: '2', budgetAmount: '500', currency: 'USD',
+      originContactName: null, originContactPhone: null, destinationContactName: null, destinationContactPhone: null,
+      pickupAt: null, deliveryAt: null, status: 'PENDING_REVIEW', version: 1, createdAt: '', updatedAt: '',
+    }
+    vi.mocked(listUsTruckOrders).mockResolvedValue({ records: [truck], total: 1, page: 1, size: 20, pages: 1 })
+    const wrapper = mountList('truck'); await flushPromises()
+    const columns = wrapper.findComponent({ name: 'DataTable' }).props('columns') as DataTableColumn[]
+    expect(columns.find(column => column.key === 'palletCount')).toMatchObject({ label: '托数', prop: 'palletCount' })
+    expect(columns.some(column => column.key === 'packageCount')).toBe(false)
+    expect(wrapper.get('[data-column="palletCount"]').text()).toBe('3')
+    const actions = wrapper.findComponent(RowActions)
+    expect(actions.text()).toContain('详情')
+    expect(actions.text()).not.toContain('审核')
+    expect(actions.text()).not.toContain('编辑')
+  })
+
+  it('preserves looseboard package counts and forecast pallet counts', async () => {
+    const wrapper = mountList('looseboard'); await flushPromises()
+    const columns = wrapper.findComponent({ name: 'DataTable' }).props('columns') as DataTableColumn[]
+    expect(columns.find(column => column.key === 'packageCount')).toMatchObject({ label: '件数', prop: 'packageCount' })
+    expect(columns.find(column => column.key === 'estimatedPalletCount')).toMatchObject({ label: '预计托数', prop: 'estimatedPalletCount' })
+    expect(wrapper.get('[data-column="packageCount"]').text()).toBe('20')
+    expect(wrapper.get('[data-column="estimatedPalletCount"]').text()).toBe('2')
+  })
 })
@@ -15,6 +15,7 @@ import AppDialog from '@/shared/components/AppDialog.vue'
 import RowActions, { type RowActionItem } from '@/shared/components/RowActions.vue'
 import { truckStatusLabels } from '../truckWorkflow'
 import FleetArrangementSummary from '../components/FleetArrangementSummary.vue'
+import LooseboardReviewDialog from '../components/LooseboardReviewDialog.vue'
 import { poolOrderStatusLabels, type FleetArrangement } from '../fleetArrangement'
 import { getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
 import { useAccessPreviewStore } from '@/core/access/accessPreview'
@@ -23,6 +24,7 @@ import { overseasBusinessPermissions } from '../permissions'
 import type { LocalLooseboardOrder, LocalLooseboardQuery, LocalLooseboardStatus, LocalTransportOrder, LocalTransportQuery, LocalTransportStatus, LocalTransportType } from '../types'

 const props = defineProps<{ domain: 'truck' | 'looseboard' }>()
+const reviewOpen = ref(false), reviewOrder = ref<LocalLooseboardOrder | null>(null)
 const routeOpen = ref(false)
 const routeOrigin = ref<RouteLocation>(routeLocation('')), routeDestinations = ref<RouteLocation[]>([])
 function openRoute(row: LocalTransportOrder | LocalLooseboardOrder) {
@@ -34,24 +36,24 @@ const route = useRoute(); const router = useRouter(); const access = useAccessPr
 const isLooseboard = computed(() => props.domain === 'looseboard'); const domainLabel = computed(() => isLooseboard.value ? '本土散板' : '本土卡车')
 const queryPreferenceKey = computed(() => isLooseboard.value ? 'overseas-business-looseboard-query' : 'overseas-business-truck-query')
 const createPermission = computed(() => isLooseboard.value ? overseasBusinessPermissions.looseboardCreate : overseasBusinessPermissions.truckCreate)
-const editPermission = computed(() => isLooseboard.value ? overseasBusinessPermissions.looseboardEdit : overseasBusinessPermissions.truckEdit)
+const editPermission = computed(() => overseasBusinessPermissions.truckEdit)
 const rows = ref<Array<LocalTransportOrder | LocalLooseboardOrder>>([]); const loading = ref(false); const loadError = ref<ApiErrorDetails | null>(null)
 const page = ref(1); const pageSize = ref(20); const total = ref(0)
 const arrangementOpen = ref(false), arrangement = ref<FleetArrangement | null>(null)
 function showArrangement(row: LocalTransportOrder | LocalLooseboardOrder) { arrangement.value = row.fleetArrangement; arrangementOpen.value = true }
 const filters = ref<QueryModel>({ orderNo: String(route.query.orderNo || ''), status: '', routeKeyword: '' }); const applied = ref({ ...filters.value })
-const looseboardStatusLabels: Record<LocalLooseboardStatus, string> = { PENDING_ACCEPTANCE: '待接单', WAITING_INBOUND: '待入仓', RECEIVING: '收货中', WAITING_CONSOLIDATION: '待合托', PENDING_DISPATCH: '待派车', DISPATCHED: '已派车', IN_TRANSIT: '运输中', COMPLETED: '已完成', CANCELLED: '已取消', ...poolOrderStatusLabels }
+const looseboardStatusLabels: Record<LocalLooseboardStatus, string> = { FUNDING_PENDING: '资金处理中', FUNDING_FAILED: '资金冻结失败', PENDING_ACCEPTANCE: '待接单', WAITING_INBOUND: '待入仓', RECEIVING: '收货中', WAITING_CONSOLIDATION: '待合托', PENDING_DISPATCH: '待派车', DISPATCHED: '已派车', IN_TRANSIT: '派送中', COMPLETED: '已完成', CANCELLED: '已取消', ...poolOrderStatusLabels }
 const transportTypeLabels: Record<LocalTransportType, string> = { PORT_PICKUP: '港口提柜', WAREHOUSE_TO_WAREHOUSE: '仓到仓', WAREHOUSE_TO_DOOR: '仓到门' }
 const statusLabels = computed<Record<string, string>>(() => isLooseboard.value ? looseboardStatusLabels : truckStatusLabels)
 const statusTones: Record<LocalTransportStatus | LocalLooseboardStatus, 'warning' | 'primary' | 'success' | 'danger' | 'info'> = {
-  PENDING_REVIEW: 'warning', PENDING_ACCEPTANCE: 'warning', WAITING_INBOUND: 'warning',
+  FUNDING_PENDING: 'warning', FUNDING_FAILED: 'danger', PENDING_REVIEW: 'warning', PENDING_ACCEPTANCE: 'warning', WAITING_INBOUND: 'warning',
  RECEIVING: 'primary', WAITING_CONSOLIDATION: 'warning', PALLET_OVERAGE_REVIEW: 'warning',
  PARTIALLY_ALLOCATED: 'primary', ALLOCATED: 'primary', PENDING_DISPATCH: 'warning',
  DISPATCHED: 'primary', IN_TRANSIT: 'primary', COMPLETED: 'success', REJECTED: 'danger', CANCELLED: 'info',
 }
 const fields = computed<QueryField[]>(() => [
  { key: 'orderNo', type: 'input', label: '商业单号', placeholder: '请输入商业单号', width: 230 },
-  { key: 'status', type: 'select', label: '状态', placeholder: '全部状态', width: 170, options: Object.entries(isLooseboard.value ? looseboardStatusLabels : truckStatusLabels).map(([value, label]) => ({ value, label })) },
+  { key: 'status', type: 'select', label: '状态', placeholder: '全部状态', width: 170, options: Object.entries(isLooseboard.value ? looseboardStatusLabels : truckStatusLabels).filter(([value]) => isLooseboard.value || !['WAITING_INBOUND', 'RECEIVING', 'WAITING_CONSOLIDATION', 'PALLET_OVERAGE_REVIEW', 'PARTIALLY_ALLOCATED', 'ALLOCATED', 'PENDING_DISPATCH'].includes(value)).map(([value, label]) => ({ value, label })) },
  { key: 'routeKeyword', type: 'input', label: '运输路线', placeholder: '起运地/目的地', width: 240 },
 ])
 const truckColumns: DataTableColumn[] = [
@@ -60,7 +62,7 @@ const truckColumns: DataTableColumn[] = [
  { key: 'origin', prop: 'origin', label: '起运地', minWidth: 145 }, { key: 'destination', prop: 'destination', label: '目的地', minWidth: 145 },
  { key: 'originContactName', prop: 'originContactName', label: '起运地联系人', minWidth: 125 }, { key: 'originContactPhone', prop: 'originContactPhone', label: '起运地联系电话', minWidth: 155 },
  { key: 'destinationContactName', prop: 'destinationContactName', label: '目的地联系人', minWidth: 125 }, { key: 'destinationContactPhone', prop: 'destinationContactPhone', label: '目的地联系电话', minWidth: 155 },
-  { key: 'packageCount', prop: 'packageCount', label: '件数', width: 80, align: 'right' }, { key: 'totalWeightKg', prop: 'totalWeightKg', label: '总重量(kg)', width: 115, align: 'right' },
+  { key: 'palletCount', prop: 'palletCount', label: '托数', width: 80, align: 'right' }, { key: 'totalWeightKg', prop: 'totalWeightKg', label: '总重量(kg)', width: 115, align: 'right' },
  { key: 'budgetAmount', label: '预算总价', width: 120, align: 'right', formatter: (row: LocalTransportOrder) => row.budgetAmount == null ? '—' : `${row.budgetAmount} ${row.currency}` },
  { key: 'pickupAt', label: '取货时间', width: 165, formatter: (row: LocalTransportOrder) => formatDateTime(row.pickupAt) },
  { key: 'deliveryAt', label: '送货时间', width: 165, formatter: (row: LocalTransportOrder) => formatDateTime(row.deliveryAt) },
@@ -104,7 +106,7 @@ async function load() {
 }
 function search(model: QueryModel) { applied.value = { ...model }; if (page.value === 1) void load(); else page.value = 1 }
 function openCreate() { void router.push({ name: isLooseboard.value ? 'overseas-business-looseboard-new' : 'overseas-business-truck-new' }) }
-function canEdit(row: LocalTransportOrder | LocalLooseboardOrder) { return !row.fleetArrangement && (isLooseboard.value ? row.status === 'PENDING_ACCEPTANCE' : row.status === 'PENDING_REVIEW') }
+function canEdit(row: LocalTransportOrder | LocalLooseboardOrder) { return !row.fleetArrangement && (isLooseboard.value ? row.status === 'PENDING_ACCEPTANCE' && !(row as LocalLooseboardOrder).deliveryMode : row.status === 'PENDING_REVIEW') }
 function openEdit(row: LocalTransportOrder | LocalLooseboardOrder) { if (!canEdit(row)) return; void router.push({ name: isLooseboard.value ? 'overseas-business-looseboard-edit' : 'overseas-business-truck-edit', params: { orderId: row.orderNo }, query: { customerId: row.customerId } }) }
 /** 单据详情保留订单与客户范围，费用在原业务单中处理。 */
 function openDetail(row: LocalTransportOrder | LocalLooseboardOrder) {
@@ -114,19 +116,20 @@ function openDetail(row: LocalTransportOrder | LocalLooseboardOrder) {
 function looseboardActions(row: LocalLooseboardOrder): RowActionItem[] {
  return [
    { key: 'detail', label: '详情', priority: 10 },
-    { key: 'edit', label: '编辑', visible: !row.fleetArrangement && access.can(editPermission.value), disabled: !canEdit(row) },
+    { key: 'review', label: '审核', visible: row.status === 'PENDING_ACCEPTANCE' && access.can(overseasBusinessPermissions.looseboardStatus), priority: 20 },
+    { key: 'edit', label: '编辑', visible: row.status === 'PENDING_ACCEPTANCE' && !row.deliveryMode && access.can(overseasBusinessPermissions.looseboardEdit) },
    { key: 'arrangement', label: '承运安排', visible: !!row.fleetArrangement },
  ]
 }
 function truckActions(row: LocalTransportOrder): RowActionItem[] {
  return [
-    { key: 'detail', label: row.status === 'PENDING_REVIEW' && !row.fleetArrangement && access.can(overseasBusinessPermissions.truckStatus) ? '审核' : '详情', priority: 10 },
-    { key: 'edit', label: '编辑', visible: !row.fleetArrangement && access.can(editPermission.value), disabled: !canEdit(row) },
+    { key: 'detail', label: '详情', priority: 10 },
    { key: 'arrangement', label: '承运安排', visible: !!row.fleetArrangement },
  ]
 }
 function handleTruckAction(key: string, row: LocalTransportOrder | LocalLooseboardOrder) {
-  if (key === 'edit') openEdit(row)
+  if (key === 'review' && isLooseboard.value) { reviewOrder.value=row as LocalLooseboardOrder; reviewOpen.value=true }
+  else if (key === 'edit') openEdit(row)
  else if (key === 'arrangement') showArrangement(row)
  else if (key === 'detail') openDetail(row)
 }
@@ -136,6 +139,7 @@ watch([page, pageSize], () => { void load() }); watch([isLooseboard, () => route
 </script>

 <template>
+  <LooseboardReviewDialog v-model="reviewOpen" :order="reviewOrder" @saved="load" />
  <AdminPage class="admin-density admin-workbench"><ListPageLayout :aria-label="`${domainLabel}订单列表`">


@@ -68,6 +68,14 @@ describe('truck review and fulfillment', () => {
    })
  })

+  it('displays saved pallet counts instead of the unused package count', async () => {
+    vi.mocked(getUsTruckOrder).mockResolvedValue(order({ palletCount: 3, packageCount: 0 }))
+    const wrapper = mountDetail(); await flushPromises()
+    const facts = new Map(wrapper.findAll('.truck-detail-fact').map(fact => [fact.get('dt').text(), fact.get('dd').text()]))
+    expect(facts.get('托数')).toBe('3')
+    expect(facts.has('件数')).toBe(false)
+  })
+
  it('groups the business number, single status and actions in the shared detail header', async () => {
    const wrapper = mountDetail(); await flushPromises()
    const header = wrapper.find('.detail-page-layout__header')
@@ -75,7 +83,7 @@ describe('truck review and fulfillment', () => {
    expect(header.find('.status-badge').text()).toBe('待审核')
    expect(wrapper.findAll('.status-badge')).toHaveLength(1)
    expect(header.find('.truck-order-actions').text()).toContain('审核')
-    expect(header.find('.truck-order-actions').text()).toContain('取消订单')
+    expect(header.find('.truck-order-actions').text()).not.toContain('取消订单')
    await click(wrapper, '刷新订单')
    expect(getUsTruckOrder).toHaveBeenCalledTimes(2)
    await click(wrapper, '返回列表')
@@ -118,6 +126,9 @@ describe('truck review and fulfillment', () => {
    const wrapper = mountDetail(); await flushPromises(); await click(wrapper, '审核并生成排车')
    formModel(wrapper).remark = '核对完成'; await confirm(wrapper)
    expect(wrapper.text()).toContain('订单版本冲突')
+    expect(wrapper.text()).not.toContain('TRUCK-409')
+    expect(wrapper.text()).not.toContain('请求 ID')
+    expect(wrapper.text()).not.toContain('可修改后重新提交')
    expect(wrapper.findComponent({ name: 'ElForm' }).props('disabled')).toBe(true)
    const original = JSON.parse(JSON.stringify(vi.mocked(executeUsTruckCommand).mock.calls[0][2]))
    wrapper.findComponent(TruckOrderActions).findComponent(AppDialog).vm.$emit('update:modelValue', false); await flushPromises()
@@ -152,11 +163,10 @@ describe('truck review and fulfillment', () => {
    expect(wrapper.text()).not.toContain('登记实收'); expect(wrapper.text()).not.toContain('分配托盘'); expect(wrapper.text()).not.toContain('超托审核')
  })

-  it('requires cancellation reason and submits only the cancellation status', async () => {
-    const wrapper = mountDetail(); await flushPromises(); await click(wrapper, '取消订单'); await confirm(wrapper)
+  it('does not offer platform cancellation of a customer truck order', async () => {
+    const wrapper = mountDetail(); await flushPromises()
+    expect(wrapper.text()).not.toContain('取消订单')
    expect(executeUsTruckCommand).not.toHaveBeenCalled()
-    formModel(wrapper).remark = '客户取消需求'; vi.mocked(executeUsTruckCommand).mockResolvedValue(order({ status: 'CANCELLED', version: 2 })); await confirm(wrapper)
-    expect(executeUsTruckCommand).toHaveBeenCalledWith('TR-TEST', '9007199254741999', expect.objectContaining({ command: 'cancel', payload: expect.objectContaining({ status: 'CANCELLED', remark: '客户取消需求' }) }))
  })

  it('keeps list-only users read-only and guards direct attempts to emit submit', async () => {
@@ -42,7 +42,7 @@ const fields = computed(() => detail.value ? [
  ['取货联系人', detail.value.originContactName], ['取货联系电话', detail.value.originContactPhone],
  ['送达地', detail.value.destination], ['送达地址', detail.value.destinationAddress],
  ['送达联系人', detail.value.destinationContactName], ['送达联系电话', detail.value.destinationContactPhone],
-  ['件数', detail.value.packageCount], ['重量（kg）', detail.value.totalWeightKg], ['体积（m³）', detail.value.totalVolumeCbm],
+  ['托数', detail.value.palletCount], ['重量（kg）', detail.value.totalWeightKg], ['体积（m³）', detail.value.totalVolumeCbm],
  ['预算总价', detail.value.budgetAmount == null ? '—' : `${detail.value.budgetAmount} ${detail.value.currency}`],
  ['取货时间', dateTime(detail.value.pickupAt)], ['送货时间', dateTime(detail.value.deliveryAt)],
  ['创建时间', dateTime(detail.value.createdAt)], ['备注', detail.value.remark],
@@ -97,7 +97,7 @@ watch([orderNo, customerId], load, { immediate: true })
      <section v-if="detail.fleetArrangement" class="truck-detail-section"><FleetArrangementSummary :arrangement="detail.fleetArrangement" /><p class="truck-detail-note">取货和送达照片请在排车任务中上传。</p></section>

      <section class="truck-detail-section truck-flow-section" aria-label="运输流程">
-        <div class="truck-section-heading"><h2>运输流程</h2><span class="truck-flow-caption">审核通过后由排车单推进取货、派送和送达</span></div>
+        <div class="truck-section-heading"><h2>运输流程</h2></div>
        <ol class="truck-flow">
          <li v-for="(step, index) in flowSteps" :key="step" :class="{ active: index === flowIndex, done: index < flowIndex || detail.status === 'COMPLETED' }">
            <span class="truck-flow-marker"><Check v-if="index < flowIndex || detail.status === 'COMPLETED'" :size="14" /><MapPin v-else-if="index === 2 || index === 4" :size="14" /><span v-else>{{ index + 1 }}</span></span>
@@ -106,9 +106,9 @@ watch([orderNo, customerId], load, { immediate: true })
        </ol>
      </section>

-      <section class="truck-detail-section"><div class="truck-section-heading"><h2>订单资料</h2><span class="truck-flow-caption">基础信息与货量</span></div><dl class="truck-detail-grid"><div v-for="[label, value] in fields" :key="String(label)" class="truck-detail-fact"><dt>{{ label }}</dt><dd>{{ value ?? '—' }}</dd></div></dl></section>
+      <section class="truck-detail-section"><div class="truck-section-heading"><h2>订单资料</h2></div><dl class="truck-detail-grid"><div v-for="[label, value] in fields" :key="String(label)" class="truck-detail-fact"><dt>{{ label }}</dt><dd>{{ value ?? '—' }}</dd></div></dl></section>
      <section class="truck-detail-section"><BusinessDocumentFees business-type="US_TRUCK" :business-no="detail.orderNo" :customer-id="detail.customerId" :business-id="detail.id" /></section>
-      <section class="truck-detail-section"><div class="truck-section-heading"><h2>审核与操作记录</h2><span class="truck-flow-caption">保留关键节点</span></div><div class="workbench-table"><DataTable :data="detail.histories" :columns="historyColumns" empty-text="暂无操作记录" /></div></section>
+      <section class="truck-detail-section"><div class="truck-section-heading"><h2>审核与操作记录</h2></div><div class="workbench-table"><DataTable :data="detail.histories" :columns="historyColumns" empty-text="暂无操作记录" /></div></section>
    </template>
  </DetailPageLayout></AdminPage>
 </template>
@@ -121,7 +121,7 @@ watch([orderNo, customerId], load, { immediate: true })
 .truck-detail-section { margin-bottom: var(--admin-space-6); }
 .truck-section-heading { display: flex; align-items: baseline; justify-content: space-between; gap: 12px; margin-bottom: 14px; }
 .truck-section-heading h2 { margin: 0; font-size: var(--admin-font-section); color: var(--cc-text); }
-.truck-flow-caption, .truck-detail-note { color: var(--cc-muted); font-size: var(--admin-font-caption); }
+.truck-detail-note { color: var(--cc-muted); font-size: var(--admin-font-caption); }
 .truck-detail-note { margin: 10px 0 0; }
 .truck-flow { display: grid; grid-template-columns: repeat(5, minmax(0, 1fr)); gap: 0; margin: 0; padding: 0; list-style: none; }
 .truck-flow li { position: relative; display: flex; flex-direction: column; align-items: center; gap: 8px; min-width: 0; color: var(--cc-muted); text-align: center; }
@@ -2,17 +2,18 @@ import { regionText } from './procurementDirection'
 import type { Amount, ProcurementFee } from './procurementTypes'

 export const procurementStatuses: Record<string, string> = {
-  PENDING_REVIEW: '待审核', RECEIVING: '收货中', WAIT_CUSTOMER_CONFIRM: '待客户确认', CONFIRMED: '已确认',
+  FUNDING_PENDING: '订单受理中', FUNDING_FAILED: '订单处理失败', PENDING_REVIEW: '待审核', RECEIVING: '收货中', WAIT_CUSTOMER_CONFIRM: '待客户确认', CONFIRMED: '已确认',
  IN_TRANSIT: '运输中', DELIVERING: '派送中', COMPLETED: '签收完成',
+  REJECTED: '已拒绝', CANCELLED: '已取消',
 }
 export const feePurposes: Record<string, string> = {
  SAMPLE_PAYMENT: '样品货款', INTERNATIONAL_ESTIMATE: '预估国际运费', INTERNATIONAL_FREIGHT: '实际国际运费',
  DUTY: '关税', DOMESTIC_FREIGHT: '国内运费', OTHER: '其他费用', ADJUSTMENT: '追加费用', REFUND: '退款',
 }
-export function statusLabel(status: string | null | undefined, direction?: string | null) { return regionText(status ? procurementStatuses[status] || ({ REJECTED: '已拒绝', CANCELLED: '已取消', EXCEPTION_CLOSED: '异常关闭' } as Record<string, string>)[status] || '待核对进度' : '—', direction) }
+export function statusLabel(status: string | null | undefined, direction?: string | null) { return regionText(status ? procurementStatuses[status] || ({ EXCEPTION_CLOSED: '异常关闭' } as Record<string, string>)[status] || '待核对进度' : '—', direction) }
 export function statusTone(status: string | null | undefined): 'success' | 'warning' | 'danger' | 'info' | 'primary' {
  if (status === 'COMPLETED') return 'success'
-  if (status === 'REJECTED' || status === 'EXCEPTION_CLOSED') return 'danger'
+  if ((status === 'REJECTED' || status === 'FUNDING_FAILED') || status === 'EXCEPTION_CLOSED') return 'danger'
  if (status === 'CANCELLED') return 'info'
  if (status === 'IN_TRANSIT' || status === 'DELIVERING') return 'primary'
  return 'warning'
@@ -9,6 +9,7 @@ it('distinguishes missing charges, genuine free rent and incomplete settlement',
  expect(storageRentSummaryStatus({ ...lot, settledAmount: 0 })).toBe('免租 · 已结算')
  expect(storageRentSummaryStatus({ ...lot, chargeCount: 0 })).toBe('仓租记录待核对')
  expect(storageRentBillingShare(2, lot)).toBe('0.5 托')
+  expect(storageRentBillingShare(1, lot, { billingQuantity: 1, billingUnit: 'PALLET' })).toBe('1 托')
 })

 describe('仓租原币汇总显示', () => {
@@ -1,5 +1,5 @@
 import { feeMoney } from './overseasFeePresentation'
-import type { StorageRentLot } from './api/storageRent'
+import type { StorageRentLot, StorageRentCharge } from './api/storageRent'

 export function storageRentSourceType(type?: string | null) {
  const labels: Record<string, string> = { LASTLEG_ORDER: '头程尾程订单', WAREHOUSE_TRANSFER: '仓储转运单', RETURN_ORDER: '退货单' }
@@ -24,7 +24,8 @@ export function storageRentSummaryStatus(lot: StorageRentLot) {
  return Number(lot.settledAmount) === 0 ? '免租 · 已结算' : '已扣款'
 }

-export function storageRentBillingShare(quantity: number, lot: StorageRentLot) {
+export function storageRentBillingShare(quantity: number, lot: StorageRentLot, charge?: Pick<StorageRentCharge, 'billingQuantity' | 'billingUnit'>) {
+  if (charge?.billingQuantity != null && charge.billingUnit) return `${charge.billingQuantity} ${charge.billingUnit === 'PALLET' ? '托' : charge.billingUnit}`
  if (!(Number(lot.originalQuantity) > 0) || lot.billingQuantity == null) return '—'
  const units = Number(quantity) * Number(lot.billingQuantity) / Number(lot.originalQuantity)
  return `${Number(units.toFixed(6))} ${lot.billingUnit === 'PALLET' ? '托' : lot.billingUnit}`
@@ -0,0 +1,29 @@
+import { describe, expect, it } from 'vitest'
+import { createTransportDemandForm, transportDemandError, transportDemandRules, buildTransportDemand } from './transportDemandForm'
+import { truckStatusLabels } from './truckWorkflow'
+
+describe('truck order validation and state filters', () => {
+  it('requires both detailed addresses before submitting a truck order', () => {
+    const form = Object.assign(createTransportDemandForm(), {
+      vehicleType: 'PALLET_15' as const, origin: 'LA', destination: 'ONT',
+      originContactName: '发货人', originContactPhone: '1', destinationContactName: '收货人', destinationContactPhone: '2',
+      pickupAt: '2026-11-02T12:00:00', deliveryAt: '2026-11-03T12:00:00', estimatedPalletCount: 1, budgetAmount: 100,
+    })
+    expect(transportDemandRules('truck', form)).toMatchObject({ originAddress: [{ required: true }], destinationAddress: [{ required: true }] })
+    expect(transportDemandError('truck', form)).toBe('请输入取货地址')
+    form.originAddress = ' 取货街道1号 '
+    expect(transportDemandError('truck', form)).toBe('请输入送达地址')
+    form.destinationAddress = '   '
+    expect(() => buildTransportDemand('truck', form)).toThrow('请输入送达地址')
+    form.destinationAddress = ' 送达街道2号 '
+    expect(buildTransportDemand('truck', form)).toMatchObject({ originAddress: '取货街道1号', destinationAddress: '送达街道2号' })
+  })
+
+  it('assigns each filter a distinct Chinese state label', () => {
+    const labels = Object.values(truckStatusLabels)
+    expect(new Set(labels).size).toBe(labels.length)
+    expect(truckStatusLabels.PENDING_DISPATCH).toBe('待排车')
+    expect(truckStatusLabels.DISPATCHED).toBe('待取货')
+    expect(labels.every(label => /[\u4e00-\u9fff]/.test(label))).toBe(true)
+  })
+})
@@ -2,6 +2,14 @@ import type { FormRules } from 'element-plus'

 export type TransportDemandKind = 'truck' | 'looseboard'
 export interface TransportDemandForm {
+  deliveryMode: 'DELIVERY_TO_WAREHOUSE' | 'WAREHOUSE_PICKUP'
+  operatingWarehouseId: string
+  deliveryContactName: string
+  deliveryContactPhone: string
+  estimatedArrivalAt: string
+  trackingNo: string
+  destinationType: 'FBA' | 'PRIVATE'
+  destinationPostalCode: string
  vehicleType: '' | 'PALLET_15' | 'PALLET_30'
  origin: string
  destination: string
@@ -25,6 +33,7 @@ export interface TransportDemandForm {

 export function createTransportDemandForm(): TransportDemandForm {
  return {
+    deliveryMode: 'DELIVERY_TO_WAREHOUSE', operatingWarehouseId: '', deliveryContactName: '', deliveryContactPhone: '', estimatedArrivalAt: '', trackingNo: '', destinationType: 'PRIVATE', destinationPostalCode: '',
    vehicleType: '', origin: '', destination: '', originAddress: '', destinationAddress: '',
    originContactName: '', originContactPhone: '', destinationContactName: '', destinationContactPhone: '',
    productName: '', estimatedPalletCount: 0, packageCount: 0, totalWeightKg: 0, totalVolumeCbm: 0,
@@ -32,11 +41,10 @@ export function createTransportDemandForm(): TransportDemandForm {
  }
 }

-const requiredText = (kind: TransportDemandKind) => ({
-  origin: kind === 'truck' ? '取货地' : '起运地',
+const requiredText = (kind: TransportDemandKind, form: TransportDemandForm) => ({
+  ...(kind === 'truck' ? { originAddress: '取货地址', destinationAddress: '送达地址' } : {}),
+  ...(kind === 'truck' || form.deliveryMode === 'WAREHOUSE_PICKUP' ? { origin: kind === 'truck' ? '取货地' : '起运地', originContactName: kind === 'truck' ? '取货联系人' : '起运地联系人', originContactPhone: kind === 'truck' ? '取货联系电话' : '起运地联系电话' } : {}),
  destination: kind === 'truck' ? '送达地' : '目的地',
-  originContactName: kind === 'truck' ? '取货联系人' : '起运地联系人',
-  originContactPhone: kind === 'truck' ? '取货联系电话' : '起运地联系电话',
  destinationContactName: kind === 'truck' ? '送达联系人' : '目的地联系人',
  destinationContactPhone: kind === 'truck' ? '送达联系电话' : '目的地联系电话',
 } as const)
@@ -47,16 +55,27 @@ export function localMinuteInput(value: unknown) {

 export function transportDemandRules(kind: TransportDemandKind, form: TransportDemandForm): FormRules<TransportDemandForm> {
  const rules: FormRules<TransportDemandForm> = {}
-  const labels = requiredText(kind)
+  const labels = requiredText(kind, form)
  for (const [field, label] of Object.entries(labels)) {
    rules[field as keyof typeof labels] = [{ required: true, whitespace: true, message: `请输入${label}`, trigger: 'blur' }]
  }
+  if (kind === 'looseboard') {
+    if (form.deliveryMode === 'WAREHOUSE_PICKUP') rules.originAddress = [{ required: true, whitespace: true, message: '请输入起运详细地址', trigger: 'blur' }]
+    rules.operatingWarehouseId = [{ required: true, message: '请选择收货仓库', trigger: 'change' }]
+    if (form.destinationType === 'PRIVATE') {
+      rules.destinationAddress = [{ required: true, whitespace: true, message: '请输入目的详细地址', trigger: 'blur' }]
+      rules.destinationPostalCode = [{ required: true, whitespace: true, message: '请输入目的地邮编', trigger: 'blur' }]
+    }
+    if (form.deliveryMode === 'DELIVERY_TO_WAREHOUSE') {
+      for (const [field, label] of [['deliveryContactName', '到仓联系人'], ['deliveryContactPhone', '到仓联系电话'], ['estimatedArrivalAt', '预计到货时间']] as const) rules[field] = [{ required: true, message: '请填写' + label, trigger: 'change' }]
+    }
+  }
  if (kind === 'truck') rules.vehicleType = [{ required: true, message: '请选择车辆类型', trigger: 'change' }]
  for (const [field, label] of [['packageCount', '件数'], ['estimatedPalletCount', '预计托数'], ['totalWeightKg', '总重量'], ['totalVolumeCbm', '总体积']] as const) {
    if (field === 'packageCount' && kind === 'truck') continue
    rules[field] = [{ required: true, type: 'number', min: 0, message: `${label}须为不小于 0 的数字`, trigger: 'change' }]
  }
-  rules.budgetAmount = [{ required: kind === 'truck', type: 'number', min: kind === 'truck' ? 0.01 : 0, message: '请输入大于 0 的预算总价', trigger: 'change' }]
+  rules.budgetAmount = [{ required: true, type: 'number', min: kind === 'truck' ? 0.01 : 0, message: kind === 'truck' ? '请输入大于 0 的预算总价' : '请输入预算总价，不能小于 0', trigger: 'change' }]
  const pickupLabel = kind === 'truck' ? '取货时间' : '取货时间', deliveryLabel = kind === 'truck' ? '送达时间' : '送货时间'
  rules.pickupAt = [{ required: true, message: `请选择${pickupLabel}`, trigger: 'change' }]
  rules.deliveryAt = [{ required: true, message: `请选择${deliveryLabel}`, trigger: 'change' }, {
@@ -66,8 +85,16 @@ export function transportDemandRules(kind: TransportDemandKind, form: TransportD
 }

 export function transportDemandError(kind: TransportDemandKind, form: TransportDemandForm): string | undefined {
+  if (kind === 'looseboard') {
+    if (!form.operatingWarehouseId) return '请选择收货仓库'
+    if (!['DELIVERY_TO_WAREHOUSE', 'WAREHOUSE_PICKUP'].includes(form.deliveryMode)) return '请选择送货方式'
+    if (form.destinationType === 'PRIVATE' && (!form.destinationAddress.trim() || !form.destinationPostalCode.trim())) return '请填写目的详细地址和邮编'
+    if (form.deliveryMode === 'DELIVERY_TO_WAREHOUSE' && (!form.deliveryContactName.trim() || !form.deliveryContactPhone.trim() || !form.estimatedArrivalAt)) return '送货到仓须填写仓库联系人和预计到货时间'
+    if (form.deliveryMode === 'WAREHOUSE_PICKUP' && !form.originAddress.trim()) return '请输入起运详细地址'
+    if (form.packageCount < 1) return '散板收货件数须大于 0'
+  }
  if (kind === 'truck' && !['PALLET_15', 'PALLET_30'].includes(form.vehicleType)) return '请选择车辆类型'
-  const labels = requiredText(kind)
+  const labels = requiredText(kind, form)
  for (const [field, label] of Object.entries(labels)) {
    if (!String(form[field as keyof typeof labels] || '').trim()) return `请输入${label}`
  }
@@ -83,6 +110,7 @@ export function transportDemandError(kind: TransportDemandKind, form: TransportD
  if (!Number.isInteger(form.packageCount) || kind === 'looseboard' && !Number.isInteger(form.estimatedPalletCount)) return '件数和预计托数须为整数'
  if (kind === 'truck' && (!Number.isSafeInteger(form.estimatedPalletCount) || form.estimatedPalletCount <= 0)) return '请输入大于 0 的托数'
  if (kind === 'truck' && (form.budgetAmount == null || !Number.isFinite(form.budgetAmount) || form.budgetAmount <= 0)) return '请输入大于 0 的预算总价'
+  if (kind === 'looseboard' && form.budgetAmount == null) return '请输入预算总价'
  if (form.budgetAmount != null && (!Number.isFinite(form.budgetAmount) || form.budgetAmount < 0)) return '预算总价不能小于 0'
  if (!['USD', 'CNY'].includes(form.currency)) return '请选择预算币种'
  return undefined
@@ -102,15 +130,15 @@ function commonPayload(form: TransportDemandForm) {

 type CommonPayload = ReturnType<typeof commonPayload>
 type TruckPayload = Omit<CommonPayload, 'packageCount'> & { palletCount: number; vehicleType: 'PALLET_15' | 'PALLET_30' }
-type LooseboardPayload = CommonPayload & { productName: string | undefined; estimatedPalletCount: number }
+type LooseboardPayload = CommonPayload & { deliveryMode: 'DELIVERY_TO_WAREHOUSE' | 'WAREHOUSE_PICKUP'; operatingWarehouseId: string; destinationType: 'FBA' | 'PRIVATE'; destinationPostalCode?: string; deliveryContactName?: string; deliveryContactPhone?: string; estimatedArrivalAt?: string; trackingNo?: string; productName: string | undefined; estimatedPalletCount: number }

 export function buildTransportDemand(kind: 'truck', form: TransportDemandForm): TruckPayload
 export function buildTransportDemand(kind: 'looseboard', form: TransportDemandForm): LooseboardPayload
-export function buildTransportDemand(kind: TransportDemandKind, form: TransportDemandForm) {
+export function buildTransportDemand(kind: TransportDemandKind, form: TransportDemandForm): TruckPayload | LooseboardPayload {
  const failure = transportDemandError(kind, form)
  if (failure) throw new Error(failure)
  const common = commonPayload(form)
  return kind === 'truck'
    ? { ...(({ packageCount: _packages, ...rest }) => rest)(common), palletCount: form.estimatedPalletCount, vehicleType: form.vehicleType as 'PALLET_15' | 'PALLET_30' }
-    : { ...common, productName: form.productName.trim() || undefined, estimatedPalletCount: form.estimatedPalletCount }
+    : { ...common, ...(form.deliveryMode === 'DELIVERY_TO_WAREHOUSE' ? { origin: '', originAddress: undefined, originContactName: '', originContactPhone: '' } : {}), deliveryMode: form.deliveryMode, operatingWarehouseId: form.operatingWarehouseId, deliveryContactName: form.deliveryMode === 'DELIVERY_TO_WAREHOUSE' ? form.deliveryContactName.trim() : undefined, deliveryContactPhone: form.deliveryMode === 'DELIVERY_TO_WAREHOUSE' ? form.deliveryContactPhone.trim() : undefined, estimatedArrivalAt: form.deliveryMode === 'DELIVERY_TO_WAREHOUSE' ? localMinuteInput(form.estimatedArrivalAt) : undefined, trackingNo: form.deliveryMode === 'DELIVERY_TO_WAREHOUSE' ? form.trackingNo.trim() || undefined : undefined, destinationType: form.destinationType, destinationPostalCode: form.destinationType === 'PRIVATE' ? form.destinationPostalCode.trim() : undefined, productName: form.productName.trim() || undefined, estimatedPalletCount: form.estimatedPalletCount }
 }
@@ -1,9 +1,9 @@
 import type { LocalTransportDetail, LocalTransportStatus } from './types'

 export const truckStatusLabels: Record<LocalTransportStatus, string> = {
-  PENDING_REVIEW: '待审核', WAITING_INBOUND: '待取货', RECEIVING: '待取货', WAITING_CONSOLIDATION: '待取货',
-  PALLET_OVERAGE_REVIEW: '待取货', PARTIALLY_ALLOCATED: '待取货', ALLOCATED: '待取货',
-  PENDING_DISPATCH: '待取货', DISPATCHED: '待取货', IN_TRANSIT: '派送中', COMPLETED: '已完成', REJECTED: '已拒绝', CANCELLED: '已取消',
+  FUNDING_PENDING: '订单受理中', FUNDING_FAILED: '订单处理失败', PENDING_REVIEW: '待审核', WAITING_INBOUND: '待入仓', RECEIVING: '收货中', WAITING_CONSOLIDATION: '待合托',
+  PALLET_OVERAGE_REVIEW: '超托待审核', PARTIALLY_ALLOCATED: '部分分配', ALLOCATED: '已分配',
+  PENDING_DISPATCH: '待排车', DISPATCHED: '待取货', IN_TRANSIT: '派送中', COMPLETED: '已完成', REJECTED: '已拒绝', CANCELLED: '已取消',
 }
 export const truckCommandLabels = {
  review: '审核并生成排车', arrange: '补建排车单', 'receive-pallets': '登记实收', 'review-pallet-overage': '超托审核', 'allocate-pallets': '分配托盘',
@@ -23,8 +23,8 @@ export type TruckOperation =
 /** 拼车来源只读；原单只保留审核入口，排车后的执行动作统一在排车任务完成。 */
 export function availableTruckCommands(order: Pick<LocalTransportDetail, 'status' | 'fleetArrangement'>): TruckCommand[] {
  if (order.fleetArrangement) return []
-  if (order.status === 'PENDING_REVIEW') return ['review', 'cancel']
-  return order.status === 'PENDING_DISPATCH' ? ['arrange', 'cancel'] : []
+  if (order.status === 'PENDING_REVIEW') return ['review']
+  return order.status === 'PENDING_DISPATCH' ? ['arrange'] : []
 }

 export const truckCommandHints: Record<TruckCommand, string> = {
@@ -35,7 +35,7 @@ export const truckCommandHints: Record<TruckCommand, string> = {
  'allocate-pallets': '选择本单已实收且未分配的托盘，可分批分配；全部已接收托盘分配完成后才能进入待派车。',
  'prepare-dispatch': '确认全部已接收托盘已分配完成，将本单交由调度安排车辆。',
  dispatch: '请在车辆安排已实际完成后确认，本单将进入已派车。',
-  'start-transit': '请在车辆已实际发运后确认，本单将进入运输中。',
+  'start-transit': '请在车辆已实际发运后确认，本单将进入派送中。',
  complete: '请在运输及交付已实际完成后确认。确认完成后不能撤回。',
  cancel: '取消后本单不能继续履约，请填写取消原因。',
 }
@@ -5,7 +5,7 @@ export interface OverseasBusinessHistory {
  operatorId: string | null; changeDetail?: string | null; remark: string | null; createdAt: string
 }

-export type OverseasPurchaseStatus = 'PENDING_REVIEW' | 'RECEIVING' | 'WAIT_CUSTOMER_CONFIRM' | 'CONFIRMED' | 'IN_TRANSIT' | 'DELIVERING' | 'COMPLETED'
+export type OverseasPurchaseStatus = 'FUNDING_PENDING' | 'FUNDING_FAILED' | 'PENDING_REVIEW' | 'RECEIVING' | 'WAIT_CUSTOMER_CONFIRM' | 'CONFIRMED' | 'IN_TRANSIT' | 'DELIVERING' | 'COMPLETED' | 'REJECTED' | 'CANCELLED'
 export interface OverseasPurchaseQuery {
  page?: number; size?: number; customerId?: string; orderNo?: string; customerKeyword?: string
  purchaseCategory?: string; productName?: string; status?: OverseasPurchaseStatus | ''
@@ -29,7 +29,7 @@ export interface OverseasPurchaseEditorDetail {
  internalRemark: string | null
 }
 export type LocalTransportType = 'PORT_PICKUP' | 'WAREHOUSE_TO_WAREHOUSE' | 'WAREHOUSE_TO_DOOR'
-export type LocalTransportStatus = 'PENDING_REVIEW' | 'WAITING_INBOUND' | 'RECEIVING' | 'WAITING_CONSOLIDATION' | 'PALLET_OVERAGE_REVIEW' | 'PARTIALLY_ALLOCATED' | 'ALLOCATED' | 'PENDING_DISPATCH' | 'DISPATCHED' | 'IN_TRANSIT' | 'COMPLETED' | 'REJECTED' | 'CANCELLED'
+export type LocalTransportStatus = 'FUNDING_PENDING' | 'FUNDING_FAILED' | 'PENDING_REVIEW' | 'WAITING_INBOUND' | 'RECEIVING' | 'WAITING_CONSOLIDATION' | 'PALLET_OVERAGE_REVIEW' | 'PARTIALLY_ALLOCATED' | 'ALLOCATED' | 'PENDING_DISPATCH' | 'DISPATCHED' | 'IN_TRANSIT' | 'COMPLETED' | 'REJECTED' | 'CANCELLED'
 export type TruckVehicleType = 'PALLET_15' | 'PALLET_30'
 export interface LocalTransportQuery {
  page?: number; size?: number; orderNo?: string; routeKeyword?: string; status?: LocalTransportStatus | ''
@@ -66,12 +66,22 @@ export interface UpdateLocalTransportOrderRequest extends Omit<CreateLocalTransp
 }

 export type PalletRequired = 'YES' | 'NO'
-export type LocalLooseboardStatus = 'PENDING_ACCEPTANCE' | 'WAITING_INBOUND' | 'RECEIVING' | 'WAITING_CONSOLIDATION' | 'PENDING_DISPATCH' | 'DISPATCHED' | 'IN_TRANSIT' | 'COMPLETED' | 'CANCELLED'
+export type LocalLooseboardStatus = 'FUNDING_PENDING' | 'FUNDING_FAILED' | 'PENDING_ACCEPTANCE' | 'WAITING_INBOUND' | 'RECEIVING' | 'WAITING_CONSOLIDATION' | 'PENDING_DISPATCH' | 'DISPATCHED' | 'IN_TRANSIT' | 'COMPLETED' | 'CANCELLED'
 export interface LocalLooseboardQuery {
  page?: number; size?: number; customerId?: string; orderNo?: string; routeKeyword?: string
  status?: LocalLooseboardStatus | ''; requestedFrom?: string; requestedTo?: string
 }
 export interface LocalLooseboardOrder {
+  deliveryMode?: 'DELIVERY_TO_WAREHOUSE' | 'WAREHOUSE_PICKUP'
+  operatingWarehouseId?: string
+  destinationType?: 'FBA' | 'PRIVATE'
+  destinationPostalCode?: string
+  deliveryContactName?: string
+  deliveryContactPhone?: string
+  estimatedArrivalAt?: string
+  trackingNo?: string
+  transferNo?: string
+
  fleetArrangement: import('./fleetArrangement').FleetArrangement | null
  id: string; customerId: string; orderNo: string; palletRequired: PalletRequired | null
  transportType: LocalTransportType | null; origin: string; destination: string; productName: string | null; estimatedPalletCount: number | null; packageCount: number
@@ -82,8 +92,19 @@ export interface LocalLooseboardOrder {
 export interface LocalLooseboardDetail extends LocalLooseboardOrder {
  originAddress: string | null; destinationAddress: string | null; remark: string | null; createdBy: string | null
  histories: OverseasBusinessHistory[]
+  dispatchNos: string[]
 }
 export interface CreateLocalLooseboardOrderRequest {
+  deliveryMode?: 'DELIVERY_TO_WAREHOUSE' | 'WAREHOUSE_PICKUP'
+  operatingWarehouseId?: string
+  destinationType?: 'FBA' | 'PRIVATE'
+  destinationPostalCode?: string
+  deliveryContactName?: string
+  deliveryContactPhone?: string
+  estimatedArrivalAt?: string
+  trackingNo?: string
+  transferNo?: string
+
  productName?: string | null; estimatedPalletCount: number
  origin: string; originAddress?: string | null; destination: string; destinationAddress?: string | null
  packageCount: number; totalWeightKg: number; totalVolumeCbm: number
@@ -6,6 +6,7 @@
 - 运输路线地图：`components/TransportRouteDialog.vue`经`index.ts`公开导出，排车装车后、本土散板列表、本土卡车表单共用；来源字段、缺值规则和原型映射唯一见`PROTOTYPE_MATRIX.md`“运输路线地图”。仓库引用经`routeLocations.ts`复用Warehouse列表/详情解析完整地址（warehouse:list）；解析失败不加载地图。仅规划路线，不接GPS、不用固定样例，不在车辆主档顶部重复放入口。

 - 当前散板需求：正式列表使用`pages/DispatchCapacityDemandsView.vue`、`api/dispatchCapacityDemands.ts`，只读消费日常派送排车的`/dispatches/capacity-demands`摘要；发布选项仅在智能排车建单时选择，默认不勾选；维护车辆不提供发布修改，预约日历建单不自动发布，重发先取消原排车再重新创建，规则见拼车主契约当前页面范围。不得以实托数推算标准托位，未知余位明确待确认，不读取客户或司机私人资料。原登记和旧车次入口代码保留隐藏。
+- 散板加货从上述列表的 `components/LooseboardCargoDialog.vue` 进入，通过 `../overseas-warehouse` 公开的 `listLooseboardCargo/addLooseboardCargo` 调用 `dispatch/controller/LooseboardCargoController.java`；区别于客户本土散板下单及排车提货/派送执行。

 - 保留的内部拼车实现：`pages/CapacityOffersView.vue`、`pages/CapacityOfferDetailView.vue`、`api/capacityOffers.ts`，车次详情显式打开 `components/CapacityOfferSettingsDialog.vue` 发布余位；独立 `capacity-offer:list/manage/inquiry-*` 权限，销售只操作本人意向。流程与交互唯一契约见 `../../../../../docs/海外仓业务/内部拼车需求池首版开发契约.md`，服务端沿 `fleet-capacity-offers-v1.yaml`；首版所有货到我仓上车，未确认意向不占位，列表不逐行请求详情。

@@ -0,0 +1,32 @@
+import { shallowMount, flushPromises } from '@vue/test-utils'
+import { beforeEach, expect, it, vi } from 'vitest'
+import Dialog from './LooseboardCargoDialog.vue'
+import { candidate, detail } from '../../overseas-warehouse/dispatchTestFixtures'
+import * as api from '@/modules/overseas-warehouse'
+
+vi.mock('@/modules/overseas-warehouse', async () => ({
+  getDispatch: vi.fn(), listLooseboardCargo: vi.fn(), addLooseboardCargo: vi.fn(),
+  expandSelectionGroups: (await import('../../overseas-warehouse/dispatchContracts')).expandSelectionGroups,
+}))
+vi.mock('element-plus', () => ({ ElMessage: { success: vi.fn() } }))
+beforeEach(() => { vi.clearAllMocks() })
+
+it('selects one looseboard order and submits all original pallet selections together', async () => {
+  const first = candidate({ orderNo: 'LB1', availablePackages: 9 })
+  const second = candidate({ sourceKey: 'source-2', sourceVersion: 'version-2', selection: { ...first.selection, planPalletId: '2', sourceVersion: 'version-2' } })
+  first.selectionGroup = { ...first.selectionGroup, sources: [...first.selectionGroup.sources, ...second.selectionGroup.sources], pallets: [...first.selectionGroup.pallets, { warehousePalletId: null, palletNo: 'P2', sourceKeys: [second.sourceKey], packageCount: 2 }] }
+  const dispatch = detail(); dispatch.actions.ADD_CARGO = { allowed: true, blockCode: null, blockReason: null }
+  vi.mocked(api.getDispatch).mockResolvedValue(dispatch)
+  vi.mocked(api.listLooseboardCargo).mockResolvedValue({ candidates: [first], total: 1, page: 1, size: 20, pages: 1, complete: true, snapshotAt: '2026-11-05T00:00:00Z' })
+  const wrapper = shallowMount(Dialog, { props: { modelValue: false, dispatchNo: 'PC/1' }, global: { renderStubDefaultSlot: true, stubs: { ElAlert: true } } })
+  await wrapper.setProps({ modelValue: true }); await flushPromises()
+  const table = wrapper.getComponent({ name: 'DataTable' })
+  expect(table.props('data')).toHaveLength(1)
+  expect(table.props('columns').map((column: { label?: string }) => column.label)).toContain('托数')
+  expect(table.props('columns').map((column: { label?: string }) => column.label)).not.toContain('计划 / 实物托盘')
+  table.vm.$emit('selection-change', [first]); await flushPromises()
+  wrapper.getComponent({ name: 'AppDialog' }).vm.$emit('confirm'); await flushPromises()
+  expect(api.addLooseboardCargo).toHaveBeenCalledWith('PC/1', expect.objectContaining({ cargo: [first.selection, second.selection] }))
+  expect(wrapper.emitted('update:modelValue')).toEqual([[false]])
+  wrapper.unmount()
+})
@@ -0,0 +1,53 @@
+<script setup lang="ts">
+import { ref, watch } from 'vue'
+import { ElMessage } from 'element-plus'
+import AppDialog from '@/shared/components/AppDialog.vue'
+import DataTable, { type DataTableColumn } from '@/shared/components/DataTable.vue'
+import LoadErrorState from '@/shared/components/LoadErrorState.vue'
+import ApiErrorMeta from '@/shared/components/ApiErrorMeta.vue'
+import { getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
+import { getDispatch, listLooseboardCargo, addLooseboardCargo, expandSelectionGroups, type Candidate, type DispatchDetail } from '@/modules/overseas-warehouse'
+const open=defineModel<boolean>({default:false})
+const props=defineProps<{dispatchNo:string}>()
+const emit=defineEmits<{saved:[]}>()
+const rows=ref<Candidate[]>([]), selected=ref<Candidate[]>([]), detail=ref<DispatchDetail|null>(null)
+const page=ref(1), size=ref(20), total=ref(0), loading=ref(false), saving=ref(false), error=ref<ApiErrorDetails|null>(null)
+const columns:DataTableColumn[]=[
+  {key:'selection',type:'selection',width:45}, {key:'orderNo',label:'订单号',minWidth:180},
+  {key:'customerName',label:'客户',minWidth:140}, {key:'inboundCode',label:'入仓号',minWidth:150},
+  {key:'sourceStage',label:'货物阶段',width:110,formatter:(row:Candidate)=>row.selectionGroup?.sources.every(source=>source.selection.warehousePalletId) ? '已实收' : '申报待到仓'}, {key:'palletCount',label:'托数',width:80,formatter:(row:Candidate)=>row.selectionGroup?.pallets.length ?? '—'}, {key:'destination',label:'目的地',minWidth:180,formatter:(row:Candidate)=>row.destination.warehouseCode || row.destination.address || '—'},
+  {key:'availablePackages',label:'计划 / 可用箱数',width:100},
+  {key:'blockReasons',label:'资格',minWidth:200,formatter:(row:Candidate)=>row.blockReasons.length?row.blockReasons.join('；'):'可添加'},
+]
+let generation=0
+async function load() {
+  const current=++generation;loading.value=true;error.value=null;selected.value=[];rows.value=[];detail.value=null
+  try {
+    const [dispatch,value]=await Promise.all([getDispatch(props.dispatchNo),listLooseboardCargo(props.dispatchNo,page.value,size.value)])
+    if(current!==generation)return
+    if(dispatch.dispatchNo!==props.dispatchNo)throw new Error('排车身份不一致，请重新打开')
+    detail.value=dispatch;rows.value=value.candidates;total.value=value.total
+  }catch(cause){if(current===generation)error.value=getApiErrorDetails(cause,'散板货物读取失败')}
+  finally{if(current===generation)loading.value=false}
+}
+async function submit(){
+  if(!detail.value || saving.value || !selected.value.length)return
+  saving.value=true;error.value=null
+  try{
+    if(selected.value.some(row=>row.blockReasons.length))throw new Error('所选货物存在阻断，请重新选择')
+    const cargo=expandSelectionGroups(selected.value)
+    // 完整组来源版本由后端复核；预约批次继续通过原排车预约工作台绑定。
+    await addLooseboardCargo(props.dispatchNo,{recordVersion:detail.value.recordVersion,idempotencyKey:crypto.randomUUID(),cargo,batchAllocations:[]})
+    ElMessage.success('散板货物已加入排车，请按当前货物重新审核');open.value=false;emit('saved')
+  }catch(cause){await load();error.value=getApiErrorDetails(cause,'添加货物失败')}
+  finally{saving.value=false}
+}
+watch(open,value=>{if(value){page.value=1;void load()}else generation++})
+watch([page,size],()=>{if(open.value)void load()})
+</script>
+<template><AppDialog v-model="open" title="添加散板货物" width="1180px" class="admin-density-dialog admin-workbench" :confirm-loading="saving" :confirm-disabled="loading || !selected.length || !detail?.actions.ADD_CARGO?.allowed" lock-while-submitting @confirm="submit">
+  <LoadErrorState v-if="error" title="添加货物暂未完成" :message="error.message" @retry="load"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState>
+  <el-alert v-if="detail && !detail.actions.ADD_CARGO?.allowed" :title="detail.actions.ADD_CARGO?.blockReason || '当前排车不可加货，请先退回审核或重新排车'" type="warning" :closable="false" />
+  <el-alert title="申报货物可先加入排车；实际到仓后核对货量，完成实收后才能出库拣货。上门取货的凭证在对应取货排车节点上传。" type="info" :closable="false" />
+  <DataTable v-model:page="page" v-model:page-size="size" :data="rows" :columns="columns" :total="total" :loading="loading" row-key="sourceKey" :page-sizes="[10,20,50]" empty-text="暂无可添加的已审核散板货物" @selection-change="selected=$event" />
+</AppDialog></template>
@@ -19,7 +19,7 @@ export interface OutsourcedBusinessQuery { page?: number; size?: number; planned
 export interface OutsourcedBusinessSummary { dispatchCount: number; afterLoadingCount: number; deliveringCount: number; deliveredCount: number }
 export interface OutsourcedBusinessPage<T> { records: T[]; page: number; size: number; total: number }
 export interface OutsourcedBusinessList extends OutsourcedBusinessPage<OutsourcedBusinessRow> { summary: OutsourcedBusinessSummary }
-export interface OutsourcedBusinessDetail { row: OutsourcedBusinessRow; dispatch: DispatchDetail; cargo: { sourceKey: string; customerId: string; customerName: string | null; orderNo: string | null; inboundCode: string | null; palletNo: string; destinationKey: string; packages: string }[]; photos: OutsourcedBusinessPhoto[] }
+export interface OutsourcedBusinessDetail { row: OutsourcedBusinessRow; dispatch: DispatchDetail; cargo: { sourceKey: string; customerId: string; customerName: string | null; orderNo: string | null; inboundCode: string | null; palletNo: string | null; destinationKey: string; destinationKeys?: string[]; packages: string | null }[]; photos: OutsourcedBusinessPhoto[] }
 export interface OutsourcedBusinessSave { recordVersion: string; idempotencyKey: string; operations: OutsourcedBusinessOperations; reason: string | null }
 export interface OutsourcedBusinessBind { recordVersion: string; idempotencyKey: string; fileId: string; replaceFileId?: string }
 export type OutsourcedBusinessAction = 'SAVE_OPERATIONS' | 'UPLOAD_PHOTO' | 'BIND_PHOTO'
@@ -20,7 +20,7 @@ export interface OwnedBusinessQuery { page?: number; size?: number; plannedDepar
 export interface OwnedBusinessSummary { dispatchCount: number; afterLoadingCount: number; deliveringCount: number; deliveredCount: number }
 export interface OwnedBusinessPage<T> { records: T[]; page: number; size: number; total: number }
 export interface OwnedBusinessList extends OwnedBusinessPage<OwnedBusinessRow> { summary: OwnedBusinessSummary }
-export interface OwnedBusinessDetail { row: OwnedBusinessRow; dispatch: DispatchDetail; cargo: { sourceKey: string; customerId: string; customerName: string | null; orderNo: string | null; inboundCode: string | null; palletNo: string; destinationKey: string; packages: string }[]; photos: OwnedBusinessPhoto[] }
+export interface OwnedBusinessDetail { row: OwnedBusinessRow; dispatch: DispatchDetail; cargo: { sourceKey: string; customerId: string; customerName: string | null; orderNo: string | null; inboundCode: string | null; palletNo: string | null; destinationKey: string; destinationKeys?: string[]; packages: string | null }[]; photos: OwnedBusinessPhoto[] }
 export interface OwnedBusinessSave { recordVersion: string; idempotencyKey: string; operations: OwnedBusinessOperations; reason: string | null }
 export interface OwnedBusinessBind { recordVersion: string; idempotencyKey: string; fileId: string; replaceFileId?: string }
 export type OwnedBusinessAction = 'SAVE_OPERATIONS' | 'UPLOAD_PHOTO' | 'BIND_PHOTO'
@@ -2,6 +2,10 @@
 import '@/styles/adminWorkbench.css'
 import '@/styles/adminDensity.css'
 import { onBeforeUnmount, onMounted, ref, watch } from 'vue'
+import { useAccessPreviewStore } from '@/core/access/accessPreview'
+import LooseboardCargoDialog from '../components/LooseboardCargoDialog.vue'
+const access=useAccessPreviewStore(), cargoOpen=ref(false), cargoDispatchNo=ref('')
+function addCargo(row:DispatchCapacityDemand){cargoDispatchNo.value=row.dispatchNo;cargoOpen.value=true}
 import AdminPage from '@/shared/components/AdminPage.vue'
 import ListPageLayout from '@/shared/components/ListPageLayout.vue'
 import DataTable, { type DataTableColumn } from '@/shared/components/DataTable.vue'
@@ -16,6 +20,7 @@ const filters = ref<QueryModel>({ origin: '', destination: '' }), applied = ref(
 const fields: QueryField[] = [{ key: 'origin', label: '起运仓', type: 'input', placeholder: '起运仓名称', width: 190 }, { key: 'destination', label: '目的地', type: 'input', placeholder: '目的地名称', width: 190 }]
 const amount = (value: number | null | undefined) => value == null ? '—' : String(value)
 const columns: DataTableColumn[] = [
+  {key:'actions',label:'操作',width:120,fixed:'left',slotName:'actions'},
  { key: 'dispatchNo', label: '排车单号', minWidth: 200 },
  { key: 'capacityReason', label: '余位状态', minWidth: 220, formatter: (row: DispatchCapacityDemand) => row.capacityKnown ? '余位已确认' : row.capacityReason || '余位待确认', afterColumn: 'dispatchNo' }, { key: 'warehouseName', label: '起运仓', minWidth: 160 },
  { key: 'route', label: '路线', minWidth: 240, formatter: (row: DispatchCapacityDemand) => row.route || '—' },
@@ -39,8 +44,10 @@ function search() { applied.value = { ...filters.value }; if (page.value === 1)
 watch([page, size], load); onMounted(load); onBeforeUnmount(() => { sequence++ })
 </script>
 <template><AdminPage class="admin-density admin-workbench"><ListPageLayout aria-label="散板需求"><div class="workbench-table is-page-surface">
+  <LooseboardCargoDialog v-model="cargoOpen" :dispatch-no="cargoDispatchNo" @saved="load" />
  <DataTable appearance="integrated" preference-key="dispatch-capacity-demands" column-settings-mode="show" :results-visible="!error" v-model:page="page" v-model:page-size="size" :columns="columns" :data="rows" :total="total" :loading="loading" row-key="dispatchNo" empty-text="暂无已发布的散板需求">
    <template #toolbar-start><h1>散板需求</h1></template>
+    <template #actions="{row}"><el-button v-if="(access.can('platform:fleet:capacity-offer:cargo-add') || access.can('platform:fleet:capacity-offer:manage')) && access.can('platform:overseas-warehouse:dispatch:edit') && access.can('platform:overseas-warehouse:dispatch:list')" link type="primary" @click="addCargo(row as DispatchCapacityDemand)">添加货物</el-button><span v-else>—</span></template>
    <template #filters><QueryToolbar v-model="filters" :fields="fields" ariaLabel="散板需求查询" :loading="loading" @search="search" /></template>
    <template #notices><LoadErrorState v-if="error" title="散板需求读取失败" :message="error.message" @retry="load"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState></template>
    <template #pagination-left>共 {{ total }} 条散板需求</template>
@@ -23,7 +23,7 @@ const history = ref<OutsourcedBusinessHistory[]>([]), historyPage = ref(1), hist
 let generation = 0, historyGeneration = 0, active = true, initialActivation = true
 const previewUrls = new Set<string>()
 const historyRows = computed(() => history.value.map((event, index) => ({ ...event, eventKey: `${event.eventSource}:${event.recordVersion ?? event.dispatchRecordVersion ?? event.occurredAt}:${event.action}:${index}` })))
-const cargoColumns: DataTableColumn[] = [{ prop: 'customerName', label: '客户', minWidth: 150 }, { prop: 'orderNo', label: '订单号', minWidth: 220 }, { prop: 'inboundCode', label: '入仓码', minWidth: 180 }, { prop: 'palletNo', label: '实物托盘码', minWidth: 180 }, { key: 'destination', label: '目的地', minWidth: 180, slotName: 'destination' }, { prop: 'packages', label: '箱数', minWidth: 90 }]
+const cargoColumns: DataTableColumn[] = [{ prop: 'customerName', label: '客户', minWidth: 150 }, { prop: 'orderNo', label: '订单号', minWidth: 220 }, { prop: 'inboundCode', label: '入仓码', minWidth: 180 }, { prop: 'palletNo', label: '关联托盘码', minWidth: 180 }, { key: 'destination', label: '目的地', minWidth: 180, slotName: 'destination' }, { prop: 'packages', label: '箱数', minWidth: 90 }]
 const historyColumns: DataTableColumn[] = [{ key: 'source', label: '事件来源', minWidth: 110, slotName: 'source' }, { key: 'revision', label: '运营版本', minWidth: 90, prop: 'recordVersion' }, { prop: 'dispatchRecordVersion', label: '排车版本', minWidth: 90 }, { key: 'action', label: '操作', minWidth: 150, slotName: 'action' }, { prop: 'operatorName', label: '操作人', minWidth: 140 }, { key: 'occurredAt', label: '操作时间', minWidth: 180, slotName: 'occurredAt' }, { prop: 'reason', label: '说明', minWidth: 160 }, { key: 'snapshot', label: '当时运营信息', minWidth: 250, slotName: 'snapshot' }, { key: 'photos', label: '当时照片', minWidth: 190, slotName: 'photos' }]
 const taskFields = computed(() => {
  const row = detail.value?.row
@@ -68,7 +68,7 @@ onBeforeUnmount(() => { active = false; generation++; historyGeneration++; previ
    <template #actions><el-button v-if="detail && access.can(permission.outsourcedBusinessEdit)" class="density-action" :disabled="busy || !detail.row.actions.edit.allowed" @click="editorOpen = true">登记运营信息</el-button><el-button v-if="detail" class="density-action" :disabled="busy" @click="photosOpen = true">{{ access.can(permission.outsourcedBusinessUpload) && detail.row.actions.upload.allowed ? '上传照片' : '查看照片' }}</el-button></template>
    <template #state><LoadErrorState v-if="error" title="外配任务详情读取失败" :message="error.message" @retry="load"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState><p v-for="issue in detail?.row.sourceIssues || []" :key="issue">{{ issue }}</p></template>
    <template #task><dl v-if="detail" class="density-fields outsourced-business-fields"><div v-for="field in taskFields" :key="field[0]"><dt>{{ field[0] }}</dt><dd>{{ field[1] }}</dd></div></dl></template>
-    <template #route><template v-if="detail"><section v-for="destination in detail.row.destinations" :key="destination.destinationKey" class="outsourced-business-route"><h3>{{ destination.warehouseCode || destination.warehouseName || destination.address || '目的地资料缺失' }}</h3><p v-if="destination.address">{{ destination.address }}</p><p v-for="appointment in destination.appointments" :key="appointment.appointmentNo">预约号 {{ appointment.appointmentNo }} · 确认号 {{ text(appointment.confirmationNo) }} · 预约到达 {{ time(appointment.scheduledAt) }}</p><p>实际到达 {{ time(destination.actualArrivedAt) }}</p></section><div class="workbench-table"><DataTable :data="detail.cargo" :columns="cargoColumns" row-key="sourceKey" column-settings-mode="hide" empty-text="暂无真实货物明细"><template #destination="{ row }">{{ destinationLabel(row.destinationKey) }}</template></DataTable></div><section class="outsourced-business-route"><h3>原排车关联单据</h3><p>出库单：{{ detail.dispatch.documents.outbounds.map(item => item.outboundNo).join('、') || '—' }}</p><p>派送单：{{ detail.dispatch.documents.deliveries.map(item => item.deliveryNo).join('、') || '—' }}</p><el-button @click="photosOpen = true">查看分类照片</el-button></section></template></template>
+    <template #route><template v-if="detail"><section v-for="destination in detail.row.destinations" :key="destination.destinationKey" class="outsourced-business-route"><h3>{{ destination.warehouseCode || destination.warehouseName || destination.address || '目的地资料缺失' }}</h3><p v-if="destination.address">{{ destination.address }}</p><p v-for="appointment in destination.appointments" :key="appointment.appointmentNo">预约号 {{ appointment.appointmentNo }} · 确认号 {{ text(appointment.confirmationNo) }} · 预约到达 {{ time(appointment.scheduledAt) }}</p><p>实际到达 {{ time(destination.actualArrivedAt) }}</p></section><div class="workbench-table"><DataTable :data="detail.cargo" :columns="cargoColumns" row-key="sourceKey" column-settings-mode="hide" empty-text="暂无真实货物明细"><template #destination="{ row }">{{ (row.destinationKeys || [row.destinationKey]).map(destinationLabel).join('、') }}</template></DataTable></div><section class="outsourced-business-route"><h3>原排车关联单据</h3><p>出库单：{{ detail.dispatch.documents.outbounds.map(item => item.outboundNo).join('、') || '—' }}</p><p>派送单：{{ detail.dispatch.documents.deliveries.map(item => item.deliveryNo).join('、') || '—' }}</p><el-button @click="photosOpen = true">查看分类照片</el-button></section></template></template>
    <template #history><LoadErrorState v-if="historyError" title="操作记录读取失败" :message="historyError.message" @retry="loadHistory"><template #details><ApiErrorMeta :details="historyError" /></template></LoadErrorState><LoadErrorState v-if="previewError" title="历史照片读取失败" :message="previewError.message" :show-retry="false"><template #details><ApiErrorMeta :details="previewError" /></template></LoadErrorState><div class="workbench-table"><DataTable v-model:page="historyPage" v-model:page-size="historySize" :data="historyRows" :columns="historyColumns" :total="historyTotal" :loading="historyLoading" row-key="eventKey" empty-text="暂无操作记录"><template #source="{ row }">{{ row.eventSource === 'DISPATCH' ? '原排车' : '运营登记' }}</template><template #action="{ row }">{{ outsourcedBusinessActionLabels[row.action] || '其他操作' }}</template><template #occurredAt="{ row }">{{ time(row.occurredAt) }}</template><template #snapshot="{ row }"><template v-if="row.operations"><p>整车承运金额 {{ row.operations.money ? row.operations.money.currency + ' ' + row.operations.money.amount : '未登记' }}</p><div v-for="arrival in row.operations.arrivals" :key="arrival.destinationKey">{{ destinationLabel(arrival.destinationKey) }} · {{ time(arrival.actualArrivedAt) }}</div></template><span v-else>—</span></template><template #photos="{ row }"><el-button v-for="photo in row.photos" :key="photo.slot" link @click="preview(photo, row.recordVersion)">{{ photoLabel(photo) }}</el-button></template></DataTable></div></template>
  </OutsourcedBusinessDetailLayout>
  <OutsourcedBusinessOperationsEditor v-model="editorOpen" :detail="detail" @busy="busy = $event" @saved="saved" />
@@ -30,6 +30,19 @@ beforeEach(() => {
 })

 describe('outsourced business views', () => {
+  it('shows the complete destination set on a grouped looseboard order', async () => {
+    const detail = outsourcedBusinessFixture()
+    detail.row.destinations.push({ ...detail.row.destinations[0]!, destinationKey: 'destination-2', warehouseCode: 'FBA-2' })
+    detail.cargo = [{ ...detail.cargo[0]!, orderNo: 'LB-1', palletNo: 'PAL-1、PAL-2', destinationKeys: ['destination-1', 'destination-2'], packages: '9' }]
+    calls.detail.mockResolvedValue(detail)
+    const wrapper = mount(OutsourcedBusinessDetailView, { global }); await flushPromises()
+    wrapper.findComponent(Tabs).vm.$emit('update:modelValue', 'route'); await flushPromises()
+    const table = wrapper.findAllComponents(Table).find(component => component.props('columns').some((column: { prop?: string }) => column.prop === 'orderNo'))!
+    expect(table.props('data')).toHaveLength(1)
+    expect(table.props('data')[0]).toMatchObject({ orderNo: 'LB-1', palletNo: 'PAL-1、PAL-2', packages: '9' })
+    expect(table.text()).toContain('FBA-1、FBA-2')
+    wrapper.unmount()
+  })
  it('keeps an owned vehicle with pooled cargo in the outsourced task list', async () => {
    const detail = outsourcedBusinessFixture()
    detail.row.vehicle.ownership = 'OWNED'
@@ -23,7 +23,7 @@ const history = ref<OwnedBusinessHistory[]>([]), historyPage = ref(1), historySi
 let generation = 0, historyGeneration = 0, active = true, initialActivation = true
 const previewUrls = new Set<string>()
 const historyRows = computed(() => history.value.map((event, index) => ({ ...event, eventKey: `${event.eventSource}:${event.recordVersion ?? event.dispatchRecordVersion ?? event.occurredAt}:${event.action}:${index}` })))
-const cargoColumns: DataTableColumn[] = [{ prop: 'customerName', label: '客户', minWidth: 150 }, { prop: 'orderNo', label: '订单号', minWidth: 220 }, { prop: 'inboundCode', label: '入仓码', minWidth: 180 }, { prop: 'palletNo', label: '实物托盘码', minWidth: 180 }, { key: 'destination', label: '目的地', minWidth: 180, slotName: 'destination' }, { prop: 'packages', label: '箱数', minWidth: 90 }]
+const cargoColumns: DataTableColumn[] = [{ prop: 'customerName', label: '客户', minWidth: 150 }, { prop: 'orderNo', label: '订单号', minWidth: 220 }, { prop: 'inboundCode', label: '入仓码', minWidth: 180 }, { prop: 'palletNo', label: '关联托盘码', minWidth: 180 }, { key: 'destination', label: '目的地', minWidth: 180, slotName: 'destination' }, { prop: 'packages', label: '箱数', minWidth: 90 }]
 const historyColumns: DataTableColumn[] = [{ key: 'source', label: '事件来源', minWidth: 110, slotName: 'source' }, { key: 'revision', label: '运营版本', minWidth: 90, prop: 'recordVersion' }, { prop: 'dispatchRecordVersion', label: '排车版本', minWidth: 90 }, { key: 'action', label: '操作', minWidth: 150, slotName: 'action' }, { prop: 'operatorName', label: '操作人', minWidth: 140 }, { key: 'occurredAt', label: '操作时间', minWidth: 180, slotName: 'occurredAt' }, { prop: 'reason', label: '说明', minWidth: 160 }, { key: 'snapshot', label: '当时运营信息', minWidth: 250, slotName: 'snapshot' }, { key: 'photos', label: '当时照片', minWidth: 190, slotName: 'photos' }]
 const taskFields = computed(() => {
  const row = detail.value?.row
@@ -68,7 +68,7 @@ onBeforeUnmount(() => { active = false; generation++; historyGeneration++; previ
    <template #actions><el-button v-if="detail && access.can(permission.ownedBusinessEdit)" class="density-action" :disabled="busy || !detail.row.actions.edit.allowed" @click="editorOpen = true">登记运营信息</el-button><el-button v-if="detail" class="density-action" :disabled="busy" @click="photosOpen = true">{{ access.can(permission.ownedBusinessUpload) && detail.row.actions.upload.allowed ? '上传照片' : '查看照片' }}</el-button></template>
    <template #state><LoadErrorState v-if="error" title="自有业务详情读取失败" :message="error.message" @retry="load"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState><p v-for="issue in detail?.row.sourceIssues || []" :key="issue">{{ issue }}</p></template>
    <template #task><dl v-if="detail" class="density-fields owned-business-fields"><div v-for="field in taskFields" :key="field[0]"><dt>{{ field[0] }}</dt><dd>{{ field[1] }}</dd></div></dl></template>
-    <template #route><template v-if="detail"><section v-for="destination in detail.row.destinations" :key="destination.destinationKey" class="owned-business-route"><h3>{{ destination.warehouseCode || destination.warehouseName || destination.address || '目的地资料缺失' }}</h3><p v-if="destination.address">{{ destination.address }}</p><p v-for="appointment in destination.appointments" :key="appointment.appointmentNo">预约号 {{ appointment.appointmentNo }} · 确认号 {{ text(appointment.confirmationNo) }} · 预约到达 {{ time(appointment.scheduledAt) }}</p><p>实际到达 {{ time(destination.actualArrivedAt) }}</p></section><div class="workbench-table"><DataTable :data="detail.cargo" :columns="cargoColumns" row-key="sourceKey" column-settings-mode="hide" empty-text="暂无真实货物明细"><template #destination="{ row }">{{ destinationLabel(row.destinationKey) }}</template></DataTable></div><section class="owned-business-route"><h3>原排车关联单据</h3><p>出库单：{{ detail.dispatch.documents.outbounds.map(item => item.outboundNo).join('、') || '—' }}</p><p>派送单：{{ detail.dispatch.documents.deliveries.map(item => item.deliveryNo).join('、') || '—' }}</p><el-button @click="photosOpen = true">查看分类照片</el-button></section></template></template>
+    <template #route><template v-if="detail"><section v-for="destination in detail.row.destinations" :key="destination.destinationKey" class="owned-business-route"><h3>{{ destination.warehouseCode || destination.warehouseName || destination.address || '目的地资料缺失' }}</h3><p v-if="destination.address">{{ destination.address }}</p><p v-for="appointment in destination.appointments" :key="appointment.appointmentNo">预约号 {{ appointment.appointmentNo }} · 确认号 {{ text(appointment.confirmationNo) }} · 预约到达 {{ time(appointment.scheduledAt) }}</p><p>实际到达 {{ time(destination.actualArrivedAt) }}</p></section><div class="workbench-table"><DataTable :data="detail.cargo" :columns="cargoColumns" row-key="sourceKey" column-settings-mode="hide" empty-text="暂无真实货物明细"><template #destination="{ row }">{{ (row.destinationKeys || [row.destinationKey]).map(destinationLabel).join('、') }}</template></DataTable></div><section class="owned-business-route"><h3>原排车关联单据</h3><p>出库单：{{ detail.dispatch.documents.outbounds.map(item => item.outboundNo).join('、') || '—' }}</p><p>派送单：{{ detail.dispatch.documents.deliveries.map(item => item.deliveryNo).join('、') || '—' }}</p><el-button @click="photosOpen = true">查看分类照片</el-button></section></template></template>
    <template #history><LoadErrorState v-if="historyError" title="操作记录读取失败" :message="historyError.message" @retry="loadHistory"><template #details><ApiErrorMeta :details="historyError" /></template></LoadErrorState><LoadErrorState v-if="previewError" title="历史照片读取失败" :message="previewError.message" :show-retry="false"><template #details><ApiErrorMeta :details="previewError" /></template></LoadErrorState><div class="workbench-table"><DataTable v-model:page="historyPage" v-model:page-size="historySize" :data="historyRows" :columns="historyColumns" :total="historyTotal" :loading="historyLoading" row-key="eventKey" empty-text="暂无操作记录"><template #source="{ row }">{{ row.eventSource === 'DISPATCH' ? '原排车' : '运营登记' }}</template><template #action="{ row }">{{ ownedBusinessActionLabels[row.action] || '其他操作' }}</template><template #occurredAt="{ row }">{{ time(row.occurredAt) }}</template><template #snapshot="{ row }"><template v-if="row.operations"><p>整车金额 {{ row.operations.money ? row.operations.money.currency + ' ' + row.operations.money.amount : '未登记' }}</p><p>里程 {{ row.operations.actualDistanceMiles ?? '未登记' }} mile · 油耗 {{ row.operations.fuelConsumptionLitresPer100Km ?? '未登记' }} L/100km</p><div v-for="arrival in row.operations.arrivals" :key="arrival.destinationKey">{{ destinationLabel(arrival.destinationKey) }} · {{ time(arrival.actualArrivedAt) }}</div></template><span v-else>—</span></template><template #photos="{ row }"><el-button v-for="photo in row.photos" :key="photo.slot" link @click="preview(photo, row.recordVersion)">{{ photoLabel(photo) }}</el-button></template></DataTable></div></template>
  </OwnedBusinessDetailLayout>
  <OwnedBusinessOperationsEditor v-model="editorOpen" :detail="detail" @busy="busy = $event" @saved="saved" />
@@ -30,6 +30,19 @@ beforeEach(() => {
 })

 describe('owned business views', () => {
+  it('shows one looseboard order with all associated destinations and pallets', async () => {
+    const detail = ownedBusinessFixture()
+    detail.row.destinations.push({ ...detail.row.destinations[0]!, destinationKey: 'destination-2', warehouseCode: 'FBA-2' })
+    detail.cargo = [{ ...detail.cargo[0]!, orderNo: 'LB-1', palletNo: 'PAL-1、PAL-2', destinationKeys: ['destination-1', 'destination-2'], packages: '9' }]
+    calls.detail.mockResolvedValue(detail)
+    const wrapper = mount(OwnedBusinessDetailView, { global }); await flushPromises()
+    wrapper.findComponent(Tabs).vm.$emit('update:modelValue', 'route'); await flushPromises()
+    const table = wrapper.findAllComponents(Table).find(component => component.props('columns').some((column: { prop?: string }) => column.prop === 'orderNo'))!
+    expect(table.props('data')).toHaveLength(1)
+    expect(table.props('data')[0]).toMatchObject({ orderNo: 'LB-1', palletNo: 'PAL-1、PAL-2', packages: '9' })
+    expect(table.text()).toContain('FBA-1、FBA-2')
+    wrapper.unmount()
+  })
  it('keeps split prices authoritative and arrival times associated with each destination', async () => {
    const detail = ownedBusinessFixture()
    detail.row.operations.money = { currency: 'USD', amount: '0.00' }; detail.row.unitPrice = '0.00'
@@ -1,6 +1,7 @@
 export const overseasMasterDataPermissions = {
  capacityOfferList: 'platform:fleet:capacity-offer:list',
  capacityOfferManage: 'platform:fleet:capacity-offer:manage',
+  capacityCargoAdd: 'platform:fleet:capacity-offer:cargo-add',
  capacityInquiryCreate: 'platform:fleet:capacity-offer:inquiry-create',
  capacityInquiryEdit: 'platform:fleet:capacity-offer:inquiry-edit',
  capacityInquiryCancel: 'platform:fleet:capacity-offer:inquiry-cancel',
@@ -62,4 +63,3 @@ export const overseasMasterDataPermissions = {
  vehicleRecordUpload: 'platform:overseas-master-data:vehicle:record-upload',
  vehicleRecordFinanceSubmit: 'platform:overseas-master-data:vehicle:record-finance-submit',
 } as const
-
@@ -25,8 +25,10 @@
 | 仓储转运审核、审核通过 | `pages/LastMileOrdersView.vue`、`components/WarehouseTransferReviewDialog.vue` | `permissions.ts` 的 `warehouseTransferApprove`；仅 `WAREHOUSE_TRANSFER + PENDING_REVIEW` 行开放。当前弹框仅提交 `APPROVE`，携带该行客户和转运单号；无驳回按钮 |
 | 转运驳回、REJECT 接口能力 | `api/warehouseTransfers.ts` 的 `reviewWarehouseTransfer` | API 支持 `APPROVE/REJECT` 与 `remark`；不据此推定当前弹框提供驳回操作，界面能力沿上一行组件核对 |
 | 尾程订单控制与柜级入仓计划转换 | `pages/LastMileOrdersView.vue`、`pages/LastMileOrderDetailView.vue` | `api/lastMileOrders.ts`；[入仓计划页面约束](../../../../../docs/业务实现边界.md#admin-入仓计划页面约束)，仅计划/状态/请求行为变化时查 |
-| 入仓单、入仓计划、FBA 预约 | `pages/InboundOrdersView.vue`、`pages/InboundOrderDetailView.vue` | 列表/预约 `api/inboundOrders.ts`，计划列表/详情 `api/inboundPlans.ts`；Backend `lastleg-service/inboundplan/` |
+| 入仓单、私人地址计划与 FBA 预约 | `pages/InboundOrdersView.vue`、`pages/InboundOrderDetailView.vue` | 列表/预约 `api/inboundOrders.ts`，计划列表/详情 `api/inboundPlans.ts`；Backend `lastleg-service/inboundplan/` |
 | 排车查询、整车草稿、审核与装车资料 | `pages/DispatchesView.vue`、`pages/DispatchDetailView.vue`、`components/SmartDispatchDialog.vue`、`components/DispatchWorkflowDialog.vue` | `api/dispatches.ts`、`dispatchContracts.ts`、`dispatchCommandRecovery.ts`；Backend `lastleg-service/dispatch/`、`delivery/`。一单一趟、同仓多客户多目的地，空单或先选货均可；候选使用来源版本，草稿走服务器token及公共版本，全部容器原子转换。当前规则见`../../../../../docs/海外仓业务/排车列表统一作业改造契约.md`，不恢复旧单客户预排协议 |
+| 散板提货/派送执行与取证 | `components/DispatchDocumentsDialog.vue` → `DispatchLooseboardExecution.vue` | `api/dispatchLooseboardExecution.ts`；Backend `dispatch/controller/DispatchLooseboardExecutionController.java`，区别于客户散板下单 |
+| 派送异常回仓、退回货物与实收入库 | `components/DispatchReturnCargo.vue`、`pages/ExceptionOrdersView.vue` | 候选 `api/dispatches.ts`，退回建单 `api/exceptionOrders.ts` 的 `generateExceptionReturn`；PDA 实收查 `ExceptionReturnWork.vue` 与 Lastleg 异常回仓契约 |
 | 海外出库与派送 | `pages/OutboundsView.vue`、`pages/OutboundDetailView.vue`、`pages/DeliveryOrdersView.vue`、`pages/DeliveryOrderDetailView.vue` | `api/outbounds.ts`、`api/deliveryOrders.ts`；[出库与派送页面约束](../../../../../docs/业务实现边界.md#admin-出库与派送页面约束)，候选选择另查下表 |
 | 异常退回与客户回访 | `pages/ExceptionOrdersView.vue`、`pages/CustomerVisitsView.vue` | `api/exceptionOrders.ts`、`api/customerVisits.ts`；异常关系解析、异常建档、派送退回、完成/状态和回访附件对应 Backend `lastleg-service/exceptionorder/`、`customervisit/` |
 | 库存余额、库位与流水 | `pages/InventoryView.vue`、`pages/InventoryDetailView.vue`、`pages/InventoryTransactionsView.vue` | `api/inventory.ts`；业务库存归 `lastleg-service/inventory/`，实物资源归 `warehouse-overseas-service/` |
@@ -41,7 +43,7 @@
 - 托盘标签从 `pages/PalletsView.vue` → `api/pallets.ts` 的 `getPalletLabelPdf` 下载服务端 PDF，传该行仓库与托盘 ID，复用列表权限；不在前端生成标签或维护模板、尺寸、编码。模板/接口变化才查 [Print 指引](../../../../../baiyue-firstleg/print/AGENTS.md)的托盘入口及[标签维护](../../../../../docs/打印标签维护/README.md)，纯按钮文案不追加打印资料。

 - API 为 `api/dispatches.ts`、`api/outbounds.ts`、`api/deliveryOrders.ts`；Backend `lastleg-service/dispatch/`、`delivery/`、`dropship/`。一件代发独立出库，从服务端库存位置选择并携带幂等键；换标只有平台卡车进入排车，普通自提、亚马逊自提、客户自提及快递由客户确认直接创建出库任务。出库/派送建单时机按[排车现行契约](../../../../../docs/海外仓业务/排车列表统一作业改造契约.md)执行；每客户一张出库单，每客户每目的地一张派送单，公开完整数组，不能回退为单个outboundNo或按客户拆排车头。
- API 为 `api/exceptionOrders.ts`、`api/customerVisits.ts`；Backend `lastleg-service/exceptionorder/`、`customervisit/`。异常处理只消费服务端 `allowedActions/version`；完成时至少上传一份异常证据。派送退回先从服务端原出库拣货事实选择入仓单和可退箱数，不允许自由填写 SKU/数量；退回海外仓时必须选择服务端校验的目标托盘和库位，库存恢复、异常完成与派送 `RETURNED` 由服务端原子推进。回访附件和派送完成/状态均走海外真实 API
+- 异常回仓先从原出库事实选择可退货物，由平台生成关联异常的退回尾程单/计划；建单不恢复库存。PDA 经异常回仓任务分批实收并恢复原来源库存，不走普通接柜或客户退货预报链。版本、证据、目标资源及完成状态以工作区 `baiyue-firstleg/lastleg-service/src/main/resources/openapi/exception-return-inbound-v1.yaml` 为准；回访仍走 `api/customerVisits.ts`。

 ## 作业细则按需入口

@@ -476,3 +476,13 @@


 2026-10-29 用户截图调整：排车列表查看路线更名查看轨迹。已完成本土卡车详情补充货物数量卡片、起讫地址与联系人、司机/车辆及证照照片、实际发车和完成时间。维护车辆/司机候选排除其他车次实际占用，当前车次已选资源允许保留。尾程查询占位提示字体12px。自动检查与人工视觉验收分别记录；待人工1920×1080、100%截图确认。
+
+## 2026-11-05 PDA拆柜收货与维护车辆问题修复
+
+| 页面／问题 | 修复 | 验收 |
+|---|---|---|
+| PDA拆柜收货按钮重叠 | 底部操作区改为随内容正常排列，解析、校验、保存及结束按钮全部保留；照片上传后返回页面不再清理同一签收会话的未签收草稿。 | PDA定向35项通过，App资源构建通过；真实设备截图待确认 |
+| 维护车辆字段与附件 | 移除不可维护的发车时间及主档拖车公司展示；保留可编辑的外配拖车公司字段；预约号回显已登记编号；驾驶证展示优先本趟上传文件，避免保存后重复主档或空白图。 | Admin定向67项通过，修改文件Scoped TypeScript检查通过；真实页面截图待确认 |
+| 后端预约号 | 已登记预约号可回显，只有有效收货确认提供确认时间。 | Lastleg定向8项通过；未部署 |
+
+本轮修改未部署到测试或生产环境；需在真实PDA和Admin页面进行人工截图及业务数据验收。
@@ -2,7 +2,7 @@ import { http, unwrapApiResponse, type ApiEnvelope } from '@/shared/api/http'
 import { normalizeOverseasPage, type OverseasPagePayload } from './lastMileOrders'

 export interface CargoDiscardQuery { page: number; size: number; customerId?: string; discardNo?: string; inboundCode?: string; overseasWarehouseId?: string; status?: string }
-export interface CargoDiscardSummary { skuCodes?: string[]; skuCount?: number; requestedPackages?: number; actualPackages?: number | null; id: string; customerId?: string | null; discardNo: string; outboundNo?: string | null; inboundCodes?: string | null; overseasWarehouseId?: string | null; overseasWarehouseName?: string | null; totalPackages?: number | null; totalFee?: number | string | null; currency?: string | null; status?: string | null; createdBy?: string | null; createdAt?: string | null; reviewedAt?: string | null }
+export interface CargoDiscardSummary { skuCodes?: string[]; skuCount?: number; requestedPackages?: number; actualPackages?: number | null; id: string; customerId?: string | null; discardNo: string; outboundNo?: string | null; inboundCodes?: string | null; overseasWarehouseId?: string | null; overseasWarehouseName?: string | null; totalPackages?: number | null; totalFee?: number | string | null; currency?: string | null; status?: string | null; createdBy?: string | null; createdByName?: string | null; createdAt?: string | null; reviewedAt?: string | null }
 export interface CargoDiscardItem { actualCartonMarks?: string[]; palletNo?: string | null; quantityUnit?: string | null; actualDiscardPackages?: number | null; pdaStatus?: string | null; cartonMarks?: string[]; id: string; orderId?: string | null; inboundCode?: string | null; skuCode?: string | null; productName?: string | null; availablePackagesSnapshot?: number | null; discardPackages?: number | null }
 export interface CargoDiscardStatistics { orderCount: number; skuCount: number; requestedPackages: number; actualPackages: number | null; requestedPieces: number | null; actualPieces: number | null; palletCount: number | null }
 export async function getCargoDiscardStatistics(query: CargoDiscardQuery) {
@@ -0,0 +1,26 @@
+import { http, unwrapApiResponse, type ApiEnvelope } from '@/shared/api/http'
+
+export type LooseboardPhotoPhase = 'PICKUP' | 'ARRIVAL'
+export interface LooseboardPhoto { fileId: string; fileName: string; contentType: string; sizeBytes: string | number }
+export interface LooseboardExecutionItem { itemId: string; customerId: string; orderNo: string; destination: string | null; packages: number; pickupPhotos: LooseboardPhoto[]; arrivalPhotos: LooseboardPhoto[]; canPickup: boolean; canArrive: boolean; warehouseNotice?: string | null; pickupRequired?: boolean }
+export interface LooseboardExecution { dispatchNo: string; recordVersion: string | number; stage: string; direct: boolean; items: LooseboardExecutionItem[]; canCompletePickup?: boolean; pickupCompleted?: boolean }
+const path = (number: string) => `/platform/v1/last-leg/dispatches/${encodeURIComponent(number)}/looseboard-execution`
+const itemPath = (number: string, item: string, phase: LooseboardPhotoPhase) => `${path(number)}/${encodeURIComponent(item)}/${phase}`
+export async function getLooseboardExecution(number: string) {
+  return unwrapApiResponse(await http.get<ApiEnvelope<LooseboardExecution>, ApiEnvelope<LooseboardExecution>>(path(number)))
+}
+export async function completeLooseboardPickup(number: string, body: { recordVersion: string | number; idempotencyKey: string }) {
+  return unwrapApiResponse(await http.post<ApiEnvelope<LooseboardExecution>, ApiEnvelope<LooseboardExecution>>(`${path(number)}/pickup-complete`, body))
+}
+export async function uploadLooseboardPhoto(number: string, item: string, phase: LooseboardPhotoPhase, file: File) {
+  const body = new FormData(); body.append('file', file)
+  return unwrapApiResponse(await http.post<ApiEnvelope<LooseboardPhoto>, ApiEnvelope<LooseboardPhoto>>(`${itemPath(number, item, phase)}/uploads`, body))
+}
+export async function saveLooseboardPhotos(number: string, item: string, phase: LooseboardPhotoPhase, body: { recordVersion: string | number; idempotencyKey: string; fileIds: string[] }) {
+  return unwrapApiResponse(await http.put<ApiEnvelope<LooseboardExecution>, ApiEnvelope<LooseboardExecution>>(itemPath(number, item, phase), body))
+}
+export async function readLooseboardPhoto(number: string, item: string, phase: LooseboardPhotoPhase, photo: LooseboardPhoto) {
+  const blob = await http.get<Blob, Blob>(`${itemPath(number, item, phase)}/files/${encodeURIComponent(photo.fileId)}/content`, { responseType: 'blob' })
+  if (!(blob instanceof Blob) || !['image/jpeg', 'image/png'].includes(blob.type) || blob.type !== photo.contentType || !blob.size) throw new Error('散板照片读取失败')
+  return blob
+}
@@ -17,6 +17,11 @@ export async function listDispatches(query: DispatchQuery) {
  return normalizeDispatchPage(unwrapApiResponse(await http.get<ApiEnvelope<DispatchPageWire>, ApiEnvelope<DispatchPageWire>>(base, { params: query })))
 }
 export const getDispatch = (dispatchNo: string) => get<DispatchDetailWire>(path(dispatchNo)).then(normalizeDispatchDetail)
+/** 散板余位页只选择已实收打托且与本车同仓的散板来源。 */
+export async function listLooseboardCargo(no: string, page = 1, size = 20) {
+  return normalizeCandidateList(unwrapApiResponse(await http.get<ApiEnvelope<CandidateListWire>, ApiEnvelope<CandidateListWire>>(`${base}/capacity-demands/${encodeURIComponent(no)}/cargo`, { params: { page, size } })))
+}
+export const addLooseboardCargo = (no: string, body: AddCargo) => { versioned(body); requireBatchVersions(body.batchAllocations); return postCommand(`${base}/capacity-demands/${encodeURIComponent(no)}/cargo`, body) }
 export const getDispatchItems = (no: string) => get<DispatchItemsWire>(`${path(no)}/items`).then(normalizeDispatchItems)
 export async function getDispatchAppointmentAllocations(no: string) {
  const value = await get<AppointmentAllocations>(`${path(no)}/appointment-allocations`)
@@ -74,3 +79,6 @@ export const convertDispatchDraft = (body: ConvertDraft) => { versioned(body); r
 export interface BatchDispatchCandidate { planPalletId: string; palletNo: string; planId: string; planNo: string; customerId: string; sourceStage: string; packageCount: number | null; allocations: DispatchBatchAllocation[]; blockReasons: string[] }
 export interface BatchDispatchCandidates { batchKey: string; version: number; candidates: BatchDispatchCandidate[]; blockReasons: string[] }
 export const getBatchDispatchCandidates = (key: string) => get<BatchDispatchCandidates>(`/platform/v1/last-leg/appointment-planning/batches/${encodeURIComponent(key)}/dispatch-candidates`).then(value => { requireBatchVersions(value.candidates.flatMap(row => row.allocations)); return value })
+
+/** 退回货物仅使用当前排车服务端给出的原出库候选。 */
+export const getDispatchReturnOptions = (no: string) => get<import('../dispatchContracts').DispatchReturnCandidate[]>(  `${path(no)}/exception-return-options`)
@@ -1,10 +1,16 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { http } from '@/shared/api/http'
-import { createExceptionOrder, listExceptionOrders, resolveExceptionRelation, getExceptionDetail, commandException, uploadExceptionEvidence, normalizeExceptionDetail, type ExceptionDetail } from './exceptionOrders'
+import { generateExceptionReturn, createExceptionOrder, listExceptionOrders, resolveExceptionRelation, getExceptionDetail, commandException, uploadExceptionEvidence, normalizeExceptionDetail, type ExceptionDetail } from './exceptionOrders'

 vi.mock('@/shared/api/http', async (importOriginal) => ({ ...(await importOriginal<typeof import('@/shared/api/http')>()), http: { get: vi.fn(), post: vi.fn() } }))

 describe('exception order API', () => {
+  it('generates the return order through the dedicated endpoint without evidence or receipt data', async () => {
+    vi.mocked(http.post).mockResolvedValue({ code: '200', data: { orderNo: 'WC-RETURN-1' } })
+    expect(await generateExceptionReturn('100', 'EX/1', 7)).toEqual({ orderNo: 'WC-RETURN-1' })
+    expect(http.post).toHaveBeenCalledExactlyOnceWith('/platform/v1/last-leg/exception-orders/EX%2F1/generate-return-inbound',
+      { expectedVersion: 7, idempotencyKey: expect.any(String) }, { params: { customerId: '100' } })
+  })
  it('normalizes native carton sources and rejects missing, ambiguous or unsafe source identities', () => {
    const raw = { order: { version: '1' }, returnSources: [{ outboundPalletItemId: '9007199254740995', inventoryPositionId: null, returnCartonId: '9007199254740997', cartonMark: 'RTN-1', maxReturnPackages: '1' }], returnReceipts: [] } as unknown as ExceptionDetail
    expect(normalizeExceptionDetail(raw).returnSources[0]).toMatchObject({ inventoryPositionId: null, returnCartonId: '9007199254740997', cartonMark: 'RTN-1', maxReturnPackages: 1 })
@@ -33,7 +39,7 @@ describe('exception order API', () => {
    await getExceptionDetail('100', 'EX/1')
    expect(http.get).toHaveBeenCalledWith('/platform/v1/last-leg/exception-orders/EX%2F1', { params: { customerId: '100' } })
    vi.mocked(http.post).mockResolvedValue({ code: '200', data: { exceptionNo: 'EX/1', version: '8', restoredPackages: '0' } })
-    for (const action of ['start-processing', 'cancel', 'complete'] as const) {
+    for (const action of ['start-processing', 'cancel', 'complete', 'force-close'] as const) {
      const body = { expectedVersion: 7, idempotencyKey: `original-${action}` }
      await commandException('100', 'EX/1', action, body)
      expect(http.post).toHaveBeenLastCalledWith(`/platform/v1/last-leg/exception-orders/EX%2F1/${action}`, body, { params: { customerId: '100' } })
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
ouyangxq	c78fbd2d45	fix(pda): display latest APK download QR codes for both apps	2026-11-06 14:42:21 +08:00
ouyangxq	d761bff871	release: merge latest TEST admin and align receiving fixtures	2026-11-06 14:04:39 +08:00
liuyihe	e10e079565	优化	2026-11-06 13:33:14 +08:00
ouyangxq	110d52fd5b	fix(ci): bound Docker image build resources	2026-11-06 12:52:05 +08:00
admin	bd76c977e0	Merge pull request '灰度晋级：发布 TEST 已部署的管理后台（2026-11-06）' (#31 ) from release/aliyun-gray-20261106 into main	2026-11-06 12:08:54 +08:00
liuyihe	f5f62af4a7	优化	2026-11-06 10:42:39 +08:00
liuyihe	8d80074266	优化	2026-11-05 17:46:01 +08:00
ouyangxq	40095a749b	Merge remote-tracking branch 'origin/release/test' into release/test # Conflicts: # src/modules/overseas-warehouse/components/DispatchWorkflowDialog.layout.test.ts	2026-11-05 16:30:48 +08:00
ouyangxq	a1721371e4	fix: preserve required inputs and refine operations screens	2026-11-05 16:30:28 +08:00
liuyihe	d075ac7e03	Merge branch 'release/test' of http://8.163.30.128:10082/html/admin-web into release/test	2026-11-05 16:03:06 +08:00
liuyihe	525392963c	优化	2026-11-05 16:03:04 +08:00
ouyangxq	2d1bb38ad5	fix(inbounds): restore approved measurement workspace	2026-11-05 14:21:32 +08:00
liuyihe	b5f9537e21	Merge branch 'release/test' of http://8.163.30.128:10082/html/admin-web into release/test	2026-11-04 19:27:18 +08:00
liuyihe	f54d3ae8a5	优化	2026-11-04 19:27:16 +08:00
ouyangxq	1150f245be	优化	2026-11-04 18:08:28 +08:00
ouyangxq	c17d355a69	明确私人地址人工报价及预装前置提示	2026-11-04 14:47:39 +08:00
liuyihe	00169b9d7d	Merge branch 'release/test' of http://8.163.30.128:10082/html/admin-web into release/test	2026-11-04 14:39:23 +08:00
liuyihe	73dc7311d3	优化	2026-11-04 14:39:22 +08:00
ouyangxq	20bde6c72d	支持私人地址人工报价及海外入库托盘打印和短少确认	2026-11-04 14:11:26 +08:00
liuyihe	84dd9dcbb4	优化	2026-11-04 10:39:15 +08:00
ouyangxq	01d0a81603	优化	2026-11-03 17:15:03 +08:00
liuyihe	1afc7034cd	优化	2026-11-03 16:15:24 +08:00
liuyihe	604e7fb2e1	优化	2026-11-03 14:23:49 +08:00
liuyihe	1c2dd8797a	优化	2026-11-03 11:43:50 +08:00
liuyihe	f8408b8076	优化	2026-11-02 17:15:37 +08:00
ouyangxq	7704532e8f	修复财务页面竞态并整理采购与运输展示	2026-10-30 18:50:53 +08:00
liuyihe	19a618c9d2	优化	2026-10-30 18:47:19 +08:00
liuyihe	51d0877a45	优化	2026-10-30 18:15:26 +08:00
liuyihe	09a766c2c8	Merge origin/release/test and reconcile overseas business tests	2026-10-30 18:03:35 +08:00
liuyihe	bef074097a	优化	2026-10-30 17:59:39 +08:00