Sync optional CDN base configuration from GitHub dev [skip ci]

Reviewed-on: #11

.dockerignore

@@ -3,6 +3,8 @@
 dist
 node_modules
 node_modules.broken-by-path
-.env.local
+.env
+.env.*
+!.env.example
 npm-debug.log*
 pnpm-debug.log*

.env.example

@@ -1,13 +1,13 @@
 VITE_API_BASE_URL=/api
-# 按本机联调环境填写国内 Gateway origin，不提交真实环境地址。
+# 按本机联调环境填写统一 Gateway origin，不提交真实环境地址。
 API_PROXY_TARGET=http://localhost:9000
-# 可选：本地分别直连 Auth、IAM、Warehouse；未设置时复用 API_PROXY_TARGET。
-# AUTH_API_PROXY_TARGET=http://localhost:9001
-# IAM_API_PROXY_TARGET=http://localhost:9002
-# WAREHOUSE_API_PROXY_TARGET=http://localhost:9003
-# 海外业务浏览器请求使用独立代理，代理会将 /overseas-api 重写为海外 Gateway 的 /api。
-VITE_OVERSEAS_API_BASE_URL=/overseas-api
-# 按本机联调环境填写海外 Gateway origin，不提交真实环境地址。
-OVERSEAS_API_PROXY_TARGET=http://localhost:9300
 # Local Vite fallback. Container deployments should use CLIENT_WEB_URL instead.
 VITE_CLIENT_WEB_URL=http://localhost:5174
+
+# Test container deployment (Jenkins environment or untracked .env).
+# API_UPSTREAM: unified Gateway origin, no /api suffix.
+# TEST_NETWORK: shared test Docker network.
+API_UPSTREAM=http://gateway:9000
+TEST_NETWORK=firstleg-test-network
+IMAGE_TAG=
+CLIENT_WEB_URL=

AGENTS.md

@@ -3,10 +3,12 @@
 ## 快速读取顺序
 
 1. 用“模块快速路由”选择最小业务模块，进入后读取该目录最近的 `AGENTS.md`；按 `routes.ts → pages/ → api/types/stores/composables` 下钻，不先扫描全部 `src/`。
-2. 页面、布局或交互任务同时读取 `../../docs/Admin-Client前端原型还原验收规则.md` 和后台原型 `../../docs/悦/货代SAAS平台后台/AGENTS.md`。
+2. 视觉还原、布局/交互承载方式变更或真实页面验收时读取 `../../docs/Admin-Client前端原型还原验收规则.md`；需要原型依据才读取 `../../docs/悦/货代SAAS平台后台/AGENTS.md` 并定位目标片段。纯文案、逻辑或单元测试任务不自动读取。
    Admin 样式优化还须读取 `../../docs/Admin高密度界面规范.md` 的“样式维护边界”和“新模块接入规则”；以已确认密度与彩色页签为视觉基线，逐操作保留业务语义和承载方式。国内仓、客户管理是样板；新增菜单按本轮范围显式接入，货柜管理入口见 `../../docs/Admin货柜管理样式核对记录.md`。
 3. 标准列表或公共组件任务读取 `src/shared/components/AGENTS.md`；国内/海外 HTTP、Token 或刷新任务读取 `src/shared/api/AGENTS.md`；Finance 任务读取 `src/modules/finance/AGENTS.md`；海外仓全流程任务先读 `../../docs/海外仓业务/README.md`。
-4. 平台/客户层级与权限公共语义读取 `../../docs/平台客户层级与权限契约.md`；双区域 API、海外 Token 和跨区事件读取 `../../docs/跨区域认证与服务通信契约.md`。
+4. 平台/客户层级与权限公共语义读取 `../../docs/平台客户层级与权限契约.md`；统一 API、Token、会话撤销或可靠事件任务按需读取 `../../docs/统一认证与服务通信契约.md` 对应章节。
+
+普通单端任务的最小读取集是本文件、目标模块最近的 `AGENTS.md` 和目标代码命中段；只有跨服务状态、权限或接口边界无法判断时才增加后端契约。读取预算遵循根指引的行数与字符数标准，先读适用规则，再定向读取业务表，不全文加载无关专题。
 
 ## 项目定位与技术基线
 
@@ -29,8 +31,8 @@
 
 - 依赖方向为 `app → modules/core/shared`、`modules → core/shared`、`core → shared`、`shared → 无上层依赖`。模块间只通过对方公开入口或契约协作，不引用其他模块的页面和内部目录。
 - 路由级页面放 `modules/*/pages/`，模块路由放 `modules/*/routes.ts` 并由 `app/router/index.ts` 装配；新增模块同步维护 `core/navigation/adminNavigation.ts`。
-- 领域接口放 `modules/*/api/`；国内、海外公共客户端分别为 `shared/api/http.ts`、`shared/api/overseasHttp.ts`，具体 Token 与刷新规则见 `shared/api/AGENTS.md`。
-- `VITE_API_BASE_URL`、`VITE_OVERSEAS_API_BASE_URL` 分别控制国内、海外浏览器前缀；开发代理上游只由 Vite 读取。环境变量变化同步 `.env.example`，不提交真实地址或凭据。
+- 领域接口放 `modules/*/api/`；全部业务共用 `shared/api/http.ts`，具体 Token 与刷新规则见 `shared/api/AGENTS.md`。
+- `VITE_API_BASE_URL` 控制唯一浏览器前缀；`API_PROXY_TARGET` 由 Vite 读取并指向统一 Gateway。环境变量变化同步 `.env.example`，不提交真实地址或凭据。
 
 ## 模块快速路由
 
@@ -38,9 +40,12 @@
 
 | 业务 | Admin 入口 | 联查 |
 |---|---|---|
-| 登录、会话与双区域 Token | `modules/auth/`、`core/auth/` | 国内 `auth/`、`iam/`；海外请求客户端再读 `shared/api/AGENTS.md` |
+| 登录、会话与统一 Token | `modules/auth/`、`core/auth/` | 国内 `auth/`、`iam/`；海外请求客户端再读 `shared/api/AGENTS.md` |
 | 启动与懒加载资源恢复 | `main.ts`、`core/routing/navigationRecovery.ts` | 仅识别动态模块/Chunk 资源过期；30 秒内同目标最多自动恢复一次，存在未保存编辑时必须先确认 |
 | 工作台与指标 | `modules/dashboard/` | 指标所属模块与服务端，不复制领域契约 |
+| 自营销量、库存与数据采集 | `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 存在代替页面接入完成 |
 | 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/`；公司联系电话只作企业联系信息，不修改管理员/成员登录手机号且不要求跨企业唯一。审核必填资质仅营业执照与统一社会信用代码；法人身份证选填，可随资质包提交，也可在已有营业执照后单独补传或替换 |
@@ -57,7 +62,7 @@
 | 入库单扣货、解除、凭证与历史 | `modules/inbounds/pages/InboundOrdersView.vue`、详情工作区、`modules/inbounds/core/api.ts` | 列表展示服务端 `holdFlag/currentHoldReason` 并支持筛选；详情只按 `canHold/canRelease/actionBlockReason` 开放操作。扣货与解除提交当前 `version`、原因和独立幂等键，可选凭证先按明确客户与入库单上传；历史文件只调用专用下载入口，不把上传成功但未提交命令的文件冒充扣货证据 |
 | 客户专属价格簿、柜级阶梯运费与受控调价 | 列表/上传 `modules/fba-pricing/carrier-rates/pages/CarrierRatesView.vue`，版本详情/仓库映射/确认 `modules/fba-pricing/carrier-rates/pages/CarrierRateDetailView.vue`，路由 `modules/fba-pricing/routes.ts`；`modules/inbounds/fee/`、`modules/unified-orders/components/InboundFeeDetailManager.vue` | 列表与上传后按 `versionId` 进入 `fba-carrier-rate-detail` 独立详情页，价格行只读；回归入口 `modules/fba-pricing/carrier-rates/pages/CarrierRatesView.test.ts`。价格簿页面显式选择公共报价或具体客户；列表、上传、确认只作用于该 `customerId`，不得混合版本。计价优先消费客户专属 ACTIVE 版本，无专属版本才回退公共 ACTIVE；柜级阶梯金额和各客户分摊只展示服务端结果。调整计费量只能在服务端返回的上下 10% 范围内并提交当前费用版本、原因与二次确认；私人仓尾程派送费使用稳定 `PRIVATE_LAST_MILE_DELIVERY` 代码且只对 `PRIVATE` 目的地开放；一件代发须在预装确认前完成试算，计价后保持服务端 `WAIT_PALLETIZE` 状态 |
 | 财务、客户资金账户与柜级公共费用分摊 | `modules/finance/`，继续读该目录 `AGENTS.md`；客户账户 `pages/FinanceCustomerAccountsView.vue`，柜费 `modules/loading-lists/components/ContainerFeesPanel.vue`、`api/containerFees.ts` | `finance/`、`firstleg/`、`file/`、`docs/财务管理/`；实际、冻结、可用余额、授信与流水只消费 Finance 权威结果，充值审核和手工充扣携带版本与幂等键。跨客户公共柜费只按服务端柜内客户/订单事实分摊，金额必须守恒，创建与审核、驳回、调整、作废均整组原子处理 |
-| 货柜双工作台、排柜、预装/装柜清单、真实柜号后补与整柜报关 | 国内 `modules/container-loading/pages/DomesticContainersView.vue`、海外 `OverseasContainersView.vue`，共享详情实现 `ContainerDetailView.vue`；预装详情 `modules/loading-lists/pages/PreloadPlanDetailView.vue`，资料/PDA 证据 `components/ContainerOverviewPanel.vue`，报关 `components/ContainerCustomsPanel.vue` | 国内“送柜报关”只消费 `/containers/domestic` 与服务端 `allowedActions`，承载模拟柜、订舱关联、智能装柜；模拟柜创建选择与智能装柜一致的 9 类计划渠道，未关联订舱前实际渠道为空，订舱关联候选按计划渠道组匹配并同时展示订舱号与提单号、装柜清单页签、出口报关和国内出仓；创建柜次时自动生成唯一预装计划，预装详情先调用 `/loading-plans/{planId}/lifecycle`，完成后深链进入国内货柜详情的装柜清单页签，不再注册独立正式清单导航和路由。订舱关联允许真实集装箱号为空，但确认预装和创建 PDA 任务前必须补齐；历史已建但缺号的任务仍可在预装详情首次补录，保存后恢复 PDA 可进入状态；全买单柜继续使用 `complete-all-buy`。海外“清关提柜”只消费 `/containers/overseas`，承载船节点、目的港清关、DO/PU、码头车队和还空；原预约/实际提柜展示位改为整柜预计/实际到仓，预计到仓在列表内人工快捷维护并经海外接口同步整柜尾程订单，实际到仓只读海外 PDA 首次开始收货时间。还空截止事实由服务端基于卸柜完成时间加 72 小时计算，前端不重算。两端统一使用 `containerBookingId`，列表范围由服务端 `scope=ACTIVE/HISTORY` 分页，禁止浏览器筛选或本地推导写资格。后端为 `LoadingListService`、`firstleg/customs/container/`、`firstleg/terminaldrayage/` 和 `lastleg-service/`，文件归 `file/` |
+| 货柜双工作台、排柜、预装/装柜清单、真实柜号后补与整柜报关 | 国内 `modules/container-loading/pages/DomesticContainersView.vue`、海外 `OverseasContainersView.vue`，共享详情实现 `ContainerDetailView.vue`；预装详情 `modules/loading-lists/pages/PreloadPlanDetailView.vue`，资料/PDA 证据 `components/ContainerOverviewPanel.vue`，报关 `components/ContainerCustomsPanel.vue` | 国内“送柜报关”只消费 `/containers/domestic` 与服务端 `allowedActions`，承载模拟柜、订舱关联、智能装柜；模拟柜创建选择与智能装柜一致的 9 类计划渠道，未关联订舱前实际渠道为空，订舱关联候选按计划渠道组匹配并同时展示订舱号与提单号、装柜清单页签、出口报关和国内出仓；创建柜次时自动生成唯一预装计划，预装详情先调用 `/loading-plans/{planId}/lifecycle`，完成后深链进入国内货柜详情的装柜清单页签，独立装柜清单导航 `/loading-lists` 复用已确认清单 API，查看进入独立详情路由 `/loading-lists/:planId`，保留返回列表和打印；独立清单详情与货柜清单页签共同使用 `useLoadingListDetail.ts` 加载、校验和处理错误，`LoadingListDetailDrawer.vue` 统一密度、摘要、明细、历史及打印入口，打印实现归 `printLoadingList.ts`，外层只保留返回目标与货柜专属 PDA/报关区域；货柜列表经 `ContainerWorkbenchView.vue` 在国内装柜与海外清关提柜之间按权限切换。订舱关联允许真实集装箱号为空，但确认预装和创建 PDA 任务前必须补齐；历史已建但缺号的任务仍可在预装详情首次补录，保存后恢复 PDA 可进入状态；全买单柜继续使用 `complete-all-buy`。海外“清关提柜”只消费 `/containers/overseas`，承载船节点、目的港清关、DO/PU、码头车队和还空；原预约/实际提柜展示位改为整柜预计/实际到仓，预计到仓在列表内人工快捷维护并经海外接口同步整柜尾程订单，实际到仓只读海外 PDA 首次开始收货时间。还空截止事实由服务端基于卸柜完成时间加 72 小时计算，前端不重算。两端统一使用 `containerBookingId`，列表范围由服务端 `scope=ACTIVE/HISTORY` 分页，禁止浏览器筛选或本地推导写资格。后端为 `LoadingListService`、`firstleg/customs/container/`、`firstleg/terminaldrayage/` 和 `lastleg-service/`，文件归 `file/` |
 | 合柜报关 / 同柜不可拆组 | `modules/unified-orders/api/coLoadGroups.ts`、`pages/UnifiedOrdersView.vue`；装柜消费 `modules/container-loading/pages/SmartLoadingWorkbenchView.vue` | 前端只提交订单 ID；Backend `firstleg/loading/coload/` 展开并冻结每票全部可用入仓片段。成员数是入仓片段数，不等于订单票数；只要求同国内仓、同渠道，允许跨客户及不同目的仓港；分配、移除、取消均整组处理 |
 | 全局智能装柜工作台、入仓码候选与箱数分配 | `modules/container-loading/components/SmartLoadingDialog.vue` 内嵌 `pages/GlobalSmartLoadingView.vue`，柜次页 `SmartLoadingWorkbenchView.vue`，以及 `smartLoadingChannelGroups.ts`、`smartLoadingItems.ts`、`api/platformContainerLoading.ts`；全局页当前不注册独立路由 | Backend `firstleg/` 的 `/inbound-candidates`、`/containers`、`/inbound-assignments`、`/plans/{planId}/pending-review-assignments`、`/group-assignments`、`/unpicked-items`。`orderStatuses` 最多四项且未传表示全部未完成状态；候选状态多选覆盖待审核、待测量、待分柜、装柜中，状态只用于筛选展示，按钮资格以服务端 `canAssign` 为准；待审核/待测量可提前占位但不得提前确认预装或启动 PDA。计划箱数编辑上限、已用和未用展示只消费服务端 `totalPackageCount/remainingPackageCount`，不得从候选页或本地规格重新拼算。人工加入允许跨渠道，智能推荐仍按柜次渠道。柜次容量和限重取服务端字段；同柜组作为单卡整组分页、分配和移除，任一成员已拣时整组保留 |
 | 国内货柜履约订舱资料、打印、关联候选与出仓前船期 | `modules/ocean-bookings/` 的 `components/OceanBookingDocumentsPanel.vue`、`OceanBookingPrintDialog.vue`，以及 `modules/container-loading/`、`modules/port-schedules/` | 订舱草稿按当前版本维护资料，放舱后资料与表单只读；打印对草稿与已放舱订舱均开放，按当前已保存资料生成，未填写字段显示“—”。`platformOceanBookings.ts` 的 `/link-candidates` 只消费服务端分页，`containerCount` 是柜型需求 `quantity` 总和；Backend `firstleg/oceanbooking/`、`file/`、`print/`、`firstleg/portschedule/` |
@@ -65,14 +70,14 @@
 | 目的港码头拖车与还空预警 | 海外清关提柜工作台/详情 `modules/container-loading/pages/OverseasContainersView.vue`、`OverseasContainerDetailView.vue`，API `modules/container-loading/api/terminalDrayages.ts`、`containerArrivalTimes.ts` | 与订舱级拖车预约是不同生命周期；按 `containerBookingId` 读取服务端状态、`allowedActions` 和历史，不能复用订舱级拖车表单或自行推进状态。列表“预计到仓”列直接提供人工日期时间选择器，保存时通过 Lastleg 柜级版本和幂等键原子更新该柜全部尾程订单，已有入库计划后禁止修改；“实际到仓”只读 `ll_receiving_container_session.receiving_at`，即海外 PDA 首次开始收货时间。还空截止、超时天/小时只展示服务端基于权威卸柜完成时间加 72 小时计算的结果；Backend `firstleg/terminaldrayage/`、`lastleg-service/`，邮件记录通过 `terminalDrayages.ts` 查询与重试。 |
 | 历史报关协同与国内出仓 | `modules/customs/`、`modules/outbound-dispatch/` | `modules/customs/` 是历史报关案件/清单/代理提交与回执入口；装柜完成后的整柜退税/买单资料从货柜详情进入，不在旧模块复制；Backend `firstleg/outbound/dispatch/`、`firstleg/customs/`、`file/` |
 | 主数据、下载、退避任务重试、审计 | `modules/master-data/`、`modules/downloads/pages/DownloadCenterView.vue`、`modules/audit/` | File 导出任务返回 `attemptCount/maxAttempts/nextRetryAt`；仅失败或已进入自动退避的等待任务显示重试，等待任务重试用于立即执行当前投递，不创建新任务；联查 `warehouse/`、`file/`、`audit-service/` |
-| 海外接柜、入库、库存与库内服务 | `modules/overseas-warehouse/` | `gateway-overseas/`、`lastleg-service/`、`warehouse-overseas-service/`；与排车、出库、派送、异常退回和一件代发共同组成海外仓全流程 |
-| 海外采购、卡车、散板 | `modules/overseas-business/` | `gateway-overseas/`、`lastleg-service/` |
+| 海外接柜、入库、库存与库内服务 | `modules/overseas-warehouse/` | `gateway/`、`lastleg-service/`、`warehouse-overseas-service/`；与排车、出库、派送、异常退回和一件代发共同组成海外仓全流程 |
+| 海外采购、卡车、散板 | `modules/overseas-business/` | `gateway/`、`lastleg-service/` |
 | 海外仓业务合作仓与通用资料 | 合作仓 `modules/warehouses/`；报价/汇率/车辆 `modules/overseas-master-data/` | 国内 `warehouse/`、海外实际资源与服务 |
 | 海外仓业务国内出仓后船节点 | `modules/port-schedules/`、`modules/ocean-bookings/`、货柜详情 | `firstleg/portschedule/`、`integration-service/`；预计节点只展示不推进实际进度，手工实际节点必须严格向后追加并防重复，十节点标准见 `../../docs/海外仓业务/船节点标准化契约.md` |
 | 海外排车、出库与派送 | `modules/overseas-warehouse/AGENTS.md` | 按模块表定位排车、出库、派送页面及 API；履约边界在模块内维护 |
 | 海外异常退回与客户回访 | `modules/overseas-warehouse/AGENTS.md` | 派送异常退回区别于退货库存；页面、API 与原子推进约束见模块指引 |
 
-全量验收按业务从 `../../docs/订单与客户/`、`入库测量与计费/`、`国内货柜履约/`、`财务管理/` 选择最小契约；海外仓业务开发先读 `../../docs/海外仓业务/README.md`。进度、排期或验收状态问题再读取进度表和报告。
+全量验收按业务从 `../../docs/订单与客户/`、`入库测量与计费/`、`国内货柜履约/`、`财务管理/` 选择最小契约；海外跨模块流程或入口不明时读 `../../docs/海外仓业务/README.md`，已定位局部任务直接沿模块入口。进度、排期或验收状态问题再读取对应进度表和报告。
 
 散货托盘码打印：`modules/loading-lists/components/PalletLabelPrintDialog.vue`、`modules/loading-lists/api/platformLoadingLists.ts`，由货柜详情与装柜清单详情进入；先调用 `/pallet-labels/prepare` 获取服务端按 FBA 仓分组的冻结清单，再通过 `/pallet-labels/print` 下载 PDF。托盘码使用“真实柜号-FBA 地址内部编号-三位序号”，页面同时展示 FBA 仓码和内部编号；支持全部打印或按仓指定张数补打，一件代发托盘不在该清单，前端不生成或重新编号托盘码。
 
@@ -85,6 +90,7 @@
 | 海外采购 | `modules/overseas-business/pages/PurchaseOrdersView.vue`、详情/编辑页 | `modules/overseas-business/api/platformOverseasBusiness.ts` 的 purchase 方法；Backend `lastleg-service/procurement/` |
 | 美国卡车、本土散板 | `modules/overseas-business/pages/TransportOrdersView.vue`、`TransportOrderFormView.vue` | 同一 API 的 us-truck/looseboard 方法；Backend `lastleg-service/trucking/`、`looseboard/` |
 | 海外报价、月度汇率、车辆 | `modules/overseas-master-data/pages/OverseasQuotesView.vue`、`ExchangeRatesView.vue`、`VehiclesView.vue` | `modules/overseas-master-data/api/overseasMasterData.ts`；Backend `lastleg-service/masterdata/` |
+| 司机档案、驾驶证、到期提醒与资格预览 | `modules/overseas-master-data/pages/DriversView.vue`、`DriverDetailView.vue`；最近指引 `modules/overseas-master-data/AGENTS.md` | `api/drivers.ts`；Backend `lastleg-service/fleet/driver/`、File `FLEET_DRIVER_LICENSE` |
 
 ## 业务、安全与共享装配
 
@@ -95,7 +101,7 @@
 - 国内出仓以真实货柜为原子边界：货柜详情只在装柜完成、全部入仓绑定门禁通过且有写权限时显示确认离仓；成功后由服务端同事务推进全部技术行并幂等创建船节点查询。前端不得逐入仓确认、把拖车状态当阻断门禁或重复追加实际船节点。
 - `core/navigation/adminNavigation.ts`、`app/router/index.ts` 和模块 `routes.ts` 是共享装配文件；并行任务不得覆盖总控已确认语义，重叠时保留现有改动并回传总控。
 - `core/routing/navigationRecovery.ts` 只处理已识别的动态 import/Chunk 资源过期；普通路由错误直接提示。自动恢复前保护未保存表单，同一目标 30 秒内不得重复刷新或形成重载循环。
-- 认证统一经过 `core/auth/auth.ts`、`shared/api/http.ts` 和 `shared/api/overseasHttp.ts`。登录/刷新原子替换国内、海外 Token，海外 401 统一刷新并最多重放一次；页面不读写 Token 或手工拼 `Authorization`。
+- 认证统一经过 `core/auth/auth.ts` 和 `shared/api/http.ts`。登录/刷新替换统一 Access/Refresh Token，全部 401 共用刷新并最多重放一次；页面不读写 Token 或手工拼 `Authorization`。
 - 接入真实接口时删除对应模拟路径，不允许生产逻辑静默回退假数据。客户专属写操作显式选择客户，长整型 ID 按字符串透传，不从本地存储推断。
 - 订舱代理、拖车承运商和报关代理提交服务端供应商 ID，从公共供应商列表选择 `ACTIVE` 且类别/范围匹配的记录；参数变化同步检查 API、类型、表单、展示、Mock/Fixture、测试和 OpenAPI。
 - 删除、停用、改权限等高风险操作必须有确认、处理中、成功和失败反馈；失败保留用户上下文。日志、提示和示例不得包含真实账号、Token、隐私或生产数据。
@@ -104,7 +110,7 @@
 ## 开发验收身份
 
 - 开发环境人工验收身份为 `platform_admin`。密码从未提交的 `CHONGCHONG_ADMIN_ACCEPTANCE_PASSWORD` 或 `C:/Users/BY-OY/.codex/chongchong-global-dev-acceptance.env` 读取；缺失时再向用户索取，不写入仓库、日志或快照。
-- 由人工操作真实页面并截图，AI 核对加载、空态、错误态、权限和桌面布局；缺少截图时标记“待人工截图确认”，不自行批量取证。
+- 视觉验收由人工操作真实页面并截图，AI 核对受影响的状态和桌面布局；缺少截图标记“待人工截图确认”，不自行批量取证。自动检查单独报告“自动检查通过/失败”；纯逻辑且无视觉变化标记“无需视觉验收”，不能据此声称真实页面验收通过。
 
 ## 命令与质量门禁
 

Jenkinsfile

@@ -1,250 +1,60 @@
-def sendProductionWeComNotification(String title, String status, String color, String detail) {
-  withCredentials([string(credentialsId: 'wecom-prod-webhook', variable: 'WECOM_WEBHOOK')]) {
-    String sourceVersion = env.SOURCE_TAG ?: env.GIT_COMMIT ?: '未解析'
-    String duration = currentBuild.durationString?.replace(' and counting', '') ?: '—'
-    String content = """## ${title}
-> 应用：管理后台
-> Job：${env.JOB_NAME}
-> 构建：[#${env.BUILD_NUMBER}](${env.BUILD_URL})
-> 提交：${sourceVersion}
-> 状态：<font color="${color}">${status}</font>
-${detail}
-> 耗时：${duration}
-> 时间：${new Date().format('yyyy-MM-dd HH:mm:ss', TimeZone.getTimeZone('Asia/Shanghai'))}
-"""
-    String payloadFile = 'wecom-production-notification.json'
-    writeFile(
-      file: payloadFile,
-      text: groovy.json.JsonOutput.toJson([
-        msgtype: 'markdown',
-        markdown: [content: content]
-      ]),
-      encoding: 'UTF-8'
-    )
-    sh '''
-      set -eu
-      payload_file='wecom-production-notification.json'
-      trap 'rm -f "$payload_file"' EXIT HUP INT TERM
-      response="$(curl --fail --silent --show-error \
-        -H 'Content-Type: application/json' \
-        --data-binary @"$payload_file" \
-        "$WECOM_WEBHOOK")"
-      printf '%s\n' "$response"
-      printf '%s' "$response" | grep -Eq '"errcode"[[:space:]]*:[[:space:]]*0([[:space:]]*[,}])'
-    '''
-  }
-}
-
 pipeline {
-  agent {
-    label "${env.JOB_BASE_NAME?.endsWith('-prod') ? 'java-builder' : (env.JOB_BASE_NAME?.endsWith('-dev') ? 'java-dev' : 'java-test')}"
-  }
-
-  environment {
-    DEVELOPMENT_COMPOSE_FILE = 'docker-compose.development.yml'
-    DEVELOPMENT_COMPOSE_PROJECT = 'admin-web'
-    REGISTRY_HOST = '172.31.198.7:10082'
-    REGISTRY_CREDENTIALS = 'gitea-registry-token'
-    NODE_BASE_IMAGE = '172.31.198.7:10082/java-project/node:22-alpine'
-    NGINX_BASE_IMAGE = '172.31.198.7:10082/java-project/nginx:1.27-alpine'
-    PRODUCTION_IMAGE_REPOSITORY = 'git.buggoglobal.com/html/admin-web'
-  }
-
+  agent { label "${env.JOB_BASE_NAME?.endsWith('-prod') ? 'java-builder' : 'java-test'}" }
   options {
     timestamps()
     disableConcurrentBuilds()
   }
-
   stages {
-    stage('确认提交版本') {
+    stage('检查测试发布参数') {
+      when { expression { !env.JOB_BASE_NAME?.endsWith('-prod') } }
       steps {
         script {
-          env.IS_DEVELOPMENT = env.JOB_BASE_NAME?.endsWith('-dev') ? 'true' : 'false'
-          env.IS_PRODUCTION = env.JOB_BASE_NAME?.endsWith('-prod') ? 'true' : 'false'
-          if (env.IS_PRODUCTION == 'true') {
-            sh '''
-              set -eu
-              git fetch --no-tags origin +refs/heads/main:refs/remotes/origin/main
-              test "$(git rev-parse HEAD)" = "$(git rev-parse origin/main)" || {
-                echo "生产部署只允许 origin/main 当前提交；请先合并代码到 main" >&2
-                exit 1
-              }
-            '''
+          if (env.JOB_BASE_NAME?.endsWith('-dev')) {
+            error('此流水线仅支持 test 和本轮授权的 prod 灰度')
           }
-          env.SOURCE_TAG = sh(script: 'git rev-parse --short=12 HEAD', returnStdout: true).trim()
+          env.IMAGE_TAG = sh(script: 'git rev-parse --short=12 HEAD', returnStdout: true).trim()
         }
-        sh 'git log -1 --oneline'
+        sh '''set -eu
+          export API_UPSTREAM="${API_UPSTREAM:-http://gateway:9000}"
+          export TEST_NETWORK="${TEST_NETWORK:-firstleg-test-network}"
+          : "${CLIENT_WEB_URL:?CLIENT_WEB_URL 未设置}"
+          docker network inspect "$TEST_NETWORK" >/dev/null
+          docker compose -f docker-compose.test.yml config --quiet
+        '''
       }
     }
-
     stage('构建并部署测试前端') {
-      when { expression { env.IS_DEVELOPMENT != 'true' && env.IS_PRODUCTION != 'true' } }
+      when { expression { !env.JOB_BASE_NAME?.endsWith('-prod') } }
       steps {
-        withCredentials([usernamePassword(credentialsId: env.REGISTRY_CREDENTIALS, usernameVariable: 'REGISTRY_USER', passwordVariable: 'REGISTRY_PASSWORD')]) {
-          sh '''
-            set -eu
-            export DOCKER_CONFIG="${WORKSPACE}@tmp/docker-auth"
-            rm -rf "$DOCKER_CONFIG"
-            mkdir -p "$DOCKER_CONFIG"
-            cleanup_registry() {
-              docker logout "$REGISTRY_HOST" >/dev/null 2>&1 || true
-              rm -rf "$DOCKER_CONFIG"
-            }
-            trap cleanup_registry EXIT HUP INT TERM
-            printf %s "$REGISTRY_PASSWORD" | docker login -u "$REGISTRY_USER" --password-stdin "$REGISTRY_HOST"
-            docker compose -f docker-compose.test.yml build --pull=false
-            docker compose -f docker-compose.test.yml up -d --remove-orphans
-          '''
-        }
+        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
+          docker compose -f docker-compose.test.yml exec -T admin-web wget -qO- http://127.0.0.1/healthz
+        '''
       }
     }
-
-    stage('构建并发布生产镜像') {
-      when { expression { env.IS_PRODUCTION == 'true' } }
+    stage('发布临时生产灰度') {
+      when { expression { env.JOB_BASE_NAME?.endsWith('-prod') } }
       steps {
-        withCredentials([usernamePassword(credentialsId: env.REGISTRY_CREDENTIALS, usernameVariable: 'REGISTRY_USER', passwordVariable: 'REGISTRY_PASSWORD')]) {
-          sh '''
-            set -eu
-            export DOCKER_CONFIG="${WORKSPACE}@tmp/docker-auth"
-            rm -rf "$DOCKER_CONFIG"
-            mkdir -p "$DOCKER_CONFIG"
-            cleanup_registry() {
-              docker logout git.buggoglobal.com >/dev/null 2>&1 || true
-              rm -rf "$DOCKER_CONFIG"
-            }
-            trap cleanup_registry EXIT HUP INT TERM
-            printf %s "$REGISTRY_PASSWORD" | docker login -u "$REGISTRY_USER" --password-stdin git.buggoglobal.com
-            image="$PRODUCTION_IMAGE_REPOSITORY:$SOURCE_TAG"
-            docker build \
-              --build-arg NODE_IMAGE="$NODE_BASE_IMAGE" \
-              --build-arg NGINX_IMAGE="$NGINX_BASE_IMAGE" \
-              --build-arg VITE_CLIENT_WEB_URL=https://app.buggoglobal.com/ \
-              -t "$image" .
-            docker push "$image"
-          '''
-        }
-      }
-    }
-
-    stage('部署生产前端') {
-      when { expression { env.IS_PRODUCTION == 'true' } }
-      steps {
-        lock(resource: 'firstleg-production-admin-web-deploy', inversePrecedence: true) {
+        lock(resource: 'firstleg-production-admin-web-deploy') {
           withCredentials([
+            usernamePassword(credentialsId: 'gitea-registry-token', usernameVariable: 'BUILD_REGISTRY_USER', passwordVariable: 'BUILD_REGISTRY_PASSWORD'),
             usernamePassword(credentialsId: 'gitea-production-pull-token', usernameVariable: 'REGISTRY_USER', passwordVariable: 'REGISTRY_PASSWORD'),
             sshUserPrivateKey(credentialsId: 'firstleg-production-ssh', keyFileVariable: 'TARGET_SSH_KEY', usernameVariable: 'TARGET_SSH_USER'),
             string(credentialsId: 'firstleg-production-host', variable: 'TARGET_SSH_HOST'),
             file(credentialsId: 'firstleg-production-known-hosts', variable: 'TARGET_SSH_KNOWN_HOSTS')
           ]) {
-            withEnv([
-              'TARGET_DEPLOY_DIR=/data/firstleg/deploy/frontend',
-              'TARGET_SSH_TARGET=' + env.TARGET_SSH_USER + '@' + env.TARGET_SSH_HOST
-            ]) {
-              sh "sh scripts/deploy-production.sh admin-web '${env.PRODUCTION_IMAGE_REPOSITORY}' '${env.SOURCE_TAG}' docker-compose.production.yml"
-            }
+            sh 'sh scripts/deploy-production.sh'
           }
         }
       }
     }
-
-    stage('构建并部署开发前端') {
-      when { expression { env.IS_DEVELOPMENT == 'true' } }
-      steps {
-        withCredentials([usernamePassword(credentialsId: env.REGISTRY_CREDENTIALS, usernameVariable: 'REGISTRY_USER', passwordVariable: 'REGISTRY_PASSWORD')]) {
-          sh '''
-            set -eu
-            export DOCKER_CONFIG="${WORKSPACE}@tmp/docker-auth"
-            rm -rf "$DOCKER_CONFIG"
-            mkdir -p "$DOCKER_CONFIG"
-            cleanup_registry() {
-              docker logout "$REGISTRY_HOST" >/dev/null 2>&1 || true
-              rm -rf "$DOCKER_CONFIG"
-            }
-            trap cleanup_registry EXIT HUP INT TERM
-            printf %s "$REGISTRY_PASSWORD" | docker login -u "$REGISTRY_USER" --password-stdin "$REGISTRY_HOST"
-            image="admin-web-development:${SOURCE_TAG}"
-
-            docker build \
-              --build-arg NODE_IMAGE="$NODE_BASE_IMAGE" \
-              --build-arg NGINX_IMAGE="$NGINX_BASE_IMAGE" \
-              --build-arg VITE_CLIENT_WEB_URL="${CLIENT_WEB_URL:-https://dev-app.buggoglobal.com/}" \
-              -t "$image" .
-            export IMAGE_TAG="$SOURCE_TAG"
-            docker compose -p "$DEVELOPMENT_COMPOSE_PROJECT" -f "$DEVELOPMENT_COMPOSE_FILE" up -d --remove-orphans --pull never
-            docker compose -p "$DEVELOPMENT_COMPOSE_PROJECT" -f "$DEVELOPMENT_COMPOSE_FILE" ps
-            docker compose -p "$DEVELOPMENT_COMPOSE_PROJECT" -f "$DEVELOPMENT_COMPOSE_FILE" exec -T admin-web wget -qO- http://127.0.0.1/healthz
-          '''
-        }
-      }
-    }
-
-    stage('部署检查') {
-      when { expression { env.IS_DEVELOPMENT != 'true' && env.IS_PRODUCTION != 'true' } }
-      steps {
-        sh '''
-          set -eu
-          docker compose -f docker-compose.test.yml ps
-          docker compose -f docker-compose.test.yml exec -T admin-web wget -qO- http://127.0.0.1/healthz
-        '''
-      }
-    }
   }
-
   post {
-    success {
-      script {
-        if (env.JOB_BASE_NAME?.endsWith('-prod')) {
-          try {
-            sendProductionWeComNotification(
-              '✅ 生产部署成功',
-              '成功',
-              'info',
-              '> 结果：Admin 生产前端已完成发布和部署流程'
-            )
-          } catch (Exception error) {
-            echo "企业微信通知失败，不影响原构建结果：${error.message}"
-          }
-        }
-      }
-    }
     failure {
-      sh '''
-        if [ "${IS_PRODUCTION:-false}" = "true" ]; then
-          echo "生产部署失败，请查看上方远程部署日志"
-        elif [ "${IS_DEVELOPMENT:-false}" = "true" ]; then
-          docker logs --tail=100 admin-web-development || true
-        else
-          docker compose -f docker-compose.test.yml logs --tail=100 || true
-        fi
-      '''
       script {
-        if (env.JOB_BASE_NAME?.endsWith('-prod')) {
-          try {
-            sendProductionWeComNotification(
-              '❌ 生产发布失败',
-              '失败',
-              'warning',
-              '> 说明：请打开 Jenkins 构建日志查看失败阶段'
-            )
-          } catch (Exception error) {
-            echo "企业微信通知失败，不影响原构建结果：${error.message}"
-          }
-        }
-      }
-    }
-    aborted {
-      script {
-        if (env.JOB_BASE_NAME?.endsWith('-prod')) {
-          try {
-            sendProductionWeComNotification(
-              '⏹ 生产部署已取消',
-              '已取消',
-              'comment',
-              '> 说明：生产部署流程被人工取消或中止'
-            )
-          } catch (Exception error) {
-            echo "企业微信通知失败，不影响原构建结果：${error.message}"
-          }
+        if (!env.JOB_BASE_NAME?.endsWith('-prod')) {
+          sh 'docker compose -f docker-compose.test.yml logs --tail=100 || true'
         }
       }
     }

README.md

@@ -10,7 +10,7 @@ pnpm install
 pnpm dev
 ```
 
-生产构建：
+发布资源构建：
 
 ```bash
 pnpm typecheck
@@ -54,16 +54,16 @@ pnpm test
 ```dotenv
 VITE_API_BASE_URL=/api
 API_PROXY_TARGET=http://localhost:9000
-VITE_OVERSEAS_API_BASE_URL=/overseas-api
-OVERSEAS_API_PROXY_TARGET=http://localhost:9300
 VITE_CLIENT_WEB_URL=http://localhost:5174
 ```
 
-国内业务继续使用 `http` 和 `/api` 代理；海外业务统一使用 `overseasHttp` 和 `/overseas-api` 代理。Vite 会把 `/overseas-api/platform/...` 重写为海外 Gateway 的 `/api/platform/...`。海外 Token 的签发、缓存和会话刷新由统一认证层维护，业务模块不得读取 Token、手拼 `Authorization` 或复用国内 `http`。
+全部业务使用共享 `http` 和同源 `/api`，通过统一 Gateway 访问。Access/Refresh Token 与并发刷新由认证层维护，业务模块不得读取 Token 或手拼 `Authorization`。
 
-切换开发或测试环境时，只修改未提交的 `.env.local` 中 `API_PROXY_TARGET`、`OVERSEAS_API_PROXY_TARGET` 和 `VITE_CLIENT_WEB_URL`，然后重启 `pnpm dev`；无需修改业务代码。真实环境地址不写入受版本控制的配置模板或说明。
+本地工具只连接同一测试环境：在未提交 `.env.local` 配置 `API_PROXY_TARGET` 和 `VITE_CLIENT_WEB_URL`；不提供业务服务直连或独立海外代理。
 
-客户代登录打开的工作台地址是运行时配置，不需要为每个环境重新构建镜像。Docker 部署时为 Admin 容器设置当前环境的 `CLIENT_WEB_URL`；容器启动时会生成 `/runtime-config.js`。开发、测试和生产分别在各自部署任务中注入自己的 Client 根地址，禁止复用其他环境的域名。本地 Vite 开发使用 `VITE_CLIENT_WEB_URL` 作为兜底。部署后可读取 `/runtime-config.js` 核对最终生效值。
+唯一部署入口是 `docker-compose.test.yml` 和 test Jenkins Job。发布前在 Job/未提交环境文件配置 `API_UPSTREAM`（统一 Gateway origin，不含 `/api`）、`TEST_NETWORK`（后端共享测试网络）、`CLIENT_WEB_URL`（客户工作台地址）及 `IMAGE_TAG`。可选 `HOST_PORT` 默认 9001，`NODE_BASE_IMAGE`/`NGINX_BASE_IMAGE` 可指定已授权拉取的基础镜像；私有镜像仓库认证由构建节点配置，不在源码存放凭据。Jenkins 从当前提交生成 IMAGE_TAG，不再按 Job 后缀切换 dev/prod。宿主机反向代理连接 loopback 端口。
+
+容器启动通过 `CLIENT_WEB_URL` 生成 `/runtime-config.js`；本地 Vite 使用 `VITE_CLIENT_WEB_URL`。本地构建通过不代表容器或测试环境已发布。真实 HTTP 验收入口为 `pnpm test:phase4:test --environment test --gateway <统一入口>`，凭据通过环境变量传入，仅在取得对应测试写入授权后执行。
 
 认证请求使用 `/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` 类型。其余业务页面需在对应服务契约确认后逐项替换，生产逻辑不得静默回退到模拟数据。
 
@@ -74,3 +74,7 @@ VITE_CLIENT_WEB_URL=http://localhost:5174
 真实接口错误会保留后端返回的业务错误码、`requestId` 和 `traceId`。登录、企业审核、平台角色及权限资源的主要失败态支持直接复制追踪标识，便于与后端日志关联。
 
 登录表单在开发和生产环境均默认留空，不包含联调账号、密码或演示提示。菜单、路由和操作权限只使用真实登录会话返回的服务端权限快照；前端控制仅改善体验，服务端仍须独立校验身份、角色权限和数据范围。接口失败时页面展示真实错误及追踪标识，不回退到假数据或模拟成功。
+
+同机目标默认值：`API_UPSTREAM=http://gateway:9000`、`TEST_NETWORK=firstleg-test-network`；必须与后端同批 test Compose 配置一致。
+
+TEST 入口同时转发两个独立 PDA 静态应用：`/pda-domestic/` 到共享网络中的 `pda-domestic-h5-test:80`，`/pda-overseas/` 到 `pda-overseas-h5-test:80`。各自构建、镜像和静态文件由对应 PDA 项目维护，Admin 不打包 PDA 源码。请求时解析 Docker DNS，PDA 未启动不会阻止 Admin 启动。国内 H5 的 `/gateway-api/` 在此转换为同一 `API_UPSTREAM` 的 `/api/`，海外 H5 直接使用既有 `/api/`；所有业务认证与仓绑定仍由统一 Gateway 和服务端校验。发布时先启动 PDA 容器，再验收两个路径的 HTML、资产、登录、权限与缺失资产 404。H5 通过不能替代 Android 真机扫码验收。

docker-compose.development.yml

@@ -1,22 +0,0 @@
-services:
-  admin-web:
-    image: admin-web-development:${IMAGE_TAG:?IMAGE_TAG is required}
-    container_name: admin-web-development
-    restart: unless-stopped
-    ports:
-      - "127.0.0.1:9001:80"
-    environment:
-      CLIENT_WEB_URL: "${CLIENT_WEB_URL:-https://dev-app.buggoglobal.com/}"
-      API_UPSTREAM: "http://firstleg-development-gateway:9000"
-      OVERSEAS_API_UPSTREAM: "http://firstleg-development-gateway-overseas:9300"
-    networks:
-      - development-backend
-      - development-overseas-backend
-
-networks:
-  development-backend:
-    external: true
-    name: firstleg-development-network
-  development-overseas-backend:
-    external: true
-    name: firstleg-development-overseas-network

docker-compose.production.yml

@@ -1,24 +1,23 @@
 name: firstleg-prod-admin-web
-
 services:
   admin-web:
-    image: ${IMAGE_REPOSITORY:?IMAGE_REPOSITORY is required}:${IMAGE_TAG:?IMAGE_TAG is required}
+    image: "${PRODUCTION_IMAGE_REPOSITORY:?PRODUCTION_IMAGE_REPOSITORY is required}:${IMAGE_TAG:?IMAGE_TAG is required}"
     container_name: firstleg-prod-admin-web
     restart: unless-stopped
     ports:
-      - "127.0.0.1:${HOST_PORT:-9001}:80"
+      - "127.0.0.1:${HOST_PORT:-29011}:80"
     environment:
-      CLIENT_WEB_URL: "https://app.buggoglobal.com/"
-      API_UPSTREAM: "http://gateway-active:9000"
-      OVERSEAS_API_UPSTREAM: "http://gateway-overseas-active:9300"
+      CLIENT_WEB_URL: "${PUBLIC_WEB_ORIGIN:?PUBLIC_WEB_ORIGIN is required}"
+      API_UPSTREAM: "http://gateway:9000"
+    healthcheck:
+      test: ["CMD", "wget", "-qO-", "http://127.0.0.1/healthz"]
+      interval: 5s
+      timeout: 3s
+      retries: 12
+      start_period: 5s
     networks:
-      - infra-network
-      - routing-network
-
+      - backend
 networks:
-  infra-network:
+  backend:
     external: true
-    name: firstleg-prod-infra-network
-  routing-network:
-    external: true
-    name: firstleg-production-routing
+    name: firstleg-production-network

docker-compose.test.yml

@@ -1,3 +1,4 @@
+name: firstleg-test-admin-web
 services:
   admin-web:
     build:
@@ -6,16 +7,23 @@ services:
       args:
         NODE_IMAGE: "${NODE_BASE_IMAGE:-node:22-alpine}"
         NGINX_IMAGE: "${NGINX_BASE_IMAGE:-nginx:1.27-alpine}"
-    image: admin-web-test:local
+    image: admin-web-test:${IMAGE_TAG:?IMAGE_TAG is required}
     container_name: admin-web-test
     restart: unless-stopped
+    healthcheck:
+      test: ["CMD", "wget", "-qO-", "http://127.0.0.1/healthz"]
+      interval: 5s
+      timeout: 3s
+      retries: 12
+      start_period: 5s
     ports:
-      - "${HOST_PORT:-9001}:80"
-    extra_hosts:
-      - "host.docker.internal:host-gateway"
+      - "127.0.0.1:${HOST_PORT:-9001}:80"
     environment:
-      # Runtime URL used by the secure customer-workbench handoff. Each
-      # environment may override it without rebuilding the Admin image.
-      CLIENT_WEB_URL: "${CLIENT_WEB_URL:-https://test-app.buggoglobal.com/}"
-      API_UPSTREAM: "${API_UPSTREAM:-http://host.docker.internal:9000}"
-      OVERSEAS_API_UPSTREAM: "${OVERSEAS_API_UPSTREAM:-http://host.docker.internal:9300}"
+      CLIENT_WEB_URL: "${CLIENT_WEB_URL:?CLIENT_WEB_URL is required}"
+      API_UPSTREAM: "${API_UPSTREAM:-http://gateway:9000}"
+    networks:
+      - test-backend
+networks:
+  test-backend:
+    external: true
+    name: "${TEST_NETWORK:-firstleg-test-network}"

nginx/default.conf.template

@@ -6,6 +6,21 @@ server {
     root /usr/share/nginx/html;
     index index.html;
 
+    # Resolve independent PDA containers at request time; their restart must not block Admin startup.
+    resolver 127.0.0.11 valid=10s ipv6=off;
+    location = /pda-domestic { return 308 /pda-domestic/; }
+    location = /pda-overseas { return 308 /pda-overseas/; }
+    location ^~ /pda-domestic/ {
+        set $pda_domestic_origin http://pda-domestic-h5-test:80;
+        proxy_pass $pda_domestic_origin$request_uri;
+        proxy_set_header Host $proxy_host;
+    }
+    location ^~ /pda-overseas/ {
+        set $pda_overseas_origin http://pda-overseas-h5-test:80;
+        proxy_pass $pda_overseas_origin$request_uri;
+        proxy_set_header Host $proxy_host;
+    }
+
     # Docker 容器运行正常的检查地址，供 Jenkins 使用。
     location = /healthz {
         default_type text/plain;
@@ -30,7 +45,7 @@ server {
         proxy_set_header X-Forwarded-Proto $scheme;
     }
 
-    # 墨家测量设备使用独立 OpenAPI 前缀，直接转发到国内 Gateway。
+    # 墨家测量设备使用独立 OpenAPI 前缀，直接转发到统一 Gateway。
     # 该入口不经过 Admin 前端路由，供设备以固定 AppKey/HMAC 调用。
     location /openapi/ {
         client_max_body_size 55m;
@@ -42,11 +57,10 @@ server {
         proxy_set_header X-Forwarded-Proto $scheme;
     }
 
-    # 海外业务使用独立 Gateway；将浏览器前缀改写为 Gateway 的 /api 前缀。
-    location /overseas-api/ {
+    # Domestic PDA keeps its H5 module-safe prefix; authorization still belongs to the same Gateway.
+    location /gateway-api/ {
         client_max_body_size 55m;
-        rewrite ^/overseas-api/(.*)$ /api/$1 break;
-        proxy_pass ${OVERSEAS_API_UPSTREAM};
+        proxy_pass ${API_UPSTREAM}/api/;
         proxy_http_version 1.1;
         proxy_set_header Host $proxy_host;
         proxy_set_header X-Real-IP $remote_addr;
@@ -54,6 +68,7 @@ server {
         proxy_set_header X-Forwarded-Proto $scheme;
     }
 
+
     # HTML must be revalidated on every visit so a new deployment cannot keep
     # referencing hashed chunks that were removed with the previous image.
     location = /index.html {

output/appointment-calendar/verification.json

@@ -0,0 +1,92 @@
+{
+  "date": "2026-10-09",
+  "testOnly": true,
+  "deployment": {
+    "admin": {
+      "build": 536,
+      "result": "SUCCESS",
+      "commit": "73c29f5"
+    },
+    "firstleg": {
+      "build": 488,
+      "result": "SUCCESS",
+      "commit": "e94271706ce7"
+    },
+    "lastleg": {
+      "build": 234,
+      "result": "SUCCESS",
+      "commit": "7fd7699f6e83"
+    }
+  },
+  "databaseReset": {
+    "tables": [
+      "ll_inbound_fba_appointment",
+      "ll_inbound_fba_appointment_item"
+    ],
+    "beforeCounts": [
+      49,
+      59
+    ],
+    "afterResetCounts": [
+      0,
+      0
+    ]
+  },
+  "httpPassed": [
+    "five_customer_one_appointment",
+    "same_command_replay",
+    "duplicate_cargo_conflict",
+    "update_version",
+    "stale_update_conflict",
+    "stale_delete_conflict",
+    "delete_and_calendar_absence",
+    "rebook_after_delete",
+    "two_new_customer_accounts_10_negative_isolation_checks",
+    "nonempty_customer_75_rows_all_owned",
+    "nonempty_customer_forged_filter_stays_scoped",
+    "own_plan_detail_visible_other_plan_hidden",
+    "existing_customer_platform_appointment_forbidden",
+    "browser_deleted_appointment_absence_http_confirmed"
+  ],
+  "uiPassed": [
+    "1920x1080_month",
+    "five_customer_detail",
+    "edit_saved",
+    "week_view",
+    "candidate_existing_appointment_disabled",
+    "two_customer_selection",
+    "cross_page_selection_retained",
+    "create_saved",
+    "final_month_top_alignment",
+    "final_week_top_alignment",
+    "delete_confirmation_and_active_dispatch_rejection",
+    "month_week_three_previews_233_total_title",
+    "browser_successful_delete_two_to_one"
+  ],
+  "initialCalendarRequests": [
+    {
+      "type": "appointments",
+      "count": 1,
+      "durationMs": 59
+    },
+    {
+      "type": "arrivals",
+      "count": 1,
+      "durationMs": 106
+    }
+  ],
+  "pending": [],
+  "screenshots": [
+    "month-five-customers.png",
+    "week-five-customers.png",
+    "final-month.png",
+    "compact-month.png",
+    "compact-week.png",
+    "delete-success.png"
+  ],
+  "scope": {
+    "admin": "appointment calendar and inbound appointment consumer",
+    "client": "no page or code change; merchant inbound API positive and negative isolation verified",
+    "remainingSample": "QA-UI-20261009-2CUSTOMERS"
+  }
+}

output/appointment-gray-release/admin-pr.json

@@ -0,0 +1 @@
+{"repo": "html/admin-web", "number": 18, "url": "http://8.163.30.128:10082/html/admin-web/pulls/18", "head": "73c29f5264e46f648713c58b469a8c7bd335cd9c", "branch": "release/appointment-gray-20261009"}

output/appointment-gray-release/admin-release-commit.txt

@@ -0,0 +1 @@
+f9dd30b8b9c6b756c4502e4efc33df4ddb59e566

output/appointment-gray-release/backend-pr.json

@@ -0,0 +1 @@
+{"repo": "java-project/baiyue-firstleg", "number": 25, "url": "http://8.163.30.128:10082/java-project/baiyue-firstleg/pulls/25", "head": "7fd7699f6e83e77e487aceff914d160cf42376a0", "branch": "release/appointment-gray-20261009"}

output/appointment-gray-release/backend-release-commit.txt

@@ -0,0 +1 @@
+f60f44793f289f7612b561f1c470e093f67f4e32

output/appointment-gray-release/http-postdeploy.json

@@ -0,0 +1,30 @@
+[
+  {
+    "name": "permissions",
+    "http": 200,
+    "code": "200",
+    "count": 358,
+    "elapsedMs": 115
+  },
+  {
+    "name": "arrivals",
+    "http": 200,
+    "code": "200",
+    "count": 10,
+    "elapsedMs": 297
+  },
+  {
+    "name": "appointments",
+    "http": 200,
+    "code": "200",
+    "count": 0,
+    "elapsedMs": 287
+  },
+  {
+    "name": "inboundCandidates",
+    "http": 200,
+    "code": "200",
+    "count": 10,
+    "elapsedMs": 221
+  }
+]

output/appointment-gray-release/jobs.json

@@ -0,0 +1 @@
+[{"job": "baiyue-firstleg-prod-lastleg-service", "queue": "https://jenkins.buggoglobal.com/queue/item/7294/", "number": 13, "_class": "org.jenkinsci.plugins.workflow.job.WorkflowRun", "building": false, "result": "SUCCESS"}, {"job": "baiyue-firstleg-prod-firstleg", "queue": "https://jenkins.buggoglobal.com/queue/item/7295/", "number": 14, "_class": "org.jenkinsci.plugins.workflow.job.WorkflowRun", "building": false, "result": "SUCCESS"}, {"job": "admin-web-prod", "queue": "https://jenkins.buggoglobal.com/queue/item/7300/", "number": 26, "_class": "org.jenkinsci.plugins.workflow.job.WorkflowRun", "building": false, "result": "SUCCESS"}]

output/appointment-gray-release/preflight.json

@@ -0,0 +1,32 @@
+{
+  "scope": [
+    "admin-web",
+    "firstleg",
+    "lastleg-service"
+  ],
+  "databaseAuthorized": true,
+  "schemaPreflight": {
+    "appointmentRows": 0,
+    "itemRows": 0,
+    "permissionConflicts": 0,
+    "adminRoleCount": 1,
+    "affectedAdminSubjects": 1
+  },
+  "targets": {
+    "backend": "7fd7699f6",
+    "admin": "73c29f5"
+  },
+  "sourceEquivalence": {
+    "backendMergeTreeMatchesTestedSource": true,
+    "adminMergeTreeMatchesTestedSource": true
+  },
+  "sqlExecuted": true,
+  "deployed": true,
+  "pending": null,
+  "releaseBranchesDeleted": [
+    "backend",
+    "admin"
+  ],
+  "browserVerified": true,
+  "grayWriteCrudRetested": false
+}

output/appointment-gray-release/review-schema-permissions.sql

@@ -0,0 +1,35 @@
+-- REVIEW ONLY: gray appointment schema and platform administrator permissions.
+-- Execute only with explicit gray SQL authorization, after verifying both appointment tables remain empty.
+-- No DROP TABLE, DELETE, TRUNCATE, or business-data backfill.
+-- DDL auto-commits; stop immediately on any error. Do not use mysql --force.
+USE baiyue_lastleg;
+ALTER TABLE ll_inbound_fba_appointment
+  DROP INDEX uk_ll_fba_appointment_no,
+  DROP INDEX idx_ll_fba_appointment_list,
+  DROP COLUMN customer_id,
+  ADD COLUMN appointment_end_at DATETIME(3) NULL COMMENT '预约结束时间，未明确时为空' AFTER appointment_at,
+  ADD COLUMN version INT NOT NULL DEFAULT 0 COMMENT '并发版本' AFTER appointment_end_at,
+  ADD UNIQUE KEY uk_ll_fba_appointment_no (appointment_no),
+  ADD KEY idx_ll_fba_appointment_list (appointment_at, appointment_status, fba_warehouse_code);
+ALTER TABLE ll_inbound_fba_appointment_item
+  ADD COLUMN customer_id VARCHAR(128) NOT NULL COMMENT '本票货物客户ID' AFTER appointment_id,
+  ADD KEY idx_ll_fba_appointment_item_cargo (line_id, appointment_id);
+USE baiyue_iam;
+START TRANSACTION;
+INSERT INTO iam_permission
+  (id,tenant_id,app_code,permission_type,parent_id,permission_code,permission_name,route_path,http_method,sort_no,status,built_in,deleted)
+VALUES
+  (5107280,0,'PLATFORM','MENU',0,'platform:appointment:list','预约列表','/appointment-calendar','GET',740,'ACTIVE',1,0),
+  (5107281,0,'PLATFORM','BUTTON',5107280,'platform:appointment:delete','删除预约',NULL,'DELETE',741,'ACTIVE',1,0);
+INSERT INTO iam_role_permission (tenant_id,role_id,permission_id,created_at)
+SELECT 0,r.id,p.id,NOW(3) FROM iam_role r CROSS JOIN iam_permission p
+WHERE r.id=4000001 AND r.tenant_id=0 AND r.role_code='PLATFORM_ADMIN' AND r.status='ACTIVE' AND r.deleted=0
+AND p.id IN (5107280,5107281);
+INSERT INTO iam_security_subject_version (auth_user_id,permission_version,updated_at)
+SELECT DISTINCT u.auth_user_id,1,NOW(3)
+FROM iam_membership_role mr
+JOIN iam_membership m ON m.id=mr.membership_id AND m.tenant_id=mr.tenant_id
+JOIN iam_user u ON u.id=m.user_id
+WHERE mr.tenant_id=0 AND mr.role_id=4000001 AND m.deleted=0 AND u.deleted=0
+ON DUPLICATE KEY UPDATE permission_version=permission_version+1,updated_at=NOW(3);
+COMMIT;

output/appointment-gray-release/sql-postcheck.txt

@@ -0,0 +1,5 @@
+ll_inbound_fba_appointment	13
+ll_inbound_fba_appointment_item	9
+platform:appointment:list
+platform:appointment:delete
+2

package.json

@@ -8,7 +8,7 @@
     "build": "vue-tsc --noEmit && vite build",
     "typecheck": "vue-tsc --noEmit",
     "test": "vitest run",
-    "test:phase4:development": "node scripts/phase4-development-frontend-acceptance.mjs",
+    "test:phase4:test": "node scripts/phase4-test-frontend-acceptance.mjs",
     "preview": "vite preview --port 4173"
   },
   "dependencies": {
@@ -16,10 +16,12 @@
     "@lucide/vue": "^1.27.0",
     "axios": "^1.18.1",
     "dayjs": "^1.11.21",
+    "echarts": "^6.1.0",
     "element-plus": "^2.14.3",
     "pinia": "^4.0.2",
     "sortablejs": "^1.15.7",
     "vue": "^3.5.40",
+    "vue-echarts": "^8.3.2",
     "vue-router": "^5.2.0"
   },
   "devDependencies": {

pnpm-lock.yaml

@@ -20,6 +20,9 @@ importers:
       dayjs:
         specifier: ^1.11.21
         version: 1.11.21
+      echarts:
+        specifier: ^6.1.0
+        version: 6.1.0
       element-plus:
         specifier: ^2.14.3
         version: 2.14.3(vue@3.5.40(typescript@5.9.3))
@@ -32,6 +35,9 @@ importers:
       vue:
         specifier: ^3.5.40
         version: 3.5.40(typescript@5.9.3)
+      vue-echarts:
+        specifier: ^8.3.2
+        version: 8.3.2(echarts@6.1.0)(vue@3.5.40(typescript@5.9.3))
       vue-router:
         specifier: ^5.2.0
         version: 5.2.0(@vue/compiler-sfc@3.5.40)(pinia@4.0.2(@vue/devtools-api@8.2.1)(typescript@5.9.3)(vue@3.5.40(typescript@5.9.3)))(rolldown@1.1.5)(vite@8.1.5(@types/node@24.13.3)(yaml@2.9.0))(vue@3.5.40(typescript@5.9.3))
@@ -641,6 +647,9 @@ packages:
   eastasianwidth@0.2.0:
     resolution: {integrity: sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==}
 
+  echarts@6.1.0:
+    resolution: {integrity: sha512-q0yaFPggC9FUdsWH4blavRWFmxdrIodbkoKNAjJudAI6CA9gNPxHtV2RcZNEepZVlk4yvBYkOkbk6HIVpIyHZA==}
+
   editorconfig@1.0.7:
     resolution: {integrity: sha512-e0GOtq/aTQhVdNyDU9e02+wz9oDDM+SIOQxWME2QRjzRX5yyLAuHDE+0aE8vHb9XRC8XD37eO2u57+F09JqFhw==}
     engines: {node: '>=14'}
@@ -1150,6 +1159,9 @@ packages:
     resolution: {integrity: sha512-bLVMLPtstlZ4iMQHpFHTR7GAGj2jxi8Dg0s2h2MafAE4uSWF98FC/3MomU51iQAMf8/qDUbKWf5GxuvvVcXEhw==}
     engines: {node: '>=20'}
 
+  tslib@2.3.0:
+    resolution: {integrity: sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==}
+
   tslib@2.8.1:
     resolution: {integrity: sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==}
 
@@ -1325,6 +1337,12 @@ packages:
   vue-component-type-helpers@3.3.8:
     resolution: {integrity: sha512-troqCMmQodQDqUqn63NQaFi+CDSclSe7sc8VEBFqf5GFLqmGR2Ph3P2WEC7qwpRVyEWsTi/aAr4vyOe/B1hU3g==}
 
+  vue-echarts@8.3.2:
+    resolution: {integrity: sha512-FbJD49OZZZv1I8aclHQ+gcQxU+Y9nNWQMuod1sewE7/YjGQUJAaeVcf6WrSfQDBRPke+WoVsUtdRFIqPOsRrnw==}
+    peerDependencies:
+      echarts: ^6.0.0
+      vue: ^3.3.0
+
   vue-router@5.2.0:
     resolution: {integrity: sha512-QAC5i0LEb1GLG0LXDQmHu8L7FX12j0KwU/JTKmLQUJMrn04gQdKP6Du+p0QwpHb3iy71vBlqnHQ8WAfOSAWhqw==}
     peerDependencies:
@@ -1406,6 +1424,9 @@ packages:
     engines: {node: '>= 14.6'}
     hasBin: true
 
+  zrender@6.1.0:
+    resolution: {integrity: sha512-oEGMDB6pOP2S6OwRR4PdVv610zrjnA3Bh+JnSG12fYJlBKjtNAoEb5fSUoCOOINlH96I2fU38/A2UpRKs67xYQ==}
+
 snapshots:
 
   '@asamuzakjp/css-color@5.1.11':
@@ -1960,6 +1981,11 @@ snapshots:
 
   eastasianwidth@0.2.0: {}
 
+  echarts@6.1.0:
+    dependencies:
+      tslib: 2.3.0
+      zrender: 6.1.0
+
   editorconfig@1.0.7:
     dependencies:
       '@one-ini/wasm': 0.1.1
@@ -2436,6 +2462,8 @@ snapshots:
     dependencies:
       punycode: 2.3.1
 
+  tslib@2.3.0: {}
+
   tslib@2.8.1:
     optional: true
 
@@ -2563,6 +2591,11 @@ snapshots:
 
   vue-component-type-helpers@3.3.8: {}
 
+  vue-echarts@8.3.2(echarts@6.1.0)(vue@3.5.40(typescript@5.9.3)):
+    dependencies:
+      echarts: 6.1.0
+      vue: 3.5.40(typescript@5.9.3)
+
   vue-router@5.2.0(@vue/compiler-sfc@3.5.40)(pinia@4.0.2(@vue/devtools-api@8.2.1)(typescript@5.9.3)(vue@3.5.40(typescript@5.9.3)))(rolldown@1.1.5)(vite@8.1.5(@types/node@24.13.3)(yaml@2.9.0))(vue@3.5.40(typescript@5.9.3)):
     dependencies:
       '@babel/generator': 8.0.0
@@ -2658,3 +2691,7 @@ snapshots:
   xmlchars@2.2.0: {}
 
   yaml@2.9.0: {}
+
+  zrender@6.1.0:
+    dependencies:
+      tslib: 2.3.0

scripts/deploy-production.sh

@@ -1,150 +1,58 @@
-#!/usr/bin/env sh
+#!/bin/sh
 set -eu
-
-if [ "$#" -ne 4 ]; then
-  echo "用法: $0 <服务名> <镜像仓库> <镜像标签> <Compose 文件>" >&2
-  exit 2
-fi
-
-SERVICE="$1"
-IMAGE_REPOSITORY="$2"
-IMAGE_TAG="$3"
-COMPOSE_FILE="$4"
-IMAGE="$IMAGE_REPOSITORY:$IMAGE_TAG"
-REGISTRY_HOST="${IMAGE_REPOSITORY%%/*}"
-SSH_TARGET="${TARGET_SSH_TARGET:?TARGET_SSH_TARGET 未设置}"
-SSH_KEY="${TARGET_SSH_KEY:?TARGET_SSH_KEY 未设置}"
-SSH_KNOWN_HOSTS="${TARGET_SSH_KNOWN_HOSTS:?TARGET_SSH_KNOWN_HOSTS 未设置}"
-REMOTE_DIR="${TARGET_DEPLOY_DIR:?TARGET_DEPLOY_DIR 未设置}"
-: "${REGISTRY_USER:?REGISTRY_USER 未设置}"
-: "${REGISTRY_PASSWORD:?REGISTRY_PASSWORD 未设置}"
-
+set +x
+: "${PUBLIC_WEB_ORIGIN:?PUBLIC_WEB_ORIGIN is required}"
+: "${PRODUCTION_IMAGE_REPOSITORY:?PRODUCTION_IMAGE_REPOSITORY is required}"
+: "${TARGET_SSH_KEY:?}"
+: "${TARGET_SSH_USER:?}"
+: "${TARGET_SSH_HOST:?}"
+: "${TARGET_SSH_KNOWN_HOSTS:?}"
+: "${BUILD_REGISTRY_USER:?}"
+: "${BUILD_REGISTRY_PASSWORD:?}"
+: "${REGISTRY_USER:?}"
+: "${REGISTRY_PASSWORD:?}"
+case "$PUBLIC_WEB_ORIGIN" in https://*) ;; *) echo 'prod requires HTTPS web origin' >&2; exit 2 ;; esac
+# Only an origin (optionally a trailing slash) is accepted; no shell/env-file metacharacters.
+printf '%s' "$PUBLIC_WEB_ORIGIN" | grep -Eq '^https://[A-Za-z0-9.-]+(:[0-9]+)?/?$'
+printf '%s' "$PRODUCTION_IMAGE_REPOSITORY" | grep -Eq '^[A-Za-z0-9.-]+(:[0-9]+)?/[a-z0-9._/-]+$'
+git fetch --no-tags origin +refs/heads/main:refs/remotes/origin/main
+test "$(git rev-parse HEAD)" = "$(git rev-parse origin/main)"
+IMAGE_TAG=$(git rev-parse --short=12 HEAD)
+registry=${PRODUCTION_IMAGE_REPOSITORY%%/*}
+image="$PRODUCTION_IMAGE_REPOSITORY:$IMAGE_TAG"
+TARGET_SSH_TARGET="$TARGET_SSH_USER@$TARGET_SSH_HOST"
+remote_dir=/data/firstleg/deploy/gray-admin-web
 run_ssh() {
-  ssh -i "$SSH_KEY" -o BatchMode=yes -o StrictHostKeyChecking=yes \
-    -o UserKnownHostsFile="$SSH_KNOWN_HOSTS" -o ConnectTimeout=10 "$SSH_TARGET" "$@"
+  ssh -i "$TARGET_SSH_KEY" -o BatchMode=yes -o StrictHostKeyChecking=yes \
+    -o UserKnownHostsFile="$TARGET_SSH_KNOWN_HOSTS" -o ConnectTimeout=12 "$TARGET_SSH_TARGET" "$@"
 }
-
 run_scp() {
-  scp -i "$SSH_KEY" -o BatchMode=yes -o StrictHostKeyChecking=yes \
-    -o UserKnownHostsFile="$SSH_KNOWN_HOSTS" -o ConnectTimeout=10 "$@"
+  scp -i "$TARGET_SSH_KEY" -o BatchMode=yes -o StrictHostKeyChecking=yes \
+    -o UserKnownHostsFile="$TARGET_SSH_KNOWN_HOSTS" -o ConnectTimeout=12 "$@"
 }
-
-run_ssh install -d -m 750 "$REMOTE_DIR"
-REMOTE_COMPOSE="$REMOTE_DIR/docker-compose.$SERVICE.yml"
-run_scp "$COMPOSE_FILE" "$SSH_TARGET:$REMOTE_COMPOSE.tmp"
-run_ssh sh -s -- "$REMOTE_COMPOSE.tmp" "$REMOTE_COMPOSE" <<'REMOTE_PREPARE'
+export DOCKER_CONFIG
+DOCKER_CONFIG=$(mktemp -d)
+cleanup() { rm -f "$DOCKER_CONFIG/config.json"; rmdir "$DOCKER_CONFIG" 2>/dev/null || true; }
+trap cleanup EXIT HUP INT TERM
+printf '%s' "$BUILD_REGISTRY_PASSWORD" | docker login -u "$BUILD_REGISTRY_USER" --password-stdin "$registry"
+docker build --build-arg NODE_IMAGE="${NODE_BASE_IMAGE:-node:22-alpine}" \
+  --build-arg NGINX_IMAGE="${NGINX_BASE_IMAGE:-nginx:1.27-alpine}" \
+  --build-arg VITE_CLIENT_WEB_URL="$PUBLIC_WEB_ORIGIN" -t "$image" .
+docker push "$image"
+run_ssh install -d -m 750 "$remote_dir"
+run_scp docker-compose.production.yml "$TARGET_SSH_TARGET:$remote_dir/compose.yml"
+# The remote env file contains only image coordinates and public web origin, never credentials.
+printf 'PRODUCTION_IMAGE_REPOSITORY=%s\nIMAGE_TAG=%s\nPUBLIC_WEB_ORIGIN=%s\n' \
+  "$PRODUCTION_IMAGE_REPOSITORY" "$IMAGE_TAG" "$PUBLIC_WEB_ORIGIN" | run_ssh sh -c "'umask 077; cat > $remote_dir/release.env'"
+# Registry credentials exist only in an isolated temporary Docker config, removed after pull.
+printf '%s' "$REGISTRY_USER" | grep -Eq '^[A-Za-z0-9_.@-]+$'
+run_scp scripts/pull-production-image.sh "$TARGET_SSH_TARGET:$remote_dir/pull-image.sh"
+printf '%s' "$REGISTRY_PASSWORD" | run_ssh sh "$remote_dir/pull-image.sh" "$REGISTRY_USER" "$registry" "$image"
+run_ssh sh -s -- "$remote_dir" <<'REMOTE'
 set -eu
-compose_tmp="$1"
-compose_target="$2"
-chmod 644 "$compose_tmp"
-mv -f "$compose_tmp" "$compose_target"
-REMOTE_PREPARE
-
-printf '%s' "$REGISTRY_PASSWORD" | run_ssh docker login -u "$REGISTRY_USER" --password-stdin "$REGISTRY_HOST"
-trap 'run_ssh docker logout "$REGISTRY_HOST" >/dev/null 2>&1 || true' EXIT HUP INT TERM
-run_ssh docker pull "$IMAGE"
-
-run_ssh sh -s -- "$REMOTE_DIR" "$SERVICE" "$IMAGE_REPOSITORY" "$IMAGE_TAG" <<'REMOTE_DEPLOY'
-set -eu
-remote_dir="$1"
-service="$2"
-image_repository="$3"
-image_tag="$4"
-compose_file="docker-compose.$service.yml"
-project_name="firstleg-prod-$service"
-cd "$remote_dir"
-export IMAGE_REPOSITORY="$image_repository" IMAGE_TAG="$image_tag"
-
-compose() {
-  docker compose --project-name "$project_name" -f "$compose_file" "$@"
-}
-
-case "$service" in
-  admin-web)
-    base_port=9001
-    nginx_config=/www/server/panel/vhost/nginx/00-blue-green-admin-web.conf
-    legacy_container=firstleg-prod-admin-web
-    ;;
-  client-web)
-    base_port=9002
-    nginx_config=/www/server/panel/vhost/nginx/00-blue-green-client-web.conf
-    legacy_container=firstleg-prod-client-web
-    ;;
-  *) echo "不支持蓝绿部署的前端服务: $service" >&2; exit 2 ;;
-esac
-
-state_root=/data/firstleg/deploy/blue-green-state
-state_file="$state_root/frontend-$service.active"
-routing_network=firstleg-production-routing
-mkdir -p "$state_root"
-chmod 750 "$state_root"
-docker network inspect "$routing_network" >/dev/null 2>&1 || docker network create "$routing_network" >/dev/null
-
-for pair in gateway-active:firstleg-production-gateway gateway-overseas-active:firstleg-production-gateway-overseas; do
-  alias_name="${pair%%:*}"
-  container="${pair#*:}"
-  if docker inspect "$container" >/dev/null 2>&1; then
-    docker network inspect "$routing_network" --format '{{json .Containers}}' | grep -q "\"$container\"" \
-      || docker network connect --alias "$alias_name" "$routing_network" "$container"
-  fi
-done
-
-active_slot=""
-active_container=""
-active_port=""
-if [ -s "$state_file" ]; then
-  IFS='|' read -r active_slot active_container active_port active_image < "$state_file"
-elif docker inspect "$legacy_container" >/dev/null 2>&1; then
-  active_slot=legacy
-  active_container="$legacy_container"
-  active_port="$base_port"
-fi
-
-if [ "$active_slot" = blue ]; then target_slot=green; else target_slot=blue; fi
-[ "$active_slot" = legacy ] && target_slot=green
-if [ "$target_slot" = blue ]; then target_port=$((base_port + 20000)); else target_port=$((base_port + 10000)); fi
-candidate="${legacy_container}-${target_slot}"
-docker rm -f "$candidate" >/dev/null 2>&1 || true
-
-if ! compose run -d --no-deps --name "$candidate" \
-    -p "127.0.0.1:$target_port:80" "$service" >/dev/null; then
-  docker rm -f "$candidate" >/dev/null 2>&1 || true
-  exit 1
-fi
-
-healthy=false
-elapsed=0
-while [ "$elapsed" -lt 120 ]; do
-  if docker exec "$candidate" wget -qO- http://127.0.0.1/healthz >/dev/null 2>&1; then
-    healthy=true
-    break
-  fi
-  sleep 2
-  elapsed=$((elapsed + 2))
-done
-if [ "$healthy" != true ]; then
-  docker logs --tail 100 "$candidate" >&2 || true
-  docker rm -f "$candidate" >/dev/null 2>&1 || true
-  exit 1
-fi
-
-backup="$nginx_config.blue-green-backup"
-cp -f "$nginx_config" "$backup"
-if ! sed -i "s#127\.0\.0\.1:${active_port:-$base_port}#127.0.0.1:$target_port#g" "$nginx_config" \
-  || cmp -s "$nginx_config" "$backup" || ! nginx -t || ! nginx -s reload; then
-  cp -f "$backup" "$nginx_config"
-  nginx -t && nginx -s reload || true
-  docker rm -f "$candidate" >/dev/null 2>&1 || true
-  exit 1
-fi
-rm -f "$backup"
-
-if [ -n "$active_container" ] && docker inspect "$active_container" >/dev/null 2>&1; then
-  docker stop --time 30 "$active_container" >/dev/null
-  docker rm "$active_container" >/dev/null
-fi
-printf '%s|%s|%s|%s\n' "$target_slot" "$candidate" "$target_port" "$image_repository:$image_tag" > "$state_file.tmp"
-chmod 640 "$state_file.tmp"
-mv -f "$state_file.tmp" "$state_file"
-echo "生产前端蓝绿部署成功: service=$service slot=$target_slot port=$target_port image=$image_repository:$image_tag"
-REMOTE_DEPLOY
+cd "$1"
+docker network inspect firstleg-production-network >/dev/null
+docker compose --env-file release.env -f compose.yml config --quiet
+docker compose --env-file release.env -f compose.yml up -d --wait --wait-timeout 120
+docker compose --env-file release.env -f compose.yml exec -T admin-web wget -qO- http://127.0.0.1/healthz
+REMOTE

scripts/phase4-test-frontend-acceptance.mjs

@@ -1,4 +1,3 @@
-import { existsSync, readFileSync } from 'node:fs'
 import { spawnSync } from 'node:child_process'
 
 function option(name) {
@@ -15,22 +14,13 @@ function normalizeOrigin(value, name) {
   return url.origin
 }
 
-function acceptancePassword() {
-  if (process.env.CHONGCHONG_ADMIN_ACCEPTANCE_PASSWORD) return process.env.CHONGCHONG_ADMIN_ACCEPTANCE_PASSWORD
-  const file = 'C:/Users/BY-OY/.codex/chongchong-global-dev-acceptance.env'
-  if (!existsSync(file)) return ''
-  const match = readFileSync(file, 'utf8').match(/^CHONGCHONG_ADMIN_ACCEPTANCE_PASSWORD=(.*)$/m)
-  return match?.[1]?.trim() || ''
-}
-
 const environment = option('--environment')
-if (environment !== 'development') throw new Error('本入口仅允许显式指定 --environment development')
-const gateway = normalizeOrigin(option('--gateway') || process.env.ADMIN_DEVELOPMENT_GATEWAY, '--gateway')
-const overseasGateway = normalizeOrigin(option('--overseas-gateway') || process.env.ADMIN_DEVELOPMENT_OVERSEAS_GATEWAY, '--overseas-gateway')
-const password = acceptancePassword()
-if (!password) throw new Error('缺少 CHONGCHONG_ADMIN_ACCEPTANCE_PASSWORD 或本机开发验收凭据文件')
+if (environment !== 'test') throw new Error('本入口仅允许显式指定 --environment test')
+const gateway = normalizeOrigin(option('--gateway') || process.env.ADMIN_TEST_GATEWAY, '--gateway')
+const password = process.env.CHONGCHONG_ADMIN_ACCEPTANCE_PASSWORD
+if (!password) throw new Error('缺少 CHONGCHONG_ADMIN_ACCEPTANCE_PASSWORD')
 
-const result = spawnSync('pnpm', ['exec', 'vitest', 'run', '--config', 'vitest.phase4-development.config.ts'], {
+const result = spawnSync('pnpm', ['exec', 'vitest', 'run', '--config', 'vitest.phase4-test.config.ts'], {
   cwd: process.cwd(),
   stdio: 'inherit',
   shell: process.platform === 'win32',
@@ -39,10 +29,8 @@ const result = spawnSync('pnpm', ['exec', 'vitest', 'run', '--config', 'vitest.p
     ADMIN_PHASE4_LIVE: '1',
     ADMIN_ACCEPTANCE_USERNAME: process.env.ADMIN_ACCEPTANCE_USERNAME || 'platform_admin',
     ADMIN_ACCEPTANCE_PASSWORD: password,
-    ADMIN_DEVELOPMENT_GATEWAY: gateway,
-    ADMIN_DEVELOPMENT_OVERSEAS_GATEWAY: overseasGateway,
+    ADMIN_TEST_GATEWAY: gateway,
     VITE_API_BASE_URL: `${gateway}/api`,
-    VITE_OVERSEAS_API_BASE_URL: `${overseasGateway}/api`,
   },
 })
 if (result.error) throw result.error

scripts/phase4-test-frontend-contract.test.mjs

@@ -2,14 +2,14 @@ import assert from 'node:assert/strict'
 import { readFileSync } from 'node:fs'
 import test from 'node:test'
 
-const runner = readFileSync(new URL('./phase4-development-frontend-acceptance.mjs', import.meta.url), 'utf8')
-const suite = readFileSync(new URL('./phase4-development-frontend.acceptance.ts', import.meta.url), 'utf8')
+const runner = readFileSync(new URL('./phase4-test-frontend-acceptance.mjs', import.meta.url), 'utf8')
+const suite = readFileSync(new URL('./phase4-test-frontend.acceptance.ts', import.meta.url), 'utf8')
 
-test('development runner requires an explicit development environment and gateways', () => {
+test('test runner requires an explicit test environment and unified gateway', () => {
   assert.match(runner, /--environment/)
-  assert.match(runner, /environment !== 'development'/)
+  assert.match(runner, /environment !== 'test'/)
   assert.match(runner, /--gateway/)
-  assert.match(runner, /--overseas-gateway/)
+  assert.doesNotMatch(runner, /--overseas-gateway|VITE_OVERSEAS/)
   assert.match(runner, /shell: process\.platform === 'win32'/)
   assert.match(runner, /if \(result\.error\) throw result\.error/)
   assert.doesNotMatch(runner, /ADMIN_ACCEPTANCE_PASSWORD\s*[:=]\s*['"][^'"]+['"]/)
@@ -17,7 +17,7 @@ test('development runner requires an explicit development environment and gatewa
 
 test('live suite uses production auth clients and domain adapters', () => {
   assert.match(suite, /useAuthStore/)
-  assert.match(suite, /clearOverseasAccessToken/)
+  assert.match(suite, /refreshAuthenticatedSession/)
   assert.match(suite, /createQuote/)
   assert.match(suite, /createUsTruckOrder/)
   assert.match(suite, /createLocalLooseboardOrder/)

scripts/phase4-test-frontend.acceptance.ts

@@ -8,7 +8,7 @@ import { defineComponent, nextTick } from 'vue'
 import { mount, type VueWrapper } from '@vue/test-utils'
 import ElementPlus from 'element-plus'
 import { http, ApiResponseError } from '@/shared/api/http'
-import { clearOverseasAccessToken, overseasHttp } from '@/shared/api/overseasHttp'
+import { refreshAuthenticatedSession } from '@/shared/api/http'
 import { useAuthStore } from '@/core/auth/auth'
 import { listPlatformTenants } from '@/modules/iam/api/platformIam'
 import {
@@ -45,7 +45,7 @@ import InventoryTransactionsView from '@/modules/overseas-warehouse/pages/Invent
 import PalletsView from '@/modules/overseas-warehouse/pages/PalletsView.vue'
 import QueryToolbar from '@/shared/components/QueryToolbar.vue'
 
-type Region = 'domestic' | 'overseas'
+type Region = 'unified'
 interface TraceStep { region: Region; method: string; path: string; params: unknown; body: unknown; httpStatus: number; code?: string; requestId?: string; traceId?: string; authorization: boolean }
 interface CoverageGap { area: string; reason: string }
 
@@ -150,7 +150,7 @@ async function masterDataLifecycle() {
 }
 
 async function cleanupTransport(path: string, customerId: string, version: number) {
-  await overseasHttp.patch(`${path}/status`, { version, status: 'CANCELLED', remark: `${marker} cleanup` }, { params: { customerId } })
+  await http.patch(`${path}/status`, { version, status: 'CANCELLED', remark: `${marker} cleanup` }, { params: { customerId } })
 }
 async function overseasBusinessLifecycle() {
   const customers = (await listPlatformTenants({ page: 1, size: 200, status: 'ACTIVE' })).records.filter(item => item.status === 'ACTIVE')
@@ -355,25 +355,25 @@ async function pageRequestCoverage() {
     { occurredDate: ['2098-01-01', '2098-01-02'], customerName: `${marker}-CUSTOMER`, warehouse: `${marker}-WAREHOUSE`, sku: `${marker}-SKU`, businessType: 'ADJUST', businessOrderNo: `${marker}-BUSINESS`, inboundCode: `${marker}-INBOUND`, inboundOrderNo: `${marker}-INBOUND-ORDER`, outboundOrderNo: `${marker}-OUTBOUND` },
     { customerName: `${marker}-CUSTOMER`, destinationWarehouseCode: `${marker}-WAREHOUSE`, skuCode: `${marker}-SKU`, businessType: 'ADJUST', businessOrderNo: `${marker}-BUSINESS`, inboundCode: `${marker}-INBOUND`, inboundOrderNo: `${marker}-INBOUND-ORDER`, outboundOrderNo: `${marker}-OUTBOUND`, occurredFrom: '2098-01-01T00:00:00', occurredTo: '2098-01-02T23:59:59' })
 
-  const pallets = await mountPage(PalletsView, 'GET', '/platform/v1/warehouse-admin/pallets')
-  await exerciseListSearch(pallets, '/platform/v1/warehouse-admin/pallets',
+  const pallets = await mountPage(PalletsView, 'GET', '/platform/v1/overseas-warehouse-resources/pallets')
+  await exerciseListSearch(pallets, '/platform/v1/overseas-warehouse-resources/pallets',
     { warehouseId: '', code: `${marker}-PALLET`, type: 'WOOD', status: 'IDLE' },
     { keyword: `${marker}-PALLET`, palletType: 'WOOD', status: 'IDLE' })
 }
 
-describe.skipIf(!enabled).sequential('phase4 development frontend acceptance', () => {
+describe.skipIf(!enabled).sequential('phase4 test frontend acceptance', () => {
   beforeAll(async () => {
     Object.defineProperty(window, 'matchMedia', { writable: true, value: () => ({ matches: false, addEventListener() {}, removeEventListener() {} }) })
     globalThis.ResizeObserver = class { observe() {}; unobserve() {}; disconnect() {} }
-    installTracingAdapter(http, 'domestic'); installTracingAdapter(overseasHttp, 'overseas')
+    installTracingAdapter(http, 'unified')
     const pinia = createPinia(); setActivePinia(pinia)
     const auth = useAuthStore(pinia)
     await auth.login(process.env.ADMIN_ACCEPTANCE_USERNAME || 'platform_admin', process.env.ADMIN_ACCEPTANCE_PASSWORD || '')
     expect(localStorage.getItem('cc-admin-token')).toBeTruthy()
-    clearOverseasAccessToken()
+    await refreshAuthenticatedSession()
     await listVehicles({ page: 1, size: 1 })
-    expect(traces.some(item => item.region === 'domestic' && item.path === '/auth/refresh')).toBe(true)
-    expect(traces.some(item => item.region === 'overseas' && item.authorization)).toBe(true)
+    expect(traces.some(item => item.region === 'unified' && item.path === '/auth/refresh')).toBe(true)
+    expect(traces.some(item => item.region === 'unified' && item.authorization)).toBe(true)
   })
   it('runs marker-owned adapter lifecycles and real page requests', async () => {
     await masterDataLifecycle()
@@ -388,7 +388,7 @@ describe.skipIf(!enabled).sequential('phase4 development frontend acceptance', (
     const reportDir = resolve(process.cwd(), 'reports')
     mkdirSync(reportDir, { recursive: true })
     const report = { generatedAt: new Date().toISOString(), marker, summary: { requests: traces.length, coverageGaps: coverageGaps.length }, traces, coverageGaps, createdResources }
-    const file = resolve(reportDir, `phase4-frontend-development-${marker.replace(/[^A-Za-z0-9-]/g, '')}.json`)
+    const file = resolve(reportDir, `phase4-frontend-test-${marker.replace(/[^A-Za-z0-9-]/g, '')}.json`)
     writeFileSync(file, `${JSON.stringify(report, null, 2)}\n`, 'utf8')
     console.info(`PHASE4_FRONTEND_REPORT=${file}`)
   })

scripts/pull-production-image.sh

@@ -0,0 +1,9 @@
+#!/bin/sh
+set -eu
+set +x
+export DOCKER_CONFIG
+DOCKER_CONFIG=$(mktemp -d)
+cleanup() { rm -f "$DOCKER_CONFIG/config.json"; rmdir "$DOCKER_CONFIG" 2>/dev/null || true; }
+trap cleanup EXIT HUP INT TERM
+docker login -u "$1" --password-stdin "$2"
+docker pull "$3"

src/app/DomesticOutboundListLayout.test.ts

@@ -31,7 +31,7 @@ describe('domestic outbound list responsive contracts', () => {
     const content = source(path)
     const columns = [...content.matchAll(/\{[^{}]*(?:key|prop): '[^']+'[^{}]*label: '[^']+'[^{}]*\}/g)]
       .map((match) => match[0])
-      .filter((column) => !column.includes("type: 'input'") && !column.includes("type: 'select'") && !column.includes("type: 'daterange'"))
+      .filter((column) => !column.includes("type: 'input'") && !column.includes("type: 'select'") && !column.includes("type: 'daterange'") && !column.includes('priority:') && !column.includes("key: 'view'"))
     expect(columns.length).toBeGreaterThan(1)
     for (const column of columns) expect(column).toMatch(/\b(?:width|minWidth):\s*\d+/)
   })

src/app/components/AdminSidebarMenu.test.ts

@@ -63,10 +63,12 @@ describe('AdminSidebarMenu', () => {
     expect(groupTitles).not.toContain('供应商中心')
     expect(groupTitles).toContain('通用')
     expect(groupTitles).toContain('系统管理')
+    expect(groupTitles).not.toContain('预约管理')
     expect(groupTitles).not.toContain('财务管理')
+    expect(paths).not.toContain('/finance/customer-accounts')
     expect(paths).toContain('/dashboard')
     expect(paths).toContain('/orders')
-    expect(paths).toContain('/master-data/express-companies')
+    expect(paths).not.toContain('/master-data/express-companies')
     expect(paths).not.toContain('/orders/first-leg')
     expect(paths).not.toContain('/first-leg-pricing/customer-rules')
     expect(paths).toContain('/downloads')

src/app/router/index.ts

@@ -32,6 +32,9 @@ import { overseasWarehouseRoutes } from '@/modules/overseas-warehouse/routes'
 import { overseasBusinessRoutes } from '@/modules/overseas-business/routes'
 import { overseasMasterDataRoutes } from '@/modules/overseas-master-data/routes'
 import { pdaReleaseRoutes } from '@/modules/pda-releases/routes'
+import { sailingCalendarRoutes } from '@/modules/sailing-calendar/routes'
+import { appointmentCalendarRoutes } from '@/modules/appointment-calendar/routes'
+import { selfOperatedRoutes } from '@/modules/self-operated/routes'
 
 const router = createRouter({
   history: createWebHistory(),
@@ -77,6 +80,9 @@ const router = createRouter({
         ...downloadRoutes,
         ...iamRoutes,
         ...pdaReleaseRoutes,
+        ...sailingCalendarRoutes,
+        ...appointmentCalendarRoutes,
+        ...selfOperatedRoutes,
         {
           path: '403',
           name: 'forbidden',

src/core/auth/auth.test.ts

@@ -60,13 +60,11 @@ function loginResponse(accessToken = token(), refreshToken = 'refresh-next') {
       expiresIn: 1800,
       refreshToken,
       refreshExpiresIn: 604800,
-      overseasAccessToken: 'overseas-token',
-      overseasExpiresIn: 900,
     },
   }
 }
 
-function domesticOnlyLoginResponse() {
+function unifiedLoginResponse() {
   return {
     code: '200',
     message: 'success',
@@ -91,8 +89,8 @@ describe('admin auth session', () => {
 
   afterEach(() => vi.unstubAllGlobals())
 
-  it('accepts a domestic-only token response when the test environment has no overseas services', async () => {
-    mocks.post.mockResolvedValue(domesticOnlyLoginResponse())
+  it('accepts the unified access and refresh token response', async () => {
+    mocks.post.mockResolvedValue(unifiedLoginResponse())
     mocks.listCurrentPlatformPermissionCodes.mockResolvedValue(['platform:warehouse:list'])
     const auth = useAuthStore()
 
@@ -116,8 +114,6 @@ describe('admin auth session', () => {
         expiresIn: '7200',
         refreshToken: 'refresh-serialized',
         refreshExpiresIn: '604800',
-        overseasAccessToken: null,
-        overseasExpiresIn: '0',
       },
     })
     mocks.listCurrentPlatformPermissionCodes.mockResolvedValue(['platform:warehouse:list'])
@@ -245,4 +241,157 @@ describe('admin auth session', () => {
     expect(auth.refreshToken).toBe('')
     expect(localStorage.getItem('cc-admin-token')).toBeNull()
   })
+
+  it('rejects an old refresh after another tab has switched to a different account', async () => {
+    localStorage.setItem('cc-admin-token', token())
+    localStorage.setItem('cc-admin-refresh-token', 'admin-refresh')
+    localStorage.setItem('cc-admin-permission-codes', '["platform:warehouse:list"]')
+    let finishRefresh!: (value: ReturnType<typeof loginResponse>) => void
+    mocks.post.mockImplementation(() => new Promise(resolve => { finishRefresh = resolve }))
+    mocks.listCurrentPlatformPermissionCodes.mockResolvedValue(['platform:warehouse:list'])
+    const listeners = vi.spyOn(window, 'addEventListener')
+    const auth = useAuthStore()
+    const onStorage = listeners.mock.calls.find(([name]) => name === 'storage')![1] as (event: StorageEvent) => void
+    listeners.mockRestore()
+    const refreshing = auth.refreshSession()
+    await Promise.resolve()
+    const salesToken = token({ user_id: '2000002', username: 'sales' })
+    localStorage.setItem('cc-admin-token', salesToken)
+    localStorage.setItem('cc-admin-refresh-token', 'sales-refresh')
+    localStorage.setItem('cc-admin-permission-codes', '["platform:fleet:capacity-offer:list"]')
+    onStorage(new StorageEvent('storage', { key: 'cc-admin-token' }))
+    expect(auth.user?.account).toBe('sales')
+    finishRefresh(loginResponse(token(), 'admin-rotated'))
+    await expect(refreshing).rejects.toThrow('登录会话已被后续操作替代')
+    expect(auth.user?.account).toBe('sales')
+    expect(auth.token).toBe(salesToken)
+    expect(localStorage.getItem('cc-admin-refresh-token')).toBe('sales-refresh')
+    expect([...auth.permissionCodes]).toEqual(['platform:fleet:capacity-offer:list'])
+  })
+
+  it('discards late permission results after another tab switches accounts without clearing the new session', async () => {
+    mocks.post.mockResolvedValue(loginResponse())
+    let finishPermissions!: (value: string[]) => void
+    let permissionsStarted!: () => void
+    const started = new Promise<void>(resolve => { permissionsStarted = resolve })
+    mocks.listCurrentPlatformPermissionCodes.mockImplementation(() => {
+      permissionsStarted()
+      return new Promise(resolve => { finishPermissions = resolve })
+    })
+    const listeners = vi.spyOn(window, 'addEventListener')
+    const auth = useAuthStore()
+    const onStorage = listeners.mock.calls.find(([name]) => name === 'storage')![1] as (event: StorageEvent) => void
+    listeners.mockRestore()
+    const login = auth.login('platform_admin', 'password')
+    await started
+    const salesToken = token({ user_id: '2000002', username: 'sales' })
+    localStorage.setItem('cc-admin-token', salesToken)
+    localStorage.setItem('cc-admin-refresh-token', 'sales-refresh')
+    localStorage.setItem('cc-admin-permission-codes', '["platform:fleet:capacity-offer:list"]')
+    onStorage(new StorageEvent('storage', { key: 'cc-admin-token' }))
+    finishPermissions(['platform:warehouse:list'])
+    await expect(login).rejects.toThrow('登录会话已被后续操作替代')
+    expect(auth.user?.account).toBe('sales')
+    expect(auth.token).toBe(salesToken)
+    expect(localStorage.getItem('cc-admin-refresh-token')).toBe('sales-refresh')
+    expect([...auth.permissionCodes]).toEqual(['platform:fleet:capacity-offer:list'])
+    expect(mocks.post).toHaveBeenCalledTimes(1)
+  })
+
+  it('refreshes a rejected logout once and revokes the rotated pair without restoring local state', async () => {
+    const previous = token()
+    const rotated = token({ token_version: 2 })
+    localStorage.setItem('cc-admin-token', previous)
+    localStorage.setItem('cc-admin-refresh-token', 'refresh-old')
+    mocks.post.mockRejectedValueOnce({ isAxiosError: true, response: { status: 401 } })
+      .mockResolvedValueOnce(loginResponse(rotated, 'refresh-rotated'))
+      .mockResolvedValueOnce({ code: '200', data: null })
+    const auth = useAuthStore()
+
+    await expect(auth.logout()).resolves.toBeUndefined()
+
+    expect(mocks.post).toHaveBeenCalledTimes(3)
+    expect(mocks.post).toHaveBeenNthCalledWith(2, '/auth/refresh', { refreshToken: 'refresh-old' })
+    expect(mocks.post).toHaveBeenNthCalledWith(3, '/auth/logout', { refreshToken: 'refresh-rotated' }, {
+      headers: { Authorization: `Bearer ${rotated}` },
+    })
+    expect(auth.isAuthenticated).toBe(false)
+    expect(localStorage.getItem('cc-admin-token')).toBeNull()
+    expect(localStorage.getItem('cc-admin-refresh-token')).toBeNull()
+    expect(mocks.listCurrentPlatformPermissionCodes).not.toHaveBeenCalled()
+  })
+
+  it('revokes a persisted refresh session when startup already removed its expired access token', async () => {
+    localStorage.setItem('cc-admin-token', token({ exp: 1 }))
+    localStorage.setItem('cc-admin-refresh-token', 'refresh-old')
+    const rotated = token()
+    mocks.post.mockResolvedValueOnce(loginResponse(rotated, 'refresh-rotated'))
+      .mockResolvedValueOnce({ code: '200', data: null })
+    const auth = useAuthStore()
+    expect(auth.token).toBe('')
+
+    await auth.logout()
+
+    expect(mocks.post).toHaveBeenCalledTimes(2)
+    expect(mocks.post).toHaveBeenNthCalledWith(1, '/auth/refresh', { refreshToken: 'refresh-old' })
+    expect(mocks.post).toHaveBeenNthCalledWith(2, '/auth/logout', { refreshToken: 'refresh-rotated' }, {
+      headers: { Authorization: `Bearer ${rotated}` },
+    })
+    expect(auth.isAuthenticated).toBe(false)
+  })
+
+  it('leaves a subsequent login intact while finishing revocation of the previous session', async () => {
+    localStorage.setItem('cc-admin-token', token())
+    localStorage.setItem('cc-admin-refresh-token', 'refresh-old')
+    let finishRefresh: ((value: ReturnType<typeof loginResponse>) => void) | undefined
+    const started = new Promise<void>(resolve => {
+      mocks.post.mockRejectedValueOnce({ isAxiosError: true, response: { status: 401 } })
+        .mockImplementationOnce(() => { resolve(); return new Promise(done => { finishRefresh = done }) })
+    })
+    const auth = useAuthStore()
+    const loggingOut = auth.logout()
+    // Attach immediately so a regression rejecting early does not become an unhandled rejection.
+    const result = loggingOut.then(() => null, error => error)
+    await Promise.race([started, loggingOut.catch(() => undefined)])
+    expect(finishRefresh).toBeTypeOf('function')
+    const newAccess = token({ user_id: '1000002', username: 'second' })
+    mocks.post.mockResolvedValueOnce(loginResponse(newAccess, 'refresh-new-login'))
+      .mockResolvedValueOnce({ code: '200', data: null })
+    mocks.listCurrentPlatformPermissionCodes.mockResolvedValue(['platform:warehouse:list'])
+    await auth.login('second', 'password')
+    const revocationAccess = token({ token_version: 3 })
+    finishRefresh?.(loginResponse(revocationAccess, 'refresh-revocation-only'))
+
+    expect(await result).toBeNull()
+    expect(auth.token).toBe(newAccess)
+    expect(localStorage.getItem('cc-admin-refresh-token')).toBe('refresh-new-login')
+    expect(mocks.post).toHaveBeenLastCalledWith('/auth/logout', { refreshToken: 'refresh-revocation-only' }, {
+      headers: { Authorization: `Bearer ${revocationAccess}` },
+    })
+  })
+
+  it('does not refresh or retry an ambiguous logout transport failure', async () => {
+    localStorage.setItem('cc-admin-token', token())
+    localStorage.setItem('cc-admin-refresh-token', 'refresh-old')
+    const failure = { isAxiosError: true, response: { status: 503 } }
+    mocks.post.mockRejectedValue(failure)
+    const auth = useAuthStore()
+    await expect(auth.logout()).rejects.toBe(failure)
+    expect(mocks.post).toHaveBeenCalledTimes(1)
+    expect(auth.isAuthenticated).toBe(false)
+  })
+
+  it.each(['refresh', 'second-logout'])('stops after a %s rejection and never restores the logged-out session', async stage => {
+    localStorage.setItem('cc-admin-token', token())
+    localStorage.setItem('cc-admin-refresh-token', 'refresh-old')
+    const unauthorized = { isAxiosError: true, response: { status: 401 } }
+    mocks.post.mockRejectedValueOnce(unauthorized)
+    if (stage === 'second-logout') mocks.post.mockResolvedValueOnce(loginResponse())
+    mocks.post.mockRejectedValueOnce(unauthorized)
+    const auth = useAuthStore()
+    await expect(auth.logout()).rejects.toBe(unauthorized)
+    expect(mocks.post).toHaveBeenCalledTimes(stage === 'refresh' ? 2 : 3)
+    expect(localStorage.getItem('cc-admin-token')).toBeNull()
+    expect(localStorage.getItem('cc-admin-refresh-token')).toBeNull()
+  })
 })

src/core/auth/auth.ts

@@ -1,5 +1,6 @@
 import { computed, ref } from 'vue'
 import { defineStore } from 'pinia'
+import { isAxiosError } from 'axios'
 import type { CurrentUser } from '@chongchong/shared'
 import {
   http,
@@ -8,7 +9,6 @@ import {
   type ApiEnvelope,
 } from '@/shared/api/http'
 import type { PlatformPermissionResource } from '@/shared/types/platformPermission'
-import { clearOverseasAccessToken, replaceOverseasAccessToken } from '@/shared/api/overseasHttp'
 import { decodeJwtClaims } from './jwt'
 import { listCurrentPlatformPermissionCodes } from './platformAuthorization'
 import { coordinateCrossTabRefresh } from './crossTabRefresh'
@@ -24,8 +24,6 @@ interface LoginResponse {
   expiresIn: number | string
   refreshToken: string
   refreshExpiresIn: number | string
-  overseasAccessToken?: string | null
-  overseasExpiresIn?: number | string
 }
 
 class ExpiredAccessTokenError extends Error {}
@@ -100,10 +98,6 @@ export const useAuthStore = defineStore('admin-auth', () => {
   async function applySession(result: LoginResponse, expectedGeneration: number) {
     const session = sessionFromToken(result.accessToken)
     ensureCurrentGeneration(expectedGeneration)
-    replaceOverseasAccessToken(
-      result.overseasAccessToken ?? null,
-      parseLifetimeSeconds(result.overseasExpiresIn ?? 0, 'overseasExpiresIn'),
-    )
     token.value = result.accessToken
     refreshToken.value = result.refreshToken
     user.value = session.user
@@ -123,7 +117,6 @@ export const useAuthStore = defineStore('admin-auth', () => {
 
   function clearSession() {
     sessionGeneration += 1
-    clearOverseasAccessToken()
     token.value = ''
     refreshToken.value = ''
     user.value = null
@@ -151,7 +144,10 @@ export const useAuthStore = defineStore('admin-auth', () => {
     try {
       const session = sessionFromToken(storedToken)
       const cachedPermissions = JSON.parse(localStorage.getItem(PERMISSION_CODES_KEY) || '[]') as unknown
-      if (token.value !== storedToken) clearOverseasAccessToken()
+      // A different account in another tab supersedes this tab's pending login/refresh responses.
+      if (user.value?.id !== session.user.id || user.value?.account !== session.user.account) {
+        sessionGeneration += 1
+      }
       token.value = storedToken
       refreshToken.value = storedRefreshToken
       user.value = session.user
@@ -166,9 +162,29 @@ export const useAuthStore = defineStore('admin-auth', () => {
   }
 
   async function revokeTokenPair(accessToken: string, refreshTokenToRevoke: string) {
-    await http.post('/auth/logout', { refreshToken: refreshTokenToRevoke }, {
-      headers: { Authorization: `Bearer ${accessToken}` },
-    })
+    async function revoke(access: string, refresh: string) {
+      const response = await http.post<ApiEnvelope<null>, ApiEnvelope<null>>(
+        '/auth/logout', { refreshToken: refresh }, { headers: { Authorization: `Bearer ${access}` } },
+      )
+      unwrapApiResponse(response)
+    }
+    if (accessToken) {
+      try {
+        await revoke(accessToken, refreshTokenToRevoke)
+        return
+      } catch (error) {
+        if (!isAxiosError(error) || error.response?.status !== 401) throw error
+      }
+    }
+    // Logout has already cleared local state. Refresh only this captured pair
+    // for revocation; never apply it to this tab or overwrite a subsequent login.
+    const response = await http.post<ApiEnvelope<LoginResponse>, ApiEnvelope<LoginResponse>>(
+      '/auth/refresh', { refreshToken: refreshTokenToRevoke },
+    )
+    const rotated = unwrapApiResponse<LoginResponse>(response)
+    sessionFromToken(rotated.accessToken)
+    if (!rotated.refreshToken) throw new Error('退出时刷新响应缺少会话凭据')
+    await revoke(rotated.accessToken, rotated.refreshToken)
   }
 
   async function login(account: string, password: string) {
@@ -254,7 +270,7 @@ export const useAuthStore = defineStore('admin-auth', () => {
     const accessToken = token.value
     const tokenToRevoke = refreshToken.value
     clearSession()
-    if (accessToken && tokenToRevoke) {
+    if (tokenToRevoke) {
       await revokeTokenPair(accessToken, tokenToRevoke)
     }
   }

src/core/navigation/adminNavigation.test.ts

@@ -8,75 +8,40 @@ import {
 } from './adminNavigation'
 
 describe('adminNavigation', () => {
-  it('keeps the latest prototype menu skeleton in source order and groups additions under general', () => {
-    expect(adminNavigation.map((item) => item.title)).toEqual([
-      '首页数据看板',
-      '客户管理',
-      '国内仓',
-      '海外派送',
-      '货柜管理',
-      '海外业务',
-      '海外仓',
-      '客户服务',
-      '财务管理',
-      '销售管理',
-      '通用',
-      '系统管理',
+  it('opens all self-operated read pages with list permission and keeps sync alone insufficient', () => {
+    const read = filterAdminNavigation(adminNavigation, new Set(['platform:self-operated-analytics:list']))
+    expect(getNavigationLeaves(read).map(item => item.path)).toEqual([
+      '/dashboard', '/self-operated/overview', '/self-operated/sales', '/self-operated/inventory', '/self-operated/collection',
     ])
-    expect(adminNavigation.find((item) => item.key === 'customers')?.children?.map((item) => item.title)).toEqual([
-      '客户列表',
-      '海外仓阶梯费用',
-    ])
-    expect(adminNavigation.find((item) => item.key === 'domestic-warehouse')?.children?.map((item) => item.title)).toEqual([
-      '订单列表',
-      '订单测量',
-      '测量数据审核',
-      '预装清单',
-      '库位管理',
-      '托盘管理',
-      '整柜业务',
-    ])
-    expect(adminNavigation.find((item) => item.key === 'customer-service')?.children?.map((item) => item.title)).toEqual(['异常订单', '客户回访'])
-    expect(adminNavigation.find((item) => item.key === 'supplier-center')).toBeUndefined()
-    expect(adminNavigation.find((item) => item.key === 'container-management')?.children?.map((item) => item.title)).toEqual([
-      '订舱列表',
-      '拖车列表',
-      '货柜列表',
-      '清关提柜',
-    ])
-    expect(adminNavigation.find((item) => item.key === 'overseas-inventory')?.children?.map((item) => item.title)).toEqual([
-      '尾程订单',
-      '入库单',
-      '排车列表',
-      '出库单',
-      '派送单列表',
-      '换标单',
-      '托盘管理',
-      '库存管理',
-      '退货库存管理',
-      '退货箱号管理',
-    ])
-    expect(adminNavigation.find((item) => item.key === 'general')?.children?.map((item) => item.title)).toEqual([
-      '产品信息',
-      '供应商列表',
-      '快递公司',
-      '往来单位',
-      '费用项目',
-      '汇率管理',
-      '仓库管理',
-      '海外仓报价',
-      '船期价格表',
-      '车辆列表',
-      '下载中心',
+    const sync = filterAdminNavigation(adminNavigation, new Set(['platform:self-operated-analytics:sync']))
+    expect(getNavigationLeaves(sync).map(item => item.path)).toEqual(['/dashboard'])
+  })
+  it('offers the common container menu to overseas-only operators', () => {
+    const visible = filterAdminNavigation(adminNavigation, new Set(['platform:firstleg:terminal-drayage:list']))
+    expect(getNavigationLeaves(visible).map(item => item.path)).toEqual(['/dashboard', '/container-loading/domestic'])
+  })
+  it('matches the latest prototype sidebar using only implemented menu entries', () => {
+    // 新版.html sidebar (1404–1539), ordered by its data-menu CSS rules (45–56).
+    const allPermissions = new Set(getNavigationLeaves(adminNavigation).flatMap(node => node.permission ? [node.permission] : []))
+    const visible = filterAdminNavigation(adminNavigation, allPermissions)
+    expect(visible.map(node => ({ title: node.title, children: node.children?.map(child => child.title) ?? [] }))).toEqual([
+      { title: '首页数据看板', children: [] },
+      { title: '客户管理', children: ['客户列表', '海外仓阶梯费用'] },
+      { title: '国内头程', children: ['订单列表', '订单测量', '测量数据审核', '库位管理', '托盘管理', '整柜业务', '船期管理'] },
+      { title: '货柜管理', children: ['订舱列表', '拖车列表', '货柜列表', '装柜清单', '预装清单'] },
+       { title: '海外尾程', children: ['尾程订单', '入库单', '废弃单', '出库单', '换标单', '派送单', '托盘管理', '库位管理', '库存管理', '退货库存管理', '退货箱号管理'] },
+      { title: '预约管理', children: ['预约列表'] },
+      { title: '车辆管理', children: ['排车列表', '车辆列表', '司机管理', '车次管理', '拼车接货', '出车记录'] },
+      { title: '海外业务', children: ['采购订单', '本土卡车', '本土散板'] },
+      { title: '客户服务', children: ['异常订单'] },
+      { title: '财务管理', children: ['客户账户', '客户应收应付', '应收款统计表', '客户对账单', '结算单应收', '结算单应付'] },
+      { title: '海外仓', children: ['经营总览', '销量分析', '库存分析', '数据采集'] },
+      { title: '通用', children: ['费用项目', '汇率管理', '仓库管理', '海外仓报价', '车队报价', '船期价格表', '下载中心'] },
+      { title: '系统管理', children: ['用户管理', '角色权限', '菜单权限'] },
     ])
+    expect(visible).toHaveLength(13)
+    expect(visible.flatMap(node => node.children ?? [])).toHaveLength(56)
     expect(adminNavigation.find((item) => item.key === 'notifications')).toBeUndefined()
-    expect(adminNavigation.find((item) => item.key === 'system')?.children?.map((item) => item.title)).toEqual([
-      '用户管理',
-      '角色权限',
-      '租户管理',
-      '品牌设置',
-      '菜单权限',
-    ])
   })
 
   it('assigns every page a unique path and only shares permissions backed by the API contract', () => {
@@ -96,7 +61,7 @@ describe('adminNavigation', () => {
     expect(paths).toContain('/container-loading/overseas')
     expect(paths).not.toContain('/container-loading/smart-loading')
     expect(paths).toContain('/loading-plans')
-    expect(paths).not.toContain('/loading-lists')
+    expect(paths).toContain('/loading-lists')
     expect(paths).not.toContain('/port-schedules')
     expect(paths).not.toContain('/customs')
     expect(paths).not.toContain('/outbound-dispatches')
@@ -117,7 +82,7 @@ describe('adminNavigation', () => {
     expect(paths).toContain('/system/permissions')
     expect(new Set(paths).size).toBe(paths.length)
     const duplicatedPermissions = permissions.filter((permission, index) => permissions.indexOf(permission) !== index)
-    expect(new Set(duplicatedPermissions)).toEqual(new Set())
+    expect(new Set(duplicatedPermissions)).toEqual(new Set(['platform:self-operated-analytics:list']))
     expect(leaves.every((item) => Boolean(item.icon))).toBe(true)
   })
 
@@ -169,7 +134,6 @@ describe('adminNavigation', () => {
       '/overseas-warehouse/outbounds',
       '/overseas-warehouse/delivery-orders',
       '/overseas-warehouse/exception-orders',
-      '/overseas-warehouse/customer-visits',
       '/overseas-warehouse/relabel-orders',
       '/overseas-warehouse/pallets',
       '/overseas-warehouse/inventory',
@@ -209,12 +173,10 @@ describe('adminNavigation', () => {
     ]))
     const paths = getNavigationLeaves(filtered).map((item) => item.path)
 
-    expect(filtered.map((item) => item.title)).toEqual(['首页数据看板', '国内仓', '通用'])
+    expect(filtered.map((item) => item.title)).toEqual(['首页数据看板', '国内头程', '通用'])
     expect(paths).toEqual([
       '/dashboard',
       '/orders',
-      '/master-data/express-companies',
-      '/master-data/counterparties',
       '/warehouses',
     ])
     expect(paths).toContain('/dashboard')
@@ -234,11 +196,12 @@ describe('adminNavigation', () => {
     expect(getNavigationLeaves(filtered).map((item) => item.path)).toEqual(['/dashboard', '/master-data/fee-items'])
   })
 
-  it('shows the public supplier list only with the list permission', () => {
+  it('retains the supplier route permission while omitting its entry from the latest sidebar', () => {
     const visible = filterAdminNavigation(adminNavigation, new Set(['platform:supplier:list']))
     const missing = filterAdminNavigation(adminNavigation, new Set())
 
-    expect(getNavigationLeaves(visible).map((item) => item.path)).toEqual(['/dashboard', '/suppliers'])
+    expect(getNavigationLeaves(adminNavigation).find(item => item.path === '/suppliers')?.permission).toBe('platform:supplier:list')
+    expect(getNavigationLeaves(visible).map((item) => item.path)).toEqual(['/dashboard'])
     expect(getNavigationLeaves(missing).map((item) => item.path)).toEqual(['/dashboard'])
   })
 
@@ -252,9 +215,9 @@ describe('adminNavigation', () => {
 
     expect(getNavigationLeaves(filtered).map((item) => item.path)).toEqual([
       '/dashboard',
-      '/loading-plans',
       '/container-loading/domestic',
-      '/container-loading/overseas',
+      '/loading-lists',
+      '/loading-plans',
     ])
   })
 

src/core/navigation/adminNavigation.ts

@@ -1,6 +1,7 @@
 import type { Component } from 'vue'
 import {
   Building2,
+  CalendarDays,
   ContactRound,
   ClipboardList,
   CircleDollarSign,
@@ -16,6 +17,7 @@ import {
 } from '@lucide/vue'
 import {
   PrototypeContainerIcon,
+  PrototypeCustomerServiceIcon,
   PrototypeCustomerIcon,
   PrototypeDashboardIcon,
   PrototypeDeliveryIcon,
@@ -26,6 +28,7 @@ import {
   PrototypeOverseasWarehouseIcon,
   PrototypeSalesIcon,
   PrototypeSystemIcon,
+  PrototypeVehicleIcon,
 } from './prototypeMenuIcons'
 
 export interface AdminNavigationNode {
@@ -60,16 +63,16 @@ export const adminNavigation: AdminNavigationNode[] = [
   },
   {
     key: 'domestic-warehouse',
-    title: '国内仓',
+    title: '国内头程',
     icon: PrototypeDomesticWarehouseIcon,
     children: [
       { key: 'order-list', title: '订单列表', icon: ClipboardList, path: '/orders', permission: 'platform:order:list', permissionAnyOf: ['platform:firstleg:inbound:list'] },
       { key: 'inbound-dedup', title: '订单测量', icon: ClipboardList, path: '/inbounds/measurements', permission: 'platform:firstleg:inbound:measure:view' },
       { key: 'inbound-measure', title: '测量数据审核', icon: FileCheck2, path: '/inbounds/measurement-reviews', permission: 'firstleg:inbound:measurement-review' },
-      { key: 'container-preload', title: '预装清单', icon: ClipboardList, path: '/loading-plans', permission: 'platform:firstleg:preload:list' },
       { key: 'locations', title: '库位管理', icon: WarehouseIcon, path: '/master-data/locations', permission: 'platform:location:list' },
       { key: 'pallets', title: '托盘管理', icon: WarehouseIcon, path: '/master-data/pallets', permission: 'platform:pallet:list' },
       { key: 'domestic-containers', title: '整柜业务', icon: WarehouseIcon, path: '/domestic-containers', permission: 'platform:domestic-container:list' },
+      { key: 'sailing-calendar', title: '船期管理', icon: CalendarDays, path: '/sailing-calendar', permission: 'platform:firstleg:sailing-calendar:list' },
     ],
   },
   {
@@ -91,8 +94,49 @@ export const adminNavigation: AdminNavigationNode[] = [
     children: [
       { key: 'booking-list', title: '订舱列表', icon: ClipboardList, path: '/ocean-bookings', permission: 'platform:firstleg:ocean-booking:list' },
       { key: 'truck-list', title: '拖车列表', icon: Truck, path: '/trucking', permission: 'platform:firstleg:truck-appointment:list' },
-      { key: 'domestic-container-workbench', title: '货柜列表', icon: WarehouseIcon, path: '/container-loading/domestic', permission: 'platform:firstleg:container:list' },
-      { key: 'overseas-container-workbench', title: '清关提柜', icon: ClipboardList, path: '/container-loading/overseas', permission: 'platform:firstleg:terminal-drayage:list' },
+      { key: 'domestic-container-workbench', title: '货柜列表', icon: WarehouseIcon, path: '/container-loading/domestic', permission: 'platform:firstleg:container:list', permissionAnyOf: ['platform:firstleg:terminal-drayage:list'] },
+      { key: 'container-manifest', title: '装柜清单', icon: ClipboardList, path: '/loading-lists', permission: 'platform:firstleg:loading-list:list' },
+      { key: 'container-preload', title: '预装清单', icon: ClipboardList, path: '/loading-plans', permission: 'platform:firstleg:preload:list' },
+      { key: 'overseas-container-workbench', title: '清关提柜', icon: ClipboardList, path: '/container-loading/overseas', permission: 'platform:firstleg:terminal-drayage:list', hidden: true },
+    ],
+  },
+  {
+    key: 'overseas-inventory',
+    title: '海外尾程',
+    icon: PrototypeOverseasWarehouseIcon,
+    children: [
+      { key: 'last-mile-orders', title: '尾程订单', icon: ClipboardList, path: '/overseas-warehouse/last-mile-orders', permission: 'platform:overseas-warehouse:last-mile-order:list' },
+      { key: 'fba-inbound-order', title: '入库单', icon: ClipboardList, path: '/overseas-warehouse/inbound-orders', permission: 'platform:overseas-warehouse:inbound-order:list' },
+      { key: 'fba-cargo-discard', title: '废弃单', icon: ClipboardList, path: '/overseas-warehouse/cargo-discards', permission: 'platform:overseas-warehouse:discard:list' },
+      { key: 'fba-outbound', title: '出库单', icon: ClipboardList, path: '/overseas-warehouse/outbounds', permission: 'platform:overseas-warehouse:outbound:list' },
+      { key: 'fba-relabel-order', title: '换标单', icon: ClipboardList, path: '/overseas-warehouse/relabel-orders', permission: 'platform:overseas-warehouse:relabel-order:list' },
+      { key: 'fba-delivery', title: '派送单', icon: Truck, path: '/overseas-warehouse/delivery-orders', permission: 'platform:overseas-warehouse:delivery:list' },
+      { key: 'fba-pallet', title: '托盘管理', icon: WarehouseIcon, path: '/overseas-warehouse/pallets', permission: 'platform:overseas-warehouse:pallet:list' },
+      { key: 'overseas-locations', title: '库位管理', icon: WarehouseIcon, path: '/overseas-warehouse/locations', permission: 'platform:overseas-warehouse:location:list' },
+      { key: 'overseas-inventory-list', title: '库存管理', icon: WarehouseIcon, path: '/overseas-warehouse/inventory', permission: 'platform:overseas-warehouse:inventory:list' },
+      { key: 'return-inventory-list', title: '退货库存管理', icon: WarehouseIcon, path: '/overseas-warehouse/return-inventory', permission: 'platform:overseas-warehouse:return-inventory:list' },
+      { key: 'return-cartons-list', title: '退货箱号管理', icon: WarehouseIcon, path: '/overseas-warehouse/return-cartons', permission: 'platform:overseas-warehouse:return-cartons:list' },
+    ],
+  },
+  {
+    key: 'appointment-management',
+    title: '预约管理',
+    icon: CalendarDays,
+    children: [
+      { key: 'appointment-calendar', title: '预约列表', icon: CalendarDays, path: '/appointment-calendar', permission: 'platform:appointment:list' },
+    ],
+  },
+  {
+    key: 'vehicle-management',
+    title: '车辆管理',
+    icon: PrototypeVehicleIcon,
+    children: [
+      { key: 'fba-dispatch', title: '排车列表', icon: Truck, path: '/overseas-warehouse/dispatches', permission: 'platform:overseas-warehouse:dispatch:list' },
+      { key: 'vehicle-list', title: '车辆列表', icon: Truck, path: '/overseas-master-data/vehicles', permission: 'platform:overseas-master-data:vehicle:list' },
+      { key: 'driver-management', title: '司机管理', icon: ContactRound, path: '/overseas-master-data/drivers', permission: 'platform:overseas-master-data:driver:list' },
+      { key: 'fleet-trips', title: '车次管理', icon: Truck, path: '/overseas-master-data/trips', permission: 'platform:fleet:trip:list' },
+      { key: 'fleet-capacity-offers', title: '拼车接货', icon: Truck, path: '/overseas-master-data/capacity-offers', permission: 'platform:fleet:capacity-offer:list', permissionAnyOf: ['platform:fleet:capacity-offer:manage'] },
+      { key: 'fleet-operations', title: '出车记录', icon: Truck, path: '/overseas-master-data/trip-operations', permission: 'platform:fleet:operations:list' },
     ],
   },
   {
@@ -105,31 +149,13 @@ export const adminNavigation: AdminNavigationNode[] = [
       { key: 'overseas-looseboard', title: '本土散板', icon: ClipboardList, path: '/overseas-business/looseboards', permission: 'platform:overseas-business:looseboard:list' },
     ],
   },
-  {
-    key: 'overseas-inventory',
-    title: '海外仓',
-    icon: PrototypeOverseasWarehouseIcon,
-    children: [
-      { key: 'last-mile-orders', title: '尾程订单', icon: ClipboardList, path: '/overseas-warehouse/last-mile-orders', permission: 'platform:overseas-warehouse:last-mile-order:list' },
-      { key: 'fba-inbound-order', title: '入库单', icon: ClipboardList, path: '/overseas-warehouse/inbound-orders', permission: 'platform:overseas-warehouse:inbound-order:list' },
-      { key: 'overseas-locations', title: '库位管理', icon: WarehouseIcon, path: '/overseas-warehouse/locations', permission: 'platform:overseas-warehouse:location:list' },
-      { key: 'fba-dispatch', title: '排车列表', icon: Truck, path: '/overseas-warehouse/dispatches', permission: 'platform:overseas-warehouse:dispatch:list' },
-      { key: 'fba-outbound', title: '出库单', icon: ClipboardList, path: '/overseas-warehouse/outbounds', permission: 'platform:overseas-warehouse:outbound:list' },
-      { key: 'fba-delivery', title: '派送单列表', icon: Truck, path: '/overseas-warehouse/delivery-orders', permission: 'platform:overseas-warehouse:delivery:list' },
-      { key: 'fba-relabel-order', title: '换标单', icon: ClipboardList, path: '/overseas-warehouse/relabel-orders', permission: 'platform:overseas-warehouse:relabel-order:list' },
-      { key: 'fba-pallet', title: '托盘管理', icon: WarehouseIcon, path: '/overseas-warehouse/pallets', permission: 'platform:overseas-warehouse:pallet:list' },
-      { key: 'overseas-inventory-list', title: '库存管理', icon: WarehouseIcon, path: '/overseas-warehouse/inventory', permission: 'platform:overseas-warehouse:inventory:list' },
-      { key: 'return-inventory-list', title: '退货库存管理', icon: WarehouseIcon, path: '/overseas-warehouse/return-inventory', permission: 'platform:overseas-warehouse:return-inventory:list' },
-      { key: 'return-cartons-list', title: '退货箱号管理', icon: WarehouseIcon, path: '/overseas-warehouse/return-cartons', permission: 'platform:overseas-warehouse:return-cartons:list' },
-    ],
-  },
   {
     key: 'customer-service',
     title: '客户服务',
-    icon: ContactRound,
+    icon: PrototypeCustomerServiceIcon,
     children: [
       { key: 'exception-orders', title: '异常订单', icon: ClipboardList, path: '/overseas-warehouse/exception-orders', permission: 'platform:overseas-warehouse:exception-order:list' },
-      { key: 'customer-visits', title: '客户回访', icon: ContactRound, path: '/overseas-warehouse/customer-visits', permission: 'platform:overseas-warehouse:customer-visit:list' },
+      { key: 'customer-visits', title: '客户回访', icon: ContactRound, path: '/overseas-warehouse/customer-visits', permission: 'platform:overseas-warehouse:customer-visit:list', hidden: true },
     ],
   },
   {
@@ -155,23 +181,33 @@ export const adminNavigation: AdminNavigationNode[] = [
       { key: 'sales-commission', title: '销售提成', icon: Database, path: '/prototype/sales/commission' },
     ],
   },
+  {
+    key: 'self-operated',
+    title: '海外仓',
+    icon: PrototypeSalesIcon,
+    children: [
+      { key: 'self-operated-overview', title: '经营总览', icon: PrototypeDashboardIcon, path: '/self-operated/overview', permission: 'platform:self-operated-analytics:list' },
+      { key: 'self-operated-sales', title: '销量分析', icon: ClipboardList, path: '/self-operated/sales', permission: 'platform:self-operated-analytics:list' },
+      { key: 'self-operated-inventory', title: '库存分析', icon: WarehouseIcon, path: '/self-operated/inventory', permission: 'platform:self-operated-analytics:list' },
+      { key: 'self-operated-collection', title: '数据采集', icon: Database, path: '/self-operated/collection', permission: 'platform:self-operated-analytics:list' },
+    ],
+  },
   {
     key: 'general',
     title: '通用',
     icon: PrototypeGeneralIcon,
     children: [
-      { key: 'general-product', title: '产品信息', icon: Database, path: '/prototype/general/product-information', hidden: true },
-      { key: 'supplier-list', title: '供应商列表', icon: ContactRound, path: '/suppliers', permission: 'platform:supplier:list' },
-      { key: 'express-companies', title: '快递公司', icon: Truck, path: '/master-data/express-companies', permission: 'platform:express:list' },
-      { key: 'counterparties', title: '往来单位', icon: ContactRound, path: '/master-data/counterparties', permission: 'platform:counterparty:list' },
       { key: 'general-fee', title: '费用项目', icon: Database, path: '/master-data/fee-items', permission: 'firstleg:fee-item:view' },
       { key: 'exchange-rates', title: '汇率管理', icon: CircleDollarSign, path: '/overseas-master-data/exchange-rates', permission: 'platform:overseas-master-data:exchange-rate:list' },
       { key: 'warehouses', title: '仓库管理', icon: WarehouseIcon, path: '/warehouses', permission: 'platform:warehouse:list' },
       { key: 'overseas-quotes', title: '海外仓报价', icon: CircleDollarSign, path: '/overseas-master-data/quotes', permission: 'platform:overseas-master-data:quote:list' },
+      { key: 'fleet-quotes', title: '车队报价', icon: Truck, path: '/overseas-master-data/fleet-quotes', permission: 'platform:fleet:quote:list' },
       { key: 'fba-carrier-rates', title: '船期价格表', icon: CircleDollarSign, path: '/first-leg-pricing/carrier-rates', permission: 'firstleg:fba-pricing:rate:view' },
-      { key: 'vehicle-list', title: '车辆列表', icon: Truck, path: '/overseas-master-data/vehicles', permission: 'platform:overseas-master-data:vehicle:list' },
       { key: 'download-center', title: '下载中心', icon: Download, path: '/downloads', permission: 'platform:download:list' },
-      { key: 'mojia-sku-sync', title: 'SKU同步', icon: Database, path: '/general/mojia-sku-sync', permission: 'platform:mojia-sku-sync:list' },
+      { key: 'supplier-list', title: '供应商列表', icon: ContactRound, path: '/suppliers', permission: 'platform:supplier:list', hidden: true },
+      { key: 'express-companies', title: '快递公司', icon: Truck, path: '/master-data/express-companies', permission: 'platform:express:list', hidden: true },
+      { key: 'counterparties', title: '往来单位', icon: ContactRound, path: '/master-data/counterparties', permission: 'platform:counterparty:list', hidden: true },
+      { key: 'mojia-sku-sync', title: '称重机器', icon: Database, path: '/general/mojia-sku-sync', permission: 'platform:mojia-sku-sync:list', hidden: true },
     ],
   },
   {
@@ -184,7 +220,7 @@ export const adminNavigation: AdminNavigationNode[] = [
       { key: 'tenant-management', title: '租户管理', icon: Building2, path: '/prototype/system-management/tenant-management', hidden: true },
       { key: 'brand-settings', title: '品牌设置', icon: Settings, path: '/prototype/system-management/brand-settings', hidden: true },
       { key: 'permissions', title: '菜单权限', icon: KeyRound, path: '/system/permissions', permission: 'platform:permission:list' },
-      { key: 'pda-releases', title: 'PDA版本', icon: Download, path: '/system/pda-releases', permission: 'platform:pda-release:list' },
+      { key: 'pda-releases', title: 'PDA版本', icon: Download, path: '/system/pda-releases', permission: 'platform:pda-release:list', hidden: true },
     ],
   },
 ]

src/core/navigation/prototypeMenuIcons.ts

@@ -120,6 +120,18 @@ export const PrototypeOverseasBusinessIcon = createPrototypeMenuIcon('PrototypeO
   h('path', { d: 'M3 12h18M12 3c3 3 3 15 0 18M12 3c-3 3-3 15 0 18', stroke: '#8c8c8c', 'stroke-width': 1.5, 'stroke-linecap': 'round' }),
 ])
 
+export const PrototypeVehicleIcon = createPrototypeMenuIcon('PrototypeVehicleIcon', [
+  h('path', { d: 'M3 6h12v11H3zM15 10h3l3 3v4h-6z', stroke: '#149b8f', 'stroke-width': 1.8, 'stroke-linejoin': 'round' }),
+  h('circle', { cx: 7, cy: 18, r: 2, stroke: '#149b8f', 'stroke-width': 1.8 }),
+  h('circle', { cx: 18, cy: 18, r: 2, stroke: '#149b8f', 'stroke-width': 1.8 }),
+])
+
+export const PrototypeCustomerServiceIcon = createPrototypeMenuIcon('PrototypeCustomerServiceIcon', [
+  h('path', { d: 'M4 13v-2a8 8 0 0116 0v2', stroke: '#13c2c2', 'stroke-width': 2, 'stroke-linecap': 'round' }),
+  h('path', { d: 'M4 13a2 2 0 012-2h1v6H6a2 2 0 01-2-2v-2zM20 13a2 2 0 00-2-2h-1v6h1a2 2 0 002-2v-2z', stroke: '#13c2c2', 'stroke-width': 2, 'stroke-linejoin': 'round' }),
+  h('path', { d: 'M17 17c0 2-2 3-5 3', stroke: '#13c2c2', 'stroke-width': 2, 'stroke-linecap': 'round' }),
+])
+
 export const PrototypeFinanceIcon = createPrototypeMenuIcon('PrototypeFinanceIcon', [
   h('circle', { cx: 12, cy: 12, r: 10, stroke: '#f5a623', 'stroke-width': 2 }),
   h('path', { d: 'M12 6v6l4 2', stroke: '#f5a623', 'stroke-width': 2, 'stroke-linecap': 'round' }),

src/deployment/blueGreenDeployment.test.mjs

@@ -1,27 +0,0 @@
-import assert from 'node:assert/strict'
-import { readFile } from 'node:fs/promises'
-import test from 'node:test'
-
-const script = (await readFile(new URL('../../scripts/deploy-production.sh', import.meta.url), 'utf8'))
-  .replaceAll('\r\n', '\n')
-
-test('production frontend starts and validates the candidate before switching nginx', () => {
-  const start = script.indexOf('compose run -d --no-deps --name "$candidate"')
-  const health = script.indexOf('docker exec "$candidate" wget')
-  const nginx = script.indexOf('nginx -t || ! nginx -s reload')
-  const stop = script.indexOf('docker stop --time 30 "$active_container"')
-  const state = script.indexOf('mv -f "$state_file.tmp" "$state_file"')
-  assert.ok(start >= 0 && start < health && health < nginx && nginx < stop && stop < state)
-})
-
-test('production frontend supports both slots and restores nginx on failure', () => {
-  assert.match(script, /target_port=\$\(\(base_port \+ 20000\)\)/)
-  assert.match(script, /target_port=\$\(\(base_port \+ 10000\)\)/)
-  assert.match(script, /00-blue-green-admin-web\.conf/)
-  assert.match(script, /00-blue-green-client-web\.conf/)
-  assert.doesNotMatch(script, /nginx_config=\/www\/server\/panel\/vhost\/nginx\/(?:admin|app)\.buggoglobal\.com\.conf/)
-  assert.match(script, /cp -f "\$nginx_config" "\$backup"/)
-  assert.match(script, /cp -f "\$backup" "\$nginx_config"/)
-  assert.match(script, /docker rm -f "\$candidate"/)
-  assert.match(script, /gateway-active:firstleg-production-gateway/)
-})

src/deployment/nginxConfig.test.ts

@@ -1,85 +1,76 @@
-import { readFileSync } from 'node:fs'
+import assert from 'node:assert/strict'
+import { readFileSync, existsSync } from 'node:fs'
 import { resolve } from 'node:path'
-import { describe, expect, it } from 'vitest'
+import { test } from 'vitest'
 
-const config = readFileSync(resolve(process.cwd(), 'nginx/default.conf.template'), 'utf8')
-const testCompose = readFileSync(resolve(process.cwd(), 'docker-compose.test.yml'), 'utf8')
-const developmentCompose = readFileSync(resolve(process.cwd(), 'docker-compose.development.yml'), 'utf8')
-const productionCompose = readFileSync(resolve(process.cwd(), 'docker-compose.production.yml'), 'utf8')
-const jenkinsfile = readFileSync(resolve(process.cwd(), 'Jenkinsfile'), 'utf8')
-const dockerfile = readFileSync(resolve(process.cwd(), 'Dockerfile'), 'utf8')
+const root = process.cwd()
+const config = readFileSync(resolve(root, 'nginx/default.conf.template'), 'utf8')
+const compose = readFileSync(resolve(root, 'docker-compose.test.yml'), 'utf8')
+const jenkins = readFileSync(resolve(root, 'Jenkinsfile'), 'utf8')
+const vite = readFileSync(resolve(root, 'vite.config.ts'), 'utf8')
 
-describe('admin nginx deployment config', () => {
-  it('allows 50 MiB files plus multipart overhead through both bounded API proxies', () => {
-    expect(config.match(/client_max_body_size 55m;/g)).toHaveLength(3)
-    expect(config).not.toContain('client_max_body_size 12m;')
-    expect(config).not.toContain('client_max_body_size 0;')
-  })
+test('all business traffic uses one Gateway without rewriting API paths', () => {
+  assert.match(config, /location \/api\//)
+  assert.match(config, /proxy_pass \$\{API_UPSTREAM\};/)
+  assert.doesNotMatch(config, /overseas-api|OVERSEAS_API_UPSTREAM|rewrite/)
+  assert.match(config, /client_max_body_size 55m;/)
+  assert.match(config, /proxy_set_header Host \$proxy_host;/)
+  assert.doesNotMatch(vite, /OVERSEAS_API|AUTH_API_PROXY_TARGET|IAM_API_PROXY_TARGET|WAREHOUSE_API_PROXY_TARGET/)
+})
 
-  it('prevents the application shell from retaining stale chunk references', () => {
-    expect(config).toContain('location = /index.html')
-    expect(config).toContain('Cache-Control "no-cache, no-store, must-revalidate"')
-  })
+test('test deployment requires an explicit shared network, Gateway and version', () => {
+  for (const key of ['IMAGE_TAG']) {
+    assert.ok(compose.includes('${' + key + ':?'))
+  }
+  assert.ok(compose.includes('${API_UPSTREAM:-http://gateway:9000}'))
+  assert.ok(compose.includes('${TEST_NETWORK:-firstleg-test-network}'))
+  assert.match(compose, /external: true/)
+  assert.match(compose, /127\.0\.0\.1:/)
+  assert.doesNotMatch(compose, /overseas|host\.docker\.internal|production|development/)
+  assert.match(jenkins, /'java-builder' : 'java-test'/)
+  assert.match(jenkins, /docker compose -f docker-compose\.test\.yml config --quiet/)
+  assert.match(jenkins, /docker network inspect/)
+  assert.match(jenkins, /scripts\/deploy-production\.sh/)
+  assert.match(jenkins, /firstleg-production-ssh/)
 
-  it('serves hashed assets immutably and never falls back missing chunks to HTML', () => {
-    expect(config).toContain('location /assets/')
-    expect(config).toContain('try_files $uri =404;')
-    expect(config).toContain('Cache-Control "public, max-age=31536000, immutable"')
-  })
+})
 
-  it('keeps Vue history routes on the application shell without caching them', () => {
-    expect(config).toContain('try_files $uri $uri/ /index.html;')
-    expect(config).toContain('Cache-Control "no-cache"')
-  })
+test('application shell is revalidated and missing chunks remain 404', () => {
+  assert.match(config, /location = \/index\.html/)
+  assert.match(config, /no-store/)
+  assert.match(config, /max-age=31536000, immutable/)
+  assert.match(config, /try_files \$uri =404;/)
+  assert.match(config, /try_files \$uri \$uri\/ \/index\.html;/)
+})
 
-  it('proxies overseas API requests to the gateway API prefix', () => {
-    expect(config).toContain('location /overseas-api/')
-    expect(config).toContain('rewrite ^/overseas-api/(.*)$ /api/$1 break;')
-    expect(config).toContain('proxy_pass ${OVERSEAS_API_UPSTREAM};')
-  })
+test('PDA static apps keep independent paths and share the authenticated Gateway', () => {
+  assert.match(config, /resolver 127\.0\.0\.11 valid=10s ipv6=off;/)
+  for (const app of ['domestic', 'overseas']) {
+    assert.ok(config.includes(`location = /pda-${app} { return 308 /pda-${app}/; }`))
+    assert.ok(config.includes(`location ^~ /pda-${app}/ {`))
+    assert.ok(config.includes(`set $pda_${app}_origin http://pda-${app}-h5-test:80;`))
+    assert.ok(config.includes(`proxy_pass $pda_${app}_origin$request_uri;`))
+  }
+  assert.match(config, /location \/gateway-api\/\s*\{[^}]*client_max_body_size 55m;[^}]*proxy_pass \$\{API_UPSTREAM\}\/api\//)
+  assert.doesNotMatch(config, /proxy_pass.*(?:auth:|lastleg-service:|firstleg-service:)/)
+})
 
-  it('declares an explicit overseas gateway upstream in container deployments', () => {
-    expect(testCompose).toContain('- "host.docker.internal:host-gateway"')
-    expect(testCompose).toContain('API_UPSTREAM: "${API_UPSTREAM:-http://host.docker.internal:9000}"')
-    expect(testCompose).toContain('OVERSEAS_API_UPSTREAM: "${OVERSEAS_API_UPSTREAM:-http://host.docker.internal:9300}"')
-    expect(testCompose).not.toContain('http://test-api-cn.buggoglobal.com')
-    expect(testCompose).not.toContain('http://test-api-global.buggoglobal.com')
-    expect(testCompose).toContain('CLIENT_WEB_URL: "${CLIENT_WEB_URL:-https://test-app.buggoglobal.com/}"')
-    expect(testCompose).not.toContain('CLIENT_WEB_URL: "http://8.163.')
-    expect(developmentCompose).toContain('CLIENT_WEB_URL: "${CLIENT_WEB_URL:-https://dev-app.buggoglobal.com/}"')
-    expect(developmentCompose).toContain('OVERSEAS_API_UPSTREAM: "http://firstleg-development-gateway-overseas:9300"')
-    expect(config).toContain('proxy_set_header Host $proxy_host;')
-  })
 
-  it('keeps local environments on target nodes and uses credential-managed SSH for production', () => {
-    expect(jenkinsfile).toContain("env.JOB_BASE_NAME?.endsWith('-prod') ? 'java-builder'")
-    expect(jenkinsfile).toContain("DEVELOPMENT_COMPOSE_PROJECT = 'admin-web'")
-    expect(jenkinsfile).toContain('docker compose -p "$DEVELOPMENT_COMPOSE_PROJECT" -f "$DEVELOPMENT_COMPOSE_FILE" up -d')
-    expect(jenkinsfile).not.toContain('/var/jenkins_home/.ssh')
-    expect(jenkinsfile).not.toContain('docker save')
-    expect(jenkinsfile).toContain("credentialsId: 'firstleg-production-ssh'")
-    expect(jenkinsfile).toContain('git rev-parse origin/main')
-    expect(productionCompose).toContain('127.0.0.1:${HOST_PORT:-9001}:80')
-    expect(productionCompose).toContain('API_UPSTREAM: "http://gateway-active:9000"')
-    expect(productionCompose).toContain('OVERSEAS_API_UPSTREAM: "http://gateway-overseas-active:9300"')
-    expect(productionCompose).toContain('name: firstleg-production-routing')
-    expect(productionCompose).toContain('name: firstleg-prod-infra-network')
-  })
+test('container build excludes local environment values and waits for Nginx health', () => {
+  const ignore = readFileSync(resolve(root, '.dockerignore'), 'utf8')
+  assert.match(ignore, /^\.env$/m)
+  assert.match(ignore, /^\.env\.\*$/m)
+  assert.match(compose, /healthcheck:/)
+  assert.match(compose, /http:\/\/127\.0\.0\.1\/healthz/)
+  assert.match(jenkins, /up -d --wait --wait-timeout 120/)
+})
 
-  it('uses authenticated internal base images in CI instead of pulling from Docker Hub', () => {
-    expect(dockerfile).toContain('ARG NODE_IMAGE=node:22-alpine')
-    expect(dockerfile).toContain('ARG NGINX_IMAGE=nginx:1.27-alpine')
-    expect(dockerfile).toContain('FROM ${NODE_IMAGE} AS build')
-    expect(dockerfile).toContain('FROM ${NGINX_IMAGE}')
-    expect(jenkinsfile).toContain("NODE_BASE_IMAGE = '172.31.198.7:10082/java-project/node:22-alpine'")
-    expect(jenkinsfile).toContain("NGINX_BASE_IMAGE = '172.31.198.7:10082/java-project/nginx:1.27-alpine'")
-    expect(jenkinsfile).toContain('withCredentials([usernamePassword(')
-    expect(jenkinsfile).toContain('export DOCKER_CONFIG="${WORKSPACE}@tmp/docker-auth"')
-    expect(jenkinsfile).toContain('--build-arg VITE_CLIENT_WEB_URL="${CLIENT_WEB_URL:-https://dev-app.buggoglobal.com/}"')
-  })
-
-  it('proxies Mojia measurement OpenAPI requests to the domestic gateway', () => {
-    expect(config).toContain('location /openapi/')
-    expect(config).toContain('location /openapi/ {\n        client_max_body_size 55m;\n        proxy_pass ${API_UPSTREAM};')
-  })
+test('gray production is isolated from TEST and routes to the single Gateway', () => {
+  const production = readFileSync(resolve(root, 'docker-compose.production.yml'), 'utf8')
+  assert.match(production, /name: firstleg-production-network/)
+  assert.match(production, /API_UPSTREAM: "http:\/\/gateway:9000"/)
+  assert.match(production, /127\.0\.0\.1:/)
+  assert.match(production, /healthcheck:/)
+  assert.doesNotMatch(production, /test-network|gateway-overseas|gateway-active|routing-network/)
+  assert.doesNotMatch(jenkins, /wecom|sendProductionWeComNotification/)
 })

src/modules/appointment-calendar/AppointmentCalendarPanel.test.ts

@@ -0,0 +1,120 @@
+import { mount } from '@vue/test-utils'
+import { describe, expect, it } from 'vitest'
+import AppointmentCalendarPanel from './AppointmentCalendarPanel.vue'
+
+describe('appointment calendar interactions', () => {
+  it('keeps creation beside the title and record actions beside data notices', () => {
+    const wrapper = mount(AppointmentCalendarPanel, {
+      props: { canCreate: true, events: [], notices: ['数据范围不完整'] },
+      slots: { 'toolbar-actions': '<button>未定时安排</button><button>取消记录</button>' },
+      global: { stubs: { ElButton: { template: '<button><slot /></button>' } }, directives: { loading: {} } },
+    })
+    expect(wrapper.get('.calendar-label').text()).toContain('新增预约')
+    const actions = wrapper.get('[aria-label="预约记录与数据提示"]')
+    expect(actions.text()).toContain('未定时安排')
+    expect(actions.text()).toContain('取消记录')
+    expect(actions.get('summary').text()).toContain('数据提示')
+    wrapper.unmount()
+  })
+  const render = () => mount(AppointmentCalendarPanel, {
+    props: { initialDate: '2026-09-24', canCreate: true, events: [
+      { key: 'a', type: 'delivery', date: '2026-09-24', time: '09:00-11:00', title: 'ONT8 预约送货', fields: [], canEdit: true, canDelete: true },
+    ] },
+    global: { stubs: { ElButton: { template: '<button><slot /></button>' } }, directives: { loading: {} } },
+  })
+
+  it('opens a readable appointment without exposing write actions', async () => {
+    const wrapper = render()
+    const event = {key:'a',type:'delivery' as const,date:'2026-09-24',time:'09:00',title:'预约',fields:[],canView:true,canEdit:false,canDelete:false}
+    await wrapper.setProps({events:[event]})
+    const actions=wrapper.get('.detail-event footer')
+    expect(actions.text()).toBe('查看预约')
+    await actions.get('button').trigger('click')
+    expect(wrapper.emitted('view')?.[0]).toEqual([event])
+    expect(wrapper.emitted('edit')).toBeUndefined()
+    wrapper.unmount()
+  })
+  it('hides optional references by default and counts only appointments after enabling them', async () => {
+    const wrapper = render()
+    await wrapper.setProps({ events: [
+      { key: 'a', type: 'delivery', date: '2026-09-24', time: '09:00', title: '收货预约', fields: [] },
+      { key: 'b', type: 'arrival', date: '2026-09-24', time: '08:00', title: '到港参考', fields: [] },
+      { key: 'c', type: 'trip', date: '2026-09-24', time: '07:00', title: '运输计划', fields: [] },
+    ] })
+    expect(wrapper.findAll('.detail-event')).toHaveLength(1)
+    const switches = wrapper.get('[aria-label="参考图层"]').findAll('input')
+    await switches[0]!.setValue(true); await switches[1]!.setValue(true)
+    expect(wrapper.findAll('.detail-event')).toHaveLength(3)
+    expect(wrapper.get('[aria-label="当天安排"] header').text()).toContain('1 项预约')
+    expect(wrapper.get('[aria-label="当天安排"] header').text()).toContain('2 条参考计划')
+    expect(wrapper.emitted('range')).toBeUndefined()
+  })
+  it('selects an already loaded date without requesting data again', async () => {
+    const wrapper = render()
+    await wrapper.get('[aria-label="2026-09-25，0 项安排"]').trigger('click')
+    expect(wrapper.emitted('range')).toBeUndefined()
+    expect(wrapper.get('[aria-label="当天安排"]').text()).toContain('当天暂无预约')
+  })
+
+  it('shows an overnight slot on both days without fetching again and excludes midnight ends', async () => {
+    const wrapper = render()
+    await wrapper.setProps({ events: [
+      { key: 'overnight', type: 'delivery', date: '2026-09-23', endAt: '2026-09-24T01:00:00', time: '23:00–01:00', title: '跨日送仓', fields: [] },
+      { key: 'midnight', type: 'delivery', date: '2026-09-23', endAt: '2026-09-24T00:00:00', time: '23:00–00:00', title: '午夜结束', fields: [] },
+    ] })
+    expect(wrapper.find('[aria-label="2026-09-23，2 项安排"]').exists()).toBe(true)
+    expect(wrapper.find('[aria-label="2026-09-24，1 项安排"]').exists()).toBe(true)
+    expect(wrapper.get('[aria-label="当天安排"]').text()).toContain('跨日送仓')
+    expect(wrapper.get('[aria-label="当天安排"]').text()).not.toContain('午夜结束')
+    expect(wrapper.emitted('range')).toBeUndefined()
+  })
+
+  it('requests exactly one range for a view switch and navigates seven days', async () => {
+    const wrapper = render()
+    await wrapper.get('[aria-label="预约视图"]').findAll('button')[1]!.trigger('click')
+    expect(wrapper.emitted('range')).toEqual([[{ from: '2026-09-21', to: '2026-09-28' }]])
+    await wrapper.get('[aria-label="下一周"]').trigger('click')
+    expect(wrapper.emitted('range')?.at(-1)).toEqual([{ from: '2026-09-28', to: '2026-10-05' }])
+  })
+
+  it('keeps busy days to three previews in both views and exposes the full count', async () => {
+    const wrapper = render()
+    await wrapper.setProps({ events: Array.from({ length: 233 }, (_, index) => ({
+      key: `arrival-${index}`, type: 'arrival' as const, date: '2026-09-24', time: '09:00',
+      title: `船舶 ${index}`, fields: [],
+    })) })
+    await wrapper.get('[aria-label="参考图层"] input').setValue(true)
+    for (const view of ['month', 'week']) {
+      if (view === 'week') await wrapper.get('[aria-label="预约视图"]').findAll('button')[1]!.trigger('click')
+      const day = wrapper.get('[aria-label="2026-09-24，233 项安排"]')
+      expect(day.findAll('.event-chip')).toHaveLength(3)
+      expect(day.attributes('title')).toContain('共 233 条安排')
+      expect(day.get('.event-more').text()).toBe('还有 230 条')
+      expect(wrapper.findAll('.detail-event')).toHaveLength(233)
+    }
+  })
+
+  it('uses the selected day for creation and emits edit/delete only from detail actions', async () => {
+    const wrapper = render()
+    await wrapper.findAll('button').find(button => button.text() === '＋ 新增预约')!.trigger('click')
+    expect(wrapper.emitted('create')).toEqual([['2026-09-24']])
+    await wrapper.findAll('button').find(button => button.text() === '编辑')!.trigger('click')
+    await wrapper.findAll('button').find(button => button.text() === '取消预约')!.trigger('click')
+    expect(wrapper.emitted('edit')?.[0]?.[0]).toMatchObject({ key: 'a' })
+    expect(wrapper.emitted('delete')?.[0]?.[0]).toMatchObject({ key: 'a' })
+  })
+
+  it('renders many inbound codes outside the two-column fields with only three previews', async () => {
+    const wrapper = render()
+    await wrapper.setProps({ events: [{
+      key: 'many', type: 'delivery', date: '2026-09-24', time: '09:00', title: 'ONT8 预约送仓',
+      fields: [{ label: '货物信息', value: '20 票 / 12 个客户' }],
+      inboundCodes: Array.from({ length: 20 }, (_, index) => `WT-INBOUND-${index}`), canEdit: true,
+    }] })
+    const card = wrapper.get('.detail-event')
+    expect(card.get('dl').text()).not.toContain('WT-INBOUND')
+    expect(card.findAll('.inbound-codes li')).toHaveLength(3)
+    expect(card.get('.inbound-codes').text()).toContain('20 个')
+    expect(card.get('footer').text()).toContain('编辑')
+  })
+})

src/modules/appointment-calendar/AppointmentCalendarPanel.vue

@@ -0,0 +1,209 @@
+<script setup lang="ts">
+import '@/styles/adminDensity.css'
+import { computed, ref } from 'vue'
+import AppointmentInboundCodes from './AppointmentInboundCodes.vue'
+import { addDays, calendarDates, calendarRange, dateKey, moveCalendar, occursOnDate, type CalendarMode } from './calendar'
+
+export interface CalendarEvent {
+  key: string
+  date: string
+  endAt?: string
+  time: string
+  type: 'arrival' | 'delivery' | 'pickup' | 'trip'
+  title: string
+  subtitle?: string
+  fields: Array<{ label: string; value?: string | null }>
+  inboundCodes?: Array<string | null | undefined>
+  canEdit?: boolean
+  canView?: boolean
+  canDelete?: boolean
+  sourcePath?: string
+}
+
+const props = withDefaults(defineProps<{
+  notices?: string[]
+  events: CalendarEvent[]
+  loading?: boolean
+  incomplete?: boolean
+  canCreate?: boolean
+  initialDate?: string
+}>(), { notices: () => [], loading: false, incomplete: false, canCreate: false, initialDate: '' })
+const emit = defineEmits<{
+  layers: [layers: { arrivals: boolean; trips: boolean }]
+  range: [range: { from: string; to: string }]
+  create: [date: string]
+  edit: [event: CalendarEvent]
+  view: [event: CalendarEvent]
+  delete: [event: CalendarEvent]
+  open: [event: CalendarEvent]
+}>()
+const showArrivals = ref(false), showTrips = ref(false)
+function updateLayers() { emit('layers', { arrivals: showArrivals.value, trips: showTrips.value }) }
+const visibleEvents = computed(() => props.events.filter(event => (event.type !== 'arrival' || showArrivals.value) && (event.type !== 'trip' || showTrips.value)))
+const selectedDate = ref(props.initialDate || dateKey(new Date()))
+const mode = ref<CalendarMode>('month')
+const dates = computed(() => calendarDates(selectedDate.value, mode.value))
+const grouped = computed(() => {
+  const result = new Map<string, CalendarEvent[]>()
+  for (const event of visibleEvents.value) {
+    for (const date of dates.value) {
+      if (!occursOnDate(event.date, event.endAt, date)) continue
+      const group = result.get(date) || []
+      group.push(event)
+      result.set(date, group)
+    }
+  }
+  for (const group of result.values()) group.sort((a, b) => a.time.localeCompare(b.time) || a.key.localeCompare(b.key))
+  return result
+})
+const selectedEvents = computed(() => grouped.value.get(selectedDate.value) || [])
+const appointmentCount = computed(() => selectedEvents.value.filter(event => event.type === 'delivery' || event.type === 'pickup').length)
+const weekdays = ['周一', '周二', '周三', '周四', '周五', '周六', '周日']
+const eventTypeLabels = { arrival: '船舶到港', delivery: '预约送仓', pickup: '预约提柜', trip: '用车计划' }
+const heading = computed(() => mode.value === 'month'
+  ? `${selectedDate.value.slice(0, 4)}年${Number(selectedDate.value.slice(5, 7))}月`
+  : `${dates.value[0]} — ${addDays(calendarRange(selectedDate.value, mode.value).to, -1)}`)
+function select(date: string) {
+  const before = calendarRange(selectedDate.value, mode.value)
+  selectedDate.value = date
+  const after = calendarRange(date, mode.value)
+  if (before.from !== after.from || before.to !== after.to) emit('range', after)
+}
+function changeMode(next: CalendarMode) {
+  if (mode.value === next) return
+  mode.value = next
+  emit('range', calendarRange(selectedDate.value, next))
+}
+defineExpose({ selectedDate, mode })
+</script>
+
+<template>
+  <section class="appointment-calendar admin-density" :aria-busy="loading">
+    <div class="calendar-main">
+      <header class="calendar-toolbar">
+        <div class="calendar-label">
+          <svg width="22" height="22" viewBox="0 0 24 24" fill="none" aria-hidden="true"><rect x="3" y="5" width="18" height="16" rx="2" stroke="currentColor" stroke-width="1.8"/><path d="M8 3v4M16 3v4M3 10h18M8 15h3M14 15h3" stroke="currentColor" stroke-width="1.8" stroke-linecap="round"/></svg>
+          <strong>预约日历</strong>
+          <el-button v-if="canCreate" type="primary" :disabled="loading" @click="emit('create', selectedDate)">＋ 新增预约</el-button>
+        </div>
+        <div class="calendar-controls">
+          <div class="view-toggle" role="group" aria-label="预约视图">
+            <button type="button" :aria-pressed="mode === 'month'" @click="changeMode('month')">月</button>
+            <button type="button" :aria-pressed="mode === 'week'" @click="changeMode('week')">周</button>
+          </div>
+          <button class="nav-button" type="button" :aria-label="mode === 'month' ? '上个月' : '上一周'" @click="select(moveCalendar(selectedDate, mode, -1))">‹</button>
+          <strong class="calendar-period">{{ heading }}</strong>
+          <button class="nav-button" type="button" :aria-label="mode === 'month' ? '下个月' : '下一周'" @click="select(moveCalendar(selectedDate, mode, 1))">›</button>
+          <el-button @click="select(dateKey(new Date()))">今天</el-button>
+        </div>
+        <div class="calendar-record-actions" role="group" aria-label="预约记录与数据提示">
+          <slot name="toolbar-actions" />
+          <details v-if="notices.length" class="calendar-data-notices"><summary>数据提示 · {{ notices.length }}</summary><div class="calendar-notice-content" role="status"><p v-for="notice in notices" :key="notice">{{ notice }}</p><slot name="notice-actions" /></div></details>
+        </div>
+      </header>
+      <div class="calendar-options">
+        <div class="calendar-legend"><span v-if="showArrivals" class="legend arrival">船舶到港</span><span class="legend delivery">预约送仓</span><span class="legend pickup">预约提柜</span><span v-if="showTrips" class="legend trip">用车计划</span></div>
+      <div class="calendar-layers" role="group" aria-label="参考图层"><label><input v-model="showArrivals" type="checkbox" @change="updateLayers">显示到港参考</label><label><input v-model="showTrips" type="checkbox" @change="updateLayers">显示用车计划</label></div>
+      </div>
+      <div class="weekdays"><span v-for="day in weekdays" :key="day">{{ day }}</span></div>
+      <div v-loading="loading" class="calendar-grid" :class="{ 'week-grid': mode === 'week' }">
+        <button v-for="date in dates" :key="date" type="button" class="calendar-day"
+          :class="{ selected: selectedDate === date, outside: mode === 'month' && date.slice(0, 7) !== selectedDate.slice(0, 7) }"
+          :title="`${date}，${incomplete ? '已加载' : '共'} ${(grouped.get(date) || []).length} 条安排${incomplete ? '（当前范围不完整）' : ''}`" :aria-label="`${date}，${(grouped.get(date) || []).length} 项安排${incomplete ? '（当前范围不完整）' : ''}`" :aria-pressed="selectedDate === date" @click="select(date)">
+          <span class="day-number">{{ mode === 'week' ? `${Number(date.slice(5, 7))}月` : '' }}{{ Number(date.slice(8)) }}</span>
+          <span class="day-events">
+            <span v-for="event in (grouped.get(date) || []).slice(0, 3)" :key="event.key" class="event-chip" :class="event.type" :title="`${event.time} ${event.title} · 当天${incomplete ? '已加载' : '共'} ${(grouped.get(date) || []).length} 条安排${incomplete ? '（当前范围不完整）' : ''}`">
+              {{ event.title }}<small v-if="mode === 'week'">{{ event.time }}</small>
+            </span>
+            <span v-if="(grouped.get(date) || []).length > 3" class="event-more">还有 {{ (grouped.get(date) || []).length - 3 }} 条</span>
+          </span>
+        </button>
+      </div>
+    </div>
+    <aside class="calendar-detail" aria-label="当天安排">
+      <header><strong>{{ selectedDate }}</strong><p>{{ incomplete ? '当天已加载' : '当天共有' }} <b>{{ appointmentCount }}</b> 项预约<span v-if="selectedEvents.length > appointmentCount">，{{ selectedEvents.length - appointmentCount }} 条参考计划</span><span v-if="incomplete">（当前范围不完整）</span></p></header>
+      <div class="detail-events" aria-live="polite">
+        <p v-if="!selectedEvents.length && !loading" class="empty-day">{{ incomplete ? '当前范围内暂无预约；请按上方提示核对缺失资料或失败来源' : '当天暂无预约' }}</p>
+        <article v-for="event in selectedEvents" :key="event.key" class="detail-event">
+          <div class="event-heading"><span class="event-type" :class="event.type">{{ eventTypeLabels[event.type] }}</span><span>{{ event.time || '—' }}</span></div>
+          <h3>{{ event.title }}</h3><p v-if="event.subtitle" class="event-subtitle">{{ event.subtitle }}</p>
+          <dl><div v-for="field in event.fields" :key="field.label" :class="{ 'wide-field': ['系统单号', '完整时段', '预约备注'].includes(field.label) }"><dt>{{ field.label }}</dt><dd>{{ field.value || '—' }}</dd></div></dl>
+          <AppointmentInboundCodes v-if="event.inboundCodes" :codes="event.inboundCodes" />
+          <footer v-if="event.canView || event.canEdit || event.canDelete || event.sourcePath" class="density-actions">
+            <el-button v-if="event.canView" class="density-action" :disabled="loading" @click="emit('view', event)">查看预约</el-button>
+            <el-button v-if="event.sourcePath" class="density-action" :disabled="loading" @click="emit('open', event)">查看来源</el-button>
+            <el-button v-if="event.canEdit" class="density-action" :disabled="loading" @click="emit('edit', event)">编辑</el-button>
+            <el-button v-if="event.canDelete" class="density-action" data-tone="danger" :disabled="loading" @click="emit('delete', event)">取消预约</el-button>
+          </footer>
+        </article>
+      </div>
+    </aside>
+  </section>
+</template>
+
+<style scoped>
+.calendar-data-notices { position: relative; font-size: var(--admin-font-caption); color: var(--el-text-color-secondary); }
+.calendar-data-notices summary { cursor: pointer; padding: var(--admin-space-2) var(--admin-space-3); }
+.calendar-notice-content { position: absolute; top: 100%; right: 0; z-index: 5; width: 320px; padding: var(--admin-space-5); border: 1px solid var(--admin-table-border); border-radius: var(--admin-radius); background: var(--admin-surface); box-shadow: var(--el-box-shadow-light); }
+.calendar-notice-content p { margin: 0; line-height: 1.6; }
+.calendar-notice-content p + p { margin-top: var(--admin-space-3); }
+
+.appointment-calendar { display: grid; align-items: start; grid-template-columns: minmax(0, 1fr) 360px; gap: var(--admin-space-5); color: #344054; }
+.calendar-main, .calendar-detail { background: #fff; border: 1px solid #e4e9f2; border-radius: 10px; overflow: hidden; }
+.calendar-toolbar { display: flex; flex-wrap: wrap; justify-content: space-between; align-items: center; gap: var(--admin-space-3); padding: var(--admin-space-5); border-bottom: 1px solid #edf0f6; }
+.calendar-label, .calendar-controls { display: flex; align-items: center; gap: 10px; }
+.calendar-record-actions { display: flex; align-items: center; flex-wrap: wrap; gap: var(--admin-space-3); }
+.calendar-record-actions :deep(.el-button + .el-button) { margin-left: 0; }
+.calendar-label > svg { color: #617ce9; }
+.calendar-label > strong { font-size: var(--admin-font-section); }
+.calendar-options { display: flex; align-items: center; justify-content: space-between; flex-wrap: wrap; gap: var(--admin-space-3); padding: var(--admin-space-3) var(--admin-space-5); border-bottom: 1px solid var(--admin-table-border); }
+.calendar-legend, .calendar-layers { display: flex; align-items: center; flex-wrap: wrap; gap: var(--admin-space-5); }
+.calendar-layers label { display: inline-flex; align-items: center; gap: var(--admin-space-1); cursor: pointer; font-size: var(--admin-font-caption); color: var(--el-text-color-secondary); }
+.calendar-layers input { margin: 0; accent-color: var(--el-color-primary); }
+.legend { font-size: 12px; white-space: nowrap; }
+.legend::before { content: ''; display: inline-block; width: 7px; height: 7px; border-radius: 50%; margin-right: 5px; background: #4b78e8; }
+.legend.delivery::before { background: #27a87a; }
+.legend.pickup::before { background: #c17a20; }
+.legend.trip::before { background: #8562b0; }
+.view-toggle { display: flex; border: 1px solid #dbe3ee; border-radius: 6px; padding: 2px; background: #f7f9fc; }
+.view-toggle button, .nav-button { border: 0; border-radius: 5px; background: transparent; cursor: pointer; color: #64748b; min-width: 30px; height: 30px; }
+.view-toggle button[aria-pressed='true'] { background: #fff; color: #4167d8; font-weight: 700; }
+.nav-button { border: 1px solid #dbe3ee; font-size: 22px; }
+.calendar-period { font-size: 14px; white-space: nowrap; }
+.weekdays, .calendar-grid { display: grid; grid-template-columns: repeat(7, minmax(0, 1fr)); }
+.weekdays { text-align: center; color: #8491a5; background: #f8faff; padding: var(--admin-space-3) var(--admin-space-5); font-size: var(--admin-font-caption); }
+.calendar-grid { gap: var(--admin-space-2); padding: var(--admin-space-3); background: #fbfcff; }
+.calendar-day { display: flex; flex-direction: column; align-items: stretch; justify-content: flex-start; height: 112px; min-width: 0; padding: var(--admin-space-2); border: 1px solid #e5eaf2; border-radius: 8px; background: #fff; text-align: left; cursor: pointer; color: inherit; font: inherit; overflow: hidden; }
+.calendar-day.outside { background: #f7f8fa; color: #98a2b3; }
+.calendar-day:hover { border-color: #bac8ed; background: #f8faff; }
+.calendar-day.selected { border-color: #617ce9; background: #f5f7ff; }
+.calendar-day:focus-visible, .nav-button:focus-visible, .view-toggle button:focus-visible { outline: 2px solid #4167d8; outline-offset: 2px; }
+.day-number { display: block; font-size: 12px; font-weight: 600; }
+.day-events { display: flex; flex-direction: column; gap: 2px; margin-top: var(--admin-space-1); }
+.event-chip { display: block; padding: 1px 6px; line-height: 16px; border-radius: 4px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; font-size: 12px; }
+.arrival { --event-bg: #edf3ff; --event-fg: #3765d4; }
+.delivery { --event-bg: #e8f8f1; --event-fg: #18845f; }
+.pickup { --event-bg: #fff4e3; --event-fg: #995a10; }
+.trip { --event-bg: #f2edfa; --event-fg: #725199; }
+.event-chip, .event-type { background: var(--event-bg); color: var(--event-fg); }
+.event-chip small { display: block; margin-top: 2px; font-size: 11px; opacity: .8; }
+.event-more { padding: 1px 6px; line-height: 16px; }
+.event-more, .empty-day { color: #667085; font-size: 12px; }
+.week-grid .calendar-day { height: 220px; }
+.calendar-detail { align-self: start; }
+.calendar-detail > header { padding: var(--admin-space-5); border-bottom: 1px solid #edf0f6; }
+.calendar-detail > header > strong { font-size: var(--admin-font-title); }
+.calendar-detail header p { margin: var(--admin-space-1) 0 0; font-size: var(--admin-font-caption); color: #8491a5; }
+.calendar-detail header b { color: #617ce9; font-size: var(--admin-font-title); }
+.detail-events { padding: var(--admin-space-5); max-height: 660px; overflow-y: auto; }
+.detail-event + .detail-event { border-top: 1px solid #e4e9f2; margin-top: var(--admin-space-5); padding-top: var(--admin-space-5); }
+.event-heading { display: flex; justify-content: space-between; align-items: center; gap: 10px; font-size: 12px; }
+.event-type { padding: 5px 8px; border-radius: 4px; font-weight: 600; }
+.detail-event h3 { font-size: var(--admin-font-section); margin: var(--admin-space-3) 0; overflow-wrap: anywhere; }
+.event-subtitle { color: #667085; font-size: 13px; overflow-wrap: anywhere; }
+.detail-event dl { display: grid; grid-template-columns: repeat(2, minmax(0, 1fr)); gap: var(--admin-space-3) var(--admin-space-5); margin: var(--admin-space-3) 0; }
+.detail-event .wide-field { grid-column: 1 / -1; }
+.detail-event dt { font-size: 12px; color: #8491a5; }
+.detail-event dd { margin: 4px 0 0; font-size: 13px; overflow-wrap: anywhere; }
+.detail-event footer { display: flex; justify-content: flex-end; border-top: 1px solid #edf0f6; padding-top: 10px; }
+</style>

src/modules/appointment-calendar/AppointmentCalendarView.test.ts

@@ -0,0 +1,408 @@
+import { inject, onBeforeUnmount } from 'vue'
+import { onBeforeRouteLeave, onBeforeRouteUpdate } from 'vue-router'
+import { flushPromises, mount } from '@vue/test-utils'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import AppointmentCalendarView from './AppointmentCalendarView.vue'
+import { createFbaAppointment, getFbaAppointment, updateFbaAppointment, listFbaAppointmentCalendar, listInboundOrders } from '@/modules/overseas-warehouse'
+import { listArrivalCalendar, listPickupCalendar } from './api'
+import { listTripCalendar } from './tripCalendar'
+vi.mock('./tripCalendar', async (original) => ({...(await original<typeof import('./tripCalendar')>()),listTripCalendar:vi.fn()}))
+import { resolvePlanningSource, saveFollowup, listUnscheduledAppointments } from './planningApi'
+const routing = vi.hoisted(() => ({ query: {} as Record<string,string>, canSourceRead: true, canPickup: true, canTrips: true, canWrite: true, containerPending: false }))
+vi.mock('./planningApi', () => ({ resolvePlanningSource: vi.fn(), listPlanningCargo: vi.fn(), getFollowups: vi.fn(), saveFollowup: vi.fn(), listUnscheduledAppointments: vi.fn() }))
+import { listPlatformWarehouses } from '@/modules/warehouses'
+vi.mock('@/modules/warehouses', () => ({ listPlatformWarehouses: vi.fn() }))
+
+vi.mock('vue-router', () => ({ onBeforeRouteLeave: vi.fn(), onBeforeRouteUpdate: vi.fn(), useRoute: () => routing, useRouter: () => ({ push: vi.fn() }) }))
+
+vi.mock('./api', () => ({ listArrivalCalendar: vi.fn(), listPickupCalendar: vi.fn(), deleteAppointment: vi.fn() }))
+
+vi.mock('@/core/access/accessPreview', () => ({ useAccessPreviewStore: () => ({ can: (permission: string) => (permission !== 'write' || routing.canWrite) && (permission !== 'source-read' || routing.canSourceRead) && (permission !== 'platform:firstleg:terminal-drayage:list' || routing.canPickup) && (permission !== 'platform:fleet:trip:list' || routing.canTrips) }) }))
+vi.mock('@/modules/overseas-warehouse', async (importOriginal) => ({ ...(await importOriginal<typeof import('@/modules/overseas-warehouse')>()),
+  createFbaAppointment: vi.fn(), getFbaAppointment: vi.fn(), listFbaAppointmentCalendar: vi.fn(),
+  listInboundOrders: vi.fn(), updateFbaAppointment: vi.fn(),
+  overseasWarehousePermissions: { inboundOrderAppointment: 'write', lastMileOrderList: 'source-read' },
+}))
+vi.mock('element-plus', () => ({ ElMessage: { success: vi.fn(), warning: vi.fn() }, ElMessageBox: { confirm: vi.fn() } }))
+
+const candidates = [
+  { lineId: '9007199254740993', customerId: 'A', overseasWarehouseId: '100', fbaWarehouseCode: 'ONT8', planId: '1', planNo: 'IN-A', orderId: '10' },
+  { lineId: '9007199254740994', customerId: 'B', overseasWarehouseId: '100', fbaWarehouseCode: 'ONT8', planId: '2', planNo: 'IN-B', orderId: '20' },
+]
+function render(openCalendar = true) {
+  const wrapper = mount(AppointmentCalendarView, { global: { directives: { loading: {} }, stubs: {
+    AppointmentCancellationDialog: {name:'AppointmentCancellationDialog',template:'<div>取消弹窗</div>'},
+    AppointmentCancellationHistory: {name:'AppointmentCancellationHistory',template:'<div>取消历史详情</div>'},
+    AppointmentCancellationRecords: {name:'AppointmentCancellationRecords',template:'<button data-history-view @click="$emit(\'view\',\'AP-CANCEL\')">查看取消记录</button>'},
+    AdminPage: { template: '<main><slot /></main>' },
+    AppointmentContainerPanel: { name: 'AppointmentContainerPanel', setup() {
+      const register = inject<(guard: () => boolean) => () => void>('appointment-register-leave-guard')!
+      const unregister = register(() => !routing.containerPending)
+      onBeforeUnmount(unregister)
+    }, template: '<div>整柜跟进工作区</div>' },
+    AppointmentCalendarPanel: { name: 'AppointmentCalendarPanel', mounted() { this.$emit('layers', { arrivals: true, trips: true }) }, props: ['events', 'incomplete', 'notices'], template: '<div><button data-create @click="$emit(\'create\', \'2026-10-09\')">新增预约</button><slot name="notice-actions" /><slot name="toolbar-actions" /></div>' },
+    AppDialog: { name: 'AppDialog', props: ['modelValue', 'showConfirm', 'beforeClose'], template: '<div v-if="modelValue"><slot /><button data-close @click="$emit(\'update:model-value\',false)">关闭</button><button v-if="showConfirm !== false" data-save @click="$emit(\'confirm\')">保存</button></div>' },
+    ElForm: { template: '<form><slot /></form>' },
+    ElFormItem: { template: '<label><slot /></label>' },
+    ElInput: { props: ['modelValue', 'placeholder'], template: '<input :placeholder="placeholder" :value="modelValue" @input="$emit(\'update:modelValue\', $event.target.value)" />' },
+    ElDatePicker: { props: ['modelValue'], template: '<input data-date :value="modelValue" @input="$emit(\'update:modelValue\', $event.target.value)" />' },
+    ElButton: { template: '<button><slot /></button>' },
+    ElSelect: { name: 'ElSelect', emits: ['update:modelValue', 'change'], props: ['modelValue', 'remoteMethod'], template: '<select :value="modelValue" @change="$emit(\'update:modelValue\', $event.target.value); $emit(\'change\', $event.target.value)"><option value="">请选择</option><slot /></select>' },
+    ElOption: { props: ['value', 'label'], template: '<option :value="value">{{ label }}</option>' },
+    DataTable: { name: 'DataTable', props: ['data'], template: '<div><slot name="toolbar-actions" /><slot v-for="row in data" name="actions" :row="row"/><button data-select @click="$emit(\'selection-change\', data)">选择货物</button></div>' },
+    LoadErrorState: true, ApiErrorMeta: true, AppointmentFollowupDialog: true, AppointmentCargoPanel: { name: 'AppointmentCargoPanel', props: ['externalSource'], template: '<div>合批工作区</div>' },
+  } } })
+  if (openCalendar) void wrapper.findAll('button').find(button => button.text() === '预约日历')!.trigger('click')
+  return wrapper
+}
+
+describe('appointment calendar data integration', () => {
+  beforeEach(() => {
+    vi.resetAllMocks()
+    routing.query = {}; routing.canSourceRead = true; routing.canPickup = true; routing.canTrips = true; routing.canWrite = true; routing.containerPending = false
+    vi.mocked(listPlatformWarehouses).mockResolvedValue({ records: ['ONT8', 'LAX9'].map(code => ({ id: code, tenantId: 0, warehouseCode: code, warehouseName: code, warehouseType: 'FBA' as const, status: 'ACTIVE' as const, internalCode: null, countryCode: 'US', timezone: 'America/Los_Angeles', contactName: null, contactPhone: null, contactEmail: null, remark: null })), page: 1, size: 50, pages: 1, total: 2 })
+    vi.mocked(listFbaAppointmentCalendar).mockResolvedValue([])
+    vi.mocked(listUnscheduledAppointments).mockResolvedValue({records: [], total: 0})
+    vi.mocked(listArrivalCalendar).mockResolvedValue([])
+    vi.mocked(listTripCalendar).mockResolvedValue({records:[],unresolvedRecords:[]})
+    vi.mocked(listPickupCalendar).mockResolvedValue({records: [], truncated: false, unclassifiedCount: 0, scopeBasis: 'US_DESTINATION_WAREHOUSE', timeBasis: 'SOURCE_LOCAL_UNSPECIFIED'})
+    vi.mocked(listInboundOrders).mockResolvedValue({ records: candidates, total: 2, page: 1, size: 10, pages: 1 })
+    vi.mocked(createFbaAppointment).mockResolvedValue({ version: 0, id: '1', appointmentNo: 'APT-AB', plannedDate: '2026-10-09', appointmentAt: null, originWarehouseId: '100', appointmentStatus: 'PENDING', selectedCount: 2, fbaWarehouseCode: 'ONT8', items: [] })
+  })
+
+  it('displays the existing D cabinet number in both arrival and pickup events', async () => {
+    vi.mocked(listArrivalCalendar).mockResolvedValueOnce([{ containerBookingId: '1', cabinetNo: 'D0007', arrivalAt: '2026-10-09T08:00:00', arrivalType: 'ESTIMATED' }])
+    vi.mocked(listPickupCalendar).mockResolvedValueOnce({ records: [{ containerBookingId: '1', cabinetNo: 'D0007', containerNo: null, destinationPortName: null, destinationWarehouseCode: null, fleetSupplierName: null, pickupAppointmentAt: '2026-10-09T09:00:00', actualPickupAt: null }], truncated: false, unclassifiedCount: 0, scopeBasis: 'US_DESTINATION_WAREHOUSE', timeBasis: 'SOURCE_LOCAL_UNSPECIFIED' })
+    const wrapper = render(); await flushPromises()
+    const events = wrapper.getComponent({ name: 'AppointmentCalendarPanel' }).props('events')
+    expect(events).toHaveLength(2)
+    for (const event of events) {
+      expect(event.fields).toContainEqual({ label: '柜次号', value: 'D0007' })
+      expect(event.title).toContain('D0007')
+    }
+    wrapper.unmount()
+  })
+
+  it('opens a dated calendar appointment read-only for list-only users', async () => {
+    routing.canWrite=false
+    const record={version:0,id:'1',appointmentNo:'AP-DATED',plannedDate:'2026-10-15',originWarehouseId:'100',appointmentStatus:'PENDING',selectedCount:1,fbaWarehouseCode:'ABE3',items:[]}
+    vi.mocked(listFbaAppointmentCalendar).mockResolvedValue([record])
+    vi.mocked(getFbaAppointment).mockResolvedValue(record)
+    const wrapper=render();await flushPromises()
+    const panel=wrapper.findComponent({name:'AppointmentCalendarPanel'})
+    expect(panel.props('events')).toEqual(expect.arrayContaining([expect.objectContaining({key:'AP-DATED',canView:true,canEdit:false})]))
+    panel.vm.$emit('view',{key:'AP-DATED'});await flushPromises()
+    expect(getFbaAppointment).toHaveBeenCalledWith('AP-DATED')
+    expect(wrapper.findComponent({name:'FbaAppointmentFields'}).props('disabled')).toBe(true)
+    expect(wrapper.find('[data-save]').exists()).toBe(false)
+    wrapper.findComponent({name:'AppDialog'}).vm.$emit('confirm');await flushPromises()
+    expect(updateFbaAppointment).not.toHaveBeenCalled();wrapper.unmount()
+  })
+  it('uses the dedicated cancellation dialog for an undated appointment instead of editing its status', async () => {
+    const record = { version: 3, id: '1', appointmentNo: 'AP-UNDATED', originWarehouseId: '100', appointmentStatus: 'PENDING', selectedCount: 1, fbaWarehouseCode: 'ABE3', items: [] }
+    vi.mocked(listUnscheduledAppointments).mockResolvedValue({records: [record], total: 1})
+    vi.mocked(getFbaAppointment).mockResolvedValue(record)
+    const wrapper=render(); await flushPromises()
+    await wrapper.get('[data-unscheduled]').trigger('click')
+    await wrapper.findAll('button').find(button=>button.text()==='查看 / 继续')!.trigger('click'); await flushPromises()
+    expect(wrapper.find('option[value="CANCELLED"]').exists()).toBe(false)
+    await wrapper.get('[data-cancel-editing]').trigger('click'); await flushPromises()
+    expect(wrapper.findComponent({name:'AppointmentCancellationDialog'}).attributes('appointment-no')).toBe('AP-UNDATED')
+    expect(wrapper.find('[data-save]').exists()).toBe(false)
+    expect(updateFbaAppointment).not.toHaveBeenCalled(); wrapper.unmount()
+  })
+  it('loads cancellation records only after opening the dialog and opens cancelled appointments read-only', async () => {
+    const record = { version: 1, id: '1', appointmentNo: 'AP-CANCEL', originWarehouseId: '100', appointmentStatus: 'CANCELLED', selectedCount: 1, fbaWarehouseCode: 'ABE3', items: [] }
+    vi.mocked(getFbaAppointment).mockResolvedValue(record)
+    const wrapper=render();await flushPromises()
+    expect(wrapper.findComponent({name:'AppointmentCancellationRecords'}).exists()).toBe(false)
+    const records=wrapper.get('[data-cancellations]')
+    await records.trigger('click')
+    await wrapper.get('[data-history-view]').trigger('click');await flushPromises()
+    expect(getFbaAppointment).toHaveBeenCalledWith('AP-CANCEL')
+    expect(wrapper.find('[data-save]').exists()).toBe(false)
+    expect(wrapper.findComponent({name:'FbaAppointmentFields'}).props('disabled')).toBe(true)
+    expect(wrapper.findComponent({name:'AppointmentCancellationHistory'}).exists()).toBe(false)
+    const history=wrapper.findAll('details').find(d=>d.find('summary').text()==='取消历史')!
+    ;(history.element as HTMLDetailsElement).open=true;await history.trigger('toggle')
+    expect(wrapper.findComponent({name:'AppointmentCancellationHistory'}).exists()).toBe(true)
+    wrapper.findAllComponents({name:'AppDialog'}).at(-1)!.vm.$emit('confirm');await flushPromises()
+    expect(updateFbaAppointment).not.toHaveBeenCalled();wrapper.unmount()
+  })
+
+  it('refreshes an expanded cancellation list after a successful cancellation', async () => {
+    vi.mocked(listFbaAppointmentCalendar).mockResolvedValue([{version:0,id:'1',appointmentNo:'AP-CANCEL',originWarehouseId:'100',appointmentStatus:'PENDING',selectedCount:1,fbaWarehouseCode:'ABE3',items:[],plannedDate:'2026-10-15'}])
+    const wrapper=render();await flushPromises()
+    const records=wrapper.get('[data-cancellations]')
+    await records.trigger('click')
+    const previous=wrapper.getComponent({name:'AppointmentCancellationRecords'}).vm
+    wrapper.getComponent({name:'AppointmentCalendarPanel'}).vm.$emit('delete',{key:'AP-CANCEL'});await flushPromises()
+    wrapper.getComponent({name:'AppointmentCancellationDialog'}).vm.$emit('cancelled');await flushPromises()
+    expect(wrapper.getComponent({name:'AppointmentCancellationRecords'}).vm).not.toBe(previous)
+    expect(wrapper.findComponent({name:'AppointmentCancellationDialog'}).exists()).toBe(false)
+    wrapper.unmount()
+  })
+
+  it('keeps the container view mounted while a child has an unresolved command', async () => {
+    const wrapper = render(); await flushPromises()
+    const tabs = wrapper.get('[aria-label="预约工作视图"]').findAll('button')
+    await tabs[1]!.trigger('click'); await flushPromises()
+    routing.containerPending = true
+    await tabs[0]!.trigger('click')
+    expect(tabs[1]!.attributes('aria-pressed')).toBe('true')
+    expect(wrapper.findComponent({ name: 'AppointmentContainerPanel' }).exists()).toBe(true)
+    routing.containerPending = false
+    await tabs[0]!.trigger('click')
+    expect(tabs[0]!.attributes('aria-pressed')).toBe('true')
+    expect(wrapper.findComponent({ name: 'AppointmentContainerPanel' }).exists()).toBe(false)
+    wrapper.unmount()
+  })
+
+  it('opens an unscheduled appointment read-only without allowing a save', async () => {
+    routing.canWrite = false
+    const record = { version: 0, id: '1', appointmentNo: 'AP-READ', originWarehouseId: '100', appointmentStatus: 'PENDING', selectedCount: 1, fbaWarehouseCode: 'ONT8', items: [] }
+    vi.mocked(listUnscheduledAppointments).mockResolvedValue({ records: [record], total: 1 })
+    vi.mocked(getFbaAppointment).mockResolvedValue(record)
+    const wrapper = render(); await flushPromises()
+    await wrapper.get('[data-unscheduled]').trigger('click')
+    await wrapper.findAll('button').find(b => b.text() === '查看 / 继续')!.trigger('click'); await flushPromises()
+    expect(wrapper.find('[data-save]').exists()).toBe(false)
+    const dialog = wrapper.findAllComponents({ name: 'AppDialog' }).at(-1)!
+    dialog.vm.$emit('confirm'); await flushPromises()
+    expect(updateFbaAppointment).not.toHaveBeenCalled()
+    expect(wrapper.findComponent({ name: 'FbaAppointmentFields' }).props('disabled')).toBe(true)
+    wrapper.unmount()
+  })
+
+  it('puts calendar first and opens it by default without reloading when switching back', async () => {
+    const wrapper = render(false); await flushPromises()
+    const tabs = wrapper.get('[aria-label="预约工作视图"]').findAll('button')
+    expect(tabs.map(button => button.text())).toEqual(['预约日历', '提柜与到仓', '送仓与排车'])
+    expect(tabs[0]!.attributes('aria-pressed')).toBe('true')
+    expect(wrapper.text()).not.toContain('美国预约总览')
+    expect(listFbaAppointmentCalendar).toHaveBeenCalledTimes(1)
+    expect(listArrivalCalendar).toHaveBeenCalledTimes(1)
+    await tabs[1]!.trigger('click'); await flushPromises()
+    expect(listFbaAppointmentCalendar).toHaveBeenCalledTimes(1)
+    await tabs[0]!.trigger('click'); await flushPromises()
+    expect(listFbaAppointmentCalendar).toHaveBeenCalledTimes(1)
+  })
+  it('distinguishes missing country data from truncation instead of suggesting a narrower date range', async () => {
+    vi.mocked(listPickupCalendar).mockResolvedValueOnce({ records: [], truncated: false, unclassifiedCount: 74, scopeBasis: 'US_DESTINATION_WAREHOUSE', timeBasis: 'SOURCE_LOCAL_UNSPECIFIED' })
+    const wrapper = render(); await flushPromises()
+    expect(wrapper.findComponent({ name: 'AppointmentCalendarPanel' }).props('notices').join(' ')).toContain('74 条提柜记录')
+    expect(wrapper.text()).not.toContain('缩小日期范围')
+  })
+  it('shows the original pickup time once without claiming a port time zone and retains partial-source warnings', async () => {
+    vi.mocked(listPickupCalendar).mockResolvedValueOnce({records: [{containerBookingId: '123',cabinetNo: 'D0001',containerNo: 'TEST-CONT',destinationPortName: 'Port',destinationWarehouseCode: 'US-W',fleetSupplierName: 'Fleet',pickupAppointmentAt: '2026-10-09T11:00:00',actualPickupAt: null}],truncated: false,unclassifiedCount: 1,scopeBasis: 'US_DESTINATION_WAREHOUSE',timeBasis: 'SOURCE_LOCAL_UNSPECIFIED'})
+    const wrapper=render(); await flushPromises()
+    const panel=wrapper.findComponent({name:'AppointmentCalendarPanel'})
+    expect(panel.props('events')).toEqual([expect.objectContaining({type:'pickup',date:'2026-10-09',time:'11:00',sourcePath:'/container-loading/overseas/123'})])
+    expect(panel.props('incomplete')).toBe(true)
+    expect(wrapper.findComponent({ name: 'AppointmentCalendarPanel' }).props('notices').join(' ')).toContain('目的仓国家待核实')
+    expect(listPickupCalendar).toHaveBeenCalledTimes(1)
+  })
+  it('does not request pickup records without pickup list permission and discloses the omitted source', async () => {
+    routing.canPickup=false
+    const wrapper=render(); await flushPromises()
+    expect(listPickupCalendar).not.toHaveBeenCalled()
+    expect(wrapper.findComponent({ name: 'AppointmentCalendarPanel' }).props('notices').join(' ')).toContain('无提柜查看权限')
+    expect(wrapper.findComponent({name:'AppointmentCalendarPanel'}).props('incomplete')).toBe(true)
+  })
+  it('keeps successful arrival data visible when the pickup source fails', async () => {
+    vi.mocked(listPickupCalendar).mockRejectedValueOnce(new Error('pickup unavailable'))
+    vi.mocked(listArrivalCalendar).mockResolvedValueOnce([{containerBookingId:'1',cabinetNo:'D0001',arrivalAt:'2026-10-09T09:00:00',arrivalType:'ESTIMATED'}])
+    const wrapper=render(); await flushPromises()
+    const panel=wrapper.findComponent({name:'AppointmentCalendarPanel'})
+    expect(panel.props('events')).toEqual([expect.objectContaining({type:'arrival',key:'arrival-1'})])
+    expect(panel.props('incomplete')).toBe(true)
+  })
+  it('omits trip requests without trip list permission and keeps other sources usable', async () => {
+    routing.canTrips=false
+    const wrapper=render();await flushPromises()
+    expect(listTripCalendar).not.toHaveBeenCalled();expect(listArrivalCalendar).toHaveBeenCalledTimes(1)
+    expect(wrapper.findComponent({ name: 'AppointmentCalendarPanel' }).props('notices').join(' ')).toContain('无车次查看权限')
+  })
+  it('keeps unresolved trip origins outside daily slots and clearly labels their UTC source time', async () => {
+    vi.mocked(listTripCalendar).mockResolvedValueOnce({records:[],unresolvedRecords:[{sourceType:'TRIP_PLAN',tripNo:'TR-UNKNOWN',status:'PLANNED',originWarehouseId:null,originWarehouseCode:null,originWarehouseName:null,originCountryCode:null,originTimezone:null,originWarehouseStatus:null,plannedDepartureAt:'2026-10-10T12:00:00Z',expectedDriverEndAt:null,departedAt:null,completedAt:null,stops:[],incompleteReasons:['ORIGIN_WAREHOUSE_UNKNOWN']}]})
+    const wrapper=render();await flushPromises()
+    expect(wrapper.findComponent({name:'AppointmentCalendarPanel'}).props('events')).toEqual([])
+    expect(wrapper.findAll('.appointment-extra summary').map(node => node.text())).not.toContain('待核实地点的车次（1）')
+    expect(wrapper.text()).not.toContain('原计划时间保留 UTC')
+    await wrapper.findAll('button').find(button => button.text() === '查看待核实车次（1）')!.trigger('click')
+    expect(wrapper.text()).toContain('原计划时间保留 UTC')
+    expect(listTripCalendar).toHaveBeenCalledTimes(1)
+  })
+  it('creates one shared appointment for two customers without sending a fabricated header customer', async () => {
+    const wrapper = render()
+    await flushPromises()
+    expect(listFbaAppointmentCalendar).toHaveBeenCalledTimes(1)
+    expect(listArrivalCalendar).toHaveBeenCalledTimes(1)
+    expect(listInboundOrders).not.toHaveBeenCalled()
+    await wrapper.get('[data-create]').trigger('click')
+    await flushPromises()
+    await wrapper.get('select[aria-label="预约仓库"]').setValue('ONT8')
+    await flushPromises()
+    await wrapper.get('[data-select]').trigger('click')
+    expect(wrapper.find('input[placeholder="填写仓库提供的预约编号"]').exists()).toBe(false)
+    await wrapper.get('[data-save]').trigger('click')
+    await flushPromises()
+    expect(createFbaAppointment).toHaveBeenCalledTimes(1)
+    expect(createFbaAppointment).toHaveBeenCalledWith(expect.objectContaining({
+      originWarehouseId: '100', fbaWarehouseCode: 'ONT8', lineIds: ['9007199254740993', '9007199254740994'], idempotencyKey: expect.any(String), details: expect.objectContaining({plannedDate: '2026-10-09', appointmentStatus: 'PENDING', appointmentAt: null, confirmationNo: null}),
+    }))
+    expect(vi.mocked(createFbaAppointment).mock.calls[0]![0]).not.toHaveProperty('customerId')
+    expect(listInboundOrders).toHaveBeenCalledTimes(1)
+    expect(listFbaAppointmentCalendar).toHaveBeenCalledTimes(2)
+  })
+  it('only searches active FBA warehouses and loads cargo automatically after selection', async () => {
+    const wrapper = render()
+    await flushPromises()
+    await wrapper.get('[data-create]').trigger('click')
+    await flushPromises()
+    expect(listPlatformWarehouses).toHaveBeenCalledWith(expect.objectContaining({ warehouseType: 'FBA', status: 'ACTIVE', size: 50 }))
+    expect(wrapper.find('input[placeholder="例如 ONT8"]').exists()).toBe(false)
+    expect(wrapper.text()).not.toContain('查询可预约货物')
+    expect(wrapper.findComponent({name:'AppointmentCancellationRecords'}).exists()).toBe(false)
+    await wrapper.get('select[aria-label="预约仓库"]').setValue('ONT8')
+    await flushPromises()
+    expect(listInboundOrders).toHaveBeenLastCalledWith({ page: 1, size: 10, fbaWarehouseCode: 'ONT8' })
+  })
+  it('keeps a pending unknown save retry on the same immutable command', async () => {
+    vi.mocked(createFbaAppointment).mockRejectedValueOnce(new Error('response lost'))
+    const wrapper = render(); await flushPromises()
+    await wrapper.get('[data-create]').trigger('click'); await flushPromises()
+    await wrapper.get('select[aria-label="预约仓库"]').setValue('ONT8'); await flushPromises()
+    await wrapper.get('[data-select]').trigger('click')
+    await wrapper.get('[data-save]').trigger('click'); await flushPromises()
+    const first = vi.mocked(createFbaAppointment).mock.calls[0]![0]
+    await wrapper.get('[data-close]').trigger('click')
+    expect(wrapper.find('[data-save]').exists()).toBe(true)
+    await wrapper.get('[data-create]').trigger('click')
+    expect((wrapper.get('select[aria-label="预约仓库"]').element as HTMLSelectElement).value).toBe('ONT8')
+    const done = vi.fn()
+    wrapper.findAllComponents({ name: 'AppDialog' }).at(-1)!.props('beforeClose')(done)
+    expect(done).not.toHaveBeenCalled()
+    for (const hook of [onBeforeRouteLeave, onBeforeRouteUpdate]) {
+      const guard = vi.mocked(hook).mock.calls.at(-1)![0] as () => boolean
+      expect(guard()).toBe(false)
+    }
+    await wrapper.get('[data-save]').trigger('click'); await flushPromises()
+    expect(vi.mocked(createFbaAppointment).mock.calls[1]![0]).toEqual(first)
+    expect(first.details.appointmentAt).toBeNull()
+    expect(first.details.confirmationNo).toBeNull()
+    expect(first.idempotencyKey).toBeTruthy()
+  })
+  it('keeps undated arrangements outside calendar time slots', async () => {
+    vi.mocked(listUnscheduledAppointments).mockResolvedValueOnce({ records: [{ id:'1', version:0, appointmentNo:'AP-UNSCHEDULED', originWarehouseId:'100', appointmentStatus:'PENDING', selectedCount:2, fbaWarehouseCode:'ONT8', items:[] }], total:1 })
+    const wrapper=render(); await flushPromises()
+    expect(wrapper.text()).toContain('未定时安排（1）')
+    expect(wrapper.findComponent({name:'AppointmentCalendarPanel'}).props('events')).toEqual([])
+    expect(wrapper.findComponent({name:'DataTable'}).exists()).toBe(false)
+    await wrapper.get('[data-unscheduled]').trigger('click')
+    expect(wrapper.findComponent({name:'DataTable'}).props('data')[0]).not.toHaveProperty('appointmentAt')
+  })
+
+  it('changing or clearing the warehouse clears prior cargo selection and blocks saving it', async () => {
+    const wrapper = render()
+    await flushPromises()
+    await wrapper.get('[data-create]').trigger('click')
+    await flushPromises()
+    await wrapper.get('select[aria-label="预约仓库"]').setValue('ONT8')
+    await flushPromises()
+    await wrapper.get('[data-select]').trigger('click')
+    expect(wrapper.find('input[placeholder="填写仓库提供的预约编号"]').exists()).toBe(false)
+    await wrapper.get('select[aria-label="预约仓库"]').setValue('')
+    await wrapper.get('[data-save]').trigger('click')
+    expect(createFbaAppointment).not.toHaveBeenCalled()
+    expect(listInboundOrders).toHaveBeenCalledTimes(1)
+    expect(wrapper.find('[data-select]').exists()).toBe(false)
+  })
+
+  it('discards cargo responses from the previously selected warehouse', async () => {
+    let resolveOld!: (value: Awaited<ReturnType<typeof listInboundOrders>>) => void
+    vi.mocked(listInboundOrders).mockImplementationOnce(() => new Promise(resolve => { resolveOld = resolve }))
+    const wrapper = render()
+    await flushPromises()
+    await wrapper.get('[data-create]').trigger('click')
+    await flushPromises()
+    await wrapper.get('select[aria-label="预约仓库"]').setValue('ONT8')
+    vi.mocked(listInboundOrders).mockResolvedValueOnce({ records: [], total: 0, page: 1, size: 10, pages: 0 })
+    await wrapper.get('select[aria-label="预约仓库"]').setValue('LAX9')
+    await flushPromises()
+    resolveOld({ records: candidates, total: 2, page: 1, size: 10, pages: 1 })
+    await flushPromises()
+    expect(wrapper.findComponent({ name: 'DataTable' }).props('data')).toEqual([])
+  })
+
+  it('searches by keyword and exposes warehouse failures without accepting free text', async () => {
+    const wrapper = render()
+    await flushPromises()
+    await wrapper.get('[data-create]').trigger('click')
+    await flushPromises()
+    const select = wrapper.findAllComponents({ name: 'ElSelect' }).find(item => item.props('remoteMethod'))!
+    vi.mocked(listPlatformWarehouses).mockRejectedValueOnce(new Error('仓库暂不可用'))
+    await select.props('remoteMethod')(' LAX ')
+    await flushPromises()
+    expect(listPlatformWarehouses).toHaveBeenLastCalledWith(expect.objectContaining({ keyword: 'LAX', warehouseType: 'FBA', status: 'ACTIVE' }))
+    expect(wrapper.findComponent({ name: 'LoadErrorState' }).props('title')).toBe('仓库加载失败')
+    expect(wrapper.findAll('select[aria-label="预约仓库"] option')).toHaveLength(1)
+    expect(listInboundOrders).not.toHaveBeenCalled()
+  })
+
+  it('keeps available arrivals and marks the result incomplete when appointments fail', async () => {
+    vi.mocked(listFbaAppointmentCalendar).mockRejectedValueOnce(new Error('预约暂不可用'))
+    vi.mocked(listArrivalCalendar).mockResolvedValueOnce([{ containerBookingId: '1', cabinetNo: 'D0001', arrivalAt: '2026-10-09T09:00:00', arrivalType: 'ESTIMATED' }])
+    const wrapper = render()
+    await flushPromises()
+    const calendar = wrapper.findComponent({ name: 'AppointmentCalendarPanel' })
+    expect(calendar.props('incomplete')).toBe(true)
+    expect(calendar.props('events')).toHaveLength(1)
+    expect(calendar.props('events')[0].type).toBe('arrival')
+    expect(wrapper.findComponent({ name: 'LoadErrorState' }).props('title')).toBe('送仓预约加载失败')
+  })
+
+  it('keeps delivery appointments when the arrival source fails', async () => {
+    vi.mocked(listArrivalCalendar).mockRejectedValueOnce(new Error('到港暂不可用'))
+    vi.mocked(listFbaAppointmentCalendar).mockResolvedValueOnce([{ version: 0, id: '1', appointmentNo: 'APT-AB', plannedDate: '2026-10-09', appointmentAt: null, originWarehouseId: '100', appointmentStatus: 'PENDING', selectedCount: 2, fbaWarehouseCode: 'ONT8', items: [] }])
+    const wrapper = render()
+    await flushPromises()
+    const calendar = wrapper.findComponent({ name: 'AppointmentCalendarPanel' })
+    expect(calendar.props('incomplete')).toBe(true)
+    expect(calendar.props('events')[0].key).toBe('APT-AB')
+    expect(wrapper.findComponent({ name: 'LoadErrorState' }).props('title')).toBe('船舶到港加载失败')
+  })
+
+  it('resolves an external booking deep link through the backend before opening followup', async () => {
+    routing.query = { sourceKey: 'BOOKING:B-1', customerId: 'A', destinationKey: 'FBA:ONT8' }
+    vi.mocked(resolvePlanningSource).mockResolvedValueOnce({ source: { sourceKey: 'BOOKING:B-1', customerId: 'A', orderId: null, inboundCode: null, bookingNo: 'B-1', containerNo: null, originWarehouseId: '100', originWarehouseName: '美国仓', destinationKey: 'FBA:ONT8', destinationWarehouseCode: 'ONT8', packages: null, sourceVersion: 'BOOKING:1', canFollowup: true, blockReasons: [] }, coverage: { status: 'SOURCE_NOT_MATERIALIZED', appointments: [], missingFields: ['REAL_CARGO_MATERIALS'], changeReviewRequired: false } })
+    const wrapper = render(); await flushPromises()
+    expect(resolvePlanningSource).toHaveBeenCalledWith(routing.query)
+    const dialog = wrapper.findComponent({ name: 'AppointmentFollowupDialog' })
+    expect(dialog.props('source').bookingNo).toBe('B-1')
+    expect(dialog.props('source').orderId).toBeNull()
+    expect(dialog.props('coverage').status).toBe('SOURCE_NOT_MATERIALIZED')
+    expect(createFbaAppointment).not.toHaveBeenCalled(); expect(saveFollowup).not.toHaveBeenCalled()
+    expect(dialog.props('canArrange')).toBe(true)
+    dialog.vm.$emit('arrange');await flushPromises()
+    expect(wrapper.findComponent({name:'AppointmentFollowupDialog'}).exists()).toBe(false)
+    expect(wrapper.findComponent({name:'AppointmentCargoPanel'}).props('externalSource')).toMatchObject({sourceKey:'BOOKING:B-1',bookingNo:'B-1',orderId:null})
+
+  })
+
+  it('does not trust stale destination query data or open followup after a source error', async () => {
+    routing.query = { sourceKey: 'BOOKING:B-1', customerId: 'A', destinationKey: 'FBA:OLD' }
+    vi.mocked(resolvePlanningSource).mockRejectedValueOnce(new Error('目的地已变化'))
+    const wrapper = render(); await flushPromises()
+    expect(wrapper.findComponent({ name: 'AppointmentFollowupDialog' }).exists()).toBe(false)
+    expect(wrapper.findComponent({ name: 'LoadErrorState' }).props('title')).toBe('预约货源核对失败')
+  })
+
+  it('does not request deep-link cargo without the underlying source permission', async () => {
+    routing.query = { sourceKey: 'BOOKING:B-1', customerId: 'A', destinationKey: 'FBA:ONT8' }; routing.canSourceRead = false
+    const wrapper = render(); await flushPromises()
+    expect(resolvePlanningSource).not.toHaveBeenCalled()
+    expect(wrapper.findComponent({ name: 'AppointmentFollowupDialog' }).exists()).toBe(false)
+  })
+
+})

src/modules/appointment-calendar/AppointmentCalendarView.vue

@@ -0,0 +1,485 @@
+<script setup lang="ts">
+import '@/styles/adminDensity.css'
+import { computed, provide, onBeforeUnmount, onMounted, reactive, ref, watch } from 'vue'
+import { onBeforeRouteLeave, onBeforeRouteUpdate, useRoute, useRouter } from 'vue-router'
+import { resolvePlanningSource, listUnscheduledAppointments, type ResolvedPlanningSource, type PlanningSource } from './planningApi'
+import AppointmentFollowupDialog from './AppointmentFollowupDialog.vue'
+import { ElMessage } from 'element-plus'
+import { useAccessPreviewStore } from '@/core/access/accessPreview'
+import { getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
+import AdminPage from '@/shared/components/AdminPage.vue'
+import AppDialog from '@/shared/components/AppDialog.vue'
+import ApiErrorMeta from '@/shared/components/ApiErrorMeta.vue'
+import LoadErrorState from '@/shared/components/LoadErrorState.vue'
+import DataTable, { type DataTableColumn } from '@/shared/components/DataTable.vue'
+import {
+  createFbaAppointment, getFbaAppointment, listFbaAppointmentCalendar, listInboundOrders, updateFbaAppointment,
+  overseasWarehousePermissions as permission,
+  FbaAppointmentFields, createAppointmentForm, appointmentPayload, appointmentFormError,
+  type FbaAppointmentDto, type FbaAppointmentDetailsPayload, type InboundOrderSummaryDto,
+} from '@/modules/overseas-warehouse'
+import { listPlatformWarehouses, type PlatformWarehouseSummaryResource } from '@/modules/warehouses'
+import AppointmentCalendarPanel, { type CalendarEvent } from './AppointmentCalendarPanel.vue'
+import AppointmentInboundCodes from './AppointmentInboundCodes.vue'
+import AppointmentCancellationDialog from './AppointmentCancellationDialog.vue'
+import AppointmentCancellationHistory from './AppointmentCancellationHistory.vue'
+import AppointmentCancellationRecords from './AppointmentCancellationRecords.vue'
+import AppointmentCargoPanel from './AppointmentCargoPanel.vue'
+import AppointmentContainerPanel from './AppointmentContainerPanel.vue'
+import { calendarRange, dateKey } from './calendar'
+import { listArrivalCalendar, listPickupCalendar, type ArrivalCalendarEntry, type PickupCalendarEntry } from './api'
+import { listTripCalendar, projectTripCalendar, tripIssues, type TripCalendarEntry } from './tripCalendar'
+
+const cancellationTarget = ref<FbaAppointmentDto | null>(null)
+const unscheduledOpen = ref(false)
+const cancellationsOpen = ref(false), cancellationsRevision = ref(0), cancellationHistoryOpen = ref(false), forceReadOnly = ref(false)
+const appointmentReadOnly = computed(() => forceReadOnly.value || editing.value?.appointmentStatus === 'CANCELLED' || !access.can(permission.inboundOrderAppointment))
+const access = useAccessPreviewStore()
+const route = useRoute()
+const router = useRouter()
+const linkedSource = ref<ResolvedPlanningSource | null>(null)
+const selectedSource = ref<PlanningSource | null>(null)
+const linkError = ref<ApiErrorDetails | null>(null)
+const linkLoading = ref(false)
+let linkRequest = 0
+const childLeaveGuards = new Set<() => boolean>()
+provide('appointment-register-leave-guard', (guard: () => boolean) => {
+  childLeaveGuards.add(guard)
+  return () => { childLeaveGuards.delete(guard) }
+})
+function switchWorkView(next: 'calendar' | 'cargo' | 'containers') {
+  if (canLeave()) workView.value = next
+}
+const workView = ref<'calendar' | 'cargo' | 'containers'>('calendar')
+const calendarVisited = ref(true)
+const showTripLayer = ref(false)
+const cargoVisited = ref(false)
+watch(workView, value => {
+  if (value === 'cargo') cargoVisited.value = true
+  if (value === 'calendar' && !calendarVisited.value) { calendarVisited.value = true; void load(); void loadUnscheduled() }
+})
+const appointments = ref<FbaAppointmentDto[]>([])
+const arrivals = ref<ArrivalCalendarEntry[]>([])
+const pickups = ref<PickupCalendarEntry[]>([])
+const pickupNotice = ref('')
+const tripEvents = ref<CalendarEvent[]>([])
+const unresolvedTrips = ref<TripCalendarEntry[]>([])
+const tripNotice = ref('')
+const unresolvedDialogOpen = ref(false)
+const unresolvedPage = ref(1), unresolvedSize = ref(10)
+const unresolvedRows = computed(() => unresolvedTrips.value.slice((unresolvedPage.value - 1) * unresolvedSize.value, unresolvedPage.value * unresolvedSize.value))
+const unresolvedColumns: DataTableColumn[] = [
+  { key: 'actions', label: '操作', slotName: 'actions', width: 110, fixed: 'left' },
+  { prop: 'tripNo', label: '车次号', minWidth: 210 },
+  { prop: 'originWarehouseName', label: '起运仓', minWidth: 170 },
+  { prop: 'plannedDepartureAt', label: '原计划出发（UTC）', minWidth: 225 },
+  { key: 'issues', label: '待核实资料', slotName: 'issues', minWidth: 230 },
+]
+const range = ref(calendarRange(dateKey(new Date()), 'month'))
+const loading = ref(false)
+const loadError = ref<ApiErrorDetails | null>(null)
+const sourceErrors = ref<Array<{ title: string; details: ApiErrorDetails }>>([])
+const errorTitle = ref('预约日历加载失败')
+const dialogError = ref<ApiErrorDetails | null>(null)
+const dialogOpen = ref(false)
+const saving = ref(false)
+const detailLoading = ref(false)
+const detailReady = ref(false)
+const editing = ref<FbaAppointmentDto | null>(null)
+const warehouse = ref('')
+const warehouseOptions = ref<PlatformWarehouseSummaryResource[]>([])
+const warehouseLoading = ref(false)
+const warehouseError = ref<ApiErrorDetails | null>(null)
+const warehouseKeyword = ref('')
+const warehouseTotal = ref(0)
+let warehouseRequest = 0
+const candidates = ref<InboundOrderSummaryDto[]>([])
+const selected = ref<InboundOrderSummaryDto[]>([])
+const candidateLoading = ref(false)
+const candidateError = ref<ApiErrorDetails | null>(null)
+const candidatePage = ref(1)
+const candidateSize = ref(10)
+const candidateTotal = ref(0)
+const searchedWarehouse = ref('')
+const selectionEpoch = ref(0)
+let calendarController: AbortController | undefined
+let calendarRequest = 0
+let candidateRequest = 0
+let detailRequest = 0
+const form = reactive(createAppointmentForm())
+const pendingSave = ref<{ appointmentNo: string | null; version: number; originWarehouseId: string; fbaWarehouseCode: string; lineIds: string[]; details: FbaAppointmentDetailsPayload; idempotencyKey: string } | null>(null)
+const unscheduled = ref<FbaAppointmentDto[]>([]), unscheduledTotal = ref(0), unscheduledPage = ref(1), unscheduledSize = ref(10)
+const unscheduledError = ref<ApiErrorDetails | null>(null)
+const unscheduledColumns: DataTableColumn[] = [{key:'actions',label:'操作',slotName:'actions',width:100,fixed:'left'},{prop:'appointmentNo',label:'系统预约单号',minWidth:200},{prop:'fbaWarehouseCode',label:'目的仓',width:100},{prop:'selectedCount',label:'票数',width:80}]
+let unscheduledRequest = 0
+async function loadUnscheduled() {
+  const current = ++unscheduledRequest; unscheduledError.value = null
+  try { const result = await listUnscheduledAppointments(unscheduledPage.value, unscheduledSize.value); if(current === unscheduledRequest) {unscheduled.value = result.records; unscheduledTotal.value = result.total} }
+  catch(cause) {if(current === unscheduledRequest) unscheduledError.value = getApiErrorDetails(cause, '未定时安排加载失败')}
+}
+const statusLabels: Record<string, string> = { PENDING: '安排待确认', SUCCESS: '对方已确认', FAILED: '未约成', CANCELLED: '已取消' }
+const columns: DataTableColumn[] = [
+  { key: 'selection', type: 'selection', reserveSelection: true, width: 46, selectable: (row: InboundOrderSummaryDto) => row.fbaWarehouseCode === searchedWarehouse.value && (!row.appointmentStatus || ['FAILED', 'CANCELLED'].includes(row.appointmentStatus)) },
+  { prop: 'inboundCode', label: '入仓码', minWidth: 220, singleLine: false, showOverflowTooltip: false },
+  { prop: 'customerName', label: '客户', slotName: 'customer', minWidth: 180, singleLine: false, showOverflowTooltip: false },
+  { prop: 'fbaWarehouseCode', label: '目的仓', width: 110 },
+  { prop: 'overseasWarehouseName', label: '海外仓', minWidth: 150, singleLine: false, showOverflowTooltip: false },
+  { prop: 'packageCount', label: '箱数', width: 80 },
+  { prop: 'palletCount', label: '托数', width: 80 },
+  { prop: 'appointmentNo', label: '已有预约号', minWidth: 160, singleLine: false, showOverflowTooltip: false },
+]
+const events = computed<CalendarEvent[]>(() => [...arrivals.value.map(arrival => ({
+  key: `arrival-${arrival.containerBookingId}`, type: 'arrival' as const,
+  date: arrival.arrivalAt.slice(0, 10), time: arrival.arrivalAt.slice(11, 16),
+  title: `${arrival.voyageNo || arrival.cabinetNo} ${arrival.arrivalType === 'ACTUAL' ? '实际到港' : '预计到港'}`,
+  fields: [
+    { label: '船名 / 航次', value: [arrival.vesselName, arrival.voyageNo].filter(Boolean).join(' / ') },
+    { label: '目的港', value: arrival.destinationPortName },
+    { label: '已装货柜号', value: arrival.containerNo },
+    { label: '柜次号', value: arrival.cabinetNo },
+    { label: '货物去向', value: arrival.destinationWarehouseCode },
+  ],
+})), ...pickups.value.map(pickup => ({
+  key: `pickup-${pickup.containerBookingId}`, type: 'pickup' as const,
+  date: pickup.pickupAppointmentAt.slice(0, 10), time: pickup.pickupAppointmentAt.slice(11, 16),
+  title: `${pickup.containerNo || pickup.cabinetNo || '未关联柜号'} 预约提柜`,
+  sourcePath: `/container-loading/overseas/${encodeURIComponent(pickup.containerBookingId)}`,
+  subtitle: '美国目的仓相关提柜安排',
+  fields: [
+    { label: '柜次号', value: pickup.cabinetNo }, { label: '目的港', value: pickup.destinationPortName },
+    { label: '目的仓', value: pickup.destinationWarehouseCode }, { label: '车队', value: pickup.fleetSupplierName },
+    { label: '实际提柜', value: pickup.actualPickupAt || '尚未记录' },
+    { label: '时间口径', value: '原提柜业务时间，港口时区待核实' },
+  ],
+})), ...appointments.value.map(appointment => ({
+  key: appointment.appointmentNo, type: 'delivery' as const, date: (appointment.appointmentAt || appointment.plannedAt || appointment.plannedDate || '').slice(0, 10),
+  endAt: (appointment.appointmentAt ? appointment.appointmentEndAt : appointment.plannedEndAt) || undefined,
+  time: (appointment.appointmentAt || appointment.plannedAt || '').slice(11, 16) + ((appointment.appointmentAt ? appointment.appointmentEndAt : appointment.plannedEndAt) ? `–${(appointment.appointmentAt ? appointment.appointmentEndAt : appointment.plannedEndAt)!.slice(11, 16)}` : ''), title: `${appointment.fbaWarehouseCode} ${appointment.appointmentStatus === 'SUCCESS' ? '已确认送仓' : '计划送仓'}`,
+  fields: [
+    { label: '预约仓库', value: appointment.fbaWarehouseCode },
+    { label: '系统单号', value: appointment.appointmentNo },
+    { label: '外部约号', value: appointment.confirmationNo },
+    { label: '地点时区', value: appointment.timezone || '待核实' },
+    { label: '完整时段', value: `${appointment.appointmentAt || appointment.plannedAt || appointment.plannedDate || '待定'}${(appointment.appointmentAt ? appointment.appointmentEndAt : appointment.plannedEndAt) ? ` — ${appointment.appointmentAt ? appointment.appointmentEndAt : appointment.plannedEndAt}` : ''}` },
+    { label: '预约状态', value: statusLabels[appointment.appointmentStatus] || '—' },
+    { label: '货物信息', value: `${appointment.selectedCount} 票 / ${new Set(appointment.items.map(item => item.customerId)).size} 个客户` },
+    { label: '预约备注', value: appointment.appointmentRemark },
+  ].filter(field => field.value != null && field.value !== ''),
+  inboundCodes: appointment.items.map(item => item.inboundCode),
+  canEdit: access.can(permission.inboundOrderAppointment),
+  canView: access.can('platform:appointment:list'),
+  canDelete: access.can('platform:appointment:delete'),
+})), ...tripEvents.value])
+
+async function load(nextRange = range.value) {
+  unresolvedDialogOpen.value = false
+  range.value = nextRange
+  const request = ++calendarRequest
+  calendarController?.abort()
+  calendarController = new AbortController()
+  loading.value = true
+  loadError.value = null
+  sourceErrors.value = []
+  errorTitle.value = '预约日历加载失败'
+  appointments.value = []
+  arrivals.value = []
+  pickups.value = []
+  tripEvents.value = []; unresolvedTrips.value = []; unresolvedPage.value = 1
+  const canReadPickup = access.can('platform:firstleg:terminal-drayage:list')
+  const canReadTrips = access.can('platform:fleet:trip:list')
+  pickupNotice.value = canReadPickup ? '' : '无提柜查看权限，当前日历不包含提柜预约。'
+  tripNotice.value = canReadTrips ? '' : '无车次查看权限，当前日历不包含用车计划。'
+  try {
+    const [result, arrivalResult, pickupResult, tripResult] = await Promise.allSettled([
+      listFbaAppointmentCalendar(nextRange, calendarController.signal),
+      listArrivalCalendar(nextRange, calendarController.signal),
+      canReadPickup ? listPickupCalendar(nextRange, calendarController.signal) : Promise.resolve(null),
+      canReadTrips ? listTripCalendar(nextRange, calendarController.signal) : Promise.resolve(null),
+    ])
+    if (request !== calendarRequest) return
+    if (result.status === 'fulfilled') appointments.value = result.value
+    else sourceErrors.value.push({ title: '送仓预约加载失败', details: getApiErrorDetails(result.reason, '送仓预约加载失败') })
+    if (arrivalResult.status === 'fulfilled') arrivals.value = arrivalResult.value
+    else sourceErrors.value.push({ title: '船舶到港加载失败', details: getApiErrorDetails(arrivalResult.reason, '船舶到港加载失败') })
+    if (pickupResult.status === 'fulfilled' && pickupResult.value) {
+      pickups.value = pickupResult.value.records
+      pickupNotice.value = [pickupResult.value.truncated ? '提柜安排超出读取上限，请缩小日期范围。' : '', Number(pickupResult.value.unclassifiedCount) > 0 ? `有 ${Number(pickupResult.value.unclassifiedCount)} 条提柜记录的目的仓国家待核实，请完善仓库资料后重新核对；这些记录未计入当前范围。` : ''].filter(Boolean).join(' ')
+    } else if (pickupResult.status === 'rejected') sourceErrors.value.push({ title: '提柜预约加载失败', details: getApiErrorDetails(pickupResult.reason, '提柜预约加载失败') })
+    if (tripResult.status === 'fulfilled' && tripResult.value) {
+      const projection = projectTripCalendar(tripResult.value, nextRange)
+      tripEvents.value = projection.events; unresolvedTrips.value = projection.unresolved
+      if (projection.unresolved.length) tripNotice.value = '部分车次无法确定起运地点或当地日期，已单列待核实，未计入每日安排。'
+    } else if (tripResult.status === 'rejected') sourceErrors.value.push({ title: '用车计划加载失败', details: getApiErrorDetails(tripResult.reason, '用车计划加载失败') })
+  } catch (error) {
+    if (request === calendarRequest) loadError.value = getApiErrorDetails(error, '预约日历加载失败')
+  } finally { if (request === calendarRequest) loading.value = false }
+}
+
+function openSource(event: CalendarEvent) {
+  if (event.sourcePath) void router.push(event.sourcePath)
+}
+
+function canLeave() {
+  if (saving.value || pendingSave.value) { ElMessage.warning('请先核实本次保存结果，再关闭或切换'); return false }
+  return [...childLeaveGuards].every(guard => guard())
+}
+function beforeCloseAppointment(done: () => void) { if (canLeave()) done() }
+function closeAppointment() { if (canLeave()) dialogOpen.value = false }
+onBeforeRouteLeave(canLeave)
+onBeforeRouteUpdate(canLeave)
+function openCreate(date: string) {
+  if (!access.can(permission.inboundOrderAppointment) || !canLeave()) return
+  forceReadOnly.value = false; cancellationHistoryOpen.value = false
+  ++candidateRequest
+  ++detailRequest
+  detailLoading.value = false
+  candidateLoading.value = false
+  candidatePage.value = 1
+  editing.value = null
+  warehouse.value = ''
+  searchedWarehouse.value = ''
+  candidates.value = []
+  selected.value = []
+  selectionEpoch.value++
+  candidateTotal.value = 0
+  candidateError.value = null
+  dialogError.value = null
+  Object.assign(form, createAppointmentForm(), { plannedDate: date }); pendingSave.value = null
+  dialogOpen.value = true
+  detailReady.value = true
+  void searchWarehouses('')
+}
+
+async function openEdit(event: Pick<CalendarEvent, 'key'>, readOnly = false) {
+  if (!canLeave()) return
+  forceReadOnly.value = readOnly; cancellationHistoryOpen.value = false
+  const request = ++detailRequest
+  dialogError.value = null
+  editing.value = [...appointments.value, ...unscheduled.value].find(item => item.appointmentNo === event.key) || null
+  pendingSave.value = null
+  dialogOpen.value = true
+  detailLoading.value = true
+  detailReady.value = false
+  try {
+    const detail = await getFbaAppointment(event.key)
+    if (request !== detailRequest || !dialogOpen.value) return
+    editing.value = detail
+    detailReady.value = true
+    warehouse.value = detail.fbaWarehouseCode
+    Object.assign(form, createAppointmentForm(detail))
+  } catch (error) {
+    if (request === detailRequest) dialogError.value = getApiErrorDetails(error, '预约详情加载失败')
+  } finally { if (request === detailRequest) detailLoading.value = false }
+}
+
+async function searchWarehouses(keyword: string) {
+  warehouseKeyword.value = keyword
+  const request = ++warehouseRequest
+  warehouseLoading.value = true
+  warehouseError.value = null
+  warehouseOptions.value = []
+  warehouseTotal.value = 0
+  try {
+    const result = await listPlatformWarehouses({ page: 1, size: 50, keyword: keyword.trim() || undefined, warehouseType: 'FBA', status: 'ACTIVE' })
+    if (request !== warehouseRequest || !dialogOpen.value) return
+    warehouseOptions.value = result.records.filter(item => item.warehouseType === 'FBA' && item.status === 'ACTIVE')
+    warehouseTotal.value = result.total
+  } catch (error) {
+    if (request === warehouseRequest) warehouseError.value = getApiErrorDetails(error, '仓库搜索失败，请重试')
+  } finally { if (request === warehouseRequest) warehouseLoading.value = false }
+}
+
+function changeWarehouse(value: string) {
+  ++candidateRequest
+  candidateLoading.value = false
+  candidates.value = []
+  selected.value = []
+  candidateTotal.value = 0
+  candidateError.value = null
+  candidatePage.value = 1
+  selectionEpoch.value++
+  searchedWarehouse.value = value
+  if (value) void loadCandidates()
+}
+
+async function loadCandidates() {
+  if (!searchedWarehouse.value) return
+  candidateLoading.value = true
+  candidateError.value = null
+  const request = ++candidateRequest
+  try {
+    const result = await listInboundOrders({ page: candidatePage.value, size: candidateSize.value, fbaWarehouseCode: searchedWarehouse.value })
+    if (request !== candidateRequest || !dialogOpen.value) return
+    candidates.value = result.records
+    candidateTotal.value = result.total
+  } catch (error) {
+    if (request === candidateRequest) {
+      candidates.value = []
+      candidateError.value = getApiErrorDetails(error, '可预约货物加载失败')
+    }
+  } finally { if (request === candidateRequest) candidateLoading.value = false }
+}
+
+async function save() {
+  if (appointmentReadOnly.value || saving.value || detailLoading.value || !detailReady.value) return
+  const validation = appointmentFormError(form)
+  if (!pendingSave.value && validation) { ElMessage.warning(validation); return }
+  if (!editing.value) {
+    if (!warehouse.value || warehouse.value !== searchedWarehouse.value || candidateLoading.value || candidateError.value) { ElMessage.warning('请先选择仓库并等待货物加载完成'); return }
+    if (selected.value.some(item => item.fbaWarehouseCode !== warehouse.value)) { ElMessage.warning('请重新选择当前仓库的货物'); return }
+    if (!selected.value.length) { ElMessage.warning('请选择需要预约的货物'); return }
+    if (selected.value.some(item => !item.overseasWarehouseId) || new Set(selected.value.map(item => item.overseasWarehouseId)).size !== 1) { ElMessage.warning('请选择同一接仓点的货物'); return }
+    if (new Set(selected.value.map(item => item.fbaWarehouseCode)).size !== 1) {
+      ElMessage.warning('同一预约的货物必须送往同一目的仓'); return
+    }
+  }
+  saving.value = true
+  dialogError.value = null
+  try {
+    pendingSave.value ||= {appointmentNo: editing.value?.appointmentNo || null, version: editing.value?.version || 0, originWarehouseId: String(selected.value[0]?.overseasWarehouseId || ''), fbaWarehouseCode: searchedWarehouse.value, lineIds: selected.value.map(item => item.lineId), details: appointmentPayload(form), idempotencyKey: crypto.randomUUID()}
+    const payload = pendingSave.value
+    if (payload.appointmentNo) await updateFbaAppointment(payload.appointmentNo, { details: payload.details, version: payload.version, idempotencyKey: payload.idempotencyKey })
+    else await createFbaAppointment({ originWarehouseId: payload.originWarehouseId, fbaWarehouseCode: payload.fbaWarehouseCode, details: payload.details, idempotencyKey: payload.idempotencyKey, lineIds: payload.lineIds })
+    pendingSave.value = null
+    dialogOpen.value = false
+    ElMessage.success('预约已保存')
+    await Promise.all([load(), loadUnscheduled()])
+  } catch (error) { dialogError.value = getApiErrorDetails(error, '预约保存失败，请核对后重试'); if (['400','403','404','409','A0400','A0403','A0404','A0409'].includes(dialogError.value.code || '')) pendingSave.value = null }
+  finally { saving.value = false }
+}
+
+function selectCandidates(rows: object[]) {
+  selected.value = rows as InboundOrderSummaryDto[]
+}
+
+function remove(event: CalendarEvent) {
+  if (!access.can('platform:appointment:delete') || loading.value || !canLeave()) return
+  cancellationTarget.value = appointments.value.find(item => item.appointmentNo === event.key) || null
+}
+function cancelEditing() {
+  if (!editing.value || editing.value.appointmentStatus === 'CANCELLED' || !access.can('platform:appointment:delete') || !canLeave()) return
+  cancellationTarget.value = editing.value
+  dialogOpen.value = false
+}
+async function cancelled() {
+  cancellationTarget.value = null; ++cancellationsRevision.value
+  ElMessage.success('预约已取消，可在取消记录中查看原因与原记录')
+  await Promise.all([load(),loadUnscheduled()])
+}
+
+
+watch(dialogOpen, open => {
+  if (!open) { ++candidateRequest; ++detailRequest; ++warehouseRequest; candidateLoading.value = false; warehouseLoading.value = false; detailLoading.value = false; detailReady.value = false }
+})
+
+async function resolveLink() {
+  const request = ++linkRequest
+  linkedSource.value = null; linkError.value = null; linkLoading.value = false
+  const { sourceKey, customerId, destinationKey } = route.query
+  if (!sourceKey && !customerId && !destinationKey) return
+  if (typeof sourceKey !== 'string' || typeof customerId !== 'string' || typeof destinationKey !== 'string') {
+    linkError.value = { message: '货物链接不完整，请返回原登记重新打开' }; return
+  }
+  if (!access.can(permission.lastMileOrderList)) { linkError.value = { message: '当前账号没有货源读取权限，请联系预约负责人处理' }; return }
+  linkLoading.value = true
+  try {
+    const result = await resolvePlanningSource({ sourceKey, customerId, destinationKey })
+    if (request === linkRequest) linkedSource.value = result
+  } catch (cause) { if (request === linkRequest) linkError.value = getApiErrorDetails(cause, '预约货源核对失败') }
+  finally { if (request === linkRequest) linkLoading.value = false }
+}
+function arrangeLinkedSource() {
+  if (!linkedSource.value || !access.can(permission.inboundOrderAppointment) || !linkedSource.value.source.canFollowup || linkedSource.value.coverage.appointments.length) return
+  selectedSource.value = linkedSource.value.source
+  linkedSource.value = null
+  workView.value = 'cargo'
+}
+watch(() => [route.query.sourceKey, route.query.customerId, route.query.destinationKey], resolveLink, { immediate: true })
+
+onMounted(() => { void load(); void loadUnscheduled() })
+onBeforeUnmount(() => { ++unscheduledRequest; ++calendarRequest; ++candidateRequest; ++detailRequest; ++warehouseRequest; ++linkRequest; calendarController?.abort() })
+</script>
+
+<template>
+  <AdminPage class="admin-density" spacing="compact">
+    <p v-if="linkLoading">正在核对预约货源…</p>
+    <LoadErrorState v-if="linkError" title="预约货源核对失败" :message="linkError.message" :loading="linkLoading" @retry="resolveLink" />
+    <AppointmentFollowupDialog v-if="linkedSource" :source="linkedSource.source" :coverage="linkedSource.coverage" :can-write="access.can('platform:appointment:followup')" :can-arrange="access.can(permission.inboundOrderAppointment)" @arrange="arrangeLinkedSource" @close="linkedSource = null" />
+    <div class="appointment-heading">
+    <div class="density-status-tabs" role="group" aria-label="预约工作视图">
+      <button type="button" :class="{ 'is-active': workView === 'calendar' }" :aria-pressed="workView === 'calendar'" @click="switchWorkView('calendar')">预约日历</button>
+      <button v-if="access.can(permission.lastMileOrderList)" type="button" :class="{ 'is-active': workView === 'containers' }" :aria-pressed="workView === 'containers'" @click="switchWorkView('containers')">提柜与到仓</button>
+      <button v-if="access.can(permission.lastMileOrderList)" type="button" :class="{ 'is-active': workView === 'cargo' }" :aria-pressed="workView === 'cargo'" @click="switchWorkView('cargo')">送仓与排车</button>
+    </div>
+    </div>
+    <div v-if="cargoVisited" v-show="workView === 'cargo'"><AppointmentCargoPanel :external-source="selectedSource" @source-accepted="selectedSource = null" @created="load(); loadUnscheduled()" /></div>
+    <AppointmentContainerPanel v-if="workView === 'containers'" />
+    <div v-if="calendarVisited" v-show="workView === 'calendar'">
+    <LoadErrorState v-if="loadError" :title="errorTitle" :message="loadError.message" :loading="loading" @retry="load()"><template #details><ApiErrorMeta :details="loadError" /></template></LoadErrorState>
+    <LoadErrorState v-for="error in sourceErrors" :key="error.title" :title="error.title" :message="error.details.message" :loading="loading" @retry="load()"><template #details><ApiErrorMeta :details="error.details" /></template></LoadErrorState>
+    <AppointmentCalendarPanel :notices="[pickupNotice, showTripLayer ? tripNotice : ''].filter(Boolean)" :events="events" :loading="loading" :incomplete="sourceErrors.length > 0 || !!pickupNotice || (showTripLayer && !!tripNotice)" :can-create="access.can(permission.inboundOrderAppointment)" @layers="showTripLayer = $event.trips" @range="load" @create="openCreate" @view="openEdit($event, true)" @edit="openEdit" @delete="remove" @open="openSource">
+      <template #toolbar-actions>
+        <el-button aria-haspopup="dialog" data-unscheduled @click="unscheduledOpen = true">未定时安排（{{ unscheduledError ? '加载失败' : unscheduledTotal }}）</el-button>
+        <el-button aria-haspopup="dialog" data-cancellations @click="cancellationsOpen = true">取消记录</el-button>
+      </template>
+      <template #notice-actions><el-button v-if="showTripLayer && unresolvedTrips.length" link type="primary" @click="unresolvedDialogOpen = true">查看待核实车次（{{ unresolvedTrips.length }}）</el-button></template>
+    </AppointmentCalendarPanel>
+    </div>
+    <AppDialog v-if="unscheduledOpen" v-model="unscheduledOpen" title="未定时安排" width="min(1000px, calc(100vw - 48px))" :show-confirm="false" cancel-text="关闭" class="admin-density-dialog">
+      <LoadErrorState v-if="unscheduledError" title="未定时安排加载失败" :message="unscheduledError.message" @retry="loadUnscheduled" />
+      <DataTable v-model:page="unscheduledPage" v-model:page-size="unscheduledSize" :data="unscheduled" :columns="unscheduledColumns" :total="unscheduledTotal" :results-visible="!unscheduledError" row-key="appointmentNo" empty-text="暂无未定时安排" @update:page="loadUnscheduled" @update:page-size="unscheduledPage = 1; loadUnscheduled()">
+        <template #actions="{ row }"><el-button @click="openEdit({key: row.appointmentNo})">查看 / 继续</el-button></template>
+      </DataTable>
+    </AppDialog>
+    <AppDialog v-if="cancellationsOpen" v-model="cancellationsOpen" title="取消记录" width="min(1160px, calc(100vw - 48px))" :show-confirm="false" cancel-text="关闭" class="admin-density-dialog">
+      <AppointmentCancellationRecords :key="cancellationsRevision" @view="openEdit({key: $event}, true)" />
+    </AppDialog>
+    <AppDialog v-if="unresolvedDialogOpen" v-model="unresolvedDialogOpen" :title="`待核实车次（${unresolvedTrips.length}）`" width="min(1000px, calc(100vw - 48px))" :show-confirm="false" class="admin-density-dialog">
+      <p>这些车次缺少地点或时区，暂未计入日历。原计划时间保留 UTC。</p>
+      <DataTable v-model:page="unresolvedPage" v-model:page-size="unresolvedSize" :data="unresolvedRows" :columns="unresolvedColumns" :total="unresolvedTrips.length" row-key="tripNo" @update:page-size="unresolvedPage = 1">
+        <template #actions="{ row }"><el-button class="density-action" @click="router.push(`/overseas-master-data/trips/${encodeURIComponent(row.tripNo)}`)">查看来源</el-button></template>
+        <template #issues="{ row }">{{ tripIssues(row as TripCalendarEntry) }}</template>
+      </DataTable>
+    </AppDialog>
+    <AppointmentCancellationDialog v-if="cancellationTarget" :appointment-no="cancellationTarget.appointmentNo" :version="cancellationTarget.version" :selected-count="cancellationTarget.selectedCount" @close="cancellationTarget = null" @cancelled="cancelled" />
+    <AppDialog :model-value="dialogOpen" @update:model-value="closeAppointment" :before-close="beforeCloseAppointment" :show-confirm="!appointmentReadOnly" class="admin-density-dialog" :title="appointmentReadOnly ? '查看预约' : editing ? '编辑预约' : '新增预约'" width="min(1080px, calc(100vw - 48px))" :confirm-text="pendingSave ? '重试本次保存' : '保存'" :confirm-loading="saving" :confirm-disabled="detailLoading || !detailReady || (!editing && (!warehouse || !selected.length || candidateLoading || !!candidateError))" @confirm="save">
+      <LoadErrorState v-if="dialogError" title="预约操作失败" :message="dialogError.message" :show-retry="false"><template #details><ApiErrorMeta :details="dialogError" /></template></LoadErrorState>
+      <div v-loading="detailLoading">
+        <el-form label-position="top" class="calendar-form density-form">
+          <el-form-item label="预约仓库" required>
+            <el-input v-if="editing" :model-value="warehouse" readonly />
+            <el-select v-else v-model="warehouse" aria-label="预约仓库" filterable remote clearable :remote-method="searchWarehouses" :loading="warehouseLoading" placeholder="搜索仓库编码或名称" @change="changeWarehouse">
+              <el-option v-for="item in warehouseOptions" :key="String(item.id)" :value="item.warehouseCode" :label="item.warehouseName === item.warehouseCode ? item.warehouseCode : `${item.warehouseCode} · ${item.warehouseName}`" />
+            </el-select>
+          </el-form-item>
+        </el-form>
+        <LoadErrorState v-if="!editing && warehouseError" title="仓库加载失败" :message="warehouseError.message" @retry="searchWarehouses(warehouseKeyword)" />
+        <p v-if="!editing && warehouseTotal > warehouseOptions.length && !warehouseError" class="appointment-hint">输入更完整的仓库编码或名称，缩小搜索范围。</p>
+        <FbaAppointmentFields :model="form" :appointment-no="editing?.appointmentNo" :timezone="editing?.timezone || warehouseOptions.find(item => item.warehouseCode === warehouse)?.timezone" :disabled="appointmentReadOnly || saving || !!pendingSave" />
+        <el-button v-if="editing && editing.appointmentStatus !== 'CANCELLED' && access.can('platform:appointment:delete')" data-cancel-editing type="danger" plain :disabled="saving || !!pendingSave || !detailReady" @click="cancelEditing">取消预约</el-button>
+        <template v-if="!editing && warehouse">
+          <DataTable :key="selectionEpoch" v-model:page="candidatePage" v-model:page-size="candidateSize" :data="candidates" :columns="columns" :total="candidateTotal" :loading="candidateLoading" row-key="lineId" :results-visible="!candidateError" @selection-change="selectCandidates" @update:page="loadCandidates()" @update:page-size="candidatePage = 1; loadCandidates()">
+            <template #customer="{ row }">{{ row.customerName?.trim() || '客户名称缺失' }}</template>
+            <template #notices><LoadErrorState v-if="candidateError" title="货物加载失败" :message="candidateError.message" @retry="loadCandidates()" /></template>
+            <template #pagination-left>已选 {{ selected.length }} 票，可跨客户选择同一目的仓货物</template>
+          </DataTable>
+        </template>
+        <p v-else-if="!editing" class="appointment-hint">先选择预约仓库，即可勾选同仓货物，支持多个客户一起预约。</p>
+        <div v-else class="appointment-cargo">
+          <span>{{ editing.selectedCount }} 票货物</span>
+          <AppointmentInboundCodes :key="editing.appointmentNo" :codes="editing.items.map(item => item.inboundCode)" />
+          <details :key="`cancellations-${editing.appointmentNo}`" @toggle="cancellationHistoryOpen = ($event.target as HTMLDetailsElement).open"><summary>取消历史</summary><AppointmentCancellationHistory v-if="cancellationHistoryOpen" :key="editing.appointmentNo" :appointment-no="editing.appointmentNo" /></details>
+        </div>
+      </div>
+    </AppDialog>
+  </AdminPage>
+</template>
+
+<style scoped>
+.appointment-heading { display: flex; align-items: center; flex-wrap: wrap; gap: var(--admin-space-5); }
+.appointment-heading .density-status-tabs { flex: 1; margin: 0; }
+.calendar-form { display: grid; grid-template-columns: repeat(3, minmax(0, 1fr)); gap: 0 var(--admin-space-6); }
+.calendar-form :deep(.el-select), .calendar-form :deep(.el-date-editor) { width: 100%; }
+.appointment-cargo { padding: 12px 0; line-height: 1.7; overflow-wrap: anywhere; font-size: 13px; }
+.appointment-hint { color: var(--el-text-color-secondary); font-size: var(--admin-font-body); margin: var(--admin-space-5) 0; }
+</style>

src/modules/appointment-calendar/AppointmentCancellation.test.ts

@@ -0,0 +1,53 @@
+import { flushPromises, mount } from '@vue/test-utils'
+import ElementPlus from 'element-plus'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import AppointmentCancellationDialog from './AppointmentCancellationDialog.vue'
+import AppointmentCancellationHistory from './AppointmentCancellationHistory.vue'
+import AppointmentCancellationRecords from './AppointmentCancellationRecords.vue'
+import { deleteAppointment, listAppointmentCancellations, listAppointmentCancellationRecords } from './api'
+const access = vi.hoisted(() => ({ canCancel: true }))
+vi.mock('@/core/access/accessPreview', () => ({useAccessPreviewStore: () => ({can: () => access.canCancel})}))
+vi.mock('vue-router', () => ({onBeforeRouteLeave: vi.fn(), onBeforeRouteUpdate: vi.fn()}))
+vi.mock('./api', () => ({deleteAppointment: vi.fn(),listAppointmentCancellations: vi.fn(),listAppointmentCancellationRecords: vi.fn()}))
+const record = {appointmentNo:'AP-CANCEL',version:1,cancelReason:null,cancelledAt:'2026-10-11T01:00:00',snapshot:{fbaWarehouseCode:'ABE3',appointmentStatus:'CANCELLED',appointmentRemark:'原备注保留',plannedDate:null,plannedAt:null,plannedEndAt:null,confirmationNo:'EXT-1',appointmentAt:'2026-10-15T09:00:00',appointmentEndAt:null,timezone:'America/New_York',selectedCount:1}}
+function dialog() {
+  return mount(AppointmentCancellationDialog,{props:{appointmentNo:'AP-CANCEL',version:0,selectedCount:1},global:{plugins:[ElementPlus],stubs:{AppDialog:{name:'AppDialog',props:['beforeClose','showConfirm'],template:'<section><slot/><button v-if="showConfirm" data-save @click="$emit(\'confirm\')">取消</button></section>'}}}})
+}
+describe('appointment cancellation',()=>{
+  beforeEach(()=>{vi.resetAllMocks();access.canCancel=true})
+  it('requires a reason and retries the same reason and version after an unknown result',async()=>{
+    vi.mocked(deleteAppointment).mockRejectedValueOnce(new Error('lost')).mockResolvedValueOnce(undefined)
+    const wrapper=dialog();await flushPromises()
+    await wrapper.get('[data-save]').trigger('click');expect(deleteAppointment).not.toHaveBeenCalled()
+    await wrapper.get('textarea').setValue('  仓库取消时段  ')
+    await wrapper.get('[data-save]').trigger('click');await flushPromises()
+    expect(deleteAppointment).toHaveBeenCalledWith('AP-CANCEL',0,'仓库取消时段')
+    const done=vi.fn();wrapper.getComponent({name:'AppDialog'}).props('beforeClose')(done);expect(done).not.toHaveBeenCalled()
+    expect(wrapper.get('textarea').attributes('disabled')).toBeDefined()
+    await wrapper.get('[data-save]').trigger('click');await flushPromises()
+    expect(deleteAppointment).toHaveBeenNthCalledWith(2,'AP-CANCEL',0,'仓库取消时段')
+    expect(wrapper.emitted('cancelled')).toHaveLength(1);wrapper.unmount()
+  })
+  it('does not expose or invoke cancellation without its independent permission',async()=>{
+    access.canCancel=false;const wrapper=dialog();await flushPromises()
+    expect(wrapper.find('[data-save]').exists()).toBe(false)
+    wrapper.getComponent({name:'AppDialog'}).vm.$emit('confirm');await flushPromises()
+    expect(deleteAppointment).not.toHaveBeenCalled();wrapper.unmount()
+  })
+  it('reads history once per page and keeps missing historical reason explicit',async()=>{
+    vi.mocked(listAppointmentCancellations).mockResolvedValue({records:[record],total:11})
+    const wrapper=mount(AppointmentCancellationHistory,{props:{appointmentNo:'AP-CANCEL'},global:{plugins:[ElementPlus]}});await flushPromises()
+    expect(listAppointmentCancellations).toHaveBeenCalledExactlyOnceWith('AP-CANCEL',1,10)
+    expect(wrapper.text()).toContain('历史原因未记录');expect(wrapper.text()).toContain('原备注保留')
+    wrapper.getComponent({name:'DataTable'}).vm.$emit('update:page',2);await flushPromises()
+    expect(listAppointmentCancellations).toHaveBeenLastCalledWith('AP-CANCEL',2,10);wrapper.unmount()
+  })
+  it('discovers persisted cancellations with one server page and opens by business number',async()=>{
+    vi.mocked(listAppointmentCancellationRecords).mockResolvedValue({records:[{appointmentNo:'AP-CANCEL',version:1,cancelReason:'实际原因',cancelledAt:record.cancelledAt,fbaWarehouseCode:'ABE3',selectedCount:1}],total:1})
+    const wrapper=mount(AppointmentCancellationRecords,{global:{plugins:[ElementPlus]}});await flushPromises()
+    expect(listAppointmentCancellationRecords).toHaveBeenCalledExactlyOnceWith(1,10)
+    expect(listAppointmentCancellations).not.toHaveBeenCalled()
+    await wrapper.get('.el-table__body-wrapper .el-table__row').findAll('button').find(b=>b.text()==='查看')!.trigger('click')
+    expect(wrapper.emitted('view')).toEqual([['AP-CANCEL']]);wrapper.unmount()
+  })
+})

src/modules/appointment-calendar/AppointmentCancellationApi.test.ts

@@ -0,0 +1,17 @@
+import { beforeEach, expect, it, vi } from 'vitest'
+import { http } from '@/shared/api/http'
+import { deleteAppointment, listAppointmentCancellations, listAppointmentCancellationRecords } from './api'
+vi.mock('@/shared/api/http',()=>({http:{get:vi.fn(),delete:vi.fn()},unwrapApiResponse:(result:{data:unknown})=>result.data}))
+beforeEach(()=>vi.resetAllMocks())
+it('sends the required cancellation body without the old reasonless query shape',async()=>{
+  vi.mocked(http.delete).mockResolvedValue({data:undefined})
+  await deleteAppointment('AP-TEST',3,'仓库取消时段')
+  expect(http.delete).toHaveBeenCalledExactlyOnceWith('/platform/v1/last-leg/inbound-plans/fba-appointments/AP-TEST',{data:{version:3,cancelReason:'仓库取消时段'}})
+})
+it('uses paged cancellation reads and the original business number for detail history',async()=>{
+  vi.mocked(http.get).mockResolvedValue({data:{records:[],total:'12'}})
+  expect((await listAppointmentCancellationRecords(2,10)).total).toBe(12)
+  expect(http.get).toHaveBeenLastCalledWith('/platform/v1/last-leg/inbound-plans/fba-appointments/cancellations',{params:{page:2,size:10}})
+  await listAppointmentCancellations('AP/TEST',1,10)
+  expect(http.get).toHaveBeenLastCalledWith('/platform/v1/last-leg/inbound-plans/fba-appointments/AP%2FTEST/cancellations',{params:{page:1,size:10}})
+})

src/modules/appointment-calendar/AppointmentCancellationDialog.vue

@@ -0,0 +1,49 @@
+<script setup lang="ts">
+import { inject, onBeforeUnmount, ref } from 'vue'
+import { onBeforeRouteLeave, onBeforeRouteUpdate } from 'vue-router'
+import { ElMessage } from 'element-plus'
+import AppDialog from '@/shared/components/AppDialog.vue'
+import LoadErrorState from '@/shared/components/LoadErrorState.vue'
+import { getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
+import { useAccessPreviewStore } from '@/core/access/accessPreview'
+import { deleteAppointment } from './api'
+const props = defineProps<{ appointmentNo: string; version: number; selectedCount: number }>()
+const emit = defineEmits<{ close: []; cancelled: [] }>()
+const access = useAccessPreviewStore()
+const reason = ref(''), saving = ref(false), error = ref<ApiErrorDetails | null>(null)
+const pending = ref<{number: string; version: number; reason: string} | null>(null)
+function canLeave() {
+  if (saving.value || pending.value) { ElMessage.warning('请先核实本次取消结果，再关闭或切换'); return false }
+  return true
+}
+function beforeClose(done: () => void) { if (canLeave()) done() }
+function close() { if (canLeave()) emit('close') }
+const register = inject<((guard: () => boolean) => () => void) | undefined>('appointment-register-leave-guard', undefined)
+const unregister = register?.(canLeave)
+onBeforeUnmount(() => unregister?.())
+onBeforeRouteLeave(canLeave)
+onBeforeRouteUpdate(canLeave)
+async function save() {
+  if (!access.can('platform:appointment:delete') || saving.value) return
+  if (!pending.value && !reason.value.trim()) { ElMessage.warning('请填写实际取消原因'); return }
+  pending.value ||= {number: props.appointmentNo, version: props.version, reason: reason.value.trim()}
+  saving.value = true; error.value = null
+  try {
+    await deleteAppointment(pending.value.number, pending.value.version, pending.value.reason)
+    pending.value = null; emit('cancelled')
+  } catch (cause) {
+    error.value = getApiErrorDetails(cause, '取消结果待核实，请重试本次取消')
+    if (['400','403','404','409','A0400','A0403','A0404','A0409'].includes(error.value.code || '')) pending.value = null
+  } finally { saving.value = false }
+}
+</script>
+<template>
+  <AppDialog :model-value="true" title="取消预约" width="min(600px, calc(100vw - 48px))" class="admin-density-dialog" confirm-type="danger" :confirm-text="pending ? '重试本次取消' : '确认取消预约'" :show-confirm="access.can('platform:appointment:delete')" :confirm-loading="saving" :before-close="beforeClose" @update:model-value="close" @confirm="save">
+    <p>{{ appointmentNo }} · {{ selectedCount }} 票货物</p>
+    <p>取消后释放货物占用，保留原备注、时间及取消历史；不会回退库存或取消车次。</p>
+    <LoadErrorState v-if="error" title="取消未完成" :message="error.message" :show-retry="false" />
+    <el-form label-position="top" :disabled="saving || !!pending">
+      <el-form-item label="取消原因" required><el-input v-model="reason" type="textarea" maxlength="1000" show-word-limit placeholder="请填写实际取消原因" /></el-form-item>
+    </el-form>
+  </AppDialog>
+</template>

src/modules/appointment-calendar/AppointmentCancellationHistory.vue

@@ -0,0 +1,32 @@
+<script setup lang="ts">
+import { onMounted, ref, onBeforeUnmount } from 'vue'
+import DataTable, { type DataTableColumn } from '@/shared/components/DataTable.vue'
+import LoadErrorState from '@/shared/components/LoadErrorState.vue'
+import { getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
+import { listAppointmentCancellations, type AppointmentCancellation } from './api'
+const props = defineProps<{ appointmentNo: string }>()
+const page = ref(1), size = ref(10), total = ref(0), rows = ref<AppointmentCancellation[]>([])
+const loading = ref(false), error = ref<ApiErrorDetails | null>(null)
+let request = 0
+const columns: DataTableColumn[] = [
+  {prop:'cancelledAt',label:'取消时间（UTC）',slotName:'time',minWidth:170,singleLine:false},
+  {prop:'cancelReason',label:'取消原因',slotName:'reason',minWidth:220,singleLine:false},
+  {key:'snapshot',label:'取消时记录',slotName:'snapshot',minWidth:260,singleLine:false},
+]
+async function load() {
+  const current = ++request; loading.value = true; error.value = null
+  try { const result = await listAppointmentCancellations(props.appointmentNo,page.value,size.value); if(current===request) {rows.value=result.records;total.value=result.total} }
+  catch(cause) { if(current===request) error.value=getApiErrorDetails(cause,'取消历史加载失败') }
+  finally { if(current===request) loading.value=false }
+}
+onMounted(load)
+onBeforeUnmount(()=>++request)
+</script>
+<template>
+  <LoadErrorState v-if="error" title="取消历史加载失败" :message="error.message" @retry="load" />
+  <DataTable v-model:page="page" v-model:page-size="size" :data="rows" :columns="columns" :total="total" :loading="loading" :results-visible="!error" row-key="version" @update:page="load" @update:page-size="page=1;load()">
+    <template #time="{row}">{{ row.cancelledAt?.replace('T',' ') || '—' }}</template>
+    <template #reason="{row}">{{ row.cancelReason || '历史原因未记录' }}</template>
+    <template #snapshot="{row}"><details><summary>{{ row.snapshot.fbaWarehouseCode }} · {{ row.snapshot.selectedCount }} 票 · 查看取消时记录</summary><p>原业务备注：{{ row.snapshot.appointmentRemark || '—' }}</p><p>原计划：{{ row.snapshot.plannedAt || row.snapshot.plannedDate || '待定' }}<span v-if="row.snapshot.plannedEndAt"> — {{ row.snapshot.plannedEndAt }}</span></p><p>原确认：{{ row.snapshot.appointmentAt || '未确认' }}<span v-if="row.snapshot.appointmentEndAt"> — {{ row.snapshot.appointmentEndAt }}</span> · {{ row.snapshot.timezone || '时区待核实' }}</p><p>外部确认号：{{ row.snapshot.confirmationNo || '—' }}</p></details></template>
+  </DataTable>
+</template>

src/modules/appointment-calendar/AppointmentCancellationRecords.vue

@@ -0,0 +1,35 @@
+<script setup lang="ts">
+import { onMounted, ref, onBeforeUnmount } from 'vue'
+import DataTable, { type DataTableColumn } from '@/shared/components/DataTable.vue'
+import LoadErrorState from '@/shared/components/LoadErrorState.vue'
+import { getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
+import { listAppointmentCancellationRecords, type AppointmentCancellationSummary } from './api'
+const emit = defineEmits<{ view: [appointmentNo: string] }>()
+const page=ref(1),size=ref(10),total=ref(0),rows=ref<AppointmentCancellationSummary[]>([])
+const loading=ref(false),error=ref<ApiErrorDetails|null>(null)
+let request=0
+const columns: DataTableColumn[]=[
+  {key:'actions',label:'操作',slotName:'actions',width:90,fixed:'left'},
+  {prop:'appointmentNo',label:'预约单号',minWidth:220,singleLine:false},
+  {prop:'fbaWarehouseCode',label:'目的仓',width:100},
+  {prop:'selectedCount',label:'票数',width:80},
+  {prop:'cancelledAt',label:'取消时间（UTC）',slotName:'time',minWidth:180,singleLine:false},
+  {prop:'cancelReason',label:'取消原因',slotName:'reason',minWidth:240,singleLine:false},
+]
+async function load() {
+  const current=++request;loading.value=true;error.value=null
+  try {const result=await listAppointmentCancellationRecords(page.value,size.value);if(current===request){rows.value=result.records;total.value=result.total}}
+  catch(cause){if(current===request)error.value=getApiErrorDetails(cause,'取消记录加载失败')}
+  finally{if(current===request)loading.value=false}
+}
+onMounted(load)
+onBeforeUnmount(()=>++request)
+</script>
+<template>
+  <LoadErrorState v-if="error" title="取消记录加载失败" :message="error.message" @retry="load" />
+  <DataTable v-model:page="page" v-model:page-size="size" :data="rows" :columns="columns" :total="total" :loading="loading" :results-visible="!error" :row-key="(row: object) => `${(row as AppointmentCancellationSummary).appointmentNo}:${(row as AppointmentCancellationSummary).version}`" @update:page="load" @update:page-size="page=1;load()">
+    <template #actions="{row}"><el-button @click="emit('view',row.appointmentNo)">查看</el-button></template>
+    <template #time="{row}">{{ row.cancelledAt?.replace('T',' ') || '—' }}</template>
+    <template #reason="{row}">{{ row.cancelReason || '历史原因未记录' }}</template>
+  </DataTable>
+</template>

src/modules/appointment-calendar/AppointmentCargoPanel.test.ts

@@ -0,0 +1,67 @@
+import { flushPromises, mount } from '@vue/test-utils'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import AppointmentCargoPanel from './AppointmentCargoPanel.vue'
+import { listPlanningCargo } from './planningApi'
+
+vi.mock('./planningApi', () => ({ listPlanningCargo: vi.fn(), resolvePlanningSource: vi.fn() }))
+vi.mock('vue-router', () => ({ onBeforeRouteLeave: vi.fn(), onBeforeRouteUpdate: vi.fn(), useRouter: () => ({ push: vi.fn() }) }))
+vi.mock('@/core/access/accessPreview', () => ({ useAccessPreviewStore: () => ({ can: () => true }) }))
+const empty = { records: [], page: 1, size: 20, total: 0, pages: 0 }
+function render(attach = false) {
+  return mount(AppointmentCargoPanel, { attachTo: attach ? document.body : undefined, global: { stubs: {
+    DataTable: { name: 'DataTable', props: ['data', 'total', 'resultsVisible'], emits: ['update:page'], template: '<div><slot name="filters"/><slot name="notices"/><button data-next @click="$emit(\'update:page\',2)">下一页</button></div>' },
+    QueryToolbar: { name: 'QueryToolbar', emits: ['search'], template: '<button data-search @click="$emit(\'search\')">查询</button>' },
+    LoadErrorState: true, ApiErrorMeta: true, RowActions: true, AppointmentExternalCandidates: { name: 'AppointmentExternalCandidates', template: '<section class="integrated-query-group"><slot name="query-tabs"/></section>' },
+  } } })
+}
+describe('appointment planning cargo query', () => {
+  beforeEach(() => { vi.resetAllMocks(); vi.mocked(listPlanningCargo).mockResolvedValue(empty) })
+  it('switches cargo tabs by click and keyboard without reloading first-leg cargo', async () => {
+    const wrapper = render(true); await flushPromises()
+    const tabs = () => wrapper.findAll('[role="tab"]')
+    expect(tabs().map(tab => tab.text())).toEqual(['头程货物', '外接货物'])
+    expect(wrapper.find('.integrated-query-group [role="tablist"]').exists()).toBe(true)
+    expect(tabs()[0]!.attributes('aria-selected')).toBe('true')
+    await tabs()[1]!.trigger('click')
+    expect(tabs()[1]!.attributes('aria-selected')).toBe('true')
+    expect(wrapper.findComponent({ name: 'AppointmentExternalCandidates' }).exists()).toBe(true)
+    await tabs()[1]!.trigger('keydown', { key: 'ArrowRight' })
+    await flushPromises()
+    expect(tabs()[0]!.attributes('aria-selected')).toBe('true')
+    expect(document.activeElement).toBe(tabs()[0]!.element)
+    expect(tabs()[1]!.attributes('tabindex')).toBe('-1')
+    await tabs()[0]!.trigger('keydown', { key: 'End' })
+    await flushPromises()
+    expect(tabs()[1]!.attributes('aria-selected')).toBe('true')
+    expect(document.activeElement).toBe(tabs()[1]!.element)
+    await tabs()[1]!.trigger('keydown', { key: 'Home' })
+    expect(tabs()[0]!.attributes('aria-selected')).toBe('true')
+    expect(listPlanningCargo).toHaveBeenCalledTimes(1)
+    wrapper.unmount()
+  })
+  it('uses one server-page request per entry, page change and reset', async () => {
+    const wrapper = render(); await flushPromises()
+    expect(listPlanningCargo).toHaveBeenCalledTimes(1)
+    await wrapper.get('[data-next]').trigger('click'); await flushPromises()
+    expect(listPlanningCargo).toHaveBeenLastCalledWith({ page: 2, size: 20, keyword: undefined }, expect.any(AbortSignal))
+    await wrapper.get('[data-search]').trigger('click'); await flushPromises()
+    expect(listPlanningCargo).toHaveBeenCalledTimes(3)
+    expect(listPlanningCargo).toHaveBeenLastCalledWith({ page: 1, size: 20, keyword: undefined }, expect.any(AbortSignal))
+  })
+  it('shows a source failure instead of an authoritative empty list', async () => {
+    vi.mocked(listPlanningCargo).mockRejectedValueOnce(new Error('目录不可用'))
+    const wrapper = render(); await flushPromises()
+    expect(wrapper.findComponent({ name: 'LoadErrorState' }).exists()).toBe(true)
+    expect(wrapper.findComponent({ name: 'DataTable' }).props('resultsVisible')).toBe(false)
+  })
+  it('discards a late previous page and uses the new server total', async () => {
+    let resolveOld!: (value: typeof empty) => void
+    vi.mocked(listPlanningCargo).mockImplementationOnce(() => new Promise(resolve => { resolveOld = resolve }))
+    const wrapper = render()
+    vi.mocked(listPlanningCargo).mockResolvedValueOnce({ ...empty, page: 2, total: 21, pages: 2 })
+    await wrapper.get('[data-next]').trigger('click'); await flushPromises()
+    resolveOld({ ...empty, total: 100, pages: 5 }); await flushPromises()
+    expect(wrapper.findComponent({ name: 'DataTable' }).props('total')).toBe(21)
+    expect(vi.mocked(listPlanningCargo).mock.calls[0]![1]!.aborted).toBe(true)
+  })
+})

src/modules/appointment-calendar/AppointmentCargoPanel.vue

@@ -0,0 +1,220 @@
+<script setup lang="ts">
+import { inject, computed, onBeforeUnmount, onMounted, ref, reactive } from 'vue'
+import { ElMessage } from 'element-plus'
+import { FbaAppointmentFields, createAppointmentForm, appointmentPayload, appointmentFormError, overseasWarehousePermissions } from '@/modules/overseas-warehouse'
+import AppDialog from '@/shared/components/AppDialog.vue'
+import { onBeforeRouteLeave, onBeforeRouteUpdate, useRouter } from 'vue-router'
+import DataTable, { type DataTableColumn } from '@/shared/components/DataTable.vue'
+import QueryToolbar, { type QueryModel, type QueryField } from '@/shared/components/QueryToolbar.vue'
+import LoadErrorState from '@/shared/components/LoadErrorState.vue'
+import ApiErrorMeta from '@/shared/components/ApiErrorMeta.vue'
+import RowActions from '@/shared/components/RowActions.vue'
+import { getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
+import { listPlanningCargo, resolvePlanningSource, previewPlanningBatch, createSourceAppointment, type SourceAppointmentPayload, type PlanningBatchPreview, type ResolvedPlanningSource, type PlanningCargo, type PlanningSource } from './planningApi'
+import AppointmentFollowupDialog from './AppointmentFollowupDialog.vue'
+import AppointmentExternalCandidates from './AppointmentExternalCandidates.vue'
+import AppointmentCargoTabs from './AppointmentCargoTabs.vue'
+import { useAccessPreviewStore } from '@/core/access/accessPreview'
+
+const router = useRouter()
+const access = useAccessPreviewStore()
+const props = defineProps<{ externalSource?: PlanningSource | null }>()
+const emit = defineEmits<{ created: []; sourceAccepted: [] }>()
+const arrangement = reactive(createAppointmentForm())
+const creating = ref(false), createError = ref<ApiErrorDetails | null>(null)
+const pendingCreate = ref<SourceAppointmentPayload | null>(null)
+const following = ref<ResolvedPlanningSource | null>(null)
+const candidateMode = ref<'firstleg' | 'external'>('firstleg')
+const externalRevision = ref(0)
+const followupError = ref<ApiErrorDetails | null>(null)
+type Selection = Pick<PlanningSource, 'sourceKey' | 'customerId' | 'originWarehouseId' | 'destinationWarehouseCode' | 'inboundCode'> & { bookingNo?: string | null }
+const selected = ref<Record<string, Selection>>({})
+const selectedRows = computed(() => Object.values(selected.value))
+const externalRows = computed(() => selectedRows.value.filter(row => row.sourceKey.startsWith('BOOKING:')))
+const batchPreview = ref<PlanningBatchPreview | null>(null)
+const batchLoading = ref(false), batchError = ref<ApiErrorDetails | null>(null)
+let batchRequest = 0
+function addSource(source: PlanningSource) {
+  if (!access.can(overseasWarehousePermissions.inboundOrderAppointment) || batchLoading.value || creating.value) return false
+  if (!source.canFollowup) { ElMessage.warning('当前来源尚不能安排预约'); return false }
+  const anchor = selectedRows.value[0]
+  if (anchor && (anchor.originWarehouseId !== source.originWarehouseId || anchor.destinationWarehouseCode !== source.destinationWarehouseCode)) {
+    ElMessage.warning('请先完成或清空当前合批选择；不同起运仓或目的仓不能混入'); return false
+  }
+  if (!selected.value[source.sourceKey] && selectedRows.value.length >= 100) { ElMessage.warning('每批最多选择100票'); return false }
+  selected.value[source.sourceKey] = source; batchError.value = null
+  return true
+}
+function acceptExternalSource() {
+  if (props.externalSource && addSource(props.externalSource)) emit('sourceAccepted')
+}
+function arrangeFollowing() {
+  if (following.value && !following.value.coverage.appointments.length && addSource(following.value.source)) following.value = null
+}
+function selectable(row: PlanningCargo) {
+  const anchor = selectedRows.value[0]
+  return !row.detained && !row.mixedDestinations && !row.hasActiveAppointment && (!anchor || (anchor.originWarehouseId === row.originWarehouseId && anchor.destinationWarehouseCode === row.destinationWarehouseCode))
+}
+function toggle(row: PlanningCargo, checked: unknown) {
+  batchError.value = null
+  if (checked && selectable(row) && selectedRows.value.length < 100) selected.value[row.sourceKey] = row
+  else delete selected.value[row.sourceKey]
+}
+function selectPage() { for (const row of rows.value) if (selectable(row) && selectedRows.value.length < 100) selected.value[row.sourceKey] = row }
+async function previewBatch() {
+  if (!selectedRows.value.length || batchLoading.value || creating.value || pendingCreate.value) return
+  const current = ++batchRequest
+  batchLoading.value = true; batchError.value = null
+  try {
+    const result = await previewPlanningBatch(selectedRows.value.map(row => ({ sourceKey: row.sourceKey, customerId: row.customerId, destinationKey: `FBA:${row.destinationWarehouseCode}` })))
+    if (current === batchRequest) { batchPreview.value = result; Object.assign(arrangement, createAppointmentForm()); pendingCreate.value = null; createError.value = null }
+  } catch (cause) { if (current === batchRequest) batchError.value = getApiErrorDetails(cause, '所选货物暂不能合批') }
+  finally { if (current === batchRequest) batchLoading.value = false }
+}
+async function saveArrangement() {
+  if (!batchPreview.value || creating.value || !access.can(overseasWarehousePermissions.inboundOrderAppointment)) return
+  const error = appointmentFormError(arrangement)
+  if (!pendingCreate.value && error) { ElMessage.warning(error); return }
+  pendingCreate.value ||= { originWarehouseId: batchPreview.value.group.originWarehouseId, fbaWarehouseCode: batchPreview.value.destinationWarehouseCode, sources: batchPreview.value.sources.map(row => ({sourceKey: row.sourceKey, customerId: row.customerId, destinationKey: row.destinationKey})), details: appointmentPayload(arrangement), idempotencyKey: crypto.randomUUID() }
+  creating.value = true; createError.value = null
+  try {
+    const result = await createSourceAppointment(pendingCreate.value)
+    pendingCreate.value = null; batchPreview.value = null; selected.value = {}
+    ElMessage.success(`预约安排 ${result.appointmentNo} 已保存`); ++externalRevision.value; emit('created'); await load()
+  } catch (cause) {
+    createError.value = getApiErrorDetails(cause, '保存结果待核实，请重试原请求')
+    if (['400','403','404','409','A0400','A0403','A0404','A0409'].includes(createError.value.code || '')) pendingCreate.value = null
+  } finally { creating.value = false }
+}
+let followupRequest = 0
+const query = ref<QueryModel>({ keyword: '' })
+const fields: QueryField[] = [{ key: 'keyword', type: 'input', label: '货物', placeholder: '入仓码、柜号、客户名称', width: 300 }]
+const page = ref(1), size = ref(20), total = ref(0)
+const rows = ref<PlanningCargo[]>([])
+const loading = ref(false)
+const error = ref<ApiErrorDetails | null>(null)
+let request = 0
+let controller: AbortController | undefined
+const columns: DataTableColumn[] = [
+  { key: 'actions', label: '操作', slotName: 'actions', width: 150, fixed: 'left' },
+  { key: 'select', label: '选择', slotName: 'select', width: 65 },
+  { prop: 'inboundCode', label: '入仓码', minWidth: 180 },
+  { prop: 'customerName', label: '客户', minWidth: 150 },
+  { prop: 'containerNo', label: '柜号', minWidth: 150 },
+  { prop: 'originWarehouseName', label: '接仓点', minWidth: 140 },
+  { prop: 'destinationWarehouseCode', label: '目的FBA仓', width: 110 },
+  { prop: 'packages', label: '预报箱数', width: 100 },
+  { prop: 'receivedPackages', label: '实收箱数', width: 100 },
+  { prop: 'estimatedArrivalAt', label: '来源预计到港', minWidth: 170 },
+  { prop: 'estimatedWarehouseAt', label: '已保存预计到仓', minWidth: 180, slotName: 'warehouseEta', singleLine: false },
+  { key: 'progress', label: '当前事项', slotName: 'progress', minWidth: 170 },
+]
+
+async function load(reset = false) {
+  if (reset) page.value = 1
+  const current = ++request
+  controller?.abort(); controller = new AbortController()
+  loading.value = true; error.value = null
+  try {
+    const result = await listPlanningCargo({ page: page.value, size: size.value, keyword: String(query.value.keyword || '').trim() || undefined }, controller.signal)
+    if (request !== current) return
+    rows.value = result.records; total.value = result.total
+  } catch (cause) {
+    if (request === current) { error.value = getApiErrorDetails(cause, '已开船货物加载失败'); rows.value = []; total.value = 0 }
+  } finally { if (request === current) loading.value = false }
+}
+function source(row: PlanningCargo) {
+  return router.push({ name: 'overseas-last-mile-order-detail', params: { orderId: row.orderId }, query: { customerId: row.customerId } })
+}
+async function openFollowup(row: Pick<PlanningCargo, 'sourceKey' | 'customerId' | 'destinationWarehouseCode'>) {
+  const request = ++followupRequest
+  followupError.value = null
+  try {
+    const result = await resolvePlanningSource({ sourceKey: row.sourceKey, customerId: row.customerId, destinationKey: `FBA:${row.destinationWarehouseCode}` })
+    if (request === followupRequest) following.value = result
+  } catch (cause) { if (request === followupRequest) followupError.value = getApiErrorDetails(cause, '来源核对失败') }
+}
+function canLeave() {
+  if (creating.value || pendingCreate.value) { ElMessage.warning('请先核实本次保存结果，再关闭或切换'); return false }
+  return true
+}
+function closeBatch() { if (canLeave()) batchPreview.value = null }
+function beforeClose(done: () => void) { if (canLeave()) done() }
+const registerLeaveGuard = inject<((guard: () => boolean) => () => void) | undefined>('appointment-register-leave-guard', undefined)
+const unregisterLeaveGuard = registerLeaveGuard?.(canLeave)
+onBeforeUnmount(() => unregisterLeaveGuard?.())
+onBeforeRouteLeave(canLeave)
+onBeforeRouteUpdate(canLeave)
+onMounted(() => load())
+onBeforeUnmount(() => { ++request; ++followupRequest; ++batchRequest; controller?.abort() })
+</script>
+
+<template>
+  <AppointmentExternalCandidates v-if="candidateMode === 'external'" :key="externalRevision" :can-arrange="access.can(overseasWarehousePermissions.inboundOrderAppointment)" :selected-keys="Object.keys(selected)" :busy="batchLoading || creating" @select="addSource" @followup="openFollowup($event.source)">
+    <template #query-tabs><AppointmentCargoTabs v-model="candidateMode" /></template>
+    <template #toolbar-actions>
+      <el-button :disabled="!selectedRows.length || batchLoading" @click="selected = {}; batchError = null">清空选择</el-button>
+      <el-button type="primary" :disabled="!selectedRows.length" :loading="batchLoading" @click="previewBatch">合批核对（{{ selectedRows.length }}/100）</el-button>
+    </template>
+    <template #notices>
+      <details v-if="selectedRows.length" class="external-selection"><summary>已选 {{ selectedRows.length }} 票（切换货源保留选择）</summary>
+        <div class="external-selection-list"><div v-for="row in selectedRows" :key="row.sourceKey">{{ row.bookingNo || row.inboundCode || '尚未关联业务编号' }}<el-button :disabled="batchLoading || creating" @click="delete selected[row.sourceKey]">移除选择</el-button></div></div>
+      </details>
+      <LoadErrorState v-if="batchError" title="所选货物暂不能合批" :message="batchError.message" :show-retry="false" />
+      <LoadErrorState v-if="followupError" title="来源核对失败" :message="followupError.message" :show-retry="false" />
+    </template>
+  </AppointmentExternalCandidates>
+  <DataTable v-show="candidateMode === 'firstleg'" v-model:page="page" v-model:page-size="size" appearance="integrated" :columns="columns" :data="rows" :total="total" :loading="loading" :results-visible="!error" row-key="sourceKey" @update:page="load()" @update:page-size="load(true)">
+    <template #toolbar-start>已选 {{ selectedRows.length }} 票，可跨客户选择同一起运仓、同一目的仓货物</template>
+    <template #toolbar-actions>
+      <el-button :disabled="loading || batchLoading" @click="selectPage">选择本页可合批货物</el-button>
+      <el-button :disabled="!selectedRows.length || batchLoading" @click="selected = {}; batchError = null">清空选择</el-button>
+      <el-button type="primary" :disabled="!selectedRows.length" :loading="batchLoading" @click="previewBatch">合批核对（{{ selectedRows.length }}/100）</el-button>
+    </template>
+    <template #filters>
+      <section class="integrated-query-group" aria-label="头程货物类型与筛选">
+        <AppointmentCargoTabs v-if="candidateMode === 'firstleg'" v-model="candidateMode" />
+        <QueryToolbar v-model="query" ariaLabel="在途货物查询" :fields="fields" :loading="loading" @search="load(true)" />
+      </section>
+    </template>
+    <template #notices>
+      <div v-if="externalSource" class="cargo-note">
+        待加入来源：{{ externalSource.bookingNo || externalSource.inboundCode || '尚未关联业务编号' }} · {{ externalSource.originWarehouseName }} → {{ externalSource.destinationWarehouseCode }}
+        <el-button v-if="access.can(overseasWarehousePermissions.inboundOrderAppointment)" :disabled="batchLoading || creating" @click="acceptExternalSource">加入本次选择</el-button>
+      </div>
+      <details v-if="externalRows.length" class="external-selection">
+        <summary>已选外接货 {{ externalRows.length }} 票（可与同仓头程货合批）</summary>
+        <div class="external-selection-list"><div v-for="row in externalRows" :key="row.sourceKey">{{ row.bookingNo || row.inboundCode || '尚未关联业务编号' }}<el-button :disabled="batchLoading || creating" @click="delete selected[row.sourceKey]">移除选择</el-button></div></div>
+      </details>
+      <LoadErrorState v-if="batchError" title="所选货物暂不能合批" :message="batchError.message" :show-retry="false"><template #details><ApiErrorMeta :details="batchError" /></template></LoadErrorState>
+      <LoadErrorState v-if="followupError" title="来源核对失败" :message="followupError.message" :show-retry="false" />
+      <LoadErrorState v-if="error" title="已开船货物加载失败" :message="error.message" :loading="loading" @retry="load()"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState>
+      <p v-else class="cargo-note">来源预计时间供筹划核对，确认预约前请核对最新船期与货物备妥情况。</p>
+    </template>
+    <template #actions="{ row }"><RowActions :actions="[{ key: 'followup', label: '跟进' }, { key: 'source', label: '查看来源' }]" text-actions @action="key => key === 'followup' ? openFollowup(row as PlanningCargo) : source(row as PlanningCargo)" /></template>
+    <template #select="{ row }"><el-checkbox :model-value="!!selected[row.sourceKey]" :aria-label="`选择 ${row.inboundCode || '未关联入仓码'}`" :disabled="batchLoading || (!selected[row.sourceKey] && (!selectable(row as PlanningCargo) || selectedRows.length >= 100))" @change="(value: boolean | string | number) => toggle(row as PlanningCargo, value)" /></template>
+    <template #warehouseEta="{ row }"><span>{{ row.estimatedWarehouseAt?.replace('T', ' ') || '—' }}</span><div v-if="row.estimatedWarehouseAt" class="cargo-note">来源时区未明确</div></template>
+    <template #progress="{ row }">
+      <span v-if="row.detained">暂扣，待处理</span>
+      <span v-else-if="row.mixedDestinations">含多个目的地，待核对</span>
+      <span v-else-if="row.hasActiveAppointment">已有预约</span>
+      <span v-else>{{ row.hasInboundPlan ? '已建入仓计划，待安排' : '尚未建入仓计划' }}</span>
+    </template>
+  </DataTable>
+  <AppointmentFollowupDialog v-if="following" :source="following.source" :coverage="following.coverage" :can-write="access.can('platform:appointment:followup')" :can-arrange="access.can(overseasWarehousePermissions.inboundOrderAppointment)" @arrange="arrangeFollowing" @close="following = null" />
+  <AppDialog v-if="batchPreview" :model-value="true" class="admin-density-dialog" title="合批预约安排" width="min(1080px, calc(100vw - 48px))" :show-confirm="access.can(overseasWarehousePermissions.inboundOrderAppointment)" :confirm-text="pendingCreate ? '重试本次保存' : '保存预约安排'" :confirm-loading="creating" cancel-text="关闭" @confirm="saveArrangement" @update:model-value="closeBatch" :before-close="beforeClose">
+    <p>{{ batchPreview.originWarehouseName }} → {{ batchPreview.destinationWarehouseCode }}</p>
+    <p>{{ batchPreview.group.sourceCount }} 票 / {{ batchPreview.group.customerCount }} 个客户 / 预报 {{ batchPreview.group.packages ?? '待核实' }} 箱</p>
+    <p v-if="batchPreview.group.readinessIncomplete">货物备妥窗口待核实；预计到港或预计到仓不能替代备妥时间。</p>
+    <p>保存前尚未占用货物；先保存安排不代表已取得对方确认。</p>
+    <LoadErrorState v-if="createError" title="预约安排保存未完成" :message="createError.message" :show-retry="false"><template #details><ApiErrorMeta :details="createError" /></template></LoadErrorState>
+    <FbaAppointmentFields :timezone="batchPreview.destinationTimezone" :model="arrangement" :disabled="creating || !!pendingCreate" />
+  </AppDialog>
+</template>
+
+<style scoped>
+.cargo-note { margin: var(--admin-space-3) 0; color: var(--el-text-color-secondary); font-size: var(--admin-font-caption); }
+.external-selection { margin: var(--admin-space-3) 0; }
+.external-selection-list { max-height: 216px; overflow-y: auto; }
+.external-selection-list > div { display: flex; align-items: center; justify-content: space-between; gap: 12px; overflow-wrap: anywhere; }
+</style>

src/modules/appointment-calendar/AppointmentCargoTabs.vue

@@ -0,0 +1,28 @@
+<script setup lang="ts">
+import { nextTick } from 'vue'
+
+const mode = defineModel<'firstleg' | 'external'>({ required: true })
+const tabs = [{ key: 'firstleg', label: '头程货物' }, { key: 'external', label: '外接货物' }] as const
+async function handleKeydown(event: KeyboardEvent, index: number) {
+  let next: number
+  if (event.key === 'ArrowRight') next = (index + 1) % tabs.length
+  else if (event.key === 'ArrowLeft') next = (index - 1 + tabs.length) % tabs.length
+  else if (event.key === 'Home') next = 0
+  else if (event.key === 'End') next = tabs.length - 1
+  else return
+  event.preventDefault()
+  const key = tabs[next]!.key
+  mode.value = key
+  await nextTick()
+  document.getElementById(`appointment-cargo-tab-${key}`)?.focus()
+}
+</script>
+
+<template>
+  <div class="density-status-tabs" role="tablist" aria-label="预约货源类型">
+    <button v-for="(tab, index) in tabs" :id="`appointment-cargo-tab-${tab.key}`" :key="tab.key" type="button" role="tab"
+      :aria-selected="mode === tab.key" :tabindex="mode === tab.key ? 0 : -1"
+      :class="{ 'is-active': mode === tab.key }"
+      @click="mode = tab.key" @keydown="handleKeydown($event, index)">{{ tab.label }}</button>
+  </div>
+</template>

src/modules/appointment-calendar/AppointmentContainerPanel.vue

@@ -0,0 +1,108 @@
+<script setup lang="ts">
+import { onBeforeUnmount, onMounted, ref, computed } from 'vue'
+import DataTable, { type DataTableColumn } from '@/shared/components/DataTable.vue'
+import QueryToolbar, { type QueryField, type QueryModel } from '@/shared/components/QueryToolbar.vue'
+import LoadErrorState from '@/shared/components/LoadErrorState.vue'
+import ApiErrorMeta from '@/shared/components/ApiErrorMeta.vue'
+import { getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
+import { useAccessPreviewStore } from '@/core/access/accessPreview'
+import { listPlanningContainers, resolvePlanningContainer, type PlanningContainer, type ContainerFollowupContext } from './planningApi'
+import AppointmentFollowupDialog from './AppointmentFollowupDialog.vue'
+import AppointmentImpactDialog from './AppointmentImpactDialog.vue'
+import { listImpacts, refreshImpacts, impactStatus } from './impactApi'
+
+const impactReady = ref(false), impactError = ref<ApiErrorDetails | null>(null)
+const impactId = ref<string | null>(null), refreshing = ref(false), onlyChanges = ref(false)
+const access = useAccessPreviewStore()
+const query = ref<QueryModel>({ keyword: '' })
+const fields: QueryField[] = [{ key: 'keyword', type: 'input', label: '整柜', placeholder: '柜号或入仓码', width: 300 }]
+const rows = ref<PlanningContainer[]>([]), page = ref(1), size = ref(20), total = ref(0)
+const loading = ref(false), opening = ref(false)
+const error = ref<ApiErrorDetails | null>(null), contextError = ref<ApiErrorDetails | null>(null)
+const context = ref<ContainerFollowupContext | null>(null)
+const changedCount = computed(() => rows.value.filter(row => row.impact?.status === 'OPEN').length)
+const displayedRows = computed(() => onlyChanges.value ? rows.value.filter(row => row.impact?.status === 'OPEN') : rows.value)
+async function refreshForecasts() {
+  refreshing.value = true; contextError.value = null
+  try { await refreshImpacts({ page: page.value, size: size.value, keyword: String(query.value.keyword || '').trim() || undefined }); await load() }
+  catch (cause) { contextError.value = getApiErrorDetails(cause, '船期核对未完成，原记录保留') }
+  finally { refreshing.value = false }
+}
+let request = 0, contextRequest = 0, controller: AbortController | undefined
+const columns: DataTableColumn[] = [
+  { key: 'actions', label: '操作', slotName: 'actions', width: 200, fixed: 'left' },
+  { prop: 'containerNo', label: '集装箱号', minWidth: 170 },
+  { prop: 'orderCount', label: '美国范围票数', width: 120 },
+  { prop: 'customerCount', label: '客户数', width: 90 },
+  { key: 'packages', label: '预报箱数', slotName: 'packages', width: 130 },
+  { key: 'arrival', label: '来源预计到港', slotName: 'arrival', minWidth: 200 },
+  { key: 'receiving', label: '接仓点及跟进', slotName: 'receiving', minWidth: 280, singleLine: false },
+  { key: 'impact', label: '船期跟进', slotName: 'impact', minWidth: 160 },
+  { key: 'owner', label: '负责人', slotName: 'owner', minWidth: 110 },
+  { key: 'scope', label: '范围核对', slotName: 'scope', minWidth: 200 },
+]
+async function load(reset = false) {
+  if (reset) page.value = 1
+  const current = ++request
+  controller?.abort(); controller = new AbortController()
+  loading.value = true; error.value = null; impactReady.value = false; impactError.value = null
+  try {
+    const params = { page: page.value, size: size.value, keyword: String(query.value.keyword || '').trim() || undefined }
+    const [cargo, impacts] = await Promise.allSettled([listPlanningContainers(params, controller.signal), listImpacts(params, controller.signal)])
+    if (current !== request) return
+    if (cargo.status === 'rejected') throw cargo.reason
+    rows.value = cargo.value.records; total.value = cargo.value.total
+    if (impacts.status === 'fulfilled') {
+      const states = new Map(impacts.value.records.map(row => [row.container.containerBookingId, row.impact]))
+      rows.value = rows.value.map(row => ({ ...row, impact: states.get(row.containerBookingId) || null }))
+      impactReady.value = true
+    } else { onlyChanges.value = false; impactError.value = getApiErrorDetails(impacts.reason, '船期跟进暂不可用') }
+
+  } catch (cause) { if (current === request) { error.value = getApiErrorDetails(cause, '整柜货源加载失败'); rows.value = []; total.value = 0 } }
+  finally { if (current === request) loading.value = false }
+}
+async function follow(row: PlanningContainer, warehouseId?: string) {
+  const current = ++contextRequest
+  contextError.value = null; opening.value = true
+  try {
+    const result = await resolvePlanningContainer(row.containerBookingId, warehouseId)
+    if (current === contextRequest) context.value = result
+  } catch (cause) { if (current === contextRequest) contextError.value = getApiErrorDetails(cause, '整柜范围核对失败') }
+  finally { if (current === contextRequest) opening.value = false }
+}
+const displayTime = (value: string | null) => value?.replace('T', ' ') || '—'
+onMounted(() => load())
+onBeforeUnmount(() => { ++request; ++contextRequest; controller?.abort() })
+</script>
+
+<template>
+  <DataTable v-model:page="page" v-model:page-size="size" appearance="integrated" :columns="columns" :data="displayedRows" :total="total" :loading="loading || refreshing" :results-visible="!error" row-key="containerBookingId" @update:page="load()" @update:page-size="load(true)">
+    <template #filters><QueryToolbar v-model="query" ariaLabel="提柜与到仓查询" :fields="fields" :loading="loading" @search="load(true)">
+      <template #actions>
+        <el-button v-if="impactReady" :type="onlyChanges ? 'primary' : 'default'" @click="onlyChanges = !onlyChanges">本页待处理 {{ changedCount }}</el-button>
+        <el-button v-if="impactReady && access.can('platform:appointment:followup')" :loading="refreshing" :disabled="loading" @click="refreshForecasts">核对船期</el-button>
+      </template>
+    </QueryToolbar></template>
+    <template #notices>
+      <LoadErrorState v-if="error" compact title="货柜列表暂时无法加载" :message="error.code === 'A0404' ? '列表服务暂不可用，请稍后重试。' : error.message" @retry="load()"><template #details><details><summary>诊断详情</summary><ApiErrorMeta :details="error" /></details></template></LoadErrorState>
+      <LoadErrorState v-if="contextError" compact title="操作未完成" :message="contextError.message" :show-retry="false"><template #details><details><summary>诊断详情</summary><ApiErrorMeta :details="contextError" /></details></template></LoadErrorState>
+      <details v-if="impactError" class="container-help"><summary>船期跟进暂不可用，货柜列表仍可查看</summary><ApiErrorMeta :details="impactError" /></details>
+      <details v-if="!error" class="container-help"><summary>说明</summary><p>同柜共用提柜跟进，接仓按仓库分别跟进。预计到港仅供参考。</p></details>
+    </template>
+    <template #actions="{ row }"><el-button class="density-action" size="small" :disabled="opening" @click="follow(row as PlanningContainer)">提柜跟进</el-button><el-button v-if="row.impact" link type="primary" @click="impactId = row.containerBookingId">{{ row.impact.status === 'OPEN' ? '处理船期变化' : '核对记录' }}</el-button></template>
+    <template #packages="{ row }">{{ row.packages ?? '待核实' }}</template>
+    <template #arrival="{ row }">{{ displayTime(row.earliestArrivalAt) }}<span v-if="row.latestArrivalAt && row.latestArrivalAt !== row.earliestArrivalAt"> 至 {{ displayTime(row.latestArrivalAt) }}</span></template>
+    <template #receiving="{ row }"><div v-for="warehouse in row.warehouses" :key="warehouse.warehouseId" class="receiving-row"><span>{{ warehouse.warehouseName }} · {{ warehouse.orderCount }} 票</span><el-button class="density-action" size="small" :disabled="opening" @click="follow(row as PlanningContainer, warehouse.warehouseId)">接仓跟进</el-button></div></template>
+    <template #impact="{ row }">{{ row.impact ? impactStatus[row.impact.status] : (impactReady ? '未核对' : '暂不可用') }}</template>
+    <template #owner="{ row }">{{ row.impact?.ownerName || '未认领' }}</template>
+    <template #scope="{ row }">{{ row.incompleteScope ? '有未明确或非美国接仓点，待核对' : '接仓点已核实' }}</template>
+  </DataTable>
+  <AppointmentImpactDialog v-if="impactId" :container-id="impactId" :can-write="access.can('platform:appointment:followup')" @close="impactId = null" @saved="load()" />
+  <AppointmentFollowupDialog v-if="context" :container="context" :can-write="access.can('platform:appointment:followup')" @close="context = null" />
+</template>
+
+<style scoped>
+.container-help { font-size: var(--admin-font-caption); color: var(--el-text-color-secondary); }
+.container-help summary { cursor: pointer; }
+.receiving-row { display: flex; align-items: center; justify-content: space-between; gap: var(--admin-space-3); }
+</style>

src/modules/appointment-calendar/AppointmentExternalCandidates.vue

@@ -0,0 +1,68 @@
+<script setup lang="ts">
+import { onBeforeUnmount, onMounted, ref } from 'vue'
+import DataTable, { type DataTableColumn } from '@/shared/components/DataTable.vue'
+import QueryToolbar, { type QueryModel, type QueryField } from '@/shared/components/QueryToolbar.vue'
+import LoadErrorState from '@/shared/components/LoadErrorState.vue'
+import ApiErrorMeta from '@/shared/components/ApiErrorMeta.vue'
+import { getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
+import { listExternalAppointmentCandidates, type ExternalAppointmentCandidate, type PlanningSource } from './planningApi'
+
+defineProps<{ canArrange: boolean; selectedKeys: string[]; busy: boolean }>()
+const emit = defineEmits<{ select: [source: PlanningSource]; followup: [row: ExternalAppointmentCandidate] }>()
+const page = ref(1), size = ref(20), total = ref(0), loading = ref(false)
+const rows = ref<ExternalAppointmentCandidate[]>([]), error = ref<ApiErrorDetails | null>(null)
+const query = ref<QueryModel>({ keyword: '' })
+const fields: QueryField[] = [{ key: 'keyword', type: 'input', label: '外接货', placeholder: '登记号、车次号、客户、来货号', width: 300 }]
+const columns: DataTableColumn[] = [
+  { key: 'actions', label: '操作', slotName: 'actions', width: 160, fixed: 'left' },
+  { key: 'booking', label: '原登记号', slotName: 'booking', minWidth: 190 },
+  { prop: 'customerName', label: '客户', minWidth: 130 },
+  { prop: 'tripNo', label: '车次号', minWidth: 190 },
+  { key: 'origin', label: '接仓点', slotName: 'origin', minWidth: 140 },
+  { key: 'destination', label: '目的FBA仓', slotName: 'destination', width: 110 },
+  { key: 'packages', label: '箱数', slotName: 'packages', width: 90 },
+  { key: 'coverage', label: '预约情况', slotName: 'coverage', minWidth: 180 },
+]
+let request = 0
+let controller: AbortController | undefined
+async function load(reset = false) {
+  if (reset) page.value = 1
+  const current = ++request
+  controller?.abort(); controller = new AbortController()
+  loading.value = true; error.value = null
+  try {
+    const result = await listExternalAppointmentCandidates({ page: page.value, size: size.value, keyword: String(query.value.keyword || '').trim() || undefined }, controller.signal)
+    if (current === request) { rows.value = result.records; total.value = result.total }
+  } catch (cause) {
+    if (current === request) { rows.value = []; total.value = 0; error.value = getApiErrorDetails(cause, '外接候选加载失败') }
+  } finally { if (current === request) loading.value = false }
+}
+onMounted(() => load())
+onBeforeUnmount(() => { ++request; controller?.abort() })
+</script>
+
+<template>
+  <DataTable v-model:page="page" v-model:page-size="size" appearance="integrated" :data="rows" :columns="columns" :total="total" :loading="loading" :results-visible="!error" @update:page="load()" @update:page-size="load(true)">
+    <template #toolbar-actions><slot name="toolbar-actions" /></template>
+    <template #filters>
+      <section class="integrated-query-group" aria-label="外接货物类型与筛选">
+        <slot name="query-tabs" />
+        <QueryToolbar v-model="query" ariaLabel="外接预约候选查询" :fields="fields" :loading="loading" @search="load(true)" />
+      </section>
+    </template>
+    <template #notices>
+      <slot name="notices" />
+      <LoadErrorState v-if="error" title="外接候选加载失败" :message="error.message" @retry="load()"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState>
+      <p v-else>已确认承运的美国FBA货物，来货前后保留同一原登记；箱数未知可先保存待确认安排。</p>
+    </template>
+    <template #actions="{ row }"><template v-if="row.source && row.coverage">
+      <el-button v-if="canArrange" link type="primary" :disabled="busy || selectedKeys.includes(row.source.sourceKey) || !row.source.canFollowup || row.coverage.appointments.length > 0" @click="emit('select', row.source)">{{ selectedKeys.includes(row.source.sourceKey) ? '已加入' : '加入合批' }}</el-button>
+      <el-button link type="primary" @click="emit('followup', row as ExternalAppointmentCandidate)">跟进</el-button>
+    </template></template>
+    <template #booking="{ row }">{{ row.source?.bookingNo || '—' }}</template>
+    <template #origin="{ row }">{{ row.source?.originWarehouseName || '—' }}</template>
+    <template #destination="{ row }">{{ row.source?.destinationWarehouseCode || '—' }}</template>
+    <template #packages="{ row }">{{ row.source?.packages ?? '待核实' }}</template>
+    <template #coverage="{ row }"><span v-if="row.source && row.coverage">{{ row.coverage.appointments.length ? (row.coverage.changeReviewRequired ? '已有预约，待复核' : '已有预约') : (row.source.canFollowup ? '待安排' : row.source.blockReasons.join('；')) }}</span></template>
+  </DataTable>
+</template>

src/modules/appointment-calendar/AppointmentFollowupDialog.test.ts

@@ -0,0 +1,80 @@
+import { onBeforeRouteLeave, onBeforeRouteUpdate } from 'vue-router'
+import { flushPromises, mount } from '@vue/test-utils'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import AppointmentFollowupDialog from './AppointmentFollowupDialog.vue'
+import { getFollowups, saveFollowup, getContainerFollowups, saveContainerFollowup, type PlanningSource, type ContainerFollowupContext } from './planningApi'
+
+vi.mock('./planningApi', () => ({ getFollowups: vi.fn(), saveFollowup: vi.fn(), getContainerFollowups: vi.fn(), saveContainerFollowup: vi.fn() }))
+vi.mock('vue-router', () => ({ onBeforeRouteLeave: vi.fn(), onBeforeRouteUpdate: vi.fn() }))
+vi.mock('element-plus', () => ({ ElMessage: { warning: vi.fn(), success: vi.fn() } }))
+const history = { history: { records: [], page: 1, size: 10, total: 0, pages: 0 }, versions: { DRAYAGE_CONTACT: 0, TERMINAL_APPOINTMENT: 0, WAREHOUSE_RECEIVING: 0, FBA_RECEIVING: 0 } }
+const source: PlanningSource = { sourceKey: 'ORDER:1', customerId: 'A', canFollowup: true, blockReasons: [], orderId: '1', inboundCode: 'IN-1', bookingNo: null, containerNo: null, originWarehouseId: 'US-1', originWarehouseName: '美国仓', destinationKey: 'FBA:ONT8', destinationWarehouseCode: 'ONT8', packages: null, sourceVersion: null }
+function render(canWrite = true, container?: ContainerFollowupContext) {
+  return mount(AppointmentFollowupDialog, { props: container ? { container, canWrite } : { source, coverage: { status: 'UNASSIGNED', appointments: [], missingFields: [], changeReviewRequired: false }, canWrite }, global: { stubs: {
+    AppDialog: { name: 'AppDialog', props: ['confirmDisabled', 'beforeClose'], template: '<div><slot/><button data-close @click="$emit(\'update:model-value\',false)">关闭</button><button data-save :disabled="confirmDisabled" @click="$emit(\'confirm\')">保存</button></div>' },
+    ElForm: { template: '<form><slot/></form>' }, ElFormItem: { template: '<label><slot/></label>' },
+    ElInput: { props: ['modelValue', 'placeholder'], template: '<input :value="modelValue" :placeholder="placeholder" @input="$emit(\'update:modelValue\', $event.target.value)" />' },
+    ElSelect: true, ElOption: true, ElDatePicker: true,
+    DataTable: true, LoadErrorState: true, ApiErrorMeta: true,
+  } } })
+}
+describe('appointment followup recovery', () => {
+  beforeEach(() => {
+    vi.resetAllMocks(); vi.mocked(getFollowups).mockResolvedValue(history)
+    vi.mocked(getContainerFollowups).mockResolvedValue(history)
+    vi.mocked(saveFollowup).mockResolvedValue({ stage: 'FBA_RECEIVING', version: 1, contactedParty: null, result: '已联系', nextAction: null, followupDate: null, operatorName: '运营', createdAt: '2026-10-09T12:00:00Z' })
+  })
+  it.each([null, '100'])('saves the correct container stage for warehouse %s without customer-scoped calls', async warehouseId => {
+    const container = { containerBookingId: 'C1', containerNo: 'CONTAINER-A', warehouseId, warehouseName: warehouseId ? '洛杉矶仓' : null, canFollowup: true, blockReasons: [] }
+    const wrapper = render(true, container); await flushPromises()
+    await wrapper.get('input[placeholder="记录对方反馈，不会自动确认预约"]').setValue('同柜统一联系')
+    await wrapper.get('[data-save]').trigger('click'); await flushPromises()
+    expect(saveContainerFollowup).toHaveBeenCalledWith(container, expect.objectContaining({ stage: warehouseId ? 'WAREHOUSE_RECEIVING' : 'DRAYAGE_CONTACT', expectedVersion: 0, result: '同柜统一联系' }))
+    expect(getContainerFollowups).toHaveBeenCalledTimes(2)
+    expect(getFollowups).not.toHaveBeenCalled()
+    expect(saveFollowup).not.toHaveBeenCalled()
+    wrapper.unmount()
+  })
+  it('describes FBA followup independently of batch action visibility', async () => {
+    const wrapper = render(); await flushPromises()
+    expect(wrapper.text()).toContain('FBA收货跟进')
+    expect(wrapper.text()).not.toContain('同柜多客户共用提柜')
+    wrapper.unmount()
+  })
+  it('saves contact facts without requiring appointment, inbound plan or driver fields', async () => {
+    const wrapper = render(); await flushPromises()
+    await wrapper.get('input[placeholder="记录对方反馈，不会自动确认预约"]').setValue('已联系，等待回复')
+    await wrapper.get('[data-save]').trigger('click'); await flushPromises()
+    expect(saveFollowup).toHaveBeenCalledWith('ORDER:1', 'A', expect.objectContaining({ stage: 'FBA_RECEIVING', expectedVersion: 0, result: '已联系，等待回复', followupDate: null }))
+    const body = vi.mocked(saveFollowup).mock.calls[0]![2]
+    expect(body).not.toHaveProperty('appointmentNo'); expect(body).not.toHaveProperty('driverId'); expect(body).not.toHaveProperty('operatorId')
+    expect(getFollowups).toHaveBeenCalledTimes(2)
+  })
+  it('retries an unknown outcome with the exact same body and persisted command key', async () => {
+    vi.mocked(saveFollowup).mockRejectedValueOnce(new Error('network'))
+    const wrapper = render(); await flushPromises()
+    await wrapper.get('input[placeholder="记录对方反馈，不会自动确认预约"]').setValue('等待码头开放')
+    await wrapper.get('[data-save]').trigger('click'); await flushPromises()
+    const first = vi.mocked(saveFollowup).mock.calls[0]![2]
+    await wrapper.get('[data-close]').trigger('click')
+    expect(wrapper.emitted('close')).toBeUndefined()
+    const done = vi.fn()
+    wrapper.findAllComponents({ name: 'AppDialog' }).at(-1)!.props('beforeClose')(done)
+    expect(done).not.toHaveBeenCalled()
+    for (const hook of [onBeforeRouteLeave, onBeforeRouteUpdate]) {
+      const guard = vi.mocked(hook).mock.calls.at(-1)![0] as () => boolean
+      expect(guard()).toBe(false)
+    }
+    await wrapper.get('[data-save]').trigger('click'); await flushPromises()
+    expect(vi.mocked(saveFollowup).mock.calls[1]![2]).toEqual(first)
+    expect(first.idempotencyKey).toBeTruthy()
+  })
+  it('does not allow a write without write permission or a successfully loaded version', async () => {
+    const readonly = render(false); await flushPromises()
+    expect(readonly.get('[data-save]').attributes('disabled')).toBeDefined()
+    vi.mocked(getFollowups).mockRejectedValueOnce(new Error('unavailable'))
+    const failed = render(); await flushPromises()
+    expect(failed.get('[data-save]').attributes('disabled')).toBeDefined()
+    expect(saveFollowup).not.toHaveBeenCalled()
+  })
+})

src/modules/appointment-calendar/AppointmentFollowupDialog.vue

@@ -0,0 +1,123 @@
+<script setup lang="ts">
+import { inject, computed, onBeforeUnmount, onMounted, reactive, ref } from 'vue'
+import { onBeforeRouteLeave, onBeforeRouteUpdate } from 'vue-router'
+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 { getFollowups, saveFollowup, getContainerFollowups, saveContainerFollowup, type ContainerFollowupContext, type PlanningSource, type AppointmentCoverage, type FollowupRecord, type FollowupStage, type SaveFollowup } from './planningApi'
+
+const props = defineProps<({ source: PlanningSource; coverage: AppointmentCoverage; container?: never } | { container: ContainerFollowupContext; source?: never; coverage?: never }) & { canWrite: boolean; canArrange?: boolean }>()
+const emit = defineEmits<{ close: []; arrange: [] }>()
+const stages: Record<FollowupStage, string> = { DRAYAGE_CONTACT: '拖车联系', TERMINAL_APPOINTMENT: '码头约号', WAREHOUSE_RECEIVING: '接仓跟进', FBA_RECEIVING: 'FBA收货跟进' }
+const coverageNeeds: Record<string, string> = {
+  DESTINATION: '目的仓与原安排不一致，请核对。',
+  DESTINATION_UNVERIFIED: '来源目的地资料待核实，尚不能判断是否发生变更。',
+  CARRIER_CONFIRMATION: '尚未确认承运，请先在原登记完成确认。',
+  REAL_CARGO_MATERIALS: '尚未关联实际货物资料，可先保存待确认安排；正式确认前需补齐资料。',
+  CARGO_QUANTITY_REVIEW: '货量或重复关联需要核对。',
+  RECEIVING_APPOINTMENT: '尚未安排收货预约。',
+  UNCOVERED_CARGO: '部分货物尚未纳入收货预约。',
+  RECEIVING_CONFIRMATION: '尚未取得全部货物的收货确认。',
+  APPOINTMENT_TIMEZONE_UNVERIFIED: '原预约未记录时区，请核实收货地点当地时间。',
+  FBA_SHIPMENT_REFERENCES: 'FBA货件资料尚未齐全，请补充货件号或追踪号。',
+  SOURCE_CHANGED_REVIEW: '货源资料更新晚于预约，请核对是否需要改约。',
+}
+const allowedStages = computed(() => props.container ? props.container.warehouseId ? { WAREHOUSE_RECEIVING: stages.WAREHOUSE_RECEIVING } : { DRAYAGE_CONTACT: stages.DRAYAGE_CONTACT, TERMINAL_APPOINTMENT: stages.TERMINAL_APPOINTMENT } : { FBA_RECEIVING: stages.FBA_RECEIVING })
+const canFollowup = computed(() => props.container?.canFollowup ?? props.source?.canFollowup ?? false)
+const blockReasons = computed(() => props.container?.blockReasons ?? props.source?.blockReasons ?? [])
+const title = computed(() => props.container ? `${props.container.containerNo || '未回传柜号'} · ${props.container.warehouseName || '提柜'}` : props.source?.inboundCode || props.source?.bookingNo || '未关联入仓码')
+const form = reactive({ stage: (props.container ? props.container.warehouseId ? 'WAREHOUSE_RECEIVING' : 'DRAYAGE_CONTACT' : 'FBA_RECEIVING') as FollowupStage, contactedParty: '', result: '', nextAction: '', followupDate: '' })
+const rows = ref<FollowupRecord[]>([])
+const versions = ref<Record<FollowupStage, number>>({ DRAYAGE_CONTACT: 0, TERMINAL_APPOINTMENT: 0, WAREHOUSE_RECEIVING: 0, FBA_RECEIVING: 0 })
+const page = ref(1), size = ref(10), total = ref(0)
+const loading = ref(false), saving = ref(false), ready = ref(false)
+const error = ref<ApiErrorDetails | null>(null), saveError = ref<ApiErrorDetails | null>(null)
+const pending = ref<SaveFollowup | null>(null)
+let generation = 0
+const columns: DataTableColumn[] = [
+  { key: 'stage', label: '事项', slotName: 'stage', width: 120 },
+  { prop: 'contactedParty', label: '联系对象', minWidth: 130 },
+  { prop: 'result', label: '联系结果', minWidth: 200 },
+  { prop: 'nextAction', label: '下一步', minWidth: 150 },
+  { prop: 'followupDate', label: '下次跟进日', width: 120 },
+  { prop: 'operatorName', label: '跟进人', minWidth: 110 },
+]
+function rowKey(row: object) { const value = row as FollowupRecord; return `${value.stage}:${value.version}` }
+async function load() {
+  const request = ++generation
+  loading.value = true; error.value = null; ready.value = false
+  try {
+    const result = props.container ? await getContainerFollowups(props.container, page.value, size.value) : await getFollowups(props.source!.sourceKey, props.source!.customerId, page.value, size.value)
+    if (request !== generation) return
+    rows.value = result.history.records; total.value = result.history.total; versions.value = result.versions; ready.value = true
+  } catch (cause) { if (request === generation) error.value = getApiErrorDetails(cause, '跟进记录加载失败') }
+  finally { if (request === generation) loading.value = false }
+}
+async function save() {
+  if (!props.canWrite || !canFollowup.value || saving.value || !ready.value) return
+  if (!pending.value && (!form.result.trim() || (form.followupDate && !form.nextAction.trim()))) {
+    ElMessage.warning('请填写联系结果；设置下次跟进日时需填写下一步安排'); return
+  }
+  pending.value ||= { stage: form.stage, expectedVersion: versions.value[form.stage], idempotencyKey: crypto.randomUUID(),
+    contactedParty: form.contactedParty.trim() || undefined, result: form.result.trim(), nextAction: form.nextAction.trim() || undefined, followupDate: form.followupDate || null }
+  saving.value = true; saveError.value = null
+  try {
+    if (props.container) await saveContainerFollowup(props.container, pending.value)
+    else await saveFollowup(props.source!.sourceKey, props.source!.customerId, pending.value)
+    pending.value = null; form.result = ''; form.nextAction = ''; form.followupDate = ''; page.value = 1
+    ElMessage.success('跟进记录已保存'); await load()
+  } catch (cause) {
+    saveError.value = getApiErrorDetails(cause, '保存结果待确认，请重试本次保存')
+    if (['400','403','404','409','A0400','A0403','A0404','A0409'].includes(saveError.value.code || '')) { pending.value = null; await load() }
+  } finally { saving.value = false }
+}
+function canLeave() {
+  if (saving.value || pending.value) { ElMessage.warning('请先核实本次保存结果，再关闭或切换'); return false }
+  return true
+}
+function close() { if (canLeave()) emit('close') }
+function arrange() { if (canLeave()) emit('arrange') }
+function beforeClose(done: () => void) { if (canLeave()) done() }
+const registerLeaveGuard = inject<((guard: () => boolean) => () => void) | undefined>('appointment-register-leave-guard', undefined)
+const unregisterLeaveGuard = registerLeaveGuard?.(canLeave)
+onBeforeUnmount(() => unregisterLeaveGuard?.())
+onBeforeRouteLeave(canLeave)
+onBeforeRouteUpdate(canLeave)
+onMounted(load)
+onBeforeUnmount(() => { ++generation })
+</script>
+
+<template>
+  <AppDialog :model-value="true" class="admin-density-dialog" :title="`预约跟进 · ${title}`" width="min(1080px, calc(100vw - 48px))" :confirm-text="pending ? '重试本次保存' : '保存跟进'" :confirm-loading="saving" :confirm-disabled="!canWrite || !canFollowup || !ready || loading" @confirm="save" @update:model-value="close" :before-close="beforeClose">
+    <p v-if="source">{{ source.containerNo || '—' }} · {{ source.originWarehouseName }} → {{ source.destinationWarehouseCode }}</p>
+    <el-button v-if="source && canArrange && source.canFollowup && !coverage?.appointments.length" :disabled="saving || !!pending" @click="arrange">加入预约合批</el-button>
+    <p v-if="container">同柜多客户共用{{ container?.warehouseId ? '此接仓点' : '提柜' }}跟进记录；保存联系不自动确认预约或推进收货。</p>
+    <p v-else>本条记录用于此货源的FBA收货跟进；保存联系不自动确认预约或推进收货。</p>
+    <LoadErrorState v-if="error" title="跟进记录加载失败" :message="error.message" @retry="load"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState>
+    <LoadErrorState v-if="saveError" title="跟进保存未完成" :message="saveError.message" :show-retry="false"><template #details><ApiErrorMeta :details="saveError" /></template></LoadErrorState>
+    <p v-for="reason in blockReasons" :key="reason">{{ reason }}</p>
+    <p v-if="coverage?.changeReviewRequired">来源资料有变化，请核对原预约与运输安排。</p>
+    <p v-if="coverage?.appointments.length">已关联预约：{{ coverage.appointments.map(item => item.appointmentNo).join('、') }}</p>
+    <p v-else-if="coverage">尚未关联收货预约；联系记录保存后仍需登记对方正式确认。</p>
+    <ul v-if="coverage?.missingFields.length" aria-label="预约待核实事项"><li v-for="item in coverage.missingFields" :key="item">{{ coverageNeeds[item] || '存在待核实事项，请返回来源详情核对。' }}</li></ul>
+    <el-form v-if="canWrite && canFollowup" label-position="top" class="followup-form density-form" :disabled="saving || !!pending">
+      <el-form-item label="跟进事项"><el-select v-model="form.stage"><el-option v-for="(label,value) in allowedStages" :key="value" :value="value" :label="label" /></el-select></el-form-item>
+      <el-form-item label="联系对象"><el-input v-model="form.contactedParty" maxlength="200" placeholder="本次联系的车队、码头或仓库" /></el-form-item>
+      <el-form-item label="下次跟进日期"><el-date-picker v-model="form.followupDate" type="date" value-format="YYYY-MM-DD" placeholder="业务地点当地日期" /></el-form-item>
+      <el-form-item label="联系结果" required class="wide"><el-input v-model="form.result" type="textarea" maxlength="1000" placeholder="记录对方反馈，不会自动确认预约" /></el-form-item>
+      <el-form-item label="下一步安排" class="wide"><el-input v-model="form.nextAction" maxlength="500" placeholder="填写待补资料或下次联系事项" /></el-form-item>
+    </el-form>
+    <DataTable v-model:page="page" v-model:page-size="size" :data="rows" :columns="columns" :total="total" :loading="loading" :results-visible="!error" :row-key="rowKey" @update:page="load" @update:page-size="page = 1; load()">
+      <template #stage="{ row }">{{ stages[row.stage as FollowupStage] }}</template>
+    </DataTable>
+  </AppDialog>
+</template>
+
+<style scoped>
+.followup-form { display: grid; grid-template-columns: repeat(3,minmax(0,1fr)); gap: 0 var(--admin-space-6); }
+.wide { grid-column: 1 / -1; }
+.followup-form :deep(.el-select), .followup-form :deep(.el-date-editor) { width: 100%; }
+</style>

src/modules/appointment-calendar/AppointmentImpactDialog.test.ts

@@ -0,0 +1,105 @@
+import { flushPromises, mount } from '@vue/test-utils'
+import ElementPlus from 'element-plus'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import AppointmentImpactDialog from './AppointmentImpactDialog.vue'
+import { onBeforeRouteLeave, onBeforeRouteUpdate } from 'vue-router'
+import { getImpact, handleImpact, type ImpactDetail } from './impactApi'
+vi.mock('./impactApi', async importOriginal => ({ ...await importOriginal<typeof import('./impactApi')>(), getImpact: vi.fn(), handleImpact: vi.fn() }))
+const guards = vi.hoisted(() => ({ register: vi.fn(), unregister: vi.fn(), push: vi.fn() }))
+vi.mock('vue-router', () => ({ onBeforeRouteLeave: vi.fn(), onBeforeRouteUpdate: vi.fn(), useRouter: () => ({ push: guards.push }) }))
+const detail: ImpactDetail = { impact: { containerBookingId: '1', impactNo: 'AI-TEST', version: 1, status: 'OPEN', reason: 'FORECAST_CHANGED', ownerId: null, ownerName: null, baseline: { estimatedAt: '2026-10-15T09:00:00', actualAt: null, observedAt: null, providerCode: 'carrier', sourceReference: 'ref' }, latest: { estimatedAt: '2026-10-17T09:00:00', actualAt: null, observedAt: null, providerCode: 'carrier', sourceReference: 'ref' }, forecastToken: 'current', updatedAt: '2026-10-10T12:00:00' }, cargo: [{ inboundCode: 'IN-A', customerName: '客户甲', packages: 10, destination: 'ONT8' }], appointments: [{ appointmentNo: 'AP-1', status: 'SUCCESS', destination: 'ONT8', confirmedAt: '2026-10-16T09:00:00', timezone: 'America/Los_Angeles' }], transport: null, history: { records: [], total: 0 } }
+const render = (canWrite = true) => mount(AppointmentImpactDialog, { props: { containerId: '1', canWrite }, global: { provide: { 'appointment-register-leave-guard': guards.register }, plugins: [ElementPlus], stubs: { AppDialog: { name: 'AppDialog', props: ['beforeClose'], template: '<section><slot /><button data-close @click="$emit(\'update:model-value\',false)">关闭</button></section>' } } } })
+describe('appointment impact handling', () => {
+  beforeEach(() => { vi.resetAllMocks(); guards.register.mockReturnValue(guards.unregister); vi.mocked(getImpact).mockResolvedValue(detail) })
+  function deferred() {
+    let resolve!: (value: ImpactDetail) => void, reject!: (reason: Error) => void
+    const promise=new Promise<ImpactDetail>((yes,no)=>{resolve=yes;reject=no})
+    return {promise,resolve,reject}
+  }
+  const pageDetail=(label:string):ImpactDetail=>({...detail,history:{total:60,records:[{version:1,action:'RECORD',operatorName:null,result:label,nextAction:null,followupDate:null,createdAt:'2026-10-11T00:00:00'}]}})
+  it('keeps the latest history page when responses finish in reverse order',async()=>{
+    vi.mocked(getImpact).mockResolvedValueOnce(pageDetail('第一页'))
+    const wrapper=render();await flushPromises()
+    const second=deferred(),third=deferred()
+    vi.mocked(getImpact).mockReturnValueOnce(second.promise).mockReturnValueOnce(third.promise)
+    const pager=wrapper.findComponent({name:'ElPagination'})
+    pager.vm.$emit('update:current-page',2);pager.vm.$emit('current-change',2)
+    pager.vm.$emit('update:current-page',3);pager.vm.$emit('current-change',3)
+    await flushPromises()
+    third.resolve(pageDetail('第三页最新'));await flushPromises()
+    second.resolve(pageDetail('第二页过期'));await flushPromises()
+    expect(wrapper.text()).toContain('第三页最新');expect(wrapper.text()).not.toContain('第二页过期')
+    wrapper.unmount()
+  })
+  it('ignores an obsolete failure and keeps loading until the current request finishes',async()=>{
+    vi.mocked(getImpact).mockResolvedValueOnce(pageDetail('第一页'))
+    const wrapper=render();await flushPromises()
+    const second=deferred(),third=deferred()
+    vi.mocked(getImpact).mockReturnValueOnce(second.promise).mockReturnValueOnce(third.promise)
+    const pager=wrapper.findComponent({name:'ElPagination'})
+    pager.vm.$emit('update:current-page',2);pager.vm.$emit('current-change',2)
+    pager.vm.$emit('update:current-page',3);pager.vm.$emit('current-change',3)
+    second.reject(new Error('obsolete page failure'));await flushPromises()
+    expect(wrapper.text()).not.toContain('obsolete page failure')
+    expect(pager.props('disabled')).toBe(true)
+    expect(wrapper.findAll('button').find(b=>b.text()==='认领跟进')!.attributes('disabled')).toBeDefined()
+    wrapper.findAllComponents({name:'ElButton'}).find(b=>b.text()==='认领跟进')!.vm.$emit('click')
+    await flushPromises();expect(handleImpact).not.toHaveBeenCalled()
+    third.resolve(pageDetail('第三页最新'));await flushPromises()
+    expect(pager.props('disabled')).toBe(false);wrapper.unmount()
+  })
+  it('does not let a closed dialog response replace a newly opened impact',async()=>{
+    const old=deferred();vi.mocked(getImpact).mockReturnValueOnce(old.promise)
+    const first=render();await flushPromises();first.unmount()
+    vi.mocked(getImpact).mockResolvedValueOnce({...pageDetail('新影响历史'),impact:{...detail.impact,impactNo:'AI-NEW'}})
+    const next=render();await flushPromises()
+    old.resolve(pageDetail('已关闭历史'));await flushPromises()
+    expect(next.text()).toContain('AI-NEW');expect(next.text()).not.toContain('已关闭历史');next.unmount()
+  })
+  it('shows separate forecasts, unchanged confirmed appointment and omitted transport permission', async () => {
+    const wrapper = render(false); await flushPromises()
+    expect(wrapper.text()).toContain('2026-10-15T09:00:00')
+    expect(wrapper.text()).toContain('2026-10-17T09:00:00')
+    expect(wrapper.text()).toContain('2026-10-16T09:00:00')
+    expect(wrapper.text()).toContain('无车次查看权限')
+    expect(wrapper.text()).toContain('来源：carrier')
+    expect(wrapper.text()).toContain('核对原因：到港预测变化')
+    expect(wrapper.text()).not.toContain('认领跟进')
+    expect(handleImpact).not.toHaveBeenCalled(); wrapper.unmount()
+  })
+  it('labels manual observations without exposing internal operator references and explains missing forecasts', async () => {
+    vi.mocked(getImpact).mockResolvedValueOnce({ ...detail, impact: { ...detail.impact, reason: 'FORECAST_MISSING', latest: { ...detail.impact.latest!, providerCode: 'MANUAL', sourceReference: 'MANUAL:1000001', estimatedAt: null } } })
+    const wrapper = render(); await flushPromises()
+    expect(wrapper.text()).toContain('来源：人工维护')
+    expect(wrapper.text()).toContain('来源预计到港缺失，待核实')
+    expect(wrapper.text()).not.toContain('1000001')
+    expect(wrapper.text()).not.toContain('MANUAL:')
+    expect(wrapper.text()).not.toContain('已延误')
+    expect(wrapper.text()).toContain('认领跟进')
+    expect(handleImpact).not.toHaveBeenCalled(); wrapper.unmount()
+  })
+  it('freezes an uncertain command and retries exactly once with original version and key', async () => {
+    vi.mocked(handleImpact).mockRejectedValueOnce(new Error('connection lost')).mockResolvedValueOnce({ ...detail.impact, version: 2 })
+    vi.mocked(getImpact).mockResolvedValueOnce({...detail,transport:{trips:[{tripNo:'TRIP-1',status:'PLANNED',plannedDepartureAt:null}],sameTripBookings:[]}})
+    const wrapper = render(); await flushPromises()
+    await wrapper.findAll('button').find(b => b.text() === '认领跟进')!.trigger('click'); await flushPromises()
+    const original = vi.mocked(handleImpact).mock.calls[0]![1]
+    expect(original).toMatchObject({ action: 'CLAIM', expectedVersion: 1, forecastToken: 'current' })
+    await wrapper.get('[data-close]').trigger('click'); expect(wrapper.emitted('close')).toBeUndefined()
+    const done=vi.fn(); wrapper.findComponent({name:'AppDialog'}).props('beforeClose')(done); expect(done).not.toHaveBeenCalled()
+    expect(guards.register.mock.calls[0]![0]()).toBe(false)
+    await wrapper.findAll('button').find(b=>b.text()==='TRIP-1')!.trigger('click');expect(guards.push).not.toHaveBeenCalled()
+    for (const hook of [onBeforeRouteLeave,onBeforeRouteUpdate]) expect((vi.mocked(hook).mock.calls[0]![0] as () => boolean)()).toBe(false)
+    await wrapper.findAll('button').find(b => b.text() === '重试本次处理')!.trigger('click'); await flushPromises()
+    expect(handleImpact).toHaveBeenNthCalledWith(2, '1', original)
+    expect(wrapper.emitted('saved')).toHaveLength(1)
+    expect(getImpact).toHaveBeenCalledTimes(2)
+    expect(guards.register.mock.calls[0]![0]()).toBe(true)
+    wrapper.unmount(); expect(guards.unregister).toHaveBeenCalledOnce()
+  })
+  it('does not resolve without an actual handling result', async () => {
+    const wrapper = render(); await flushPromises()
+    await wrapper.findAll('button').find(b => b.text() === '完成本次核对')!.trigger('click'); await flushPromises()
+    expect(handleImpact).not.toHaveBeenCalled(); wrapper.unmount()
+  })
+})

src/modules/appointment-calendar/AppointmentImpactDialog.vue

@@ -0,0 +1,74 @@
+<script setup lang="ts">
+import { inject, onBeforeUnmount, onMounted, reactive, ref } from 'vue'
+import { onBeforeRouteLeave, onBeforeRouteUpdate, useRouter } from 'vue-router'
+import { ElMessage } from 'element-plus'
+import AppDialog from '@/shared/components/AppDialog.vue'
+import LoadErrorState from '@/shared/components/LoadErrorState.vue'
+import { getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
+import { getImpact, handleImpact, impactStatus, impactReason, type ImpactDetail, type ImpactCommand } from './impactApi'
+const props = defineProps<{ containerId: string; canWrite: boolean }>()
+const emit = defineEmits<{ close: []; saved: [] }>()
+const router = useRouter(), detail = ref<ImpactDetail | null>(null), loading = ref(false), saving = ref(false), historyPage = ref(1)
+const error = ref<ApiErrorDetails | null>(null), pending = ref<ImpactCommand | null>(null)
+const form = reactive({ result: '', nextAction: '', followupDate: '' })
+const actions: Record<string, string> = { OBSERVED: '船期核对', CLAIM: '认领', RECORD: '记录处理', RESOLVE: '完成核对' }
+let loadGeneration = 0
+async function load() {
+  const generation = ++loadGeneration
+  loading.value = true; error.value = null
+  try { const result = await getImpact(props.containerId, historyPage.value); if (generation === loadGeneration) detail.value = result }
+  catch (cause) { if (generation === loadGeneration) error.value = getApiErrorDetails(cause, '影响详情加载失败') }
+  finally { if (generation === loadGeneration) loading.value = false }
+}
+async function save(action: ImpactCommand['action']) {
+  if (!detail.value || loading.value || saving.value || !props.canWrite) return
+  if (!pending.value && action !== 'CLAIM' && !form.result.trim()) { ElMessage.warning('请填写实际处理结果'); return }
+  pending.value ||= { expectedVersion: detail.value.impact.version, forecastToken: detail.value.impact.forecastToken, idempotencyKey: crypto.randomUUID(), action, result: form.result.trim() || null, nextAction: form.nextAction.trim() || null, followupDate: form.followupDate || null }
+  saving.value = true; error.value = null
+  try { await handleImpact(props.containerId, pending.value); pending.value = null; emit('saved'); historyPage.value = 1; await load() }
+  catch (cause) { error.value = getApiErrorDetails(cause, '处理结果待核实，请重试原请求'); if (['400','403','404','409','A0400','A0403','A0404','A0409'].includes(error.value.code || '')) pending.value = null }
+  finally { saving.value = false }
+}
+function canLeave() { if (saving.value || pending.value) { ElMessage.warning('请先核实本次处理结果，再关闭或切换'); return false } return true }
+function close() { if (canLeave()) emit('close') }
+function beforeClose(done: () => void) { if (canLeave()) done() }
+function openTrip(tripNo: string) { if (canLeave()) void router.push(`/overseas-master-data/trips/${encodeURIComponent(tripNo)}`) }
+const register = inject<((guard: () => boolean) => () => void) | undefined>('appointment-register-leave-guard', undefined)
+const unregister = register?.(canLeave)
+onBeforeUnmount(() => { ++loadGeneration; unregister?.() })
+onBeforeRouteLeave(canLeave)
+onBeforeRouteUpdate(canLeave)
+onMounted(load)
+</script>
+<template>
+  <AppDialog :model-value="true" title="船期变化影响核对" width="min(1200px, calc(100vw - 48px))" :show-confirm="false" class="admin-density-dialog" @update:model-value="close" :before-close="beforeClose">
+    <LoadErrorState v-if="error" title="核对未完成" :message="error.message" :show-retry="!pending" @retry="load" />
+    <template v-if="detail">
+      <p>{{ detail.impact.impactNo }} · {{ impactStatus[detail.impact.status] }} · 负责人：{{ detail.impact.ownerName || '未认领' }}</p>
+      <p>核对原因：{{ detail.impact.reason === 'FORECAST_MISSING' ? '来源预计到港缺失，待核实' : impactReason[detail.impact.reason || ''] || '待核实' }}</p>
+      <p>基准 ETA：{{ detail.impact.baseline?.estimatedAt || '待核实' }} → 最新 ETA：{{ detail.impact.latest?.estimatedAt || '待核实' }}</p>
+      <p>来源：{{ detail.impact.latest?.providerCode === 'MANUAL' ? '人工维护' : detail.impact.latest?.providerCode || '待核实' }} · 观察时间：{{ detail.impact.latest?.observedAt || '—' }}</p>
+      <p>实际到港：{{ detail.impact.latest?.actualAt || '未记录' }}。以上为来源原始时间，时区未核实；不能据此判定跨时区违约。</p>
+      <details open><summary>直接关联货物 {{ detail.cargo.length }} 票</summary><div class="impact-list"><p v-for="(row, index) in detail.cargo" :key="index">{{ row.inboundCode || '未关联入仓码' }} · {{ row.customerName || '—' }} · {{ row.destination || '—' }} · {{ row.packages ?? '待核实' }} 箱</p></div></details>
+      <details open><summary>需复核的收货预约 {{ detail.appointments.length }} 张（确认时间不自动修改）</summary><div class="impact-list"><p v-for="row in detail.appointments" :key="row.appointmentNo">{{ row.appointmentNo }} · {{ row.destination }} · {{ row.confirmedAt || '尚未确认时段' }} {{ row.timezone || '时区待核实' }}</p></div></details>
+      <p v-if="!detail.transport">无车次查看权限，运输影响未加载。</p>
+      <template v-else>
+        <details open><summary>关联车次 {{ detail.transport.trips.length }} 辆</summary><div class="impact-list"><p v-for="row in detail.transport.trips" :key="row.tripNo"><el-button link type="primary" @click="openTrip(row.tripNo)">{{ row.tripNo }}</el-button> · 计划出发（UTC）：{{ row.plannedDepartureAt || '待定' }}</p></div></details>
+        <details><summary>同车外接承诺 {{ detail.transport.sameTripBookings.length }} 票，仅提示运输安排复核</summary><div class="impact-list"><p v-for="row in detail.transport.sameTripBookings" :key="row.bookingNo">{{ row.bookingNo }} · {{ row.customerName || '—' }} · {{ row.tripNo }} · {{ row.destinationLabel || '—' }}</p></div></details>
+      </template>
+      <el-form v-if="canWrite && detail.impact.status === 'OPEN'" label-position="top" :disabled="saving || !!pending">
+        <el-form-item label="实际处理结果"><el-input v-model="form.result" type="textarea" maxlength="1000" placeholder="记录已联系、核对或改约的实际结果；此处不会自动改约" /></el-form-item>
+        <el-form-item label="下一步"><el-input v-model="form.nextAction" maxlength="500" placeholder="填写后续处理事项" /></el-form-item>
+        <el-form-item label="下次跟进日期"><el-date-picker v-model="form.followupDate" value-format="YYYY-MM-DD" /></el-form-item>
+      </el-form>
+      <div v-if="canWrite && detail.impact.status === 'OPEN'">
+        <el-button v-if="!pending" :disabled="saving || loading" @click="save('CLAIM')">认领跟进</el-button>
+        <el-button v-if="!pending" :disabled="saving || loading" @click="save('RECORD')">记录处理</el-button>
+        <el-button v-if="!pending" type="primary" :disabled="saving || loading" @click="save('RESOLVE')">完成本次核对</el-button>
+        <el-button v-else type="primary" :loading="saving" @click="save(pending.action)">重试本次处理</el-button>
+      </div>
+      <details><summary>观察及处理历史（{{ detail.history.total }} 条）</summary><div class="impact-list"><p v-for="row in detail.history.records" :key="row.version">{{ actions[row.action] || '核对记录' }} · {{ row.operatorName || '—' }} · {{ row.createdAt }} UTC<br>{{ row.result || '记录来源观察' }} · {{ row.nextAction || '—' }} · {{ row.followupDate || '—' }}</p></div><el-pagination v-model:current-page="historyPage" :page-size="20" :total="detail.history.total" layout="prev, pager, next" :disabled="loading || saving || !!pending" @current-change="load" /></details>
+    </template>
+  </AppDialog>
+</template>
+<style scoped>.impact-list { max-height: 220px; overflow-y: auto; overflow-wrap: anywhere; }</style>

src/modules/appointment-calendar/AppointmentInboundCodes.test.ts

@@ -0,0 +1,41 @@
+import { mount } from '@vue/test-utils'
+import { describe, expect, it } from 'vitest'
+import AppointmentInboundCodes from './AppointmentInboundCodes.vue'
+
+describe('appointment inbound code list', () => {
+  const codes = Array.from({ length: 20 }, (_, index) => `WT-LONG-INBOUND-CODE-${index + 1}`)
+
+  it('previews three codes, exposes the total and expands without losing full codes', async () => {
+    const wrapper = mount(AppointmentInboundCodes, { props: { codes } })
+    expect(wrapper.findAll('li')).toHaveLength(3)
+    expect(wrapper.text()).toContain('20 个')
+    expect(wrapper.get('button').text()).toContain('还有 17 个')
+    expect(wrapper.get('li').attributes('title')).toBe(codes[0])
+    expect(wrapper.get('button').attributes('aria-expanded')).toBe('false')
+    await wrapper.get('button').trigger('click')
+    expect(wrapper.findAll('li').map(row => row.text())).toEqual(codes)
+    expect(wrapper.get('ul').classes()).toContain('expanded')
+    expect(wrapper.get('ul').attributes('tabindex')).toBe('0')
+    expect(wrapper.get('button').attributes('aria-controls')).toBe(wrapper.get('ul').attributes('id'))
+    await wrapper.get('button').trigger('click')
+    expect(wrapper.findAll('li')).toHaveLength(3)
+  })
+
+  it('does not count missing or duplicate codes and shows no redundant toggle', () => {
+    const wrapper = mount(AppointmentInboundCodes, { props: { codes: [' A ', 'A', '', null, undefined, 'B'] } })
+    expect(wrapper.findAll('li').map(row => row.text())).toEqual(['A', 'B'])
+    expect(wrapper.text()).toContain('2 个')
+    expect(wrapper.find('button').exists()).toBe(false)
+    expect(mount(AppointmentInboundCodes, { props: { codes: [] } }).text()).toContain('—')
+  })
+
+  it('preserves expansion on equivalent data but resets when the appointment codes change', async () => {
+    const wrapper = mount(AppointmentInboundCodes, { props: { codes } })
+    await wrapper.get('button').trigger('click')
+    await wrapper.setProps({ codes: [...codes] })
+    expect(wrapper.findAll('li')).toHaveLength(20)
+    await wrapper.setProps({ codes: codes.map(code => `${code}-NEW`) })
+    expect(wrapper.findAll('li')).toHaveLength(3)
+    expect(wrapper.get('button').attributes('aria-expanded')).toBe('false')
+  })
+})

src/modules/appointment-calendar/AppointmentInboundCodes.vue

@@ -0,0 +1,37 @@
+<script setup lang="ts">
+import { computed, ref, useId, watch } from 'vue'
+
+const props = defineProps<{ codes: Array<string | null | undefined> }>()
+const expanded = ref(false)
+const listId = useId()
+const codes = computed(() => [...new Set(props.codes.map(code => code?.trim()).filter((code): code is string => !!code))])
+const visibleCodes = computed(() => expanded.value ? codes.value : codes.value.slice(0, 3))
+watch(() => codes.value.join('\n'), () => { expanded.value = false })
+</script>
+
+<template>
+  <section class="inbound-codes" aria-label="关联入仓码">
+    <div class="codes-heading">
+      <span :title="`共 ${codes.length} 个入仓码`">入仓码 <span v-if="codes.length">（{{ codes.length }} 个）</span></span>
+      <button v-if="codes.length > 3" type="button" :aria-expanded="expanded" :aria-controls="listId" @click="expanded = !expanded">
+        {{ expanded ? '收起' : `查看全部（还有 ${codes.length - 3} 个）` }}
+      </button>
+    </div>
+    <ul v-if="codes.length" :id="listId" class="codes-list" :class="{ expanded }" :tabindex="expanded ? 0 : undefined" aria-label="入仓码列表">
+      <li v-for="code in visibleCodes" :key="code" :title="code">{{ code }}</li>
+    </ul>
+    <span v-else class="codes-empty">—</span>
+  </section>
+</template>
+
+<style scoped>
+.inbound-codes { min-width: 0; margin: var(--admin-space-5) 0; font-size: var(--admin-font-body); }
+.codes-heading { display: flex; flex-wrap: wrap; justify-content: space-between; align-items: center; gap: var(--admin-space-3); color: var(--el-text-color-secondary); font-size: var(--admin-font-caption); }
+.codes-heading button { border: 0; background: transparent; color: var(--el-color-primary); cursor: pointer; font: inherit; min-height: var(--admin-action-height); padding: 0; }
+.codes-list { list-style: none; padding: 0; margin: var(--admin-space-1) 0 0; line-height: 1.8; }
+.codes-list li { white-space: nowrap; overflow: hidden; text-overflow: ellipsis; }
+.codes-list.expanded { max-height: 216px; overflow-y: auto; overscroll-behavior: contain; }
+.codes-list.expanded li { white-space: normal; overflow-wrap: anywhere; }
+.codes-heading button:focus-visible, .codes-list:focus-visible { outline: 2px solid var(--el-color-primary); outline-offset: 2px; }
+.codes-empty { display: block; margin-top: var(--admin-space-1); }
+</style>

src/modules/appointment-calendar/AppointmentTableRendering.test.ts

@@ -0,0 +1,173 @@
+import { onBeforeRouteLeave, onBeforeRouteUpdate } from 'vue-router'
+import ElementPlus from 'element-plus'
+import { listImpacts } from './impactApi'
+vi.mock('./impactApi', async original => ({ ...await original<typeof import('./impactApi')>(), listImpacts: vi.fn(), refreshImpacts: vi.fn() }))
+import { flushPromises, mount } from '@vue/test-utils'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import AppointmentCargoPanel from './AppointmentCargoPanel.vue'
+import AppointmentContainerPanel from './AppointmentContainerPanel.vue'
+import AppointmentFollowupDialog from './AppointmentFollowupDialog.vue'
+import { listExternalAppointmentCandidates, getFollowups, listPlanningCargo, resolvePlanningSource, listPlanningContainers, resolvePlanningContainer, previewPlanningBatch, createSourceAppointment, type PlanningCargo, type PlanningContainer, type PlanningSource } from './planningApi'
+
+vi.mock('./planningApi', () => ({ listExternalAppointmentCandidates: vi.fn(), listPlanningCargo: vi.fn(), resolvePlanningSource: vi.fn(), getFollowups: vi.fn(), saveFollowup: vi.fn(), listPlanningContainers: vi.fn(), resolvePlanningContainer: vi.fn(), previewPlanningBatch: vi.fn(), createSourceAppointment: vi.fn() }))
+vi.mock('vue-router', () => ({ onBeforeRouteLeave: vi.fn(), onBeforeRouteUpdate: vi.fn(), useRouter: () => ({ push: vi.fn() }) }))
+vi.mock('@/core/access/accessPreview', () => ({ useAccessPreviewStore: () => ({ can: () => true }) }))
+const source: PlanningSource = { sourceKey: 'ORDER:1', customerId: 'A', orderId: '1', inboundCode: 'IN-A', bookingNo: null, containerNo: 'CONTAINER-A', originWarehouseId: '100', originWarehouseName: '美国仓', destinationKey: 'FBA:ONT8', destinationWarehouseCode: 'ONT8', packages: 20, sourceVersion: 'ORDER:1', canFollowup: true, blockReasons: [] }
+const cargo: PlanningCargo = { sourceKey: source.sourceKey, customerId: 'A', customerName: '客户甲', orderId: '1', inboundCode: 'IN-A', containerBookingId: '2', containerNo: 'CONTAINER-A', originWarehouseId: '100', originWarehouseCode: 'US', originWarehouseName: '美国仓', destinationWarehouseCode: 'ONT8', packages: 20, receivedPackages: null, shippedPackages: null, sourcePalletCount: null, volumeCbm: null, estimatedArrivalAt: null, estimatedWarehouseAt: '2026-10-10T13:48:15', orderVersion: 1, standardNode: 'DEPARTED', shippingVersion: null, shippingObservedAt: null, shippingProvider: null, hasInboundPlan: false, hasActiveAppointment: false, detained: false, mixedDestinations: false }
+const coverage = { status: 'UNASSIGNED', appointments: [], missingFields: [], changeReviewRequired: false }
+
+describe('appointment tables use actual shared table slots', () => {
+  beforeEach(() => {
+    vi.resetAllMocks()
+    vi.mocked(listImpacts).mockImplementation(async () => {
+      const page = await vi.mocked(listPlanningContainers).mock.results.at(-1)!.value
+      return { total: page.total, records: page.records.map((container: PlanningContainer) => ({ container, impact: container.impact || null })) }
+    })
+  })
+  it('discovers external candidates lazily and mixes original bookings with selected first-leg cargo', async () => {
+    vi.mocked(listPlanningCargo).mockResolvedValue({ records: [cargo], page: 1, size: 20, total: 1, pages: 1 })
+    const external: PlanningSource = { ...source, sourceKey: 'BOOKING:B-1', customerId: 'B', orderId: null, inboundCode: null, bookingNo: 'B-1', packages: null }
+    vi.mocked(listExternalAppointmentCandidates).mockResolvedValue({ records: [{ source: external, customerName: '客户乙', tripNo: 'TR-1', coverage: { status: 'UNSCHEDULED', appointments: [], missingFields: [], changeReviewRequired: false } }], total: 1 })
+    vi.mocked(previewPlanningBatch).mockResolvedValue({ group: { originWarehouseId: '100', destinationKey: 'FBA:ONT8', packages: null, sourceCount: 2, customerCount: 2, readyFrom: null, readyTo: null, readinessIncomplete: true, unknownQuantitySources: 1 }, originWarehouseName: '美国仓', destinationWarehouseCode: 'ONT8', destinationTimezone: 'America/Los_Angeles', sources: [source, external], missingFields: [] })
+    const wrapper = mount(AppointmentCargoPanel, { global: { plugins: [ElementPlus], stubs: { AppDialog: { template: '<section><slot /></section>' } } } })
+    await flushPromises()
+    expect(listExternalAppointmentCandidates).not.toHaveBeenCalled()
+    expect(wrapper.get('.data-table__filters [role="tablist"]').text()).toContain('头程货物')
+    await wrapper.findAll('button').find(b => b.text() === '选择本页可合批货物')!.trigger('click')
+    await wrapper.findAll('button').find(b => b.text() === '外接货物')!.trigger('click'); await flushPromises()
+    expect(listExternalAppointmentCandidates).toHaveBeenCalledTimes(1)
+    expect(wrapper.findAll('.data-table__filters [role="tablist"]')).toHaveLength(1)
+    expect(wrapper.get('.data-table__filters [role="tablist"]').isVisible()).toBe(true)
+    expect(wrapper.get('.data-table__filters [role="tab"][aria-selected="true"]').text()).toBe('外接货物')
+    expect(wrapper.text()).toContain('B-1')
+    await wrapper.findAll('button').find(b => b.text() === '加入合批')!.trigger('click')
+    await wrapper.findAll('button').find(b => b.text().startsWith('合批核对') && b.isVisible())!.trigger('click'); await flushPromises()
+    expect(previewPlanningBatch).toHaveBeenCalledExactlyOnceWith([{ sourceKey: 'ORDER:1', customerId: 'A', destinationKey: 'FBA:ONT8' }, { sourceKey: 'BOOKING:B-1', customerId: 'B', destinationKey: 'FBA:ONT8' }])
+    expect(resolvePlanningSource).not.toHaveBeenCalled()
+    wrapper.unmount()
+  })
+  it('combines an original external booking with first-leg cargo and retries the identical save command', async () => {
+    const external: PlanningSource={...source,sourceKey:'BOOKING:B-1',customerId:'B',bookingNo:'B-1',orderId:null,inboundCode:null,packages:null}
+    vi.mocked(listPlanningCargo).mockResolvedValue({records:[cargo],page:1,size:20,total:1,pages:1})
+    vi.mocked(previewPlanningBatch).mockResolvedValue({group:{originWarehouseId:'100',destinationKey:'FBA:ONT8',packages:null,sourceCount:2,customerCount:2,readyFrom:null,readyTo:null,readinessIncomplete:true,unknownQuantitySources:1},originWarehouseName:'美国仓',destinationWarehouseCode:'ONT8',destinationTimezone:null,sources:[external,source],missingFields:['CARGO_QUANTITY_REVIEW']})
+    vi.mocked(createSourceAppointment).mockRejectedValueOnce(new Error('network interrupted')).mockResolvedValueOnce({id:'1',version:0,appointmentNo:'AP-MIXED',appointmentStatus:'PENDING',originWarehouseId:'100',fbaWarehouseCode:'ONT8',selectedCount:2,items:[]})
+    const wrapper=mount(AppointmentCargoPanel,{props:{externalSource:external},global:{plugins:[ElementPlus],stubs:{AppDialog:{name:'AppDialog',props:['beforeClose'],template:'<section><slot /><button data-close @click="$emit(\'update:model-value\',false)">关闭</button><button data-save @click="$emit(\'confirm\')">Save</button></section>'}}}})
+    await flushPromises()
+    await wrapper.findAll('button').find(b=>b.text()==='加入本次选择')!.trigger('click')
+    await wrapper.findAll('button').find(b=>b.text()==='选择本页可合批货物')!.trigger('click')
+    await wrapper.findAll('button').find(b=>b.text().startsWith('合批核对'))!.trigger('click');await flushPromises()
+    expect(previewPlanningBatch).toHaveBeenCalledExactlyOnceWith([{sourceKey:'BOOKING:B-1',customerId:'B',destinationKey:'FBA:ONT8'},{sourceKey:'ORDER:1',customerId:'A',destinationKey:'FBA:ONT8'}])
+    await wrapper.get('[data-save]').trigger('click');await flushPromises()
+    const first=vi.mocked(createSourceAppointment).mock.calls[0]![0]
+    await wrapper.get('[data-close]').trigger('click')
+    expect(wrapper.find('[data-save]').exists()).toBe(true)
+    const done = vi.fn()
+    wrapper.findAllComponents({ name: 'AppDialog' }).at(-1)!.props('beforeClose')(done)
+    expect(done).not.toHaveBeenCalled()
+    for (const hook of [onBeforeRouteLeave, onBeforeRouteUpdate]) {
+      const guard = vi.mocked(hook).mock.calls.at(-1)![0] as () => boolean
+      expect(guard()).toBe(false)
+    }
+    expect(first).toMatchObject({originWarehouseId:'100',fbaWarehouseCode:'ONT8',details:{appointmentStatus:'PENDING',confirmationNo:null,appointmentAt:null}})
+    expect(first.sources[0]!.sourceKey).toBe('BOOKING:B-1')
+    await wrapper.get('[data-save]').trigger('click');await flushPromises()
+    expect(createSourceAppointment).toHaveBeenNthCalledWith(2,first);expect(wrapper.emitted('created')).toHaveLength(1)
+    expect(resolvePlanningSource).not.toHaveBeenCalled();wrapper.unmount()
+  })
+  it('retains the current selection when a linked source has a different origin', async () => {
+    vi.mocked(listPlanningCargo).mockResolvedValue({records:[cargo],page:1,size:20,total:1,pages:1})
+    vi.mocked(previewPlanningBatch).mockRejectedValue(new Error('stop after observing request'))
+    const wrapper=mount(AppointmentCargoPanel,{props:{externalSource:{...source,sourceKey:'BOOKING:B-2',bookingNo:'B-2',originWarehouseId:'200'}},global:{plugins:[ElementPlus]}})
+    await flushPromises();await wrapper.findAll('button').find(b=>b.text()==='选择本页可合批货物')!.trigger('click')
+    await wrapper.findAll('button').find(b=>b.text()==='加入本次选择')!.trigger('click')
+    expect(wrapper.emitted('sourceAccepted')).toBeUndefined()
+    await wrapper.findAll('button').find(b=>b.text().startsWith('合批核对'))!.trigger('click');await flushPromises()
+    expect(previewPlanningBatch).toHaveBeenCalledExactlyOnceWith([{sourceKey:'ORDER:1',customerId:'A',destinationKey:'FBA:ONT8'}]);wrapper.unmount()
+  })
+  it('selects multiple customers and makes one authoritative batch check without per-row resolution', async () => {
+    vi.mocked(listPlanningCargo).mockResolvedValue({ records: [cargo, { ...cargo, sourceKey: 'ORDER:2', orderId: '2', inboundCode: 'IN-B', customerId: 'B', customerName: '客户乙' }], page: 1, size: 20, total: 2, pages: 1 })
+    vi.mocked(previewPlanningBatch).mockResolvedValue({ group: { originWarehouseId: '100', destinationKey: 'FBA:ONT8', packages: 40, sourceCount: 2, customerCount: 2, readyFrom: null, readyTo: null, readinessIncomplete: true, unknownQuantitySources: 0 }, originWarehouseName: '美国仓', destinationWarehouseCode: 'ONT8', destinationTimezone: 'America/Los_Angeles', sources: [source], missingFields: ['READY_WINDOW_UNVERIFIED'] })
+    const wrapper = mount(AppointmentCargoPanel, { global: { plugins: [ElementPlus], stubs: { AppDialog: { template: '<section><slot /></section>' } } } })
+    await flushPromises()
+    await wrapper.findAll('button').find(button => button.text() === '选择本页可合批货物')!.trigger('click')
+    await wrapper.findAll('button').find(button => button.text().startsWith('合批核对'))!.trigger('click')
+    await flushPromises()
+    expect(previewPlanningBatch).toHaveBeenCalledExactlyOnceWith([{ sourceKey: 'ORDER:1', customerId: 'A', destinationKey: 'FBA:ONT8' }, { sourceKey: 'ORDER:2', customerId: 'B', destinationKey: 'FBA:ONT8' }])
+    expect(resolvePlanningSource).not.toHaveBeenCalled()
+    expect(wrapper.text()).toContain('2 票 / 2 个客户 / 预报 40 箱')
+    expect(wrapper.text()).toContain('保存前尚未占用货物')
+    expect(wrapper.text()).toContain('America/Los_Angeles')
+    expect(wrapper.text()).not.toContain('目的仓时区待核实')
+    expect(wrapper.text()).toContain('2026-10-10 13:48:15')
+    expect(wrapper.text()).toContain('来源时区未明确')
+    wrapper.unmount()
+  })
+  it('keeps the cargo list usable when impact service is unavailable and never reports a false zero', async () => {
+    vi.mocked(listPlanningContainers).mockResolvedValue({ total: 1, records: [{ containerBookingId: 'C1', containerNo: 'CONTAINER-A', orderCount: 20, customerCount: 12, packages: null, unknownPackageOrders: 1, earliestArrivalAt: null, latestArrivalAt: null, standardNode: 'DEPARTED', sourceVersion: null, incompleteScope: false, warehouses: [] }] })
+    vi.mocked(listImpacts).mockRejectedValueOnce(new Error('Resource not found'))
+    const wrapper = mount(AppointmentContainerPanel, { global: { plugins: [ElementPlus] } }); await flushPromises()
+    expect(wrapper.findAll('.el-table__body-wrapper .el-table__row')).toHaveLength(1)
+    expect(wrapper.text()).toContain('CONTAINER-A')
+    expect(wrapper.text()).toContain('船期跟进暂不可用，货柜列表仍可查看')
+    expect(wrapper.text()).not.toContain('本页待处理 0')
+    expect(wrapper.find('[role="alert"]').exists()).toBe(false)
+    expect(wrapper.findAll('details').every(node => node.attributes('open') === undefined)).toBe(true)
+    expect(listPlanningContainers).toHaveBeenCalledTimes(1); expect(listImpacts).toHaveBeenCalledTimes(1)
+    wrapper.unmount()
+  })
+  it('renders one shared container and resolves each receiving warehouse without per-row requests', async () => {
+    vi.mocked(listPlanningContainers).mockResolvedValue({ total: 1, records: [{ impact: { containerBookingId: 'C1', impactNo: 'AI-T', version: 1, status: 'OPEN', reason: 'FORECAST_CHANGED', ownerId: 'A', ownerName: '运营甲', baseline: null, latest: null, forecastToken: 'x', updatedAt: '2026-10-10T00:00:00' }, containerBookingId: 'C1', containerNo: 'CONTAINER-A', orderCount: 20, customerCount: 12, packages: null, unknownPackageOrders: 1, earliestArrivalAt: null, latestArrivalAt: null, standardNode: 'DEPARTED', sourceVersion: null, incompleteScope: false, warehouses: [{ warehouseId: '100', warehouseName: '洛杉矶仓', orderCount: 20, customerCount: 12 }] }] })
+    vi.mocked(resolvePlanningContainer).mockResolvedValue({ containerBookingId: 'C1', containerNo: 'CONTAINER-A', warehouseId: '100', warehouseName: '洛杉矶仓', canFollowup: true, blockReasons: [] })
+    const wrapper = mount(AppointmentContainerPanel, { global: { plugins: [ElementPlus], stubs: { AppointmentFollowupDialog: true } } })
+    await flushPromises()
+    expect(listPlanningContainers).toHaveBeenCalledTimes(1)
+    expect(wrapper.text()).toContain('本页待处理 1')
+    expect(wrapper.text()).toContain('处理船期变化')
+    expect(wrapper.text()).toContain('运营甲')
+    expect(resolvePlanningContainer).not.toHaveBeenCalled()
+    const rows = wrapper.findAll('.el-table__body-wrapper .el-table__row')
+    expect(rows).toHaveLength(1)
+    expect(rows[0]!.text()).toContain('待核实')
+    expect(rows[0]!.text()).toContain('洛杉矶仓')
+    await rows[0]!.findAll('button').find(button => button.text() === '接仓跟进')!.trigger('click')
+    await flushPromises()
+    expect(resolvePlanningContainer).toHaveBeenCalledExactlyOnceWith('C1', '100')
+    expect(wrapper.findComponent(AppointmentFollowupDialog).props('container')?.warehouseId).toBe('100')
+    wrapper.unmount()
+  })
+  it('renders working source actions and readable progress through DataTable and RowActions', async () => {
+    vi.mocked(listPlanningCargo).mockResolvedValue({ records: [cargo], page: 1, size: 20, total: 1, pages: 1 })
+    vi.mocked(resolvePlanningSource).mockResolvedValue({ source, coverage })
+    const wrapper = mount(AppointmentCargoPanel, { global: { plugins: [ElementPlus], stubs: { AppointmentFollowupDialog: true } } })
+    await flushPromises()
+    const row = wrapper.get('.el-table__body-wrapper .el-table__row')
+    expect(row.text()).toContain('IN-A')
+    expect(row.text()).toContain('尚未建入仓计划')
+    const followup = row.findAll('button').find(button => button.text() === '跟进')
+    expect(followup).toBeDefined()
+    expect(row.findAll('button').some(button => button.text() === '查看来源')).toBe(true)
+    await followup!.trigger('click')
+    await flushPromises()
+    expect(resolvePlanningSource).toHaveBeenCalledExactlyOnceWith({ sourceKey: 'ORDER:1', customerId: 'A', destinationKey: 'FBA:ONT8' })
+    expect(wrapper.findComponent(AppointmentFollowupDialog).exists()).toBe(true)
+    wrapper.unmount()
+  })
+  it('keeps arrangement permission independent from contact-record writes and avoids duplicate active appointments', async () => {
+    vi.mocked(getFollowups).mockResolvedValue({history:{records:[],total:0,page:1,size:10,pages:0},versions:{DRAYAGE_CONTACT:0,TERMINAL_APPOINTMENT:0,WAREHOUSE_RECEIVING:0,FBA_RECEIVING:0}})
+    const wrapper=mount(AppointmentFollowupDialog,{props:{source,coverage,canWrite:false,canArrange:true},global:{plugins:[ElementPlus],stubs:{AppDialog:{name:'AppDialog',props:['beforeClose'],template:'<section><slot /></section>'}}}})
+    await flushPromises();await wrapper.findAll('button').find(b=>b.text()==='加入预约合批')!.trigger('click')
+    expect(wrapper.emitted('arrange')).toHaveLength(1)
+    await wrapper.setProps({canArrange:false});expect(wrapper.findAll('button').some(b=>b.text()==='加入预约合批')).toBe(false)
+    await wrapper.setProps({canArrange:true,coverage:{...coverage,appointments:[{appointmentNo:'AP-EXISTING',confirmationNo:null,status:'PENDING',confirmedAt:null,confirmedEndAt:null,timezone:null}]}})
+    expect(wrapper.findAll('button').some(b=>b.text()==='加入预约合批')).toBe(false);wrapper.unmount()
+  })
+  it('renders followup stage names instead of blank table cells', async () => {
+    vi.mocked(getFollowups).mockResolvedValue({ history: { records: [{ stage: 'FBA_RECEIVING', version: 1, contactedParty: null, result: '等待回复', nextAction: null, followupDate: null, operatorName: '运营', createdAt: '2026-10-09T12:00:00Z' }], total: 1, page: 1, size: 10, pages: 1 }, versions: { DRAYAGE_CONTACT: 0, TERMINAL_APPOINTMENT: 0, WAREHOUSE_RECEIVING: 0, FBA_RECEIVING: 1 } })
+    const wrapper = mount(AppointmentFollowupDialog, { props: { source, coverage, canWrite: false }, global: { plugins: [ElementPlus], stubs: { AppDialog: { template: '<section><slot /></section>' } } } })
+    await flushPromises()
+    const row = wrapper.get('.el-table__body-wrapper .el-table__row')
+    expect(row.text()).toContain('FBA收货跟进')
+    expect(row.text()).toContain('等待回复')
+    wrapper.unmount()
+  })
+})

src/modules/appointment-calendar/PROTOTYPE_MATRIX.md

@@ -0,0 +1,45 @@
+# 预约管理交互矩阵
+
+原型：用户提供 `C:/Users/BY-OY/Desktop/新版.html` 的 `page-appointment-calendar`、`modal-appointment-edit`、`renderAppointmentCalendar`、`renderAppointmentDay`、`openAppointmentModal`、`deleteAppointment`，以及本对话三张截图。
+
+用户确认：同一目的仓允许多个客户货物统一预约、统一送仓，不能按客户拆预约。客户隔离保留在货物明细。
+
+| 页面/操作 | 原型承载与布局 | 实现约束 |
+|---|---|---|
+| 补充计划时段 | 用户2026-10-12新增预约截图：开始、结束时段输入框各占整行过长 | 共用 FbaAppointmentFields 的补充区域沿用三列网格，计划开始、结束时段同排各占一列，与主字段对齐；夏令时说明整行、两个时差输入同排。日历新增/编辑、合批安排、入仓单预约同步生效；字段语义及保存不变，待人工截图确认 |
+| 预约补充记录入口 | 用户2026-10-12截图1：原顶部未定时安排、取消记录两行默认折叠文字要求优化 | 用户2026-10-12后续确认覆盖页内展开方案：入口并入日历工具栏，与数据提示同组；未定时安排1000px、取消记录1160px居中弹框，保留独立分页及错误重试，取消记录仅打开时加载。新增预约紧邻日历标题，月/周及日期操作连续排列 |
+| 送仓与排车货源页签 | 用户2026-10-12截图2、3：参考尾程订单下划线页签 | 头程货物、外接货物通过同一局部页签组件复用 density-status-tabs，两种模式均放入表格 filters 的 integrated-query-group 内并紧邻搜索；点击及方向键/Home/End切换，保留跨货源选择；新增、编辑、取消预约沿用原承载方式。待人工1920×1080、100%截图确认 |
+| 预约列表 | 左侧月/周日历，右侧选中日期详情 | 保留双栏日历；到港蓝色、送仓绿色，区分预计/实际到港 |
+| 新增预约 | 居中表单，按用户简化要求使用1080px三列 | 仓库远程搜索并自动加载货物；主区保留计划日期、登记阶段及可选备注。系统单号自动生成，不要求外部约号和预计装车时间；计划时段收至补充信息。选择“已取得对方正式确认”才展开外部号和确认时段，并显示地点时区 |
+| 编辑预约 | 复用居中表单 | 与入仓单共用记录；版本校验；真实货物归属不允许手填更改 |
+| 到港详情 | 当天安排右侧只读 | 使用货柜/船节点事实，无逐行详情请求，无模拟到港数据 |
+| 取消预约 | 二次确认 | 显式提示全部货物释放占用、历史保留；沿用独立权限，已关联有效排车时先处理运输安排，不能自动回退库存 |
+| 月/周切换 | 顶部切换与前后按钮 | 周模式按7天移动，修正原型仍按月移动的问题 |
+| 多条安排 | 日历标签、右侧明细 | 月/周日格均最多显示3条，超出显示“还有N条”，悬停显示当天总数；日格固定高度，右侧全部展示并独立滚动 |
+| 多入仓码 | 用户2026-10-09补充截图：单预约20票导致两列详情被长字符串撑高 | 右侧卡片与编辑弹框共用独立整行入仓码列表；去空去重后显示总数，默认3条，长码悬停可读全文；超过3条可展开/收起，展开后216px内独立滚动并可键盘聚焦，不拼成长段文字 |
+| 在途货物及外接来源跟进 | 美国预约统一方案的提前联系需求 | 日历与已开船FBA列表切换；跟进在居中1080px弹框中承载，3列表单、联系结果及下一步整行，历史分页；BOOKING深链先由服务端核对，再展示原登记及真实预约缺项 |
+| 整柜提柜与接仓 | 美国预约统一方案的整柜共享事项 | 独立工作视图按柜汇总，操作列左置；接仓点在行内分组，点击后共用1080px跟进弹框。整柜只选拖车/码头事项，接仓只记录对应仓库，单票只记录FBA联系；数量未知或范围不完整明确显示，不按客户复制整柜联系。首次只请求一页整柜数据，详情按点击读取；待1920×1080页面验收 |
+| 在途跨客户合批安排 | 美国预约统一方案的同起运仓、同目的仓合批 | 操作列后选择同起运仓及同目的仓，跨页累计最多100票；批量核对后在1080px弹框填写与入仓入口共用的安排表单。未知箱数保留待核实；暂扣、多目的地和已有预约不可选入。保存必须重新核对，未知结果保留同一命令供重试 |
+| 外接货进入合批 | 同仓跨客户共用预约，不因未入仓而只允许跟进 | 后端核实BOOKING深链后，“加入预约合批”进入现有合批工作区，再显式加入选择；可与同起运仓/目的仓头程货混选，保留原BOOKING键与未知箱数。跨仓不清空已有选择，已有关联预约不再开放新增入口；切换日历/合批工作视图保留本页选择，外接选择默认折叠、展开216px内滚动 |
+| 完整外接候选 | 统一方案第九节两类货源均可筹划、合批及核对覆盖 | 在同一合批工作区切换头程/外接来源列表，外接按服务端分页、关键词筛选，展示原登记、客户、车次、接仓点、目的仓、可空箱数及预约覆盖。加入选择复用原100票合批选择与保存弹框；查看跟进沿用原弹框，不新增预约数据副本。切换来源保留选择，未打开外接列表不请求；待1920×1080验收 |
+| 未定时安排 | 总览不得伪造时段 | 日历上方独立折叠分页列表；日期未定不补零点或09点，继续编辑仍操作原系统单号；仅有计划日期时日历显示日期，不生成确认时段 |
+| 提柜日历 | 美国业务预约统一总览 | 读取原码头提柜预约，一柜一条，点击查看来源进入清关提柜详情；按美国目的仓确认业务范围，不等于确认港口国家。保留原业务日期，明确港口时区待核实，不套用目的仓时区；未知目的仓及截断显示统计不完整。无提柜权限不请求该来源并提示范围缺失 |
+| 用车计划日历 | 统一总览的真实车次只读来源 | 一车一条，计划与实际出发分开，司机预计结束不当送货完成。查询一次带跨时区余量的UTC窗口，按起运仓地点时区筛回42个当地日；缺国家/时区的记录独立分页待核实，不放入每日格。路线最多3站摘要，完整路线进入原车次；不请求逐车详情，不在预约页创建车次或重算余位 |
+| 来源失败 | 统一方案的部分结果规则 | 日历保留成功来源并提示不完整；深链解析失败不打开假来源；跟进版本加载失败禁止保存，未知提交结果保留原请求供重试 |
+| 船期变化影响与处理 | 统一方案第十节场景16，旧/新预测、下游影响、负责人及结果闭环 | 并入提柜与到仓的货柜列表，不设第四工作视图；行内处理船期变化，本页待办计数明确标识范围；显式本页批量核对，不逐柜轮询。1200px居中详情展示直接货物/预约、关联车次与同车待复核承诺；各明细220px内滚动，历史服务端分页。认领及结果表单复用现有控件；未知提交保留原命令并禁止关闭，已确认预约不因核对动作改变。待1920×1080真实验收 |
+
+结束时间未明确时允许为空。系统单号、外部确认号、计划时段及确认时段保持不同语义。日历范围最多42天，每次范围变化查询预约、到港及有权限的提柜、车次来源各一次；未定时列表独立分页，选中日期不发送请求。候选选仓后自动分页读取，跨页选择保留；换仓清空旧选择并丢弃旧请求，清空仓库不查货。时区由目的仓主档核实，夏令时重叠明确时差，不凭浏览器时区猜测。仓库请求失败可重试；只展示前50个匹配仓，超出提示缩小关键词。
+
+本轮视觉验收：待人工1920×1080截图确认。
+
+视觉验收目标为1920×1080、100%缩放。该矩阵描述设计和代码边界，不代替测试环境浏览器验收证据。
+
+按用户确认收敛：主视图仅提柜与到仓、送仓与排车、预约日历，默认有权限的列表视图；日历首次进入才加载。到港参考、用车计划默认隐藏，可独立开关，不计入预约数量；缺国家资料与查询超限分开提示。送仓与排车目前仍以选货合批为主，目的仓货量汇总及7/14/30天窗口尚未完成，不因标题调整宣称完成。
+
+用户截图密度修正：业务标题复用density-detail-title并与三视图同行，不独占大标题区；船期操作并入查询栏，不单独占空白工具栏。常驻业务解释改为默认折叠“说明”；错误保留重试，诊断信息默认折叠。基础货柜与船期状态独立读取，后者失败不阻断货柜列表、不展示假的零待办。
+
+用户最新截图确认：移除“美国预约总览”文字，仅保留三视图导航；日历图例和图层开关归入有内边距的辅助栏，长范围提示默认折叠，月格112px仍容纳3条摘要及剩余数；右侧固定360px，系统单号/完整时段/备注跨整行。该项以当前用户要求覆盖原标题建议，待1920×1080实际页面确认。
+
+用户最新确认覆盖默认列表建议：预约日历排第一并默认打开，之后为提柜与到仓、送仓与排车；范围资料提示移入日历工具栏“数据提示”，点击展开浮层，不在日历上方占行。真实接口错误仍保留错误与重试入口。
+
+用户确认待核实车次不占日历顶部：入口并入“数据提示”，显式点击后打开1000px居中分页明细；保留原UTC、缺项及查看来源操作，未打开不渲染明细，不增加查询；日期范围变化关闭旧明细。

src/modules/appointment-calendar/api.ts

@@ -0,0 +1,73 @@
+import { http, unwrapApiResponse, type ApiEnvelope } from '@/shared/api/http'
+
+export interface ArrivalCalendarEntry {
+  containerBookingId: string
+  cabinetNo: string
+  containerNo?: string | null
+  vesselName?: string | null
+  voyageNo?: string | null
+  destinationPortName?: string | null
+  destinationWarehouseCode?: string | null
+  arrivalAt: string
+  arrivalType: 'ACTUAL' | 'ESTIMATED'
+}
+
+export interface PickupCalendarEntry {
+  containerBookingId: string
+  cabinetNo: string
+  containerNo: string | null
+  destinationPortName: string | null
+  destinationWarehouseCode: string | null
+  fleetSupplierName: string | null
+  pickupAppointmentAt: string
+  actualPickupAt: string | null
+}
+export interface PickupCalendar {
+  records: PickupCalendarEntry[]
+  truncated: boolean
+  unclassifiedCount: number
+  scopeBasis: 'US_DESTINATION_WAREHOUSE'
+  timeBasis: 'SOURCE_LOCAL_UNSPECIFIED'
+}
+export async function listPickupCalendar(query: { from: string; to: string }, signal?: AbortSignal) {
+  return unwrapApiResponse(await http.get<ApiEnvelope<PickupCalendar>, ApiEnvelope<PickupCalendar>>(
+    '/platform/v1/terminal-drayages/calendar', { params: query, signal },
+  ))
+}
+
+export async function listArrivalCalendar(query: { from: string; to: string }, signal?: AbortSignal) {
+  const response = await http.get<ApiEnvelope<ArrivalCalendarEntry[]>, ApiEnvelope<ArrivalCalendarEntry[]>>(
+    '/platform/v1/port-schedules/arrival-calendar', { params: query, signal },
+  )
+  return unwrapApiResponse(response)
+}
+
+export async function deleteAppointment(appointmentNo: string, version: number, cancelReason: string) {
+  const response = await http.delete<ApiEnvelope<void>, ApiEnvelope<void>>(
+    `/platform/v1/last-leg/inbound-plans/fba-appointments/${encodeURIComponent(appointmentNo)}`,
+    { data: { version, cancelReason } },
+  )
+  return unwrapApiResponse(response)
+}
+
+export interface AppointmentCancellation {
+  appointmentNo: string; version: number; cancelReason: string | null; cancelledAt: string
+  snapshot: { fbaWarehouseCode: string; appointmentStatus: string; appointmentRemark: string | null;
+    plannedDate: string | null; plannedAt: string | null; plannedEndAt: string | null;
+    confirmationNo: string | null; appointmentAt: string | null; appointmentEndAt: string | null;
+    timezone: string | null; selectedCount: number }
+}
+export async function listAppointmentCancellations(appointmentNo: string, page: number, size: number) {
+  const result = unwrapApiResponse(await http.get<ApiEnvelope<{records: AppointmentCancellation[]; total: number}>, ApiEnvelope<{records: AppointmentCancellation[]; total: number}>>(
+    `/platform/v1/last-leg/inbound-plans/fba-appointments/${encodeURIComponent(appointmentNo)}/cancellations`, {params: {page, size}},
+  ))
+  return {...result, total: Number(result.total)}
+}
+
+export type AppointmentCancellationSummary = Omit<AppointmentCancellation, 'snapshot'> & {fbaWarehouseCode: string; selectedCount: number}
+export async function listAppointmentCancellationRecords(page: number, size: number) {
+  const result = unwrapApiResponse(await http.get<ApiEnvelope<{records: AppointmentCancellationSummary[]; total: number}>, ApiEnvelope<{records: AppointmentCancellationSummary[]; total: number}>>(
+    '/platform/v1/last-leg/inbound-plans/fba-appointments/cancellations', {params: {page, size}},
+  ))
+  return {...result, total: Number(result.total)}
+}

src/modules/appointment-calendar/calendar.test.ts

@@ -0,0 +1,27 @@
+import { describe, expect, it } from 'vitest'
+import { addDays, calendarDates, calendarRange, moveCalendar } from './calendar'
+
+describe('appointment calendar', () => {
+  it('shows six complete Monday-first weeks across year boundaries', () => {
+    const dates = calendarDates('2027-01-15', 'month')
+    expect(dates).toHaveLength(42)
+    expect(dates[0]).toBe('2026-12-28')
+    expect(dates.at(-1)).toBe('2027-02-07')
+    expect(calendarRange('2027-01-15', 'month').to).toBe('2027-02-08')
+  })
+
+  it('moves by a week in week mode instead of following the prototype month-navigation bug', () => {
+    expect(moveCalendar('2026-09-24', 'week', 1)).toBe('2026-10-01')
+    expect(calendarDates('2026-09-27', 'week')).toEqual([
+      '2026-09-21', '2026-09-22', '2026-09-23', '2026-09-24',
+      '2026-09-25', '2026-09-26', '2026-09-27',
+    ])
+  })
+
+  it('clamps month-end selection and handles leap days', () => {
+    expect(moveCalendar('2028-01-31', 'month', 1)).toBe('2028-02-29')
+    expect(moveCalendar('2027-03-31', 'month', -1)).toBe('2027-02-28')
+    expect(addDays('2028-02-28', 1)).toBe('2028-02-29')
+    expect(() => addDays('2027-02-29', 1)).toThrow('无效的日历日期')
+  })
+})

src/modules/appointment-calendar/calendar.ts

@@ -0,0 +1,53 @@
+export type CalendarMode = 'month' | 'week'
+
+/** End times are exclusive; a slot ending at midnight does not occupy the next day. */
+export function occursOnDate(startDate: string, endAt: string | undefined, date: string): boolean {
+  if (date === startDate) return true
+  if (date < startDate || !endAt) return false
+  const endDate = endAt.slice(0, 10)
+  return date < endDate || (date === endDate && /[1-9]/.test(endAt.slice(11)))
+}
+
+/** Calendar dates are warehouse-local dates, never UTC conversions. */
+export function dateKey(date: Date): string {
+  return `${date.getFullYear()}-${String(date.getMonth() + 1).padStart(2, '0')}-${String(date.getDate()).padStart(2, '0')}`
+}
+
+function parseDate(value: string): Date {
+  const date = new Date(`${value}T12:00:00`)
+  if (!/^\d{4}-\d{2}-\d{2}$/.test(value) || Number.isNaN(date.getTime()) || dateKey(date) !== value) {
+    throw new Error('无效的日历日期')
+  }
+  return date
+}
+
+export function addDays(value: string, days: number): string {
+  const date = parseDate(value)
+  date.setDate(date.getDate() + days)
+  return dateKey(date)
+}
+
+export function calendarRange(anchor: string, mode: CalendarMode): { from: string; to: string } {
+  const date = parseDate(anchor)
+  if (mode === 'month') date.setDate(1)
+  date.setDate(date.getDate() - (date.getDay() + 6) % 7)
+  const from = dateKey(date)
+  // A half-open interval also works directly with database timestamps.
+  return { from, to: addDays(from, mode === 'month' ? 42 : 7) }
+}
+
+export function calendarDates(anchor: string, mode: CalendarMode): string[] {
+  const { from } = calendarRange(anchor, mode)
+  return Array.from({ length: mode === 'month' ? 42 : 7 }, (_, index) => addDays(from, index))
+}
+
+export function moveCalendar(anchor: string, mode: CalendarMode, offset: number): string {
+  if (mode === 'week') return addDays(anchor, offset * 7)
+  const date = parseDate(anchor)
+  const day = date.getDate()
+  date.setDate(1)
+  date.setMonth(date.getMonth() + offset)
+  const lastDay = new Date(date.getFullYear(), date.getMonth() + 1, 0).getDate()
+  date.setDate(Math.min(day, lastDay))
+  return dateKey(date)
+}

src/modules/appointment-calendar/impactApi.ts

@@ -0,0 +1,31 @@
+import { http, unwrapApiResponse, type ApiEnvelope } from '@/shared/api/http'
+import type { PlanningContainer } from './planningApi'
+
+export interface ForecastFact { estimatedAt: string | null; actualAt: string | null; observedAt: string | null; providerCode: string | null; sourceReference: string | null }
+export interface Impact { containerBookingId: string; impactNo: string; version: number; status: string; reason: string | null; ownerName: string | null; ownerId: string | null; baseline: ForecastFact | null; latest: ForecastFact | null; forecastToken: string; updatedAt: string }
+export interface ImpactRow { container: PlanningContainer; impact: Impact | null }
+export interface ImpactDetail {
+  impact: Impact
+  cargo: Array<{ inboundCode: string | null; customerName: string | null; packages: number | null; destination: string | null }>
+  appointments: Array<{ appointmentNo: string; status: string; destination: string; confirmedAt: string | null; timezone: string | null }>
+  transport: { trips: Array<{ tripNo: string; status: string; plannedDepartureAt: string | null }>; sameTripBookings: Array<{ tripNo: string; bookingNo: string; customerName: string | null; destinationLabel: string | null; status: string }> } | null
+  history: { records: Array<{ version: number; action: string; operatorName: string | null; result: string | null; nextAction: string | null; followupDate: string | null; createdAt: string }>; total: number }
+}
+export interface ImpactCommand { expectedVersion: number; forecastToken: string; idempotencyKey: string; action: 'CLAIM' | 'RECORD' | 'RESOLVE'; result: string | null; nextAction: string | null; followupDate: string | null }
+const base = '/platform/v1/last-leg/appointment-planning/impacts'
+export async function listImpacts(query: { page: number; size: number; keyword?: string }, signal?: AbortSignal) {
+  const result = unwrapApiResponse(await http.get<ApiEnvelope<{ records: ImpactRow[]; total: number }>, ApiEnvelope<{ records: ImpactRow[]; total: number }>>(base, { params: query, signal }))
+  return { ...result, total: Number(result.total) }
+}
+export async function refreshImpacts(query: { page: number; size: number; keyword?: string }) {
+  return unwrapApiResponse(await http.post<ApiEnvelope<Impact[]>, ApiEnvelope<Impact[]>>(`${base}/refresh`, query))
+}
+export async function getImpact(id: string, page = 1) {
+  const result = unwrapApiResponse(await http.get<ApiEnvelope<ImpactDetail>, ApiEnvelope<ImpactDetail>>(`${base}/${encodeURIComponent(id)}`, { params: { page, size: 20 } }))
+  return { ...result, impact: { ...result.impact, version: Number(result.impact.version) }, history: { ...result.history, total: Number(result.history.total) } }
+}
+export async function handleImpact(id: string, command: ImpactCommand) {
+  return unwrapApiResponse(await http.post<ApiEnvelope<Impact>, ApiEnvelope<Impact>>(`${base}/${encodeURIComponent(id)}/commands`, command))
+}
+export const impactStatus: Record<string, string> = { OPEN: '待处理', RESOLVED: '已核对处理', MONITORING: '暂无变化' }
+export const impactReason: Record<string, string> = { FORECAST_MISSING: '到港预测待核实', FORECAST_CHANGED: '到港预测变化', ACTUAL_ARRIVAL_REVIEW: '实际到港已更新', SOURCE_CHANGED: '预测来源变化', UNCHANGED: '预测未变', BASELINE_ESTABLISHED: '已建立核对基准' }

src/modules/appointment-calendar/planningApi.test.ts

@@ -0,0 +1,22 @@
+import { expect, it, vi } from 'vitest'
+import { http } from '@/shared/api/http'
+import { listPlanningCargo, listPlanningContainers } from './planningApi'
+vi.mock('@/shared/api/http', () => ({ http: { get: vi.fn() }, unwrapApiResponse: <T>(value: { data: T }) => value.data }))
+
+it('uses the gateway planning route and preserves stable source IDs and null predictions', async () => {
+  vi.mocked(http.get).mockResolvedValue({ data: { records: [{ sourceKey: 'ORDER:9007199254740993', orderId: '9007199254740993', estimatedArrivalAt: null }], page: '2', size: '20', total: '21', pages: '2' } })
+  const controller = new AbortController()
+  const result = await listPlanningCargo({ page: 2, size: 20, keyword: 'IN-A' }, controller.signal)
+  expect(http.get).toHaveBeenCalledWith('/platform/v1/last-leg/appointment-planning/cargo', { params: { page: 2, size: 20, keyword: 'IN-A' }, signal: controller.signal })
+  expect(result.records[0]!.orderId).toBe('9007199254740993')
+  expect(result.records[0]!.estimatedArrivalAt).toBeNull()
+  expect(result.total).toBe(21)
+})
+
+it('keeps basic container listing on its own endpoint rather than requiring impact persistence', async () => {
+  vi.mocked(http.get).mockClear()
+  vi.mocked(http.get).mockResolvedValue({ data: { records: [], total: '0' } })
+  const result = await listPlanningContainers({ page: 1, size: 20 })
+  expect(http.get).toHaveBeenCalledExactlyOnceWith('/platform/v1/last-leg/appointment-planning/containers', { params: { page: 1, size: 20 }, signal: undefined })
+  expect(result.total).toBe(0)
+})

src/modules/appointment-calendar/planningApi.ts

@@ -0,0 +1,133 @@
+import { http, unwrapApiResponse, type ApiEnvelope } from '@/shared/api/http'
+import type { FbaAppointmentDetailsPayload, FbaAppointmentDto } from '@/modules/overseas-warehouse'
+
+export interface PlanningCargo {
+  sourceKey: string
+  orderId: string
+  customerId: string
+  customerName: string | null
+  inboundCode: string | null
+  containerBookingId: string
+  containerNo: string | null
+  originWarehouseId: string
+  originWarehouseCode: string
+  originWarehouseName: string
+  destinationWarehouseCode: string
+  packages: number | null
+  receivedPackages: number | null
+  shippedPackages: number | null
+  sourcePalletCount: number | null
+  volumeCbm: number | null
+  estimatedArrivalAt: string | null
+  estimatedWarehouseAt: string | null
+  orderVersion: number
+  standardNode: string
+  shippingVersion: string | null
+  shippingObservedAt: string | null
+  shippingProvider: string | null
+  hasInboundPlan: boolean
+  hasActiveAppointment: boolean
+  detained: boolean
+  mixedDestinations: boolean
+}
+export interface PlanningCargoPage { records: PlanningCargo[]; page: number; size: number; total: number; pages: number }
+export async function listPlanningCargo(query: { page: number; size: number; keyword?: string }, signal?: AbortSignal) {
+  const response = await http.get<ApiEnvelope<PlanningCargoPage>, ApiEnvelope<PlanningCargoPage>>(
+    '/platform/v1/last-leg/appointment-planning/cargo', { params: query, signal },
+  )
+  const page = unwrapApiResponse(response)
+  return { ...page, page: Number(page.page), size: Number(page.size), total: Number(page.total), pages: Number(page.pages) }
+}
+
+export type FollowupStage = 'DRAYAGE_CONTACT' | 'TERMINAL_APPOINTMENT' | 'WAREHOUSE_RECEIVING' | 'FBA_RECEIVING'
+export interface FollowupRecord { stage: FollowupStage; version: number; contactedParty: string | null; result: string; nextAction: string | null; followupDate: string | null; operatorName: string | null; createdAt: string }
+export interface FollowupHistory { history: { records: FollowupRecord[]; page: number; size: number; total: number; pages: number }; versions: Record<FollowupStage, number> }
+export interface SaveFollowup { stage: FollowupStage; expectedVersion: number; idempotencyKey: string; contactedParty?: string; result: string; nextAction?: string; followupDate: string | null }
+export async function getFollowups(sourceKey: string, customerId: string, page: number, size: number) {
+  const result = unwrapApiResponse(await http.get<ApiEnvelope<FollowupHistory>, ApiEnvelope<FollowupHistory>>(
+    `/platform/v1/last-leg/appointment-planning/sources/${encodeURIComponent(sourceKey)}/follow-ups`, { params: { customerId, page, size } },
+  ))
+  return { ...result, history: { ...result.history, total: Number(result.history.total) }, versions: Object.fromEntries(Object.entries(result.versions).map(([stage, version]) => [stage, Number(version)])) as Record<FollowupStage, number> }
+}
+export async function saveFollowup(sourceKey: string, customerId: string, body: SaveFollowup) {
+  return unwrapApiResponse(await http.post<ApiEnvelope<FollowupRecord>, ApiEnvelope<FollowupRecord>>(
+    `/platform/v1/last-leg/appointment-planning/sources/${encodeURIComponent(sourceKey)}/follow-ups`, body, { params: { customerId } },
+  ))
+}
+
+export interface PlanningSource {
+  sourceKey: string; customerId: string; orderId: string | null; inboundCode: string | null; bookingNo: string | null;
+  containerNo: string | null; originWarehouseId: string; originWarehouseName: string; destinationKey: string;
+  destinationWarehouseCode: string; packages: number | null; sourceVersion: string | null; canFollowup: boolean; blockReasons: string[];
+}
+export interface AppointmentCoverage {
+  status: string; missingFields: string[]; changeReviewRequired: boolean;
+  appointments: Array<{ appointmentNo: string; confirmationNo: string | null; status: string; confirmedAt: string | null; confirmedEndAt: string | null; timezone: string | null }>;
+}
+export interface ResolvedPlanningSource { source: PlanningSource; coverage: AppointmentCoverage }
+export interface ExternalAppointmentCandidate extends ResolvedPlanningSource { customerName: string | null; tripNo: string }
+export async function listExternalAppointmentCandidates(query: { page: number; size: number; keyword?: string }, signal?: AbortSignal) {
+  const result = unwrapApiResponse(await http.get<ApiEnvelope<{ records: ExternalAppointmentCandidate[]; total: number }>, ApiEnvelope<{ records: ExternalAppointmentCandidate[]; total: number }>>(
+    '/platform/v1/last-leg/appointment-planning/external-candidates', { params: query, signal },
+  ))
+  return { ...result, total: Number(result.total) }
+}
+export interface PlanningBatchPreview {
+  group: { originWarehouseId: string; destinationKey: string; packages: number | null; sourceCount: number; customerCount: number; readinessIncomplete: boolean; readyFrom: string | null; readyTo: string | null; unknownQuantitySources: number }
+  originWarehouseName: string
+  destinationWarehouseCode: string
+  destinationTimezone: string | null
+  sources: PlanningSource[]
+  missingFields: string[]
+}
+export async function previewPlanningBatch(sources: Array<{sourceKey: string; customerId: string; destinationKey: string}>) {
+  const result = unwrapApiResponse(await http.post<ApiEnvelope<PlanningBatchPreview>, ApiEnvelope<PlanningBatchPreview>>(
+    '/platform/v1/last-leg/appointment-planning/batches/preview', { sources },
+  ))
+  return { ...result, group: { ...result.group, packages: result.group.packages == null ? null : Number(result.group.packages), sourceCount: Number(result.group.sourceCount), customerCount: Number(result.group.customerCount) } }
+}
+export interface SourceAppointmentPayload { originWarehouseId: string; fbaWarehouseCode: string; sources: Array<{sourceKey: string; customerId: string; destinationKey: string}>; details: FbaAppointmentDetailsPayload; idempotencyKey: string }
+export async function createSourceAppointment(payload: SourceAppointmentPayload) {
+  return unwrapApiResponse(await http.post<ApiEnvelope<FbaAppointmentDto>, ApiEnvelope<FbaAppointmentDto>>('/platform/v1/last-leg/appointment-planning/appointments', payload))
+}
+export async function listUnscheduledAppointments(page: number, size: number) {
+  const result = unwrapApiResponse(await http.get<ApiEnvelope<{records: FbaAppointmentDto[]; total: number}>, ApiEnvelope<{records: FbaAppointmentDto[]; total: number}>>('/platform/v1/last-leg/appointment-planning/appointments/unscheduled', { params: { page, size } }))
+  return { ...result, total: Number(result.total) }
+}
+export async function resolvePlanningSource(query: { sourceKey: string; customerId: string; destinationKey?: string }) {
+  return unwrapApiResponse(await http.get<ApiEnvelope<ResolvedPlanningSource>, ApiEnvelope<ResolvedPlanningSource>>(
+    '/platform/v1/last-leg/appointment-planning/sources/resolve', { params: query },
+  ))
+}
+
+export interface PlanningContainer {
+  impact?: import('./impactApi').Impact | null
+  containerBookingId: string; containerNo: string | null; orderCount: number; customerCount: number;
+  packages: number | null; unknownPackageOrders: number; earliestArrivalAt: string | null; latestArrivalAt: string | null;
+  standardNode: string; sourceVersion: string | null; incompleteScope: boolean;
+  warehouses: Array<{ warehouseId: string; warehouseName: string; orderCount: number; customerCount: number }>;
+}
+export interface ContainerFollowupContext {
+  containerBookingId: string; containerNo: string | null; warehouseId: string | null; warehouseName: string | null;
+  canFollowup: boolean; blockReasons: string[];
+}
+const containerBase = '/platform/v1/last-leg/appointment-planning/containers'
+export async function listPlanningContainers(query: { page: number; size: number; keyword?: string }, signal?: AbortSignal) {
+  const result = unwrapApiResponse(await http.get<ApiEnvelope<{ records: PlanningContainer[]; total: number }>, ApiEnvelope<{ records: PlanningContainer[]; total: number }>>(containerBase, { params: query, signal }))
+  return { ...result, total: Number(result.total), records: result.records.map(row => ({
+    ...row, orderCount: Number(row.orderCount), customerCount: Number(row.customerCount),
+    packages: row.packages == null ? null : Number(row.packages), unknownPackageOrders: Number(row.unknownPackageOrders),
+    warehouses: row.warehouses.map(warehouse => ({ ...warehouse, orderCount: Number(warehouse.orderCount), customerCount: Number(warehouse.customerCount) })),
+  })) }
+}
+
+export async function resolvePlanningContainer(containerId: string, warehouseId?: string) {
+  return unwrapApiResponse(await http.get<ApiEnvelope<ContainerFollowupContext>, ApiEnvelope<ContainerFollowupContext>>(`${containerBase}/${encodeURIComponent(containerId)}`, { params: { warehouseId } }))
+}
+export async function getContainerFollowups(context: ContainerFollowupContext, page: number, size: number) {
+  const result = unwrapApiResponse(await http.get<ApiEnvelope<FollowupHistory>, ApiEnvelope<FollowupHistory>>(`${containerBase}/${encodeURIComponent(context.containerBookingId)}/follow-ups`, { params: { warehouseId: context.warehouseId || undefined, page, size } }))
+  return { ...result, history: { ...result.history, total: Number(result.history.total) }, versions: Object.fromEntries(Object.entries(result.versions).map(([stage, version]) => [stage, Number(version)])) as Record<FollowupStage, number> }
+}
+export async function saveContainerFollowup(context: ContainerFollowupContext, body: SaveFollowup) {
+  return unwrapApiResponse(await http.post<ApiEnvelope<FollowupRecord>, ApiEnvelope<FollowupRecord>>(`${containerBase}/${encodeURIComponent(context.containerBookingId)}/follow-ups`, body, { params: { warehouseId: context.warehouseId || undefined } }))
+}

src/modules/appointment-calendar/routes.ts

@@ -0,0 +1,8 @@
+import type { RouteRecordRaw } from 'vue-router'
+
+export const appointmentCalendarRoutes = [{
+  path: 'appointment-calendar',
+  name: 'appointment-calendar',
+  component: () => import('./AppointmentCalendarView.vue'),
+  meta: { title: '预约列表', showPageHeading: false, permission: 'platform:appointment:list' },
+}] satisfies RouteRecordRaw[]

src/modules/appointment-calendar/tripCalendar.test.ts

@@ -0,0 +1,36 @@
+import { describe, expect, it, vi } from 'vitest'
+import { listTripCalendar, projectTripCalendar, tripQueryWindow, type TripCalendarEntry } from './tripCalendar'
+import { http } from '@/shared/api/http'
+vi.mock('@/shared/api/http', () => ({ http: { get: vi.fn() }, unwrapApiResponse: (value: {data: unknown}) => value.data }))
+const range = { from: '2026-10-01', to: '2026-11-01' }
+function trip(tripNo: string, plannedDepartureAt: string, originTimezone = 'America/Los_Angeles'): TripCalendarEntry {
+  return { sourceType: 'TRIP_PLAN', tripNo, status: 'PLANNED', originWarehouseId: '1', originWarehouseCode: 'US-W', originWarehouseName: 'US warehouse', originCountryCode: 'US', originTimezone, originWarehouseStatus: 'ACTIVE', plannedDepartureAt, expectedDriverEndAt: null, departedAt: null, completedAt: null, stops: [{name:'US warehouse'}, {name:'FBA'}], incompleteReasons: [] }
+}
+describe('location-based trip calendar', () => {
+  it('queries one padded UTC window for 42 location dates without frontend page scanning', async () => {
+    const localRange = {from:'2026-09-28',to:'2026-11-09'}
+    expect(tripQueryWindow(localRange)).toEqual({from:'2026-09-27T10:00:00.000Z',to:'2026-11-09T14:00:00.000Z'})
+    vi.mocked(http.get).mockResolvedValue({data:{records:[],unresolvedRecords:[]}})
+    await listTripCalendar(localRange)
+    expect(http.get).toHaveBeenCalledExactlyOnceWith('/platform/v1/last-leg/fleet/trips/calendar',{params:tripQueryWindow(localRange),signal:undefined})
+    expect(() => tripQueryWindow({from:'2026-10-01',to:'2026-11-20'})).toThrow()
+  })
+  it('includes the first and last local day and removes padded rows outside each origin date range', () => {
+    const records=[trip('LA-before','2026-10-01T06:30:00Z'),trip('NY-start','2026-10-01T06:30:00Z','America/New_York'),trip('LA-end','2026-11-01T06:30:00Z'),trip('NY-after','2026-11-01T06:30:00Z','America/New_York')]
+    const projected=projectTripCalendar({records,unresolvedRecords:[]},range)
+    expect(projected.events.map(event=>[event.key,event.date,event.time])).toEqual([['trip-NY-start','2026-10-01','02:30'],['trip-LA-end','2026-10-31','23:30']])
+  })
+  it('does not guess a slot for absent, fixed-offset, invalid or browser-unsupported time zones', () => {
+    const unknown={...trip('unknown','2026-10-10T12:00:00Z'),originTimezone:null,incompleteReasons:['ORIGIN_TIMEZONE_UNKNOWN']}
+    const result=projectTripCalendar({records:[trip('offset','2026-10-10T12:00:00Z','UTC-5'),trip('bad','2026-10-10T12:00:00Z','Mars/Base'),trip('naive','2026-10-10T12:00:00')],unresolvedRecords:[unknown]},range)
+    expect(result.events).toEqual([]);expect(result.unresolved.map(row=>row.tripNo)).toEqual(['unknown','offset','bad','naive'])
+  })
+  it('retains original instants through DST overlap and does not replace the plan date with actual departure', () => {
+    const row={...trip('TR-DST','2026-11-01T05:30:00Z','America/New_York'),departedAt:'2026-11-02T05:00:00Z',stops:Array.from({length:20},(_,i)=>({name:`Stop ${i}`}))}
+    const events=projectTripCalendar({records:[row,trip('TR-DST-2','2026-11-01T06:30:00Z','America/New_York')],unresolvedRecords:[]},{from:'2026-11-01',to:'2026-11-08'}).events
+    expect(events.map(event=>event.time)).toEqual(['01:30','01:30'])
+    expect(events[0]).toMatchObject({date:'2026-11-01',subtitle:'运输计划，不代表收货方预约已确认'})
+    expect(events[0]!.fields).toContainEqual({label:'计划出发（UTC）',value:'2026-11-01T05:30:00Z'})
+    expect(events[0]!.fields).toContainEqual({label:'路线',value:'Stop 0 → Stop 1 → Stop 2 等20站'})
+  })
+})

src/modules/appointment-calendar/tripCalendar.ts

@@ -0,0 +1,83 @@
+import { http, unwrapApiResponse, type ApiEnvelope } from '@/shared/api/http'
+import type { CalendarEvent } from './AppointmentCalendarPanel.vue'
+
+export interface TripCalendarEntry {
+  sourceType: 'TRIP_PLAN'
+  tripNo: string
+  status: string
+  originWarehouseId: string | null
+  originWarehouseCode: string | null
+  originWarehouseName: string | null
+  originCountryCode: string | null
+  originTimezone: string | null
+  originWarehouseStatus: string | null
+  plannedDepartureAt: string | null
+  expectedDriverEndAt: string | null
+  departedAt: string | null
+  completedAt: string | null
+  stops: Array<{ name: string; address?: string | null; destinationKey?: string | null }>
+  incompleteReasons: string[]
+}
+export interface TripCalendarResult { records: TripCalendarEntry[]; unresolvedRecords: TripCalendarEntry[] }
+export const tripIssueLabels: Record<string, string> = {
+  ORIGIN_WAREHOUSE_UNKNOWN: '起运仓资料缺失', ORIGIN_COUNTRY_UNKNOWN: '起运国家待核实',
+  ORIGIN_TIMEZONE_UNKNOWN: '起运仓时区待核实', ROUTE_INCOMPLETE: '路线资料不完整',
+  LOCAL_DATE_UNRESOLVED: '无法确定当地日期',
+}
+export function tripIssues(row: TripCalendarEntry) {
+  return row.incompleteReasons.map(reason => tripIssueLabels[reason] || '资料待核实').join('；')
+}
+export function tripQueryWindow(range: { from: string; to: string }) {
+  const start = Date.parse(`${range.from}T00:00:00Z`), end = Date.parse(`${range.to}T00:00:00Z`)
+  if (!Number.isFinite(start) || !Number.isFinite(end) || end <= start || end - start > 42 * 86400000) throw new Error('日历日期范围无效')
+  // Query all possible location dates, then place each record using its actual origin zone.
+  return { from: new Date(start - 14 * 3600000).toISOString(), to: new Date(end + 14 * 3600000).toISOString() }
+}
+export async function listTripCalendar(range: { from: string; to: string }, signal?: AbortSignal) {
+  return unwrapApiResponse(await http.get<ApiEnvelope<TripCalendarResult>, ApiEnvelope<TripCalendarResult>>(
+    '/platform/v1/last-leg/fleet/trips/calendar', { params: tripQueryWindow(range), signal },
+  ))
+}
+const formatters = new Map<string, Intl.DateTimeFormat>()
+function localStamp(value: string | null, zone: string | null) {
+  if (!value || !/(Z|[+-]\d{2}:\d{2})$/.test(value) || !zone?.includes('/') || /^(Etc|SystemV)\//.test(zone)) return null
+  const instant = new Date(value)
+  if (!Number.isFinite(instant.getTime())) return null
+  try {
+    let formatter = formatters.get(zone)
+    if (!formatter) {
+      formatter = new Intl.DateTimeFormat('en-CA', { timeZone: zone, year: 'numeric', month: '2-digit', day: '2-digit', hour: '2-digit', minute: '2-digit', hourCycle: 'h23' })
+      formatters.set(zone, formatter)
+    }
+    const parts = Object.fromEntries(formatter.formatToParts(instant).map(part => [part.type, part.value]))
+    return { date: `${parts.year}-${parts.month}-${parts.day}`, time: `${parts.hour}:${parts.minute}` }
+  } catch { return null }
+}
+export function projectTripCalendar(result: TripCalendarResult, range: { from: string; to: string }) {
+  const events: CalendarEvent[] = [], unresolved = [...result.unresolvedRecords]
+  const labels: Record<string, string> = { PLANNED: '计划中', IN_TRANSIT: '运输中', COMPLETED: '货物已结案', CANCELLED: '已取消' }
+  for (const row of result.records) {
+    const planned = localStamp(row.plannedDepartureAt, row.originTimezone)
+    if (row.originCountryCode !== 'US' || !planned) {
+      unresolved.push({ ...row, incompleteReasons: [...row.incompleteReasons, 'LOCAL_DATE_UNRESOLVED'] }); continue
+    }
+    if (planned.date < range.from || planned.date >= range.to) continue
+    const actual = localStamp(row.departedAt, row.originTimezone)
+    const driverEnd = localStamp(row.expectedDriverEndAt, row.originTimezone)
+    events.push({ key: `trip-${row.tripNo}`, type: 'trip', date: planned.date, time: planned.time,
+      title: `${row.tripNo} 用车计划`, subtitle: '运输计划，不代表收货方预约已确认',
+      sourcePath: `/overseas-master-data/trips/${encodeURIComponent(row.tripNo)}`,
+      fields: [
+        { label: '车次状态', value: labels[row.status] || '待核实' },
+        { label: '起运仓', value: row.originWarehouseName || row.originWarehouseCode },
+        { label: '地点时区', value: row.originTimezone },
+        { label: '计划出发（UTC）', value: row.plannedDepartureAt },
+        { label: '路线', value: row.stops.slice(0, 3).map(stop => stop.name).join(' → ') + (row.stops.length > 3 ? ` 等${row.stops.length}站` : '') },
+        { label: '实际出发', value: actual ? `${actual.date} ${actual.time}` : row.departedAt ? '时刻待核实' : '尚未记录' },
+        { label: '预计司机结束', value: driverEnd ? `${driverEnd.date} ${driverEnd.time}` : '待核实' },
+        { label: '资料提示', value: tripIssues(row) },
+      ].filter(field => field.value),
+    })
+  }
+  return { events, unresolved }
+}

src/modules/container-loading/api/containerArrivalTimes.test.ts

@@ -1,20 +1,20 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest'
-import { overseasHttp } from '@/shared/api/overseasHttp'
+import { http } from '@/shared/api/http'
 import { listContainerArrivalTimes, updateContainerExpectedArrival } from './containerArrivalTimes'
 
-vi.mock('@/shared/api/overseasHttp', () => ({ overseasHttp: { post: vi.fn(), put: vi.fn() } }))
+vi.mock('@/shared/api/http', async (importOriginal) => ({ ...(await importOriginal<typeof import('@/shared/api/http')>()), http: { post: vi.fn(), put: vi.fn() } }))
 
 describe('container arrival-time overseas API', () => {
   beforeEach(() => vi.clearAllMocks())
 
   it('queries visible containers and updates the whole-container expected arrival', async () => {
-    vi.mocked(overseasHttp.post).mockResolvedValue({ code: '200', data: [{ sourceContainerBookingId: '9001', estimatedWarehouseArrivalAt: null, actualWarehouseArrivalAt: null, version: 0 }] })
-    vi.mocked(overseasHttp.put).mockResolvedValue({ code: '200', data: { sourceContainerBookingId: '9001', estimatedWarehouseArrivalAt: '2026-09-25T15:31:00', actualWarehouseArrivalAt: null, version: 1 } } as never)
+    vi.mocked(http.post).mockResolvedValue({ code: '200', data: [{ sourceContainerBookingId: '9001', estimatedWarehouseArrivalAt: null, actualWarehouseArrivalAt: null, version: 0 }] })
+    vi.mocked(http.put).mockResolvedValue({ code: '200', data: { sourceContainerBookingId: '9001', estimatedWarehouseArrivalAt: '2026-09-25T15:31:00', actualWarehouseArrivalAt: null, version: 1 } } as never)
 
     await listContainerArrivalTimes(['9001'])
     await updateContainerExpectedArrival('9001', { estimatedWarehouseArrivalAt: '2026-09-25T15:31:00', expectedVersion: 0 })
 
-    expect(overseasHttp.post).toHaveBeenCalledWith('/platform/v1/last-leg/orders/container-arrival-times/query', { sourceContainerBookingIds: ['9001'] })
-    expect(overseasHttp.put).toHaveBeenCalledWith('/platform/v1/last-leg/orders/container-summaries/9001/expected-arrival', { estimatedWarehouseArrivalAt: '2026-09-25T15:31:00', expectedVersion: 0 }, { headers: { 'Idempotency-Key': expect.stringContaining('container-expected-arrival-9001-') } })
+    expect(http.post).toHaveBeenCalledWith('/platform/v1/last-leg/orders/container-arrival-times/query', { sourceContainerBookingIds: ['9001'] })
+    expect(http.put).toHaveBeenCalledWith('/platform/v1/last-leg/orders/container-summaries/9001/expected-arrival', { estimatedWarehouseArrivalAt: '2026-09-25T15:31:00', expectedVersion: 0 }, { headers: { 'Idempotency-Key': expect.stringContaining('container-expected-arrival-9001-') } })
   })
 })

src/modules/container-loading/api/containerArrivalTimes.ts

@@ -1,5 +1,5 @@
-import { overseasHttp } from '@/shared/api/overseasHttp'
-import { unwrapApiResponse, type ApiEnvelope } from '@/shared/api/http'
+import { http, unwrapApiResponse, type ApiEnvelope } from '@/shared/api/http'
+
 
 export interface ContainerArrivalTime {
   sourceContainerBookingId: string
@@ -16,7 +16,7 @@ function operationId(containerBookingId: string) {
 
 export async function listContainerArrivalTimes(sourceContainerBookingIds: string[]) {
   if (!sourceContainerBookingIds.length) return []
-  const response = await overseasHttp.post<ApiEnvelope<ContainerArrivalTime[]>, ApiEnvelope<ContainerArrivalTime[]>>(
+  const response = await http.post<ApiEnvelope<ContainerArrivalTime[]>, ApiEnvelope<ContainerArrivalTime[]>>(
     queryPath,
     { sourceContainerBookingIds },
   )
@@ -27,7 +27,7 @@ export async function updateContainerExpectedArrival(
   sourceContainerBookingId: string,
   body: { estimatedWarehouseArrivalAt: string; expectedVersion: number; remark?: string },
 ) {
-  const response = await overseasHttp.put<ApiEnvelope<ContainerArrivalTime>, ApiEnvelope<ContainerArrivalTime>>(
+  const response = await http.put<ApiEnvelope<ContainerArrivalTime>, ApiEnvelope<ContainerArrivalTime>>(
     `/platform/v1/last-leg/orders/container-summaries/${encodeURIComponent(sourceContainerBookingId)}/expected-arrival`,
     body,
     { headers: { 'Idempotency-Key': operationId(sourceContainerBookingId) } },

src/modules/container-loading/api/overseasContainerFees.test.ts

@@ -1,5 +1,5 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest'
-import { overseasHttp } from '@/shared/api/overseasHttp'
+import { http } from '@/shared/api/http'
 import { adjustOverseasContainerFee, createOverseasContainerFee, listOverseasContainerCustomers, listOverseasContainerFees, reviewOverseasContainerFee, submitOverseasContainerFee, voidOverseasContainerFee, type OverseasContainerFeeSaveRequest } from './overseasContainerFees'
 
 const raw = { id: 91, sourceFeeId: 81, sourceVersion: 2, customerId: 11, customerName: '客户A', sourceType: 'OVERSEAS_CONTAINER_FEE', businessType: 'OVERSEAS_CONTAINER', businessId: 99, businessNo: 'CONT-99', containerBookingId: 99, containerNo: 'CONT-99', feeItemCode: 'PORT_FEE', feeItemName: '港口费', direction: 'PAYABLE', amount: 300, currency: 'CNY', reviewStatus: 'DRAFT', sourceStatus: 'ACTIVE', businessDate: '2026-09-08' }
@@ -7,14 +7,14 @@ const fee: OverseasContainerFeeSaveRequest = { customerId: '11', customerName: '
 describe('overseas container fees API', () => {
   beforeEach(() => vi.restoreAllMocks())
   it('loads all fees and customers with two container aggregate requests', async () => {
-    const get = vi.spyOn(overseasHttp, 'get').mockResolvedValueOnce({ code: '200', data: [raw] }).mockResolvedValueOnce({ code: '200', data: [{ customerId: 11, customerName: '客户A' }] })
+    const get = vi.spyOn(http, 'get').mockResolvedValueOnce({ code: '200', data: [raw] }).mockResolvedValueOnce({ code: '200', data: [{ customerId: 11, customerName: '客户A' }] })
     await expect(listOverseasContainerFees('99')).resolves.toMatchObject([{ sourceFeeId: '81', containerBookingId: '99', feeItemCode: 'PORT_FEE' }])
     await expect(listOverseasContainerCustomers('99')).resolves.toEqual([{ customerId: '11', customerName: '客户A' }])
     expect(get).toHaveBeenNthCalledWith(1, '/platform/v1/last-leg/finance-fee-sources', { params: { containerBookingId: '99', businessType: 'OVERSEAS_CONTAINER' } })
     expect(get).toHaveBeenNthCalledWith(2, '/platform/v1/last-leg/finance-fee-sources/container-customers', { params: { containerBookingId: '99' } })
   })
   it('uses the exact create and lifecycle action contracts', async () => {
-    const post = vi.spyOn(overseasHttp, 'post').mockResolvedValue({ code: '200', data: raw })
+    const post = vi.spyOn(http, 'post').mockResolvedValue({ code: '200', data: raw })
     await createOverseasContainerFee(fee, 'create-1'); await submitOverseasContainerFee('81', 'submit-1'); await reviewOverseasContainerFee('81', 'APPROVE', null, 'review-1'); await adjustOverseasContainerFee('81', 2, fee, 'adjust-1'); await voidOverseasContainerFee('81', 2, '重复费用', 'void-1')
     expect(post).toHaveBeenCalledWith('/platform/v1/last-leg/finance-fee-sources', fee, { headers: { 'Idempotency-Key': 'create-1' } })
     expect(post).toHaveBeenCalledWith('/platform/v1/last-leg/finance-fee-sources/81/submit', { idempotencyKey: 'submit-1' })
@@ -22,4 +22,8 @@ describe('overseas container fees API', () => {
     expect(post).toHaveBeenCalledWith('/platform/v1/last-leg/finance-fee-sources/81/adjust', { expectedVersion: 2, fee, idempotencyKey: 'adjust-1' })
     expect(post).toHaveBeenCalledWith('/platform/v1/last-leg/finance-fee-sources/81/void', { expectedVersion: 2, reason: '重复费用', idempotencyKey: 'void-1' })
   })
+  it('preserves a pending financial cancellation without marking the source voided', async () => {
+    vi.spyOn(http, 'post').mockResolvedValue({ code: '200', data: { ...raw, reviewStatus: 'APPROVED', sourceStatus: 'ACTIVE', voidStatus: 'PENDING_FINANCE' } })
+    await expect(voidOverseasContainerFee('81', 2, '重复费用', 'void-1')).resolves.toMatchObject({ sourceStatus: 'ACTIVE', voidStatus: 'PENDING_FINANCE' })
+  })
 })

src/modules/container-loading/api/overseasContainerFees.ts

@@ -1,5 +1,5 @@
-import { overseasHttp } from '@/shared/api/overseasHttp'
-import { unwrapApiResponse, type ApiEnvelope } from '@/shared/api/http'
+import { http, unwrapApiResponse, type ApiEnvelope } from '@/shared/api/http'
+
 
 const basePath = '/platform/v1/last-leg/finance-fee-sources'
 type RawResource = Record<string, unknown>
@@ -17,6 +17,7 @@ export interface OverseasContainerFeeSource {
   paymentVoucherFileIds: string[]; businessDate: string; currency: 'CNY'; amount: number
   reviewStatus: 'DRAFT' | 'PENDING' | 'APPROVED' | 'REJECTED'; sourceStatus: 'ACTIVE' | 'SUPERSEDED' | 'VOIDED'
   reviewReason: string | null; reviewedAt: string | null
+  voidStatus?: string | null
 }
 export interface OverseasContainerFeeSaveRequest {
   customerId: string; customerName: string | null; sourceType: 'OVERSEAS_CONTAINER_FEE'; businessType: 'OVERSEAS_CONTAINER'
@@ -39,28 +40,29 @@ function normalizeFee(raw: RawResource): OverseasContainerFeeSource {
     supplierId: text(raw.supplierId), supplierName: text(raw.supplierName), supplierCategory: text(raw.supplierCategory), settlementMode: text(raw.settlementMode), paidAt: text(raw.paidAt), paymentMethod: text(raw.paymentMethod), paymentReferenceNo: text(raw.paymentReferenceNo),
     paymentVoucherFileIds: Array.isArray(raw.paymentVoucherFileIds) ? raw.paymentVoucherFileIds.map(String) : [], businessDate: requiredText(raw.businessDate), currency: 'CNY', amount: numberValue(raw.amount),
     reviewStatus: raw.reviewStatus as OverseasContainerFeeSource['reviewStatus'], sourceStatus: raw.sourceStatus as OverseasContainerFeeSource['sourceStatus'], reviewReason: text(raw.reviewReason), reviewedAt: text(raw.reviewedAt),
+    voidStatus: text(raw.voidStatus),
   }
 }
 export async function listOverseasContainerFees(containerBookingId: string) {
-  const response = await overseasHttp.get<ApiEnvelope<RawResource[]>, ApiEnvelope<RawResource[]>>(basePath, { params: { containerBookingId, businessType: 'OVERSEAS_CONTAINER' } })
+  const response = await http.get<ApiEnvelope<RawResource[]>, ApiEnvelope<RawResource[]>>(basePath, { params: { containerBookingId, businessType: 'OVERSEAS_CONTAINER' } })
   return unwrapApiResponse(response).map(normalizeFee)
 }
 export async function listOverseasContainerCustomers(containerBookingId: string) {
-  const response = await overseasHttp.get<ApiEnvelope<Array<{ customerId: unknown; customerName?: unknown }>>, ApiEnvelope<Array<{ customerId: unknown; customerName?: unknown }>>>(`${basePath}/container-customers`, { params: { containerBookingId } })
+  const response = await http.get<ApiEnvelope<Array<{ customerId: unknown; customerName?: unknown }>>, ApiEnvelope<Array<{ customerId: unknown; customerName?: unknown }>>>(`${basePath}/container-customers`, { params: { containerBookingId } })
   return unwrapApiResponse(response).map((item) => ({ customerId: requiredText(item.customerId), customerName: text(item.customerName) }))
 }
 export async function createOverseasContainerFee(payload: OverseasContainerFeeSaveRequest, idempotencyKey: string) {
-  return normalizeFee(unwrapApiResponse(await overseasHttp.post<ApiEnvelope<RawResource>, ApiEnvelope<RawResource>>(basePath, payload, { headers: { 'Idempotency-Key': idempotencyKey } })))
+  return normalizeFee(unwrapApiResponse(await http.post<ApiEnvelope<RawResource>, ApiEnvelope<RawResource>>(basePath, payload, { headers: { 'Idempotency-Key': idempotencyKey } })))
 }
 export async function submitOverseasContainerFee(sourceFeeId: string, idempotencyKey: string) {
-  return normalizeFee(unwrapApiResponse(await overseasHttp.post<ApiEnvelope<RawResource>, ApiEnvelope<RawResource>>(`${basePath}/${encodeURIComponent(sourceFeeId)}/submit`, { idempotencyKey })))
+  return normalizeFee(unwrapApiResponse(await http.post<ApiEnvelope<RawResource>, ApiEnvelope<RawResource>>(`${basePath}/${encodeURIComponent(sourceFeeId)}/submit`, { idempotencyKey })))
 }
 export async function reviewOverseasContainerFee(sourceFeeId: string, decision: 'APPROVE' | 'REJECT', reason: string | null, idempotencyKey: string) {
-  return normalizeFee(unwrapApiResponse(await overseasHttp.post<ApiEnvelope<RawResource>, ApiEnvelope<RawResource>>(`${basePath}/${encodeURIComponent(sourceFeeId)}/review`, { decision, reason, idempotencyKey })))
+  return normalizeFee(unwrapApiResponse(await http.post<ApiEnvelope<RawResource>, ApiEnvelope<RawResource>>(`${basePath}/${encodeURIComponent(sourceFeeId)}/review`, { decision, reason, idempotencyKey })))
 }
 export async function adjustOverseasContainerFee(sourceFeeId: string, expectedVersion: number, fee: OverseasContainerFeeSaveRequest, idempotencyKey: string) {
-  return normalizeFee(unwrapApiResponse(await overseasHttp.post<ApiEnvelope<RawResource>, ApiEnvelope<RawResource>>(`${basePath}/${encodeURIComponent(sourceFeeId)}/adjust`, { expectedVersion, fee, idempotencyKey })))
+  return normalizeFee(unwrapApiResponse(await http.post<ApiEnvelope<RawResource>, ApiEnvelope<RawResource>>(`${basePath}/${encodeURIComponent(sourceFeeId)}/adjust`, { expectedVersion, fee, idempotencyKey })))
 }
 export async function voidOverseasContainerFee(sourceFeeId: string, expectedVersion: number, reason: string, idempotencyKey: string) {
-  return normalizeFee(unwrapApiResponse(await overseasHttp.post<ApiEnvelope<RawResource>, ApiEnvelope<RawResource>>(`${basePath}/${encodeURIComponent(sourceFeeId)}/void`, { expectedVersion, reason, idempotencyKey })))
+  return normalizeFee(unwrapApiResponse(await http.post<ApiEnvelope<RawResource>, ApiEnvelope<RawResource>>(`${basePath}/${encodeURIComponent(sourceFeeId)}/void`, { expectedVersion, reason, idempotencyKey })))
 }

src/modules/container-loading/api/platformContainerCustoms.test.ts

@@ -1,18 +1,34 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { http } from '@/shared/api/http'
-import { completeAllBuyContainerCustoms, downloadContainerCustomsCompletion, downloadContainerCustomsDocument, getContainerCustoms, startContainerCustoms, uploadContainerCustomsCompletion } from './platformContainerCustoms'
+import { recordClearanceResult, type DeclarationBatch } from './platformContainerCustoms'
+import { completeAllBuyContainerCustoms, downloadContainerCustomsReceipt, downloadContainerCustomsDocument, getContainerCustoms, sendContainerCustomsToBroker, startContainerCustoms, uploadContainerCustomsReceipt } from './platformContainerCustoms'
 
 const customs = {
   aggregateId: 2092438843630391401n, loadingPlanId: 2092438843630391402n, containerBookingId: 2092438843630391403n,
-  planNo: 'LP-1', cabinetNo: 'CB-1', containerNo: 'MSCU-1', status: 'READY_TO_START', hasActualCargo: true, version: '3', taxRefundCount: 1, coveredTaxRefundCount: 1,
+  planNo: 'LP-1', cabinetNo: 'CB-1', containerNo: 'MSCU-1', status: 'READY_TO_START', hasActualCargo: true, version: '3', taxRefundCount: 1, coveredTaxRefundCount: 1, actualBoxCount: 12,
   inbounds: [{ inboundId: 2092438843630391404n, orderId: 2092438843630391405n, orderNo: 'O-1', inboundCode: 'RK-1', tenantId: 2092438843630391406n, customerName: '客户一', taxMode: 'TAX_REFUND', covered: true }],
-  documents: [{ documentId: 2092438843630391407n, tenantId: 2092438843630391406n, source: { fileId: '2092438843630391408', fileName: 'source.pdf', fileHash: 'hash', sizeBytes: 1, version: 2, uploadedAt: '2026-08-28T10:00:00' }, inboundIds: ['2092438843630391404'], inboundCodes: ['RK-1'], frozen: true, completion: null }],
+  documents: [{ documentId: 2092438843630391407n, tenantId: 2092438843630391406n, source: { fileId: '2092438843630391408', fileName: 'source.pdf', fileHash: 'hash', sizeBytes: 1, version: 2, uploadedAt: '2026-08-28T10:00:00' }, inboundIds: ['2092438843630391404'], inboundCodes: ['RK-1'], frozen: true, receipt: null, finalDocument: null, confirmationHistory: [] }],
+  brokerSubmission: null,
   startedAt: null, completedAt: null,
 }
 
 describe('platform container customs API', () => {
   beforeEach(() => vi.restoreAllMocks())
 
+  it('records domestic customs time in Shanghai even when UTC falls on the previous day', async () => {
+    vi.useFakeTimers()
+    try {
+      vi.setSystemTime(new Date('2026-09-29T16:30:00Z'))
+      const post = vi.spyOn(http, 'post').mockResolvedValue({ code: '200', data: { id: '1' } })
+      await recordClearanceResult({ id: '123', version: 1 } as DeclarationBatch, 'OTHER', 'test')
+      expect(post).toHaveBeenCalledWith('/platform/v1/customs/loading-plans/declaration-batches/123/results',
+        expect.objectContaining({ occurredAt: '2026-09-30T00:30:00', resultType: 'OTHER', resolution: 'test' }),
+        expect.objectContaining({ headers: { 'Idempotency-Key': expect.any(String) } }))
+    } finally {
+      vi.useRealTimers()
+    }
+  })
+
   it('uses the frozen customs-v1 paths and preserves long ids as strings', async () => {
     const get = vi.spyOn(http, 'get').mockResolvedValue({ code: '200', message: 'ok', data: customs })
     const result = await getContainerCustoms('2092438843630391402')
@@ -39,14 +55,21 @@ describe('platform container customs API', () => {
     expect(post.mock.calls[0]?.[2]).toMatchObject({ headers: { 'Idempotency-Key': expect.any(String) } })
   })
 
-  it('uploads one completion file with final-confirmation query parameters', async () => {
+  it('sends the frozen source documents to the broker through the first-send action', async () => {
+    const post = vi.spyOn(http, 'post').mockResolvedValue({ code: '200', message: 'ok', data: customs })
+    await sendContainerCustomsToBroker('2092438843630391402', 3)
+    expect(post.mock.calls[0]?.slice(0, 2)).toEqual(['/platform/v1/customs/loading-plans/2092438843630391402/send-to-broker', { expectedVersion: 3, confirm: true, remark: '已将冻结退税报关资料首次发送给报关行' }])
+    expect(post.mock.calls[0]?.[2]).toMatchObject({ headers: { 'Idempotency-Key': expect.any(String) } })
+  })
+
+  it('uploads one receipt file without completing the container', async () => {
     const document = { ...customs.documents[0], documentId: '2092438843630391407', tenantId: '2092438843630391406' }
     const post = vi.spyOn(http, 'post').mockResolvedValue({ code: '200', message: 'ok', data: document })
     const completion = new File(['done'], 'done.pdf')
-    await uploadContainerCustomsCompletion('2092438843630391407', completion, 0, true)
-    expect(post.mock.calls[0]?.[0]).toBe('/platform/v1/customs/loading-plans/documents/2092438843630391407/completion/upload')
+    await uploadContainerCustomsReceipt('2092438843630391407', completion, 0)
+    expect(post.mock.calls[0]?.[0]).toBe('/platform/v1/customs/loading-plans/documents/2092438843630391407/receipt/upload')
     expect((post.mock.calls[0]?.[1] as FormData).get('file')).toBe(completion)
-    expect(post.mock.calls[0]?.[2]).toMatchObject({ params: { expectedVersion: 0, finalConfirmation: true }, headers: { 'Content-Type': 'multipart/form-data', 'Idempotency-Key': expect.any(String) } })
+    expect(post.mock.calls[0]?.[2]).toMatchObject({ params: { expectedVersion: 0 }, headers: { 'Content-Type': 'multipart/form-data', 'Idempotency-Key': expect.any(String) } })
   })
 
   it('keeps source and completion downloads isolated on the long document id', async () => {
@@ -56,11 +79,11 @@ describe('platform container customs API', () => {
     const documentId = '2092438843630391407'
 
     await expect(downloadContainerCustomsDocument(documentId)).resolves.toBe(source)
-    await expect(downloadContainerCustomsCompletion(documentId)).resolves.toBe(completion)
+    await expect(downloadContainerCustomsReceipt(documentId)).resolves.toBe(completion)
 
     expect(get.mock.calls).toEqual([
       [`/platform/v1/customs/loading-plans/documents/${documentId}/download`, { responseType: 'blob' }],
-      [`/platform/v1/customs/loading-plans/documents/${documentId}/completion/download`, { responseType: 'blob' }],
+      [`/platform/v1/customs/loading-plans/documents/${documentId}/receipt/download`, { responseType: 'blob' }],
     ])
   })
 })

src/modules/container-loading/api/platformContainerCustoms.ts

@@ -12,6 +12,36 @@ export interface ContainerCustomsFile {
   uploadedAt: string
 }
 
+export interface ContainerCustomsReceiptVersion {
+  version: number
+  file: ContainerCustomsFile
+  operatorName?: string | null
+  createdAt: string
+}
+
+export type ContainerCustomsConfirmationAction = 'CONFIRM' | 'REJECT'
+
+export interface ContainerCustomsConfirmationHistory {
+  id: string
+  receiptVersion: number
+  action: ContainerCustomsConfirmationAction
+  reason: string | null
+  operatorName: string
+  createdAt: string
+}
+
+export interface ContainerCustomsBrokerSubmission {
+  id: string
+  customsContainerId: string
+  loadingPlanId: string
+  batchNo: string
+  status: 'SENT'
+  sourceVersion: number
+  sentByName: string
+  sentAt: string
+  version: number
+}
+
 export interface ContainerCustomsInbound {
   inboundId: string
   orderId: string
@@ -30,7 +60,12 @@ export interface ContainerCustomsDocument {
   inboundIds: string[]
   inboundCodes: string[]
   frozen: boolean
-  completion: ContainerCustomsFile | null
+  receipt: ContainerCustomsFile | null
+  receiptStatus?: 'PENDING' | 'CONFIRMED' | 'REJECTED' | null
+  receiptRejectReason?: string | null
+  finalDocument: ContainerCustomsFile | null
+  receiptHistory?: ContainerCustomsReceiptVersion[]
+  confirmationHistory: ContainerCustomsConfirmationHistory[]
 }
 
 export interface ContainerCustomsView {
@@ -45,10 +80,49 @@ export interface ContainerCustomsView {
   version: number
   taxRefundCount: number
   coveredTaxRefundCount: number
+  actualBoxCount: number
   inbounds: ContainerCustomsInbound[]
   documents: ContainerCustomsDocument[]
+  brokerSubmission: ContainerCustomsBrokerSubmission | null
   startedAt: string | null
   completedAt: string | null
+  brokerSubmittedAt?: string | null
+}
+
+export type DeclarationBatchStatus = 'READY' | 'SUBMITTED' | 'ACKNOWLEDGED' | 'RESULT_PENDING' | 'CLOSED' | 'CANCELLED'
+export type ClearanceResultType = 'INSPECTION' | 'SUPPLEMENT_REQUIRED' | 'RELEASED' | 'DETAINED' | 'OTHER'
+export type ClearanceResultStatus = 'OPEN' | 'RESOLVED' | 'CANCELLED'
+
+export interface ClearanceResult {
+  id: string
+  declarationBatchId: string
+  customsContainerId: string
+  resultType: ClearanceResultType
+  resultStatus: ClearanceResultStatus
+  customsEntryNo: string | null
+  occurredAt: string
+  resolution: string | null
+  evidenceFileId: string | null
+  recordedByName: string
+  recordedAt: string
+  previousResultId: string | null
+}
+
+export interface DeclarationBatch {
+  id: string
+  customsContainerId: string
+  loadingPlanId: string
+  batchNo: string
+  status: DeclarationBatchStatus
+  sourceVersion: number
+  customsEntryNo: string | null
+  version: number
+  submittedAt: string | null
+  submittedByName: string | null
+  acknowledgedAt: string | null
+  acknowledgedByName: string | null
+  remark: string | null
+  results: ClearanceResult[]
 }
 
 interface RawContainerCustomsView extends Omit<ContainerCustomsView, 'aggregateId' | 'loadingPlanId' | 'containerBookingId' | 'version' | 'inbounds' | 'documents'> {
@@ -57,7 +131,7 @@ interface RawContainerCustomsView extends Omit<ContainerCustomsView, 'aggregateI
   containerBookingId: string | number
   version: string | number
   inbounds: Array<Omit<ContainerCustomsInbound, 'inboundId' | 'orderId' | 'tenantId'> & { inboundId: string | number; orderId: string | number; tenantId: string | number }>
-  documents: Array<Omit<ContainerCustomsDocument, 'documentId' | 'tenantId' | 'source' | 'completion'> & { documentId: string | number; tenantId: string | number; source: ContainerCustomsFile; completion: ContainerCustomsFile | null }>
+  documents: Array<Omit<ContainerCustomsDocument, 'documentId' | 'tenantId' | 'source' | 'receipt' | 'finalDocument'> & { documentId: string | number; tenantId: string | number; source: ContainerCustomsFile; receipt: ContainerCustomsFile | null; finalDocument: ContainerCustomsFile | null }>
 }
 
 const basePath = '/platform/v1/customs/loading-plans'
@@ -70,10 +144,66 @@ function normalize(value: RawContainerCustomsView): ContainerCustomsView {
     ...value,
     aggregateId: String(value.aggregateId), loadingPlanId: String(value.loadingPlanId), containerBookingId: String(value.containerBookingId), version: Number(value.version),
     inbounds: value.inbounds.map((item) => ({ ...item, inboundId: String(item.inboundId), orderId: String(item.orderId), tenantId: String(item.tenantId) })),
-    documents: value.documents.map((item) => ({ ...item, documentId: String(item.documentId), tenantId: String(item.tenantId), source: file(item.source)!, completion: file(item.completion) })),
+    brokerSubmission: value.brokerSubmission ? {
+      ...value.brokerSubmission,
+      id: String(value.brokerSubmission.id),
+      customsContainerId: String(value.brokerSubmission.customsContainerId),
+      loadingPlanId: String(value.brokerSubmission.loadingPlanId),
+      sourceVersion: Number(value.brokerSubmission.sourceVersion),
+      version: Number(value.brokerSubmission.version),
+    } : null,
+    documents: value.documents.map((item) => ({
+      ...item,
+      documentId: String(item.documentId),
+      tenantId: String(item.tenantId),
+      source: file(item.source)!,
+      receipt: file(item.receipt),
+      finalDocument: file(item.finalDocument),
+      receiptHistory: (item.receiptHistory || []).map((version) => ({ ...version, version: Number(version.version), file: file(version.file)! })),
+      confirmationHistory: (item.confirmationHistory || []).map((history) => ({ ...history, id: String(history.id), receiptVersion: Number(history.receiptVersion), reason: history.reason ?? null })),
+    })),
   }
 }
 
+function normalizeClearanceResult(value: ClearanceResult): ClearanceResult {
+  return { ...value, id: String(value.id), declarationBatchId: String(value.declarationBatchId), customsContainerId: String(value.customsContainerId), evidenceFileId: value.evidenceFileId == null ? null : String(value.evidenceFileId), previousResultId: value.previousResultId == null ? null : String(value.previousResultId) }
+}
+
+function normalizeDeclarationBatch(value: DeclarationBatch): DeclarationBatch {
+  return { ...value, id: String(value.id), customsContainerId: String(value.customsContainerId), loadingPlanId: String(value.loadingPlanId), sourceVersion: Number(value.sourceVersion), version: Number(value.version), results: (value.results || []).map(normalizeClearanceResult) }
+}
+
+export async function getDeclarationBatches(loadingPlanId: string) {
+  const response = await http.get<ApiEnvelope<DeclarationBatch[]>, ApiEnvelope<DeclarationBatch[]>>(`${basePath}/${encodeURIComponent(loadingPlanId)}/declaration-batches`)
+  return (unwrapApiResponse(response) || []).map(normalizeDeclarationBatch)
+}
+
+export async function createDeclarationBatch(loadingPlanId: string, expectedVersion: number, batchNo?: string) {
+  const response = await http.post<ApiEnvelope<DeclarationBatch>, ApiEnvelope<DeclarationBatch>>(`${basePath}/${encodeURIComponent(loadingPlanId)}/declaration-batches`, { expectedVersion, batchNo: batchNo?.trim() || null, remark: null }, { headers: { 'Idempotency-Key': operationId('customs-declaration-batch-create') } })
+  return normalizeDeclarationBatch(unwrapApiResponse(response))
+}
+
+export async function submitDeclarationBatch(batch: DeclarationBatch, customsEntryNo: string) {
+  const response = await http.post<ApiEnvelope<DeclarationBatch>, ApiEnvelope<DeclarationBatch>>(`${basePath}/declaration-batches/${encodeURIComponent(batch.id)}/submit`, { expectedVersion: batch.version, batchNo: batch.batchNo, customsEntryNo: customsEntryNo.trim(), remark: null }, { headers: { 'Idempotency-Key': operationId('customs-declaration-batch-submit') } })
+  return normalizeDeclarationBatch(unwrapApiResponse(response))
+}
+
+export async function recordClearanceResult(batch: DeclarationBatch, resultType: ClearanceResultType, resolution?: string) {
+  // The domestic API stores LocalDateTime; send Shanghai wall time, not UTC with a discarded offset.
+  const parts = Object.fromEntries(new Intl.DateTimeFormat('en-CA', {
+    timeZone: 'Asia/Shanghai', year: 'numeric', month: '2-digit', day: '2-digit',
+    hour: '2-digit', minute: '2-digit', second: '2-digit', hourCycle: 'h23',
+  }).formatToParts(new Date()).map(({ type, value }) => [type, value]))
+  const occurredAt = `${parts.year}-${parts.month}-${parts.day}T${parts.hour}:${parts.minute}:${parts.second}`
+  const response = await http.post<ApiEnvelope<ClearanceResult>, ApiEnvelope<ClearanceResult>>(`${basePath}/declaration-batches/${encodeURIComponent(batch.id)}/results`, { expectedVersion: batch.version, resultType, occurredAt, resolution: resolution?.trim() || null, evidenceFileId: null, resolved: false }, { headers: { 'Idempotency-Key': operationId('customs-clearance-result-record') } })
+  return normalizeClearanceResult(unwrapApiResponse(response))
+}
+
+export async function resolveClearanceResult(result: ClearanceResult, batchVersion: number, resolution: string) {
+  const response = await http.post<ApiEnvelope<ClearanceResult>, ApiEnvelope<ClearanceResult>>(`${basePath}/clearance-results/${encodeURIComponent(result.id)}/resolve`, { expectedVersion: batchVersion, resolution: resolution.trim() }, { headers: { 'Idempotency-Key': operationId('customs-clearance-result-resolve') } })
+  return normalizeClearanceResult(unwrapApiResponse(response))
+}
+
 export async function getContainerCustoms(loadingPlanId: string) {
   const response = await http.get<ApiEnvelope<RawContainerCustomsView | null>, ApiEnvelope<RawContainerCustomsView | null>>(`${basePath}/${encodeURIComponent(loadingPlanId)}`)
   const value = unwrapApiResponse(response)
@@ -84,11 +214,15 @@ export function downloadContainerCustomsDocument(documentId: string) {
   return http.get<Blob, Blob>(`${basePath}/documents/${encodeURIComponent(documentId)}/download`, { responseType: 'blob' })
 }
 
-export function downloadContainerCustomsCompletion(documentId: string) {
-  return http.get<Blob, Blob>(`${basePath}/documents/${encodeURIComponent(documentId)}/completion/download`, { responseType: 'blob' })
+export function downloadContainerCustomsReceipt(documentId: string) {
+  return http.get<Blob, Blob>(`${basePath}/documents/${encodeURIComponent(documentId)}/receipt/download`, { responseType: 'blob' })
 }
 
-async function action(loadingPlanId: string, name: 'start' | 'complete-all-buy', expectedVersion: number, remark?: string) {
+export function downloadContainerCustomsFinal(documentId: string) {
+  return http.get<Blob, Blob>(`${basePath}/documents/${encodeURIComponent(documentId)}/final/download`, { responseType: 'blob' })
+}
+
+async function action(loadingPlanId: string, name: 'start' | 'send-to-broker' | 'submit-to-broker' | 'complete-all-buy', expectedVersion: number, remark?: string) {
   const response = await http.post<ApiEnvelope<RawContainerCustomsView>, ApiEnvelope<RawContainerCustomsView>>(
     `${basePath}/${encodeURIComponent(loadingPlanId)}/${name}`,
     { expectedVersion, confirm: true, remark: remark?.trim() || null },
@@ -101,18 +235,34 @@ export function startContainerCustoms(loadingPlanId: string, expectedVersion: nu
   return action(loadingPlanId, 'start', expectedVersion)
 }
 
+export function sendContainerCustomsToBroker(loadingPlanId: string, expectedVersion: number) {
+  return action(loadingPlanId, 'send-to-broker', expectedVersion, '已将冻结退税报关资料首次发送给报关行')
+}
+
 export function completeAllBuyContainerCustoms(loadingPlanId: string, expectedVersion: number) {
   return action(loadingPlanId, 'complete-all-buy', expectedVersion)
 }
 
-export async function uploadContainerCustomsCompletion(documentId: string, fileValue: File, expectedVersion: number, finalConfirmation: boolean) {
+export function submitContainerCustomsToBroker(loadingPlanId: string, expectedVersion: number) {
+  return action(loadingPlanId, 'submit-to-broker', expectedVersion, '已将客户确认回执发送给报关行')
+}
+
+async function uploadFile(documentId: string, fileValue: File, expectedVersion: number, kind: 'receipt' | 'final') {
   const body = new FormData()
   body.append('file', fileValue)
   const response = await http.post<ApiEnvelope<ContainerCustomsDocument>, ApiEnvelope<ContainerCustomsDocument>>(
-    `${basePath}/documents/${encodeURIComponent(documentId)}/completion/upload`,
+    `${basePath}/documents/${encodeURIComponent(documentId)}/${kind}/upload`,
     body,
-    { params: { expectedVersion, finalConfirmation }, headers: { 'Content-Type': 'multipart/form-data', 'Idempotency-Key': operationId('container-customs-completion') } },
+    { params: { expectedVersion }, headers: { 'Content-Type': 'multipart/form-data', 'Idempotency-Key': operationId(`container-customs-${kind}`) } },
   )
   const result = unwrapApiResponse(response)
-  return { ...result, documentId: String(result.documentId), tenantId: String(result.tenantId), source: file(result.source)!, completion: file(result.completion) }
+  return { ...result, documentId: String(result.documentId), tenantId: String(result.tenantId), source: file(result.source)!, receipt: file(result.receipt), finalDocument: file(result.finalDocument) }
+}
+
+export function uploadContainerCustomsReceipt(documentId: string, fileValue: File, expectedVersion: number) {
+  return uploadFile(documentId, fileValue, expectedVersion, 'receipt')
+}
+
+export function uploadContainerCustomsFinal(documentId: string, fileValue: File, expectedVersion: number) {
+  return uploadFile(documentId, fileValue, expectedVersion, 'final')
 }

src/modules/container-loading/api/platformContainerLoading.test.ts

@@ -182,7 +182,7 @@ describe('platform container loading API', () => {
 
   it('queries workbench containers with the same global filters and excludes the retired booking parameter', async () => {
     vi.mocked(http.get).mockResolvedValueOnce({ code: '200', data: {
-      records: [{ bookingId: 9007199254740993n, bookingNo: 'BK-1', cabinetNo: 'CAB-1', containerNo: null, warehouseId: 8, warehouseName: '义乌仓', channelCode: 'MATSON_CLX_TRUCK', channelName: '美森正班海卡', containerType: '40HQ', planId: 9007199254740994n, planNo: 'LP-1', planStatus: 'EDITING', version: '2' }],
+      records: [{ bookingId: 9007199254740993n, cabinetNo: 'CAB-1', containerNo: null, warehouseId: 8, warehouseName: '义乌仓', channelCode: 'MATSON_CLX_TRUCK', channelName: '美森正班海卡', containerType: '40HQ', planId: 9007199254740994n, planNo: 'LP-1', planStatus: 'EDITING', version: '2' }],
       page: '1', size: '200', total: '1', pages: '1',
     } })
 

src/modules/container-loading/components/ContainerCustomsPanel.test.ts

@@ -2,24 +2,31 @@ import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { flushPromises, mount } from '@vue/test-utils'
 import ElementPlus from 'element-plus'
 import { ApiResponseError } from '@/shared/api/http'
-import type { ContainerCustomsStatus, ContainerCustomsView } from '../api/platformContainerCustoms'
+import type { ContainerCustomsStatus, ContainerCustomsView, DeclarationBatch, ClearanceResultType } from '../api/platformContainerCustoms'
 
 const api = vi.hoisted(() => ({
   get: vi.fn(),
   start: vi.fn(),
   completeAllBuy: vi.fn(),
+  sendToBroker: vi.fn(),
+  getDeclarationBatches: vi.fn(),
   upload: vi.fn(),
   downloadSource: vi.fn(),
-  downloadCompletion: vi.fn(),
+  downloadReceipt: vi.fn(),
+  downloadFinal: vi.fn(),
 }))
 
 vi.mock('../api/platformContainerCustoms', () => ({
   getContainerCustoms: api.get,
   startContainerCustoms: api.start,
   completeAllBuyContainerCustoms: api.completeAllBuy,
-  uploadContainerCustomsCompletion: api.upload,
+  uploadContainerCustomsReceipt: api.upload,
   downloadContainerCustomsDocument: api.downloadSource,
-  downloadContainerCustomsCompletion: api.downloadCompletion,
+  downloadContainerCustomsReceipt: api.downloadReceipt,
+  downloadContainerCustomsFinal: api.downloadFinal,
+  submitContainerCustomsToBroker: vi.fn(),
+  sendContainerCustomsToBroker: api.sendToBroker,
+  getDeclarationBatches: api.getDeclarationBatches,
 }))
 vi.mock('@/modules/downloads', () => ({ createPlatformExportTask: vi.fn() }))
 
@@ -28,14 +35,17 @@ import ContainerCustomsPanel from './ContainerCustomsPanel.vue'
 function customs(status: ContainerCustomsStatus, hasCompletion = false): ContainerCustomsView {
   return {
     aggregateId: '2092438843630391401', loadingPlanId: '2092438843630391402', containerBookingId: '2092438843630391403',
-    planNo: 'LP-1', cabinetNo: 'MCR08290001', containerNo: 'MSCU-1', status, hasActualCargo: true, version: 3, taxRefundCount: 1, coveredTaxRefundCount: 1,
+    planNo: 'LP-1', cabinetNo: 'MCR08290001', containerNo: 'MSCU-1', status, hasActualCargo: true, version: 3, taxRefundCount: 1, coveredTaxRefundCount: 1, actualBoxCount: 12,
     inbounds: [{ inboundId: '2092438843630391404', orderId: '2092438843630391405', orderNo: 'O-1', inboundCode: 'RK-1', tenantId: '2092438843630391406', customerName: '客户一', taxMode: 'TAX_REFUND', covered: true }],
     documents: [{
       documentId: '2092438843630391407', tenantId: '2092438843630391406',
       source: { fileId: '2092438843630391408', fileName: '客户退税资料.pdf', fileHash: 'source-hash', sizeBytes: 12, version: 2, uploadedAt: '2026-08-29T10:00:00' },
       inboundIds: ['2092438843630391404'], inboundCodes: ['RK-1'], frozen: true,
-      completion: hasCompletion ? { fileId: '2092438843630391409', fileName: '报关完成文件.pdf', fileHash: 'completion-hash', sizeBytes: 13, version: 1, uploadedAt: '2026-08-29T11:00:00' } : null,
+      receipt: hasCompletion ? { fileId: '2092438843630391409', fileName: '报关行回执.pdf', fileHash: 'receipt-hash', sizeBytes: 13, version: 1, uploadedAt: '2026-08-29T11:00:00' } : null,
+      finalDocument: hasCompletion ? { fileId: '2092438843630391410', fileName: '真实报关完税文件.pdf', fileHash: 'final-hash', sizeBytes: 14, version: 1, uploadedAt: '2026-08-29T12:00:00' } : null,
+      confirmationHistory: hasCompletion ? [{ id: '2092438843630391411', receiptVersion: 1, action: 'CONFIRM', reason: null, operatorName: '客户一', createdAt: '2026-08-29T11:15:00' }] : [],
     }],
+    brokerSubmission: hasCompletion ? { id: '2092438843630391412', customsContainerId: '2092438843630391401', loadingPlanId: '2092438843630391402', batchNo: 'BS-20260829-001', status: 'SENT', sourceVersion: 3, sentByName: '平台员', sentAt: '2026-08-29T10:45:00', version: 1 } : null,
     startedAt: status === 'DECLARING' || status === 'COMPLETED' ? '2026-08-29T10:30:00' : null,
     completedAt: status === 'COMPLETED' ? '2026-08-29T11:30:00' : null,
   }
@@ -58,28 +68,68 @@ function buttonTexts(wrapper: Awaited<ReturnType<typeof render>>) {
 describe('ContainerCustomsPanel', () => {
   beforeEach(() => {
     vi.clearAllMocks()
+    api.getDeclarationBatches.mockResolvedValue([])
     api.downloadSource.mockResolvedValue(new Blob(['source']))
-    api.downloadCompletion.mockResolvedValue(new Blob(['completion']))
+    api.downloadReceipt.mockResolvedValue(new Blob(['receipt']))
+    api.downloadFinal.mockResolvedValue(new Blob(['final']))
     Object.defineProperty(URL, 'createObjectURL', { configurable: true, value: vi.fn(() => 'blob:customs-file') })
     Object.defineProperty(URL, 'revokeObjectURL', { configurable: true, value: vi.fn() })
     vi.spyOn(HTMLAnchorElement.prototype, 'click').mockImplementation(() => undefined)
   })
 
+  it('renders all customs result reasons in Chinese with the recorded remarks', async () => {
+    const reasons: Array<[ClearanceResultType, string]> = [
+      ['INSPECTION', '查验'], ['SUPPLEMENT_REQUIRED', '补资料'],
+      ['DETAINED', '扣货'], ['RELEASED', '放行'], ['OTHER', '其他'],
+    ]
+    const batch: DeclarationBatch = {
+      id: '101', customsContainerId: '102', loadingPlanId: '2092438843630391402',
+      batchNo: 'DEC-TEST-001', status: 'RESULT_PENDING', sourceVersion: 1,
+      customsEntryNo: 'ENTRY-TEST-001', version: 1, submittedAt: null,
+      submittedByName: null, acknowledgedAt: null, acknowledgedByName: null, remark: null,
+      results: reasons.map(([resultType], index) => ({
+        id: String(200 + index), declarationBatchId: '101', customsContainerId: '102',
+        resultType, resultStatus: 'OPEN', customsEntryNo: 'ENTRY-TEST-001',
+        occurredAt: '2026-09-29T10:00:00', resolution: `人工备注${index}`,
+        evidenceFileId: null, recordedByName: '操作员', recordedAt: '2026-09-29T10:00:00',
+        previousResultId: null,
+      })),
+    }
+    api.getDeclarationBatches.mockResolvedValue([batch])
+    api.get.mockResolvedValue({ ...customs('COMPLETED', true), brokerSubmittedAt: '2026-09-29T09:00:00' })
+    const wrapper = mount(ContainerCustomsPanel, {
+      props: { loadingPlanId: batch.loadingPlanId, canList: true, canManage: false, departureState: 'WAITING_OTHER_GATES' },
+      global: { plugins: [ElementPlus] },
+    })
+    await flushPromises()
+    const rows = wrapper.findAll('.declaration-result-row')
+    expect(rows).toHaveLength(reasons.length)
+    for (const [index, [code, label]] of reasons.entries()) {
+      expect(rows[index]!.text()).toContain(label)
+      expect(rows[index]!.text()).toContain(`人工备注${index}`)
+      expect(rows[index]!.text()).not.toContain(code)
+      expect(rows[index]!.find('button').exists()).toBe(false)
+    }
+    wrapper.unmount()
+  })
+
   it('keeps READY_TO_START read-only while exposing source file name and download', async () => {
     const wrapper = await render('READY_TO_START')
     expect(wrapper.text()).toContain('开始报关')
+    expect(wrapper.get('[aria-label="报关概况"] dt').text()).toBe('实际箱数')
+    expect(wrapper.get('[aria-label="报关概况"] dd').text()).toBe('12')
     expect(wrapper.text()).toContain('客户退税资料.pdf')
     expect(wrapper.text()).toContain('客户退税资料')
-    expect(wrapper.text()).toContain('报关完成文件')
+    expect(wrapper.text()).toContain('报关行回执')
     expect(wrapper.text()).not.toContain('客户报关资料')
     expect(wrapper.find('[aria-label="下载客户退税资料 客户退税资料.pdf"]').exists()).toBe(true)
-    expect(buttonTexts(wrapper)).not.toContain('上传报关完成文件')
-    expect(buttonTexts(wrapper)).not.toContain('覆盖报关完成文件')
+    expect(buttonTexts(wrapper)).not.toContain('上传报关行回执')
+    expect(buttonTexts(wrapper)).not.toContain('覆盖报关行回执')
     expect(buttonTexts(wrapper)).not.toContain('提交')
   })
 
   it('shows a successful empty state and hides customs actions when the completed plan has no actual cargo', async () => {
-    api.get.mockResolvedValue({ ...customs('READY_TO_START'), hasActualCargo: false, taxRefundCount: 0, coveredTaxRefundCount: 0, inbounds: [], documents: [] })
+    api.get.mockResolvedValue({ ...customs('READY_TO_START'), hasActualCargo: false, taxRefundCount: 0, coveredTaxRefundCount: 0, actualBoxCount: 0, inbounds: [], documents: [] })
     const wrapper = mount(ContainerCustomsPanel, {
       props: { loadingPlanId: '2092438843630391402', canList: true, canManage: true, departureState: 'WAITING_OTHER_GATES' },
       global: { plugins: [ElementPlus] },
@@ -106,29 +156,46 @@ describe('ContainerCustomsPanel', () => {
 
   it('allows completion upload and overwrite only while DECLARING with manage permission', async () => {
     let wrapper = await render('DECLARING', true, false)
-    expect(wrapper.text()).toContain('上传报关完成文件')
-    expect(wrapper.text()).toContain('提交')
+    expect(wrapper.text()).toContain('首次发送报关行')
+    expect(wrapper.text()).toContain('首次发送后上传回执')
+    expect(buttonTexts(wrapper)).not.toContain('上传报关行回执')
     wrapper.unmount()
 
     wrapper = await render('DECLARING', true, true)
-    expect(wrapper.text()).toContain('覆盖报关完成文件')
-    expect(wrapper.text()).toContain('报关完成文件.pdf')
+    expect(wrapper.text()).toContain('发送报关行执行')
+    expect(wrapper.text()).toContain('覆盖报关行回执')
+    expect(wrapper.text()).toContain('报关行回执.pdf')
+    expect(wrapper.text()).toContain('真实报关完税文件.pdf')
+    expect(wrapper.text()).toContain('确认 · 2026/8/29 11:15:00 · 客户一')
     wrapper.unmount()
 
     wrapper = await render('DECLARING', false, true)
     expect(wrapper.text()).toContain('只读')
-    expect(buttonTexts(wrapper)).not.toContain('上传报关完成文件')
-    expect(buttonTexts(wrapper)).not.toContain('覆盖报关完成文件')
+    expect(buttonTexts(wrapper)).not.toContain('上传报关行回执')
+    expect(buttonTexts(wrapper)).not.toContain('覆盖报关行回执')
     expect(buttonTexts(wrapper)).not.toContain('提交')
   })
 
+  it('loads declaration batches during DECLARING after broker execution was sent', async () => {
+    const value = { ...customs('DECLARING', true), brokerSubmittedAt: '2026-08-29T11:20:00' }
+    api.get.mockResolvedValue(value)
+    const wrapper = mount(ContainerCustomsPanel, {
+      props: { loadingPlanId: '2092438843630391402', canList: true, canManage: true, departureState: 'WAITING_OTHER_GATES' },
+      global: { plugins: [ElementPlus] },
+    })
+    await flushPromises()
+    expect(api.getDeclarationBatches).toHaveBeenCalledWith('2092438843630391402')
+    wrapper.unmount()
+  })
+
   it('keeps COMPLETED strictly read-only with both files visible and downloadable', async () => {
     const wrapper = await render('COMPLETED', true, true)
     expect(wrapper.text()).toContain('客户退税资料.pdf')
-    expect(wrapper.text()).toContain('报关完成文件.pdf')
+    expect(wrapper.text()).toContain('报关行回执.pdf')
+    expect(wrapper.text()).toContain('真实报关完税文件.pdf')
     expect(wrapper.text()).toContain('报关已完成，待其他离仓条件')
-    expect(buttonTexts(wrapper)).not.toContain('上传报关完成文件')
-    expect(buttonTexts(wrapper)).not.toContain('覆盖报关完成文件')
+    expect(buttonTexts(wrapper)).not.toContain('上传报关行回执')
+    expect(buttonTexts(wrapper)).not.toContain('覆盖报关行回执')
     expect(buttonTexts(wrapper)).not.toContain('提交')
   })
 
@@ -137,13 +204,16 @@ describe('ContainerCustomsPanel', () => {
     await wrapper.get('[aria-label="下载客户退税资料 客户退税资料.pdf"]').trigger('click')
     await flushPromises()
     expect(api.downloadSource).toHaveBeenCalledWith('2092438843630391407')
-    expect(api.downloadCompletion).not.toHaveBeenCalled()
+    expect(api.downloadReceipt).not.toHaveBeenCalled()
 
-    await wrapper.get('[aria-label="下载报关完成文件 报关完成文件.pdf"]').trigger('click')
+    await wrapper.get('[aria-label="下载报关行回执 报关行回执.pdf"]').trigger('click')
     await flushPromises()
-    expect(api.downloadCompletion).toHaveBeenCalledWith('2092438843630391407')
-    expect(HTMLAnchorElement.prototype.click).toHaveBeenCalledTimes(2)
-    expect(URL.createObjectURL).toHaveBeenCalledTimes(2)
+    expect(api.downloadReceipt).toHaveBeenCalledWith('2092438843630391407')
+    await wrapper.get('[aria-label="下载报关完税文件 真实报关完税文件.pdf"]').trigger('click')
+    await flushPromises()
+    expect(api.downloadFinal).toHaveBeenCalledWith('2092438843630391407')
+    expect(HTMLAnchorElement.prototype.click).toHaveBeenCalledTimes(3)
+    expect(URL.createObjectURL).toHaveBeenCalledTimes(3)
     expect(URL.revokeObjectURL).toHaveBeenCalledWith('blob:customs-file')
   })
 
@@ -158,6 +228,6 @@ describe('ContainerCustomsPanel', () => {
     expect(wrapper.text()).toContain('CUSTOMS_FILE_404')
     expect(wrapper.text()).toContain('request-customs-download')
     expect(wrapper.text()).toContain('trace-customs-download')
-    expect(api.downloadCompletion).not.toHaveBeenCalled()
+    expect(api.downloadReceipt).not.toHaveBeenCalled()
   })
 })

src/modules/container-loading/components/ContainerCustomsPanel.vue

@@ -9,14 +9,25 @@ import LoadErrorState from '@/shared/components/LoadErrorState.vue'
 import OperationErrorToast from '@/shared/components/OperationErrorToast.vue'
 import {
   completeAllBuyContainerCustoms,
-  downloadContainerCustomsCompletion,
+  createDeclarationBatch,
+  downloadContainerCustomsReceipt,
+  downloadContainerCustomsFinal,
   downloadContainerCustomsDocument,
   getContainerCustoms,
+  getDeclarationBatches,
+  recordClearanceResult,
+  resolveClearanceResult,
+  submitDeclarationBatch,
   startContainerCustoms,
-  uploadContainerCustomsCompletion,
+  sendContainerCustomsToBroker,
+  submitContainerCustomsToBroker,
+  uploadContainerCustomsReceipt,
+  uploadContainerCustomsFinal,
   type ContainerCustomsDocument,
   type ContainerCustomsStatus,
   type ContainerCustomsView,
+  type ClearanceResultType,
+  type DeclarationBatch,
 } from '../api/platformContainerCustoms'
 
 const props = defineProps<{
@@ -28,17 +39,37 @@ const props = defineProps<{
 const emit = defineEmits<{ refreshed: [] }>()
 
 const customs = ref<ContainerCustomsView | null>(null)
+const declarationBatches = ref<DeclarationBatch[]>([])
 const loading = ref(false)
 const actionLoading = ref(false)
 const loadError = ref<ApiErrorDetails | null>(null)
 const actionError = ref<ApiErrorDetails | null>(null)
 const downloadingKey = ref('')
-const completionFiles = reactive<Record<string, File | null>>({})
+const receiptFiles = reactive<Record<string, File | null>>({})
+const finalFiles = reactive<Record<string, File | null>>({})
+const clearanceDialogVisible = ref(false)
+const clearanceBatch = ref<DeclarationBatch | null>(null)
+const clearanceResultType = ref<ClearanceResultType>('INSPECTION')
+const clearanceRemark = ref('')
+const clearanceResultOptions: Array<{ value: ClearanceResultType; label: string }> = [
+  { value: 'INSPECTION', label: '查验' },
+  { value: 'SUPPLEMENT_REQUIRED', label: '补资料' },
+  { value: 'DETAINED', label: '扣货' },
+  { value: 'RELEASED', label: '放行' },
+  { value: 'OTHER', label: '其他' },
+]
+
+function clearanceResultLabel(value: ClearanceResultType) {
+  return clearanceResultOptions.find((option) => option.value === value)?.label || '未知结果'
+}
 
 const missingInbounds = computed(() => customs.value?.inbounds.filter((item) => item.taxMode === 'TAX_REFUND' && !item.covered) || [])
 const missingCoverageCount = computed(() => Math.max(0, (customs.value?.taxRefundCount || 0) - (customs.value?.coveredTaxRefundCount || 0)))
 const allBuy = computed(() => customs.value?.hasActualCargo === true && customs.value.taxRefundCount === 0)
-const missingCompletionCount = computed(() => customs.value?.documents.filter((item) => !item.completion).length || 0)
+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 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: '报关已完成',
 }
@@ -46,9 +77,25 @@ const statusText: Record<ContainerCustomsStatus, string> = {
 function documentCustomers(document: ContainerCustomsDocument) {
   return [...new Set((customs.value?.inbounds || []).filter((item) => document.inboundIds.includes(item.inboundId)).map((item) => item.customerName))].join('、') || '—'
 }
-function selectCompletion(documentId: string, upload: UploadFile) {
+function receiptHistoryLabel(document: ContainerCustomsDocument) {
+  return (document.receiptHistory || []).map((item) => `v${item.version}`).join('、') || '—'
+}
+function confirmationActionLabel(action: ContainerCustomsDocument['confirmationHistory'][number]['action']) {
+  return action === 'CONFIRM' ? '确认' : '打回'
+}
+function formatDateTime(value: string | null | undefined) {
+  if (!value) return '—'
+  const date = new Date(value)
+  return Number.isNaN(date.getTime()) ? value : date.toLocaleString('zh-CN', { hour12: false })
+}
+function selectReceipt(documentId: string, upload: UploadFile) {
+  if (!props.canManage || customs.value?.status !== 'DECLARING' || !brokerSubmission.value || brokerSubmitted.value) return
+  receiptFiles[documentId] = upload.raw || null
+  actionError.value = null
+}
+function selectFinal(documentId: string, upload: UploadFile) {
   if (!props.canManage || customs.value?.status !== 'DECLARING') return
-  completionFiles[documentId] = upload.raw || null
+  finalFiles[documentId] = upload.raw || null
   actionError.value = null
 }
 
@@ -56,11 +103,76 @@ async function load() {
   if (!props.canList || !props.loadingPlanId) return
   loading.value = true
   loadError.value = null
-  try { customs.value = await getContainerCustoms(props.loadingPlanId) }
+  try {
+    customs.value = await getContainerCustoms(props.loadingPlanId)
+    if (customs.value?.status === 'COMPLETED' || customs.value?.brokerSubmittedAt) {
+      try { declarationBatches.value = await getDeclarationBatches(props.loadingPlanId) } catch { declarationBatches.value = [] }
+    } else declarationBatches.value = []
+  }
   catch (error) { customs.value = null; loadError.value = getApiErrorDetails(error, '整柜报关状态加载失败') }
   finally { loading.value = false }
 }
 
+function declarationStatusLabel(value: DeclarationBatch['status']) {
+  return ({ READY: '待提交', SUBMITTED: '已提交', ACKNOWLEDGED: '已受理', RESULT_PENDING: '待处理结果', CLOSED: '已关闭', CANCELLED: '已取消' } as Record<string, string>)[value] || value
+}
+
+async function createFormalDeclaration() {
+  if (!customs.value || !['DECLARING', 'COMPLETED'].includes(customs.value.status) || !brokerSubmitted.value || openDeclarationBatch.value) return
+  try { await ElMessageBox.confirm('当前柜的资料、回执已确认并已发送报关行执行，确认创建正式申报批次？完税文件仍按报关行完成后回传。', '创建正式申报批次', { customClass: 'admin-density-confirm', type: 'warning', confirmButtonText: '确认创建' }) } catch { return }
+  actionLoading.value = true; actionError.value = null
+  try { await createDeclarationBatch(props.loadingPlanId, customs.value.version); await load(); ElMessage.success('正式申报批次已创建') }
+  catch (error) { actionError.value = getApiErrorDetails(error, '正式申报批次创建失败') }
+  finally { actionLoading.value = false }
+}
+
+async function submitFormalDeclaration(batch: DeclarationBatch) {
+  try {
+    const answer = await ElMessageBox.prompt('请输入报关单号', '提交正式申报', { customClass: 'admin-density-confirm', inputValidator: (value) => value.trim() ? true : '请输入报关单号', confirmButtonText: '确认提交' })
+    actionLoading.value = true; actionError.value = null
+    await submitDeclarationBatch(batch, answer.value)
+    await load(); ElMessage.success('正式申报已提交')
+  } catch (error) {
+    if (error === 'cancel' || error === 'close') return
+    actionError.value = getApiErrorDetails(error, '正式申报提交失败')
+  } finally { actionLoading.value = false }
+}
+
+function openFormalResultDialog(batch: DeclarationBatch) {
+  clearanceBatch.value = batch
+  clearanceResultType.value = 'INSPECTION'
+  clearanceRemark.value = ''
+  clearanceDialogVisible.value = true
+}
+
+async function recordFormalResult() {
+  const batch = clearanceBatch.value
+  if (!batch) return
+  if (clearanceResultType.value === 'OTHER' && !clearanceRemark.value.trim()) {
+    ElMessage.warning('选择“其他”时请填写备注')
+    return
+  }
+  actionLoading.value = true; actionError.value = null
+  try {
+    await recordClearanceResult(batch, clearanceResultType.value, clearanceRemark.value.trim() || undefined)
+    clearanceDialogVisible.value = false
+    await load(); ElMessage.success('海关结果已记录')
+  } catch (error) { actionError.value = getApiErrorDetails(error, '海关结果记录失败') }
+  finally { actionLoading.value = false }
+}
+
+async function resolveFormalResult(batch: DeclarationBatch, result: DeclarationBatch['results'][number]) {
+  try {
+    const answer = await ElMessageBox.prompt('请输入处理说明', '处理海关结果', { customClass: 'admin-density-confirm', inputValue: result.resolution || '', inputValidator: (value) => value.trim() ? true : '请输入处理说明', confirmButtonText: '确认处理' })
+    actionLoading.value = true; actionError.value = null
+    await resolveClearanceResult(result, batch.version, answer.value)
+    await load(); ElMessage.success('海关结果已处理')
+  } catch (error) {
+    if (error === 'cancel' || error === 'close') return
+    actionError.value = getApiErrorDetails(error, '海关结果处理失败')
+  } finally { actionLoading.value = false }
+}
+
 async function start() {
   if (!customs.value || customs.value.status !== 'READY_TO_START') return
   try {
@@ -72,24 +184,31 @@ async function start() {
   finally { actionLoading.value = false }
 }
 
-async function uploadCompletion(document: ContainerCustomsDocument) {
-  if (!props.canManage || customs.value?.status !== 'DECLARING') return
-  const selected = completionFiles[document.documentId]
-  if (!selected) { ElMessage.warning('请选择对应的报关完成文件'); return }
-  const finalConfirmation = !document.completion && missingCompletionCount.value === 1
-  if (finalConfirmation) {
-    try {
-      await ElMessageBox.confirm('这是最后一份待上传的报关完成文件；确认后系统将自动完成当前混合/退税柜报关。是否继续？', '完成整柜报关', { customClass: 'admin-density-confirm', type: 'warning', confirmButtonText: '确认上传并完成' })
-    } catch { return }
-  }
+async function uploadReceipt(document: ContainerCustomsDocument) {
+  if (!props.canManage || customs.value?.status !== 'DECLARING' || !brokerSubmission.value || brokerSubmitted.value) return
+  const selected = receiptFiles[document.documentId]
+  if (!selected) { ElMessage.warning('请选择对应的报关行回执'); return }
   actionLoading.value = true; actionError.value = null
   try {
-    await uploadContainerCustomsCompletion(document.documentId, selected, document.completion?.version || 0, finalConfirmation)
-    completionFiles[document.documentId] = null
+    await uploadContainerCustomsReceipt(document.documentId, selected, document.receipt?.version || 0)
+    receiptFiles[document.documentId] = null
     await load()
     emit('refreshed')
-    ElMessage.success(finalConfirmation ? '报关完成文件已上传，整柜报关已完成' : '报关完成文件已上传')
-  } catch (error) { actionError.value = getApiErrorDetails(error, '报关完成文件上传失败') }
+    ElMessage.success('报关行回执已上传，等待客户确认')
+  } catch (error) { actionError.value = getApiErrorDetails(error, '报关行回执上传失败') }
+  finally { actionLoading.value = false }
+}
+
+async function uploadFinal(document: ContainerCustomsDocument) {
+  if (!props.canManage || customs.value?.status !== 'DECLARING') return
+  const selected = finalFiles[document.documentId]
+  if (!selected) { ElMessage.warning('请选择真实报关完税文件'); return }
+  actionLoading.value = true; actionError.value = null
+  try {
+    await uploadContainerCustomsFinal(document.documentId, selected, document.finalDocument?.version || 0)
+    finalFiles[document.documentId] = null
+    await load(); emit('refreshed'); ElMessage.success('真实报关完税文件已上传')
+  } catch (error) { actionError.value = getApiErrorDetails(error, '真实报关完税文件上传失败') }
   finally { actionLoading.value = false }
 }
 
@@ -102,8 +221,8 @@ function saveBlob(blob: Blob, fileName: string) {
   URL.revokeObjectURL(url)
 }
 
-async function downloadFile(document: ContainerCustomsDocument, kind: 'source' | 'completion') {
-  const target = kind === 'source' ? document.source : document.completion
+async function downloadFile(document: ContainerCustomsDocument, kind: 'source' | 'receipt' | 'final') {
+  const target = kind === 'source' ? document.source : kind === 'receipt' ? document.receipt : document.finalDocument
   if (!target) return
   const key = `${kind}:${document.documentId}`
   downloadingKey.value = key
@@ -111,9 +230,9 @@ async function downloadFile(document: ContainerCustomsDocument, kind: 'source' |
   try {
     const blob = kind === 'source'
       ? await downloadContainerCustomsDocument(document.documentId)
-      : await downloadContainerCustomsCompletion(document.documentId)
+      : kind === 'receipt' ? await downloadContainerCustomsReceipt(document.documentId) : await downloadContainerCustomsFinal(document.documentId)
     saveBlob(blob, target.fileName)
-    ElMessage.success(`${kind === 'source' ? '客户退税资料' : '报关完成文件'}下载已开始`)
+    ElMessage.success(`${kind === 'source' ? '客户退税资料' : kind === 'receipt' ? '报关行回执' : '报关完税文件'}下载已开始`)
   } catch (error) {
     actionError.value = getApiErrorDetails(error, `${kind === 'source' ? '客户退税资料' : '报关完成文件'}下载失败`)
   } finally {
@@ -121,6 +240,24 @@ async function downloadFile(document: ContainerCustomsDocument, kind: 'source' |
   }
 }
 
+async function submitToBroker() {
+  if (!customs.value || customs.value.status !== 'DECLARING' || !brokerSubmission.value || brokerSubmitted.value || !allReceiptsConfirmed.value) return
+  try { await ElMessageBox.confirm('确认已核对全部回执并把确认结果发送给报关行执行？', '发送报关行执行', { customClass: 'admin-density-confirm', type: 'warning', confirmButtonText: '确认发送' }) } catch { return }
+  actionLoading.value = true; actionError.value = null
+  try { customs.value = await submitContainerCustomsToBroker(props.loadingPlanId, customs.value.version); ElMessage.success('已发送给报关行执行') }
+  catch (error) { actionError.value = getApiErrorDetails(error, '发送报关行执行失败') }
+  finally { actionLoading.value = false }
+}
+
+async function sendToBroker() {
+  if (!customs.value || customs.value.status !== 'DECLARING' || brokerSubmission.value || brokerSubmitted.value) return
+  try { await ElMessageBox.confirm('确认将当前冻结的退税报关资料首次发送给报关行？发送后由报关行返回回执，资料版本和关联范围按当前快照处理。', '首次发送报关行', { customClass: 'admin-density-confirm', type: 'warning', confirmButtonText: '确认发送' }) } catch { return }
+  actionLoading.value = true; actionError.value = null
+  try { customs.value = await sendContainerCustomsToBroker(props.loadingPlanId, customs.value.version); ElMessage.success('已首次发送给报关行，等待回执') }
+  catch (error) { actionError.value = getApiErrorDetails(error, '首次发送报关行失败') }
+  finally { actionLoading.value = false }
+}
+
 async function completeAllBuy() {
   if (!customs.value || customs.value.status !== 'DECLARING' || !allBuy.value) return
   try { await ElMessageBox.confirm('确认全买单柜报关已经完成？报关完成不等同于国内离仓。', '完成全买单柜报关', { customClass: 'admin-density-confirm', type: 'warning', confirmButtonText: '确认完成' }) }
@@ -154,11 +291,13 @@ onMounted(load)
   <section class="container-customs surface-panel admin-density" aria-label="整柜报关">
     <OperationErrorToast :details="actionError" />
     <header class="customs-header">
-      <div><h2>整柜报关</h2><p>客户退税资料与平台买单事实按柜冻结；报关完成和国内离仓分别展示。</p></div>
+      <div><h2>整柜报关</h2><p>资料、回执与完税文件按柜管理。</p></div>
       <div v-if="customs" class="customs-actions">
         <el-tag :type="!customs.hasActualCargo ? 'info' : customs.status === 'COMPLETED' ? 'success' : customs.status === 'WAITING_CUSTOMER_DOCUMENTS' ? 'danger' : 'warning'">{{ customs.hasActualCargo ? statusText[customs.status] : '无需报关' }}</el-tag>
         <el-button v-if="canManage && allBuy" plain :loading="actionLoading" @click="exportAllBuy">导出买单 XLSX</el-button>
         <el-button v-if="canManage && customs.hasActualCargo && customs.status === 'READY_TO_START'" type="primary" :loading="actionLoading" @click="start">开始报关</el-button>
+        <el-button v-if="canManage && customs.hasActualCargo && customs.status === 'DECLARING' && !brokerSubmission" type="primary" :loading="actionLoading" @click="sendToBroker">首次发送报关行</el-button>
+        <el-button v-if="canManage && customs.hasActualCargo && customs.status === 'DECLARING' && brokerSubmission && !brokerSubmitted" type="primary" plain :disabled="!allReceiptsConfirmed" :loading="actionLoading" @click="submitToBroker">发送报关行执行</el-button>
         <el-button v-if="canManage && allBuy && customs.status === 'DECLARING'" type="primary" :loading="actionLoading" @click="completeAllBuy">确认报关完成</el-button>
       </div>
     </header>
@@ -168,29 +307,61 @@ onMounted(load)
     <template v-else-if="customs">
       <el-empty v-if="!customs.hasActualCargo" description="当前装柜计划没有实际装柜货物，无需报关" :image-size="56" />
       <template v-else>
-      <div class="customs-metrics"><span>退税总票 <strong>{{ customs.taxRefundCount }}</strong></span><span>已覆盖 <strong>{{ customs.coveredTaxRefundCount }}</strong></span><span :class="{ danger: missingCoverageCount }">缺失 <strong>{{ missingCoverageCount }}</strong></span></div>
+      <dl class="density-fields customs-summary" aria-label="报关概况">
+        <div><dt>实际箱数</dt><dd>{{ customs.actualBoxCount }}</dd></div><div><dt>退税总票</dt><dd>{{ customs.taxRefundCount }}</dd></div><div><dt>已覆盖</dt><dd>{{ customs.coveredTaxRefundCount }}</dd></div><div><dt>缺失</dt><dd :class="{ 'coverage-missing': missingCoverageCount }">{{ missingCoverageCount }}</dd></div>
+        <template v-if="brokerSubmission">
+          <div class="submission-batch"><dt>首次发送批次</dt><dd>{{ brokerSubmission.batchNo }}</dd></div><div><dt>发送状态</dt><dd>{{ brokerSubmission.status === 'SENT' ? '已发送' : brokerSubmission.status }}</dd></div><div><dt>资料版本</dt><dd>v{{ brokerSubmission.sourceVersion }}</dd></div>
+          <div class="submission-batch"><dt>发送人</dt><dd>{{ brokerSubmission.sentByName || '—' }}</dd></div><div class="submission-batch"><dt>发送时间</dt><dd>{{ formatDateTime(brokerSubmission.sentAt) }}</dd></div>
+        </template>
+      </dl>
       <div v-if="missingInbounds.length" class="compact-table-wrap">
         <h3>缺退税资料清单</h3>
         <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 v-if="customs.documents.length" class="compact-table-wrap">
-        <h3>已冻结退税资料与报关完成文件</h3>
-        <table class="compact-table document-table density-table"><thead><tr><th>操作</th><th>客户退税资料</th><th>报关完成文件</th><th>关联入仓码</th><th>版本</th><th>客户</th><th>完成情况</th></tr></thead><tbody>
+        <h3>已冻结退税资料、报关行回执与完税文件</h3>
+        <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><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 :auto-upload="false" :limit="1" :show-file-list="false" :on-change="(upload: UploadFile) => selectCompletion(document.documentId, upload)"><el-button class="density-action" size="small">{{ document.completion ? '覆盖报关完成文件' : '上传报关完成文件' }}</el-button></el-upload><el-button data-tone="primary" class="density-action" size="small" type="primary" :disabled="!completionFiles[document.documentId]" :loading="actionLoading" @click="uploadCompletion(document)">提交</el-button></div><span v-else class="readonly-label">只读</span></td>
+            <td><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="(upload: UploadFile) => selectReceipt(document.documentId, upload)"><el-button class="density-action" size="small" :disabled="!brokerSubmission || brokerSubmitted">{{ !brokerSubmission ? '首次发送后上传回执' : document.receipt ? '覆盖报关行回执' : '上传报关行回执' }}</el-button></el-upload><el-button data-tone="primary" class="density-action" size="small" type="primary" :disabled="!brokerSubmission || brokerSubmitted || !receiptFiles[document.documentId]" :loading="actionLoading" @click="uploadReceipt(document)">提交</el-button><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><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.completion" class="file-cell"><span :title="document.completion.fileName">{{ document.completion.fileName }}</span><el-button class="density-action" type="primary" :loading="downloadingKey === `completion:${document.documentId}`" :aria-label="`下载报关完成文件 ${document.completion.fileName}`" @click="downloadFile(document, 'completion')">下载</el-button></div><span v-else>未上传</span></td>
-            <td>{{ document.inboundCodes.join('、') || '—' }}</td><td>退税资料 v{{ document.source.version }}<span v-if="document.completion"> / 报关完成 v{{ document.completion.version }}</span></td><td>{{ documentCustomers(document) }}</td><td>{{ document.completion ? '已上传报关完成文件' : '待上传报关完成文件' }}</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>{{ document.inboundCodes.join('、') || '—' }}</td><td>{{ brokerSubmitted ? '已发送报关行执行' : brokerSubmission ? '已首次发送，等待回执确认' : '待首次发送报关行' }}</td><td>退税资料 v{{ document.source.version }}<span v-if="document.receipt"> / 回执 v{{ document.receipt.version }}</span><span v-if="document.finalDocument"> / 完税 v{{ document.finalDocument.version }}</span><small v-if="document.receiptHistory?.length" class="receipt-history-note">回执历史：{{ receiptHistoryLabel(document) }}</small><small v-for="history in document.confirmationHistory" :key="history.id" class="confirmation-history-note">{{ confirmationActionLabel(history.action) }} · {{ formatDateTime(history.createdAt) }} · {{ history.operatorName || '—' }}<span v-if="history.reason"> · {{ history.reason }}</span></small></td><td>{{ documentCustomers(document) }}</td><td>{{ document.receipt ? (document.receiptStatus === 'CONFIRMED' ? '客户已确认回执' : document.receiptStatus === 'REJECTED' ? '客户已打回回执' : '待客户确认回执') : '待上传报关行回执' }}</td>
           </tr>
         </tbody></table>
       </div>
+      <div v-if="['DECLARING', 'COMPLETED'].includes(customs.status) && brokerSubmitted" class="compact-table-wrap declaration-batches-wrap">
+        <div class="declaration-batches-heading"><div><h3>正式申报与海关结果</h3><p>查看申报批次及海关处理结果。</p></div><el-button v-if="canManage && !openDeclarationBatch" size="small" type="primary" :loading="actionLoading" @click="createFormalDeclaration">创建正式申报批次</el-button></div>
+        <el-empty v-if="!declarationBatches.length" description="尚未创建正式申报批次" :image-size="48" />
+        <div v-else class="declaration-batch-list">
+          <article v-for="batch in declarationBatches" :key="batch.id" class="declaration-batch-card">
+            <div class="declaration-batch-main"><strong>{{ batch.batchNo }}</strong><span>报关单号：{{ batch.customsEntryNo || '—' }} · 版本 {{ batch.version }}</span></div>
+            <el-tag size="small" :type="batch.status === 'CLOSED' ? 'success' : batch.status === 'CANCELLED' ? 'info' : 'warning'">{{ declarationStatusLabel(batch.status) }}</el-tag>
+            <div class="declaration-batch-actions" v-if="canManage"><el-button v-if="batch.status === 'READY'" size="small" type="primary" :loading="actionLoading" @click="submitFormalDeclaration(batch)">提交正式申报</el-button><el-button v-if="['SUBMITTED','ACKNOWLEDGED','RESULT_PENDING'].includes(batch.status)" size="small" plain :loading="actionLoading" @click="openFormalResultDialog(batch)">标记海关异常/结果</el-button></div>
+            <div v-if="batch.results.length" class="declaration-result-list"><div v-for="result in batch.results" :key="result.id" class="declaration-result-row"><span>{{ clearanceResultLabel(result.resultType) }}</span><el-tag size="small" :type="result.resultStatus === 'RESOLVED' ? 'success' : 'warning'">{{ result.resultStatus === 'RESOLVED' ? '已处理' : result.resultStatus === 'OPEN' ? '待处理' : '已取消' }}</el-tag><small>{{ result.resolution || '—' }}</small><el-button v-if="canManage && result.resultStatus === 'OPEN'" link type="primary" size="small" :loading="actionLoading" @click="resolveFormalResult(batch, result)">处理</el-button></div></div>
+          </article>
+        </div>
+      </div>
       </template>
       <div v-if="customs.status === 'COMPLETED'" class="departure-state"><strong>国内离仓状态：</strong><el-tag :type="departureState === 'DEPARTED' ? 'success' : 'warning'">{{ departureState === 'DEPARTED' ? '已自动离仓' : departureState === 'UNKNOWN' ? '离仓状态尚未读取' : '报关已完成，待其他离仓条件' }}</el-tag></div>
     </template>
     <el-empty v-else-if="canList" description="当前装柜计划尚未完成，完成装柜后可处理报关" :image-size="56" />
+    <el-dialog v-model="clearanceDialogVisible" class="admin-density-dialog" title="标记海关异常/结果" width="460px" :close-on-click-modal="false">
+      <el-form label-position="top" class="clearance-result-form">
+        <el-form-item label="选择理由" required>
+          <el-select v-model="clearanceResultType" class="clearance-result-select" placeholder="请选择理由">
+            <el-option v-for="option in clearanceResultOptions" :key="option.value" :label="option.label" :value="option.value" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="备注" :required="clearanceResultType === 'OTHER'">
+          <el-input v-model="clearanceRemark" type="textarea" :rows="4" maxlength="1000" show-word-limit :placeholder="clearanceResultType === 'OTHER' ? '请填写具体情况' : '可填写短信内容或人工处理说明（可选）'" />
+        </el-form-item>
+      </el-form>
+      <template #footer><el-button @click="clearanceDialogVisible = false">取消</el-button><el-button type="primary" :loading="actionLoading" @click="recordFormalResult">确认标记</el-button></template>
+    </el-dialog>
   </section>
 </template>
 
 <style scoped>
-.container-customs{padding:0;border:0}.customs-header{display:flex;align-items:center;justify-content:space-between;gap:var(--admin-space-5)}.customs-header h2,.compact-table-wrap h3{margin:0;font-size:var(--admin-font-section)}.customs-header p{margin:3px 0 0;color:var(--cc-muted);font-size:var(--admin-font-caption)}.customs-actions{display:flex;align-items:center;gap:var(--admin-space-3)}.action-error{margin-top:var(--admin-space-3);padding:var(--admin-space-3) var(--admin-space-4);border:1px solid var(--el-color-danger-light-5);border-radius:var(--admin-radius);background:var(--el-color-danger-light-9);color:var(--el-color-danger);font-size:var(--admin-font-caption)}.action-error :deep(.api-error-meta){margin-top:5px}.customs-metrics{display:flex;gap:var(--admin-space-6);margin-top:var(--admin-space-4);padding:var(--admin-space-3) var(--admin-space-4);background:var(--cc-surface-muted);font-size:var(--admin-font-caption)}.customs-metrics strong{margin-left:var(--admin-space-1);font-size:var(--admin-font-body)}.customs-metrics .danger strong{color:var(--el-color-danger)}.compact-table-wrap{margin-top:var(--admin-space-4)}.compact-table-wrap h3{margin-bottom:var(--admin-space-2)}.compact-table{width:100%}.document-table th:first-child{width:270px}.document-actions,.file-cell{display:flex;align-items:center;gap:var(--admin-space-2)}.file-cell span{display:block;max-width:210px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.readonly-label{color:var(--cc-muted)}.departure-state{display:flex;align-items:center;gap:var(--admin-space-3);margin-top:var(--admin-space-4);padding-top:var(--admin-space-4);border-top:1px solid var(--cc-border);font-size:var(--admin-font-body)}
+.container-customs{padding:0;border:0}.customs-header{display:flex;align-items:center;justify-content:space-between;gap:var(--admin-space-5)}.customs-header h2,.compact-table-wrap h3{margin:0;font-size:var(--admin-font-section)}.customs-header p{margin:3px 0 0;color:var(--cc-muted);font-size:var(--admin-font-caption)}.customs-actions{display:flex;align-items:center;gap:var(--admin-space-3)}.action-error{margin-top:var(--admin-space-3);padding:var(--admin-space-3) var(--admin-space-4);border:1px solid var(--el-color-danger-light-5);border-radius:var(--admin-radius);background:var(--el-color-danger-light-9);color:var(--el-color-danger);font-size:var(--admin-font-caption)}.action-error :deep(.api-error-meta){margin-top:5px}.customs-summary{margin-top:var(--admin-space-4)!important}.customs-summary .submission-batch{grid-column:span 2}.coverage-missing{color:var(--el-color-danger)!important}.compact-table-wrap{margin-top:var(--admin-space-5);overflow-x:auto}.confirmation-history-note,.receipt-history-note{display:block;margin-top:var(--admin-space-2);color:var(--cc-muted)}.compact-table-wrap h3{margin-bottom:var(--admin-space-2)}.compact-table{width:100%}.document-table th:first-child{width:270px}.document-actions,.file-cell{display:flex;align-items:center;gap:var(--admin-space-2)}.file-cell span{display:block;max-width:210px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.readonly-label{color:var(--cc-muted)}.departure-state{display:flex;align-items:center;gap:var(--admin-space-3);margin-top:var(--admin-space-4);padding-top:var(--admin-space-4);border-top:1px solid var(--cc-border);font-size:var(--admin-font-body)}.declaration-batches-heading{display:flex;align-items:flex-start;justify-content:space-between;gap:var(--admin-space-4)}.declaration-batches-heading p{margin:3px 0 0;color:var(--cc-muted);font-size:var(--admin-font-caption)}.declaration-batch-list{display:grid;gap:var(--admin-space-3)}.declaration-batch-card{display:grid;grid-template-columns:minmax(0,1fr) auto;gap:var(--admin-space-2) var(--admin-space-4);padding:var(--admin-space-3) var(--admin-space-4);border:1px solid var(--cc-border);background:var(--cc-surface-muted)}.declaration-batch-main strong,.declaration-batch-main span{display:block}.declaration-batch-main span{margin-top:4px;color:var(--cc-muted);font-size:var(--admin-font-caption)}.declaration-batch-actions,.declaration-result-list{grid-column:1 / -1}.declaration-result-list{display:grid;gap:5px;padding-top:var(--admin-space-2);border-top:1px solid var(--cc-border)}.declaration-result-row{display:flex;align-items:center;gap:var(--admin-space-2);font-size:var(--admin-font-caption)}.declaration-result-row small{flex:1;color:var(--cc-muted)}.clearance-result-form{padding-top:var(--admin-space-2)}.clearance-result-select{width:100%}
 </style>

src/modules/container-loading/components/ContainerLastLegFeesPanel.test.ts

@@ -37,6 +37,15 @@ describe('尾程付款凭证', () => {
     mocks.download.mockResolvedValue(new Blob(['image']))
   })
 
+  it('作废待财务确认时保留有效来源，停止调整和重复作废', async () => {
+    mocks.fees.mockResolvedValue([{ sourceFeeId: '81', customerId: '11', amount: 10, reviewStatus: 'APPROVED', sourceStatus: 'ACTIVE', voidStatus: 'PENDING_FINANCE', paymentVoucherFileIds: [] }])
+    const wrapper = await setup()
+    expect(wrapper.text()).toContain('待财务确认')
+    expect(wrapper.text()).not.toContain('已作废')
+    expect(wrapper.findAll('button').some(button => ['调整', '作废'].includes(button.text()))).toBe(false)
+    wrapper.unmount()
+  })
+
   it('显示上传文件名，允许再次上传替换和移除', async () => {
     const wrapper = await setup()
     await wrapper.get('button').trigger('click')

src/modules/container-loading/components/ContainerLastLegFeesPanel.vue

@@ -68,6 +68,8 @@ const feeItems: Array<{ value: OverseasContainerFeeItem; label: string }> = [
 ]
 const feeItemLabel = (value: string) => feeItems.find((item) => item.value === value)?.label || value
 const reviewLabels: Record<string, string> = { DRAFT: '草稿', PENDING: '待审核', APPROVED: '已审核', REJECTED: '已驳回' }
+const voidLabels: Record<string, string> = { NOT_REQUESTED: '—', PENDING_FINANCE: '待财务确认', FINANCE_ATTENTION: '待财务处理', CONFIRMED: '已作废' }
+function voidPending(row: OverseasContainerFeeSource) { return ['PENDING_FINANCE', 'FINANCE_ATTENTION'].includes(row.voidStatus || '') }
 const form = reactive<{ customerId: string; feeItemCode: OverseasContainerFeeItem; direction: OverseasContainerFeeDirection; businessDate: string; amount: number | null; supplierId: string; settlementMode: ContainerFeeSettlementMode; paidAt: string; paymentMethod: ContainerFeePaymentMethod; paymentReferenceNo: string; paymentVoucherFileIds: string[] }>({ customerId: '', feeItemCode: 'PORT_FEE', direction: 'PAYABLE', businessDate: new Date().toISOString().slice(0, 10), amount: null, supplierId: '', settlementMode: 'ON_ACCOUNT', paidAt: '', paymentMethod: 'BANK_TRANSFER', paymentReferenceNo: '', paymentVoucherFileIds: [] })
 
 watch(() => form.customerId, () => { uploadSequence++; voucherUploading.value = false; form.paymentVoucherFileIds = [] }, { flush: 'sync' })
@@ -155,7 +157,7 @@ async function review(row: OverseasContainerFeeSource, decision: 'APPROVE' | 'RE
 }
 async function voidFee(row: OverseasContainerFeeSource) {
   const result = await ElMessageBox.prompt('请输入作废原因', '作废费用', { customClass: 'admin-density-confirm', inputPattern: /\S+/, inputErrorMessage: '请输入作废原因', type: 'warning' })
-  await mutate(() => voidOverseasContainerFee(row.sourceFeeId, row.sourceVersion, result.value.trim(), key('container-fee-void')), '费用已作废')
+  await mutate(() => voidOverseasContainerFee(row.sourceFeeId, row.sourceVersion, result.value.trim(), key('container-fee-void')), '作废申请已提交，请查看财务确认状态')
 }
 onMounted(load)
 </script>
@@ -168,7 +170,7 @@ onMounted(load)
     <el-alert v-if="!canView" type="warning" :closable="false" title="当前账号无权查看尾程计费。" />
     <LoadErrorState v-else-if="error" title="尾程计费加载失败" :message="error.message" :loading="loading" @retry="load"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState>
     <el-table v-else v-loading="loading" :data="rows" empty-text="当前货柜暂无尾程费用">
-      <el-table-column label="操作" fixed="left" width="240"><template #default="{ row }"><div class="row-actions density-actions"><el-button data-tone="primary" class="density-action" v-if="canEdit && row.sourceStatus === 'ACTIVE' && ['DRAFT', 'REJECTED'].includes(row.reviewStatus)" type="primary" @click="submit(row as OverseasContainerFeeSource)">提交</el-button><el-button data-tone="warning" class="density-action" v-if="canReview && row.sourceStatus === 'ACTIVE' && row.reviewStatus === 'PENDING'" type="success" @click="review(row as OverseasContainerFeeSource, 'APPROVE')">通过</el-button><el-button data-tone="danger" class="density-action" v-if="canReview && row.sourceStatus === 'ACTIVE' && row.reviewStatus === 'PENDING'" type="danger" @click="review(row as OverseasContainerFeeSource, 'REJECT')">驳回</el-button><el-button class="density-action" v-if="canEdit && row.sourceStatus === 'ACTIVE' && row.reviewStatus === 'APPROVED'" type="primary" @click="openAdjust(row as OverseasContainerFeeSource)">调整</el-button><el-button data-tone="danger" class="density-action" v-if="canReview && row.sourceStatus === 'ACTIVE' && row.reviewStatus === 'APPROVED'" type="danger" @click="voidFee(row as OverseasContainerFeeSource)">作废</el-button><span v-if="row.sourceStatus !== 'ACTIVE' || (!canEdit && !canReview)">—</span></div></template></el-table-column>
+      <el-table-column label="操作" fixed="left" width="240"><template #default="{ row }"><div class="row-actions density-actions"><el-button data-tone="primary" class="density-action" v-if="canEdit && row.sourceStatus === 'ACTIVE' && ['DRAFT', 'REJECTED'].includes(row.reviewStatus)" type="primary" @click="submit(row as OverseasContainerFeeSource)">提交</el-button><el-button data-tone="warning" class="density-action" v-if="canReview && row.sourceStatus === 'ACTIVE' && row.reviewStatus === 'PENDING'" type="success" @click="review(row as OverseasContainerFeeSource, 'APPROVE')">通过</el-button><el-button data-tone="danger" class="density-action" v-if="canReview && row.sourceStatus === 'ACTIVE' && row.reviewStatus === 'PENDING'" type="danger" @click="review(row as OverseasContainerFeeSource, 'REJECT')">驳回</el-button><el-button class="density-action" v-if="canEdit && row.sourceStatus === 'ACTIVE' && row.reviewStatus === 'APPROVED' && !voidPending(row as OverseasContainerFeeSource)" type="primary" @click="openAdjust(row as OverseasContainerFeeSource)">调整</el-button><el-button data-tone="danger" class="density-action" v-if="canReview && row.sourceStatus === 'ACTIVE' && row.reviewStatus === 'APPROVED' && !voidPending(row as OverseasContainerFeeSource)" type="danger" @click="voidFee(row as OverseasContainerFeeSource)">作废</el-button><span v-if="row.sourceStatus !== 'ACTIVE' || (!canEdit && !canReview)">—</span></div></template></el-table-column>
       <el-table-column prop="customerName" label="客户" min-width="160" show-overflow-tooltip><template #default="{ row }">{{ row.customerName || '—' }}</template></el-table-column>
       <el-table-column prop="feeItemCode" label="费用项目" min-width="140" show-overflow-tooltip><template #default="{ row }">{{ feeItemLabel(row.feeItemCode) }}</template></el-table-column>
       <el-table-column prop="direction" label="方向" width="100"><template #default="{ row }">{{ row.direction === 'RECEIVABLE' ? '应收' : '应付' }}</template></el-table-column>
@@ -177,6 +179,7 @@ onMounted(load)
       <el-table-column label="付款凭证" min-width="180"><template #default="{ row }"><div v-if="row.paymentVoucherFileIds.length" class="voucher-list"><el-button v-for="(fileId, index) in (row.paymentVoucherFileIds as string[])" :key="fileId" link type="primary" @click="previewVoucher(row.customerId, fileId)">{{ voucherNames[fileId] || `付款凭证 ${index + 1}` }}</el-button></div><span v-else>—</span></template></el-table-column>
       <el-table-column prop="businessDate" label="业务日期" width="120" />
       <el-table-column prop="reviewStatus" label="审核状态" width="110"><template #default="{ row }"><el-tag>{{ reviewLabels[row.reviewStatus] || row.reviewStatus }}</el-tag></template></el-table-column>
+      <el-table-column label="作废确认" min-width="130"><template #default="{ row }">{{ voidLabels[row.voidStatus] || '—' }}</template></el-table-column>
       <el-table-column prop="reviewReason" label="审核说明" min-width="180" show-overflow-tooltip><template #default="{ row }">{{ row.reviewReason || '—' }}</template></el-table-column>
     </el-table>
     <AppDialog class="admin-density-dialog" v-model="dialogOpen" :title="editing ? '调整尾程费用' : '新增尾程费用'" width="min(620px, calc(100vw - 28px))" confirm-text="保存" :confirm-loading="actionLoading" :confirm-disabled="voucherUploading" @confirm="save">

src/modules/container-loading/components/ContainerOverviewPanel.test.ts

@@ -8,7 +8,7 @@ import { downloadContainerPdaPhoto } from '../api/platformContainerLoading'
 vi.mock('../api/platformContainerLoading', () => ({ downloadContainerPdaPhoto: vi.fn() }))
 
 const overview: ContainerOverview = {
-  container: { id: '7', bookingNo: 'BK-1', cabinetNo: 'CB-1', containerNo: 'MSCU-1', status: 'LOADING', warehouseId: '8', warehouseName: '义乌仓', voyageNo: 'V1', vesselName: '船一', pickupCode: '00123456', pickupCodeUpdatedBy: '13', pickupCodeUpdatedByName: '操作员', pickupCodeUpdatedAt: '2026-08-13T10:30:00', version: 2 },
+  container: { id: '7', cabinetNo: 'CB-1', containerNo: 'MSCU-1', status: 'LOADING', warehouseId: '8', warehouseName: '义乌仓', voyageNo: 'V1', vesselName: '船一', pickupCode: '00123456', pickupCodeUpdatedBy: '13', pickupCodeUpdatedByName: '操作员', pickupCodeUpdatedAt: '2026-08-13T10:30:00', version: 2 },
   loadingPlanId: '9',
   pda: { taskId: '10', loadingPlanId: '9', containerBookingId: '7', taskStatus: 'IN_PROGRESS', workflowStatus: 'AWAITING_REVIEW', taskVersion: 2, itemCount: 4, completedItemCount: 4, unresolvedItemCount: 0, photoCounts: [{ evidenceType: 'PHOTO_STEP_EMPTY_CONTAINER', count: 2 }], photos: [{ evidenceId: '20', tenantId: '21', inboundId: '22', evidenceType: 'PHOTO_STEP_EMPTY_CONTAINER', fileId: '23', fileName: 'empty.jpg', status: 'ACTIVE', downloadPath: '/api/platform/v1/containers/7/pda/photos/23/download', uploadedAt: '2026-08-13T12:30:00' }], exceptionReasons: ['一项待复核'] },
   documents: [{ id: '11', documentType: 'DELIVERY_ORDER', fileId: '9007199254740999', fileName: 'do.pdf', fileHash: null, uploadedBy: '13', uploadedByName: '操作员', uploadedAt: '2026-08-13T10:00:00', version: 1, completed: false }],

src/modules/container-loading/components/ContainerOverviewPanel.vue

@@ -152,7 +152,7 @@ onBeforeUnmount(() => { photoGeneration += 1; revokePhotoUrls() })
     <section v-if="visibleSections.has('pda')" class="overview-section" aria-label="PDA作业摘要">
       <header><h3>PDA 作业进度</h3><StatusBadge v-if="overview.pda" :status="workflowStatusLabel(overview.pda.workflowStatus, overview.pda.taskStatus)" /></header>
       <el-empty v-if="!overview.pda" description="尚未生成 PDA 作业任务" :image-size="64" />
-      <template v-else><div class="pda-summary"><el-progress :percentage="pdaProgress" :status="overview.pda.unresolvedItemCount ? 'exception' : undefined" /><div class="metric-grid"><div><span>任务明细</span><strong>{{ overview.pda.itemCount }}</strong></div><div><span>已处理</span><strong>{{ overview.pda.completedItemCount }}</strong></div><div><span>未解决</span><strong>{{ overview.pda.unresolvedItemCount }}</strong></div><div><span>有效照片</span><strong>{{ overview.pda.photoCounts.reduce((sum, item) => sum + item.count, 0) }}</strong></div></div></div><el-alert v-if="workflowStatusLabel(overview.pda.workflowStatus, overview.pda.taskStatus) === '待人工复核'" type="warning" :closable="false" title="PDA 作业已完成，等待人工复核后才能完成装柜。" /><el-alert v-else-if="workflowStatusLabel(overview.pda.workflowStatus, overview.pda.taskStatus) === '作业中'" type="info" :closable="false" title="请继续在 PDA 完成拣货、拍照和封条登记。" /><div v-if="activePhotos.length" class="photo-gallery"><button v-for="photo in activePhotos" :key="photo.evidenceId" type="button" class="photo-thumb" :aria-label="`预览装柜照片 ${photo.fileName}`" :disabled="!photoStates[photo.evidenceId]?.url" @click="openPhoto(photo)"><span v-if="photoStates[photo.evidenceId]?.loading" class="photo-placeholder">加载中</span><span v-else-if="photoStates[photo.evidenceId]?.error" class="photo-placeholder photo-placeholder--error">{{ photoStates[photo.evidenceId]?.error }}</span><img v-else-if="photoStates[photo.evidenceId]?.url" :src="photoStates[photo.evidenceId]?.url || ''" :alt="`${evidenceTypeLabel(photo.evidenceType)} ${photo.fileName}`" /><span class="photo-caption"><strong>{{ evidenceTypeLabel(photo.evidenceType) }}</strong><small>{{ formatTime(photo.uploadedAt) }}</small></span></button></div><p v-else class="compact-empty">暂无可查看的有效照片</p><el-alert v-if="overview.pda.exceptionReasons.length" type="warning" :closable="false" :title="overview.pda.exceptionReasons.join('；')" /></template>
+      <template v-else><dl class="density-fields pda-summary" aria-label="PDA作业统计"><div class="pda-progress"><dt>完成进度</dt><dd><el-progress :percentage="pdaProgress" :status="overview.pda.unresolvedItemCount ? 'exception' : undefined" /></dd></div><div><dt>任务明细</dt><dd>{{ overview.pda.itemCount }}</dd></div><div><dt>已处理</dt><dd>{{ overview.pda.completedItemCount }}</dd></div><div><dt>未解决</dt><dd>{{ overview.pda.unresolvedItemCount }}</dd></div><div><dt>有效照片</dt><dd>{{ overview.pda.photoCounts.reduce((sum, item) => sum + item.count, 0) }}</dd></div></dl><el-alert v-if="workflowStatusLabel(overview.pda.workflowStatus, overview.pda.taskStatus) === '待人工复核'" type="warning" :closable="false" title="PDA 作业已完成，等待人工复核后才能完成装柜。" /><el-alert v-else-if="workflowStatusLabel(overview.pda.workflowStatus, overview.pda.taskStatus) === '作业中'" type="info" :closable="false" title="请继续在 PDA 完成拣货、拍照和封条登记。" /><div v-if="activePhotos.length" class="photo-gallery"><button v-for="photo in activePhotos" :key="photo.evidenceId" type="button" class="photo-thumb" :aria-label="`预览装柜照片 ${photo.fileName}`" :disabled="!photoStates[photo.evidenceId]?.url" @click="openPhoto(photo)"><span v-if="photoStates[photo.evidenceId]?.loading" class="photo-placeholder">加载中</span><span v-else-if="photoStates[photo.evidenceId]?.error" class="photo-placeholder photo-placeholder--error">{{ photoStates[photo.evidenceId]?.error }}</span><img v-else-if="photoStates[photo.evidenceId]?.url" :src="photoStates[photo.evidenceId]?.url || ''" :alt="`${evidenceTypeLabel(photo.evidenceType)} ${photo.fileName}`" /><span class="photo-caption"><strong>{{ evidenceTypeLabel(photo.evidenceType) }}</strong><small>{{ formatTime(photo.uploadedAt) }}</small></span></button></div><p v-else class="compact-empty">暂无可查看的有效照片</p><el-alert v-if="overview.pda.exceptionReasons.length" type="warning" :closable="false" :title="overview.pda.exceptionReasons.join('；')" /></template>
     </section>
 
 
@@ -169,11 +169,9 @@ onBeforeUnmount(() => { photoGeneration += 1; revokePhotoUrls() })
 .overview-section p { margin: 5px 0; color: var(--cc-muted); font-size: var(--admin-font-body); }
 .exception-management{padding-top:var(--admin-space-4);padding-bottom:var(--admin-space-4)}.exception-management__header{margin-bottom:7px!important}.exception-management__header>div:first-child{display:flex;min-width:0;align-items:center;gap:var(--admin-space-5)}.exception-current{display:flex;min-width:0;align-items:center;gap:9px;margin:0!important}.exception-current strong,.exception-current span{max-width:360px;white-space: normal;overflow-wrap: anywhere}.exception-current strong{color:var(--el-color-danger)}.exception-current span{font-size:var(--admin-font-caption)}.exception-management__actions{display:flex;align-items:center;gap:var(--admin-space-3)}.exception-history{overflow-x:auto;border-top:1px solid var(--cc-border);font-size:var(--admin-font-caption)}.exception-history__head,.exception-history li{display:grid;grid-template-columns:145px 120px 130px minmax(220px,1fr);gap:var(--admin-space-3);align-items:center;min-width:680px;padding:var(--admin-space-2) var(--admin-space-1)}.exception-history__head{color:var(--cc-muted);font-weight:650}.exception-history ol{margin:0;padding:0;list-style:none}.exception-history li{border-top:1px solid var(--cc-border)}.exception-history li time,.exception-history li span{color:var(--cc-muted);white-space: normal;overflow-wrap: anywhere}.exception-history__empty{margin:0!important;padding:7px var(--admin-space-1);border-top:1px solid var(--cc-border);font-size:var(--admin-font-caption)!important}
 .document-table-wrap{width:100%;overflow-x:auto;border:1px solid var(--cc-border)}.document-table{width:100%;min-width:940px;table-layout:fixed}.document-table tbody tr:last-child td{border-bottom:0}.document-table th:nth-child(1){width:260px}.document-table th:nth-child(2){width:180px}.document-table th:nth-child(3){width:210px}.document-table th:nth-child(4){width:120px}.document-table th:nth-child(5){width:150px}.document-table th:nth-child(6){width:90px}.document-table__actions{position:sticky;left:0;z-index:1;box-shadow:1px 0 0 var(--cc-border)}.document-table th.document-table__actions{z-index:2}.document-table td strong{font-size:var(--admin-font-body)}.document-table td small{display:block;overflow:hidden;max-width:170px;margin-top:2px;text-overflow:ellipsis;white-space:nowrap}.document-file-name{display:block;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.document-blocked-reason{color:var(--cc-muted)}.document-actions{white-space:nowrap}.document-actions :deep(.el-button){margin-left:0}.no-action{color:var(--cc-muted)}.pickup-code-row :deep(.el-input){max-width:260px}.pickup-code-row :deep(.el-input__inner){font-variant-numeric:tabular-nums}
-.pda-summary{display:grid;grid-template-columns:minmax(220px,1fr) minmax(0,2fr);align-items:center;gap:var(--admin-space-5);margin-bottom:var(--admin-space-4)}.metric-grid { display: grid; grid-template-columns: repeat(4, minmax(0, 1fr)); gap: var(--admin-space-2); margin:0; }
-.metric-grid > div { display: flex; align-items: baseline; gap: var(--admin-space-2); padding: 0; background: transparent; }
-.metric-grid span { color: var(--cc-muted); font-size: var(--admin-font-caption); }
-.metric-grid strong { font-size: var(--admin-font-body); }
-.photo-gallery{display:grid;grid-template-columns:repeat(5,minmax(0,1fr));gap:var(--admin-space-3);margin:var(--admin-space-4) 0}.photo-thumb{display:grid;min-width:0;overflow:hidden;padding:0;border:1px solid var(--cc-border);background:var(--admin-surface);color:inherit;text-align:left;cursor:pointer}.photo-thumb:disabled{cursor:default}.photo-thumb img,.photo-placeholder{width:100%;aspect-ratio:4/3;object-fit:cover;background:var(--cc-bg-subtle,#f7f8fa)}.photo-placeholder{display:grid;place-items:center;padding:var(--admin-space-3);color:var(--cc-muted);font-size:var(--admin-font-caption)}.photo-placeholder--error{color:var(--el-color-danger)}.photo-caption{display:flex;align-items:center;justify-content:space-between;gap:var(--admin-space-2);padding:var(--admin-space-2) var(--admin-space-3)}.photo-caption small{white-space:nowrap}.compact-empty{margin:var(--admin-space-2) 0;color:var(--cc-muted);font-size:var(--admin-font-caption)}.compact-timeline{display:grid;margin:0;padding:0;list-style:none}.compact-timeline li{display:grid;grid-template-columns:130px 130px 110px minmax(0,1fr);gap:var(--admin-space-3);padding:var(--admin-space-2) 0;border-top:1px solid var(--cc-border);font-size:var(--admin-font-caption)}.compact-timeline li:first-child{border-top:0}.compact-timeline time,.compact-timeline span,.compact-timeline small{overflow:hidden;color:var(--cc-muted);text-overflow:ellipsis;white-space:nowrap}
-@media (max-width: 1200px){.photo-gallery{grid-template-columns:repeat(4,minmax(0,1fr))}.pda-summary{grid-template-columns:1fr}.compact-timeline li{grid-template-columns:120px 120px minmax(0,1fr)}.compact-timeline small{grid-column:2/-1}}
-@media (max-width: 720px) { .exception-management__header{align-items:flex-start;flex-direction:column}.exception-management__header>div:first-child{align-items:flex-start;flex-direction:column;gap:3px}.exception-current{align-items:flex-start;flex-direction:column;gap:2px}.metric-grid { grid-template-columns: repeat(2, minmax(0, 1fr)); }.photo-gallery{grid-template-columns:repeat(2,minmax(0,1fr))}.compact-timeline li{grid-template-columns:1fr 1fr}.compact-timeline span,.compact-timeline small{grid-column:auto;white-space:normal} }
+.overview-panel .pda-summary { grid-template-columns: minmax(280px, 2fr) repeat(4, minmax(0, 1fr)); margin-bottom: var(--admin-space-4); }
+.pda-progress dd { width: 100%; }
+.photo-gallery{display:grid;grid-template-columns:repeat(auto-fill,minmax(180px,220px));gap:var(--admin-space-3);margin:var(--admin-space-4) 0}.photo-thumb{display:grid;min-width:0;overflow:hidden;padding:0;border:1px solid var(--cc-border);background:var(--admin-surface);color:inherit;text-align:left;cursor:pointer}.photo-thumb:disabled{cursor:default}.photo-thumb img,.photo-placeholder{width:100%;height:112px;object-fit:contain;background:var(--cc-bg-subtle,#f7f8fa)}.photo-placeholder{display:grid;place-items:center;padding:var(--admin-space-3);color:var(--cc-muted);font-size:var(--admin-font-caption)}.photo-placeholder--error{color:var(--el-color-danger)}.photo-caption{display:grid;gap:var(--admin-space-2);padding:var(--admin-space-2) var(--admin-space-3)}.photo-caption small{white-space:nowrap}.compact-empty{margin:var(--admin-space-2) 0;color:var(--cc-muted);font-size:var(--admin-font-caption)}.compact-timeline{display:grid;margin:0;padding:0;list-style:none}.compact-timeline li{display:grid;grid-template-columns:130px 130px 110px minmax(0,1fr);gap:var(--admin-space-3);padding:var(--admin-space-2) 0;border-top:1px solid var(--cc-border);font-size:var(--admin-font-caption)}.compact-timeline li:first-child{border-top:0}.compact-timeline time,.compact-timeline span,.compact-timeline small{overflow:hidden;color:var(--cc-muted);text-overflow:ellipsis;white-space:nowrap}
+@media (max-width: 1200px){.photo-gallery{grid-template-columns:repeat(4,minmax(0,1fr))}.overview-panel .pda-summary{grid-template-columns:1fr 1fr}.compact-timeline li{grid-template-columns:120px 120px minmax(0,1fr)}.compact-timeline small{grid-column:2/-1}}
+@media (max-width: 720px) { .exception-management__header{align-items:flex-start;flex-direction:column}.exception-management__header>div:first-child{align-items:flex-start;flex-direction:column;gap:3px}.exception-current{align-items:flex-start;flex-direction:column;gap:2px}.photo-gallery{grid-template-columns:repeat(2,minmax(0,1fr))}.compact-timeline li{grid-template-columns:1fr 1fr}.compact-timeline span,.compact-timeline small{grid-column:auto;white-space:normal} }
 </style>

src/modules/container-loading/components/OceanBookingLinkDialog.test.ts

@@ -10,7 +10,7 @@ vi.mock('@/modules/ocean-bookings', () => ({ listOceanBookingLinkCandidates: vi.
 vi.mock('../api/platformContainerLoading', () => ({ linkContainerOceanBooking: vi.fn() }))
 
 const container = {
-  id: '9001', cabinetNo: 'CAB-1', bookingNo: 'CB-1', containerNo: null, planId: '7001', planStatus: 'EDITING',
+  id: '9001', cabinetNo: 'CAB-1', containerNo: null, planId: '7001', planStatus: 'EDITING',
   sourceType: 'SIMULATION', warehouseId: '8', warehouseName: '义乌仓', channelGroupCode: 'MATSON_CLX', channelCode: null, channelName: null,
   oceanBookingId: null, billOfLadingNo: null, vesselName: null, voyageNo: null, containerType: '40HQ',
   shippingCompanyId: null, shippingCompanyName: null, departurePortCode: null, departurePortName: null,

src/modules/container-loading/containerChannelLabel.test.ts

@@ -0,0 +1,17 @@
+import { describe, expect, it } from 'vitest'
+import { containerChannelLabel } from './containerChannelLabel'
+
+describe('container actual channel label', () => {
+  it('preserves the supplied channel name regardless of booking linkage', () => {
+    expect(containerChannelLabel({ channelName: '纽约海铁', oceanBookingId: '123' })).toBe('纽约海铁')
+    expect(containerChannelLabel({ channelName: '纽约海铁', oceanBookingId: null })).toBe('纽约海铁')
+  })
+  it('does not describe a linked booking as unlinked when the channel is absent', () => {
+    expect(containerChannelLabel({ channelName: null, oceanBookingId: '123' })).toBe('—')
+    expect(containerChannelLabel({ channelName: '', oceanBookingId: '123' })).toBe('—')
+  })
+  it('shows pending linkage only when both channel and booking are absent', () => {
+    expect(containerChannelLabel({ channelName: null, oceanBookingId: null })).toBe('待关联订舱')
+    expect(containerChannelLabel({ channelName: '', oceanBookingId: undefined })).toBe('待关联订舱')
+  })
+})

src/modules/container-loading/containerChannelLabel.ts

@@ -0,0 +1,5 @@
+import type { ContainerBookingResource } from './types'
+
+export function containerChannelLabel(container: Pick<ContainerBookingResource, 'channelName' | 'oceanBookingId'>): string {
+  return container.channelName || (container.oceanBookingId ? '—' : '待关联订舱')
+}

src/modules/container-loading/index.ts

@@ -1,4 +1,5 @@
 export * from './api/platformContainerLoading'
 export * from './types'
+export { getSmartLoadingChannelGroup, isSeaRailChannel, SMART_LOADING_CHANNEL_GROUPS } from './smartLoadingChannelGroups'
 export { default as SmartLoadingDialog } from './components/SmartLoadingDialog.vue'
 export { default as ContainerSimulationCreate } from './components/ContainerSimulationCreate.vue'

src/modules/container-loading/pages/ContainerDetailView.emptyReturn.behavior.test.ts

@@ -17,10 +17,20 @@ const routeState = vi.hoisted(() => ({ params: { containerId: '9001' }, query: {
 const routerPush = vi.hoisted(() => vi.fn())
 vi.mock('@/core/access/accessPreview', () => ({ useAccessPreviewStore: () => ({ can: canAccess }) }))
 vi.mock('vue-router', () => ({ useRoute: () => routeState, useRouter: () => ({ push: routerPush }) }))
-vi.mock('@/modules/loading-lists', () => ({ ContainerFeesPanel: { template: '<div />' }, LoadingListDetailDrawer: { name: 'LoadingListDetailDrawer', props: ['detail', 'error', 'loading', 'mode', 'embedded'], template: '<div data-testid="loading-detail">{{ detail?.planNo }}</div>' }, PalletLabelPrintDialog: { template: '<div />' }, getConfirmedLoadingList: vi.fn(), getPreloadPlan: vi.fn() }))
+vi.mock('@/modules/loading-lists', async (importOriginal) => {
+  const actual = await importOriginal<typeof import('@/modules/loading-lists')>()
+  const api = { getConfirmedLoadingList: vi.fn(), getPreloadPlan: vi.fn() }
+  return {
+    ...api,
+    useLoadingListDetail: () => actual.useLoadingListDetail(api),
+    ContainerFeesPanel: { template: '<div />' },
+    LoadingListDetailDrawer: { name: 'LoadingListDetailDrawer', props: ['detail', 'error', 'loading', 'mode', 'embedded', 'dense', 'backLabel'], template: '<div data-testid="loading-detail">{{ detail?.planNo }}</div>' },
+    PalletLabelPrintDialog: { template: '<div />' },
+  }
+})
 vi.mock('@/modules/ocean-bookings', () => ({ listOceanBookingLinkCandidates: vi.fn() }))
 vi.mock('@/modules/outbound-dispatch', () => ({ confirmContainerOutboundDispatch: vi.fn(), getContainerOutboundDispatch: vi.fn() }))
-vi.mock('@/modules/port-schedules', () => ({ CarrierScheduleQueryPanel: { template: '<div />' } }))
+vi.mock('@/modules/port-schedules', () => ({ CarrierScheduleQueryPanel: { template: '<div />' }, ContainerPortSchedulePanel: { name: 'ContainerPortSchedulePanel', props: ['container'], emits: ['saved'], template: '<div />' } }))
 vi.mock('../api/platformContainerLoading', () => ({ getContainer: vi.fn(), getContainerOverview: vi.fn(), linkContainerOceanBooking: vi.fn(), cancelContainerException: vi.fn(), completeContainerClearance: vi.fn(), downloadContainerClearance: vi.fn(), downloadContainerDocument: vi.fn(), getContainerClearance: vi.fn(), markContainerException: vi.fn(), uploadContainerClearance: vi.fn(), uploadContainerDocument: vi.fn(), updateContainerPickupCode: vi.fn() }))
 vi.mock('../api/terminalDrayages', () => ({ recordTerminalDrayageEmptyReturn: vi.fn() }))
 vi.mock('../api/containerArrivalTimes', () => ({ listContainerArrivalTimes: vi.fn() }))
@@ -44,6 +54,16 @@ function accessibleText(wrapper: { element: Element } | undefined) {
 }
 
 describe('ContainerDetailView empty return', () => {
+  it('passes the original container to schedule maintenance and reloads its projection after save', async () => {
+    const wrapper = await mountDetail('DOMESTIC')
+    const panel = wrapper.findComponent({ name: 'ContainerPortSchedulePanel' })
+    expect(panel.props('container').id).toBe('9001')
+    vi.mocked(getContainer).mockResolvedValue({ ...base, vesselName: 'REASSIGNED', voyageNo: 'V2', currentPortScheduleId: 'S1' } as never)
+    panel.vm.$emit('saved'); await flushPromises()
+    expect(getContainer).toHaveBeenCalledTimes(2)
+    expect(wrapper.text()).toContain('REASSIGNED / V2')
+    expect(wrapper.findComponent({ name: 'ContainerPortSchedulePanel' }).props('container').currentPortScheduleId).toBe('S1')
+  })
   beforeEach(() => {
     routeState.query = {}
     routerPush.mockReset()
@@ -51,7 +71,7 @@ describe('ContainerDetailView empty return', () => {
     vi.mocked(getContainerOutboundDispatch).mockReset().mockResolvedValue({ aggregate: { dispatchStatus: 'WAITING_FOR_LOADING', gate: { inbounds: [] } }, timeline: [] } as never)
     vi.mocked(getContainer).mockReset().mockResolvedValue(base as never)
     vi.mocked(getContainerOverview).mockReset().mockResolvedValue(overview as never)
-    vi.mocked(getConfirmedLoadingList).mockReset().mockResolvedValue({ planNo: 'LP-1', items: [] } as never)
+    vi.mocked(getConfirmedLoadingList).mockReset().mockResolvedValue({ planNo: 'LP-1', summary: { status: 'COMPLETED' }, items: [] } as never)
     vi.mocked(recordTerminalDrayageEmptyReturn).mockReset().mockResolvedValue({ ...base.terminalDrayage, status: 'EMPTY_RETURNED', version: 4, actualEmptyReturnAt: '2026-09-09T12:00:00', allowedActions: [] } as never)
     vi.mocked(listContainerArrivalTimes).mockReset().mockResolvedValue([{ sourceContainerBookingId: '9001', estimatedWarehouseArrivalAt: '2026-09-25T15:31:00', actualWarehouseArrivalAt: '2026-09-26T09:00:00', version: 0 }])
   })
@@ -123,6 +143,7 @@ describe('ContainerDetailView empty return', () => {
     vi.mocked(getContainerOverview).mockResolvedValue({ ...overview, loadingPlanId: '7001' } as never)
     vi.mocked(getConfirmedLoadingList).mockResolvedValue({
       planNo: 'LP-1',
+      summary: { status: 'COMPLETED' },
       items: [{ destinationWarehouse: 'ABE4' }, { destinationWarehouse: 'ABE4' }],
     } as never)
 
@@ -148,7 +169,7 @@ describe('ContainerDetailView empty return', () => {
 
 describe('domestic container loading list and booking link', () => {
   const domestic = { ...base, containerNo: null, warehouseId: '8', channelCode: 'ZBYHK', sourceType: 'SIMULATION', oceanBookingId: null, planId: '7001', planStatus: 'EDITING', version: 1, allowedActions: ['EDIT_CONTAINER'], terminalDrayage: null }
-  const loadingDetail = { planNo: 'LP-1', items: [] }
+  const loadingDetail = { planNo: 'LP-1', summary: { status: 'COMPLETED' }, items: [] }
 
   beforeEach(() => {
     routeState.query = {}
@@ -202,7 +223,8 @@ describe('domestic container loading list and booking link', () => {
         if (permitted) {
           const drawer = wrapper.findComponent({ name: 'LoadingListDetailDrawer' })
           expect(drawer.props('mode')).toBe(planStatus === 'COMPLETED' ? 'confirmed' : 'preload')
-          expect(drawer.props('embedded')).not.toBeUndefined()
+          expect(drawer.props('embedded')).toBeUndefined()
+          expect(drawer.props('backLabel')).toBe('返回货柜概览')
         }
         wrapper.unmount()
       }

src/modules/container-loading/pages/ContainerDetailView.test.ts

@@ -30,24 +30,25 @@ describe('ContainerDetailView customs integration', () => {
     expect(source).toContain(':sections="[\'documents\']"')
     expect(source).toContain(':sections="[\'pda\']"')
     expect(source).toContain('<LoadingListDetailDrawer')
-    expect(source).toContain('getConfirmedLoadingList')
-    expect(source).toContain('getPreloadPlan')
+    expect(source).toContain('useLoadingListDetail')
+    expect(source).toContain('await loadListDetail(mode, aggregate.loadingPlanId')
     expect(source).toContain('label="装柜清单"')
-    expect(source).toContain('打印装柜清单')
+    expect(source).not.toContain('function printLoadingList')
     expect(source).toContain("const loadingListMode = computed<LoadingListMode>(() => detail.value?.planStatus === 'COMPLETED' ? 'confirmed' : 'preload')")
-    expect(source).toContain('<LoadingListDetailDrawer dense :mode="loadingListMode" embedded')
+    expect(source).toContain('<LoadingListDetailDrawer dense :mode="loadingListMode" back-label="返回货柜概览"')
     expect(source).toContain(':sections="[\'pda\']"')
   })
 
-  it('keeps the confirmed loading list inside the domestic container detail only', () => {
+  it('keeps the container detail entry alongside the standalone manifest', () => {
     expect(routeSource).toContain("name: 'domestic-container-detail'")
     expect(routeSource).toContain("name: 'overseas-container-detail'")
-    expect(loadingRouteSource).not.toContain("name: 'loading-lists'")
-    expect(navigationSource).not.toContain("title: '装柜清单'")
+    expect(loadingRouteSource).toContain("name: 'loading-lists'")
+    expect(navigationSource).toContain("title: '装柜清单'")
     expect(source).toContain('<el-tabs v-model="activeTab"')
     expect(source).toContain("v-if=\"isDomestic && activeTab === 'loading-list'\"")
-    expect(source).toContain("loadingDetail.value = await getConfirmedLoadingList(aggregate.loadingPlanId, resource.warehouseId)")
-    expect(source).toContain("getContainer(containerId.value, props.workbench), getContainerOverview(containerId.value)")
+    expect(source).toContain("await loadListDetail(mode, aggregate.loadingPlanId || '', resource.warehouseId || '')")
+    expect(source).toContain('getContainer(containerId.value, props.workbench)')
+    expect(source).toContain('getContainerOverview(containerId.value)')
     expect(source).toContain(':can-edit="false"')
   })
 

src/modules/container-loading/pages/ContainerDetailView.vue

@@ -11,8 +11,8 @@ import ApiErrorMeta from '@/shared/components/ApiErrorMeta.vue'
 import AppDialog from '@/shared/components/AppDialog.vue'
 import LoadErrorState from '@/shared/components/LoadErrorState.vue'
 import StatusBadge from '@/shared/components/StatusBadge.vue'
-import { CarrierScheduleQueryPanel } from '@/modules/port-schedules'
-import { ContainerFeesPanel, getConfirmedLoadingList, getPreloadPlan, LoadingListDetailDrawer, PalletLabelPrintDialog, type LoadingDetail, type LoadingListMode } from '@/modules/loading-lists'
+import { CarrierScheduleQueryPanel, ContainerPortSchedulePanel } from '@/modules/port-schedules'
+import { ContainerFeesPanel, useLoadingListDetail, LoadingListDetailDrawer, PalletLabelPrintDialog, type LoadingListMode } from '@/modules/loading-lists'
 import {
   confirmContainerOutboundDispatch,
   getContainerOutboundDispatch,
@@ -24,6 +24,7 @@ import ContainerLastLegFeesPanel from '../components/ContainerLastLegFeesPanel.v
 import ContainerOverviewPanel from '../components/ContainerOverviewPanel.vue'
 import OceanBookingLinkDialog from '../components/OceanBookingLinkDialog.vue'
 import { getSmartLoadingChannelGroup, isSeaRailChannel } from '../smartLoadingChannelGroups'
+import { containerChannelLabel } from '../containerChannelLabel'
 import {
   cancelContainerException,
   completeContainerClearance,
@@ -143,9 +144,7 @@ const outboundDetail = ref<ContainerOutboundDispatchDetail | null>(null)
 const outboundError = ref<ApiErrorDetails | null>(null)
 const showPassedGates = ref(false)
 const carrierRefreshKey = ref(0)
-const loadingDetail = ref<LoadingDetail | null>(null)
-const loadingDetailLoading = ref(false)
-const loadingDetailError = ref<ApiErrorDetails | null>(null)
+const { detail: loadingDetail, loading: loadingDetailLoading, error: loadingDetailError, load: loadListDetail, reset: resetLoadingDetail } = useLoadingListDetail()
 const emptyReturnOpen = ref(false)
 const emptyReturnAt = ref('')
 const emptyReturnReason = ref('')
@@ -171,8 +170,8 @@ const primaryStatusText = computed(() => isDomestic.value ? statusText(detail.va
 const loadingListMode = computed<LoadingListMode>(() => detail.value?.planStatus === 'COMPLETED' ? 'confirmed' : 'preload')
 const loadingListHeading = computed(() => loadingListMode.value === 'confirmed' ? '装柜清单' : '预装清单')
 const loadingListDescription = computed(() => loadingListMode.value === 'confirmed'
-  ? '装柜明细、PDA 证据与报关关联均以当前柜次为边界。'
-  : '核对预装明细与 PDA 作业准备情况，装柜完成后再处理整柜报关。')
+  ? '核对作业证据、报关资料与装柜货物。'
+  : '核对预装货物与 PDA 作业进度。')
 const overseasDestinationText = computed(() => {
   const bookingDestination = [detail.value?.destinationWarehouseCode, detail.value?.destinationWarehouseName]
     .filter(Boolean).join(' / ')
@@ -294,6 +293,7 @@ async function confirmEmptyReturn() {
 
 async function load() {
   if (!containerId.value) return
+  resetLoadingDetail()
   loading.value = true; error.value = null; overviewError.value = null
   try {
     const [resource, aggregate, arrivals] = await Promise.all([
@@ -330,23 +330,12 @@ async function loadOutboundDispatch() {
 }
 
 async function loadLoadingDetail(resource: ContainerBookingResource, aggregate: ContainerOverview) {
-  if (loadingDetail.value || loadingDetailLoading.value) return
-  loadingDetail.value = null; loadingDetailError.value = null
-  if (!aggregate.loadingPlanId || !resource.warehouseId) return
-  loadingDetailLoading.value = true
-  try {
-    if (resource.planStatus === 'COMPLETED') {
-      if (!canViewLoadingList.value) return
-      loadingDetail.value = await getConfirmedLoadingList(aggregate.loadingPlanId, resource.warehouseId)
-      return
-    }
-    if (!canViewPreload.value) return
-    loadingDetail.value = await getPreloadPlan(aggregate.loadingPlanId, resource.warehouseId)
-  } catch (cause) {
-    loadingDetailError.value = getApiErrorDetails(cause, '装柜清单加载失败')
-  } finally {
-    loadingDetailLoading.value = false
+  const mode = resource.planStatus === 'COMPLETED' ? 'confirmed' : 'preload'
+  if (!(mode === 'confirmed' ? canViewLoadingList.value : canViewPreload.value)) {
+    resetLoadingDetail()
+    return
   }
+  await loadListDetail(mode, aggregate.loadingPlanId || '', resource.warehouseId || '')
 }
 async function refreshAfterCustoms() {
   if (canViewOutboundDispatch.value) await loadOutboundDispatch()
@@ -517,7 +506,6 @@ async function completeClearance() {
 }
 
 function goBack() { void router.push({ name: isDomestic.value ? 'domestic-container-workbench' : 'overseas-container-workbench' }) }
-function printLoadingList() { window.print() }
 
 onMounted(async () => { await load(); if (isOverseas.value && route.query.action === 'documents') openDocument('DELIVERY_ORDER') })
 </script>
@@ -542,12 +530,13 @@ onMounted(async () => { await load(); if (isOverseas.value && route.query.action
       <LoadErrorState v-if="overviewError" compact title="履约摘要加载失败" :message="overviewError.message" :show-retry="false" />
       <section v-show="activeTab === 'overview'" class="detail-section surface-panel" aria-labelledby="container-information-heading">
         <header class="detail-section__heading"><h2 id="container-information-heading">货柜信息</h2><PalletLabelPrintDialog dense v-if="overview?.loadingPlanId && detail.warehouseId" :plan-id="overview.loadingPlanId" :warehouse-id="detail.warehouseId" :disabled="!detail.containerNo || detail.planStatus === 'EDITING'" /></header>
-        <div class="detail-fields"><dl class="density-fields"><div><dt>真实订舱</dt><dd><span>{{ detail.oceanBookingId ? (detail.billOfLadingNo || '已关联') : '未关联' }}</span><el-button v-if="canLinkOceanBooking" class="density-action" data-tone="primary" @click="openOceanBookingLink">关联已放舱订舱</el-button></dd></div><div><dt>计划渠道</dt><dd>{{ plannedChannelName }}</dd></div><div><dt>实际渠道</dt><dd>{{ detail.channelName || '待关联订舱' }}</dd></div><div><dt>异常状态</dt><dd>{{ detail.exceptionActive ? '异常' : '正常' }}</dd></div><div><dt>目的仓</dt><dd>{{ overseasDestinationText }}</dd></div><div><dt>拖车公司</dt><dd>{{ detail.terminalTruckingCompany || workbenchDetail?.terminalDrayage?.fleetSupplierName || '—' }}</dd></div></dl></div>
+        <div class="detail-fields"><dl class="density-fields"><div><dt>真实订舱</dt><dd><span>{{ detail.oceanBookingId ? (detail.billOfLadingNo || '已关联') : '未关联' }}</span><el-button v-if="canLinkOceanBooking" class="density-action" data-tone="primary" @click="openOceanBookingLink">关联已放舱订舱</el-button></dd></div><div><dt>计划渠道</dt><dd>{{ plannedChannelName }}</dd></div><div><dt>实际渠道</dt><dd>{{ containerChannelLabel(detail) }}</dd></div><div><dt>异常状态</dt><dd>{{ detail.exceptionActive ? '异常' : '正常' }}</dd></div><div><dt>目的仓</dt><dd>{{ overseasDestinationText }}</dd></div><div><dt>拖车公司</dt><dd>{{ detail.terminalTruckingCompany || workbenchDetail?.terminalDrayage?.fleetSupplierName || '—' }}</dd></div></dl></div>
         <ContainerOverviewPanel v-if="isDomestic && overview" :overview="overview" :sections="['exception']" :can-manage-documents="canEdit" :can-manage-customs="canManageCustoms" :can-manage-exception="canEdit" @manage-exception="openException" />
       </section>
 
       <section v-show="activeTab === 'overview'" class="detail-section surface-panel" aria-labelledby="container-voyage-heading">
         <h2 id="container-voyage-heading">船名航次信息</h2>
+        <ContainerPortSchedulePanel :container="detail" @saved="load" />
         <div class="detail-fields"><dl class="density-fields"><div><dt>船公司</dt><dd>{{ detail.shippingCompanyName || '—' }}</dd></div><div><dt>船名 / 航次</dt><dd>{{ [detail.vesselName, detail.voyageNo].filter(Boolean).join(' / ') || '—' }}</dd></div><div><dt>预计开船</dt><dd>{{ formatTime(detail.estimatedSailingAt) }}</dd></div><div><dt>预计到港</dt><dd>{{ formatTime(detail.estimatedPortArrivalAt) }}</dd></div></dl></div>
         <div class="carrier-panel"><CarrierScheduleQueryPanel dense :key="carrierRefreshKey" :ocean-booking-id="detail.oceanBookingId" :container-booking-id="detail.id" :warehouse-timeline="overview?.timeline || []" /></div>
       </section>
@@ -586,10 +575,10 @@ onMounted(async () => { await load(); if (isOverseas.value && route.query.action
       </section>
 
       <section v-if="isDomestic && activeTab === 'loading-list'" class="detail-section surface-panel" aria-labelledby="container-loading-list-heading">
-        <header class="loading-list-heading"><div><h2 id="container-loading-list-heading">{{ loadingListHeading }}</h2><p>{{ loadingListDescription }}</p></div><el-button v-if="loadingDetail && loadingListMode === 'confirmed'" @click="printLoadingList">打印装柜清单</el-button></header>
+        <header class="loading-list-heading"><div><h2 id="container-loading-list-heading">{{ loadingListHeading }}</h2><p>{{ loadingListDescription }}</p></div></header>
         <ContainerOverviewPanel v-if="overview" :overview="overview" :sections="['pda']" :can-manage-documents="false" :can-manage-customs="false" :can-manage-exception="false" />
         <ContainerCustomsPanel v-if="overview?.loadingPlanId && canListCustoms" :loading-plan-id="overview.loadingPlanId" :can-list="canListCustoms" :can-manage="canManageCustoms" :departure-state="customsDepartureState" @refreshed="refreshAfterCustoms" />
-        <LoadingListDetailDrawer dense :mode="loadingListMode" embedded :loading="loadingDetailLoading" :detail="loadingDetail" :error="loadingDetailError" :can-edit="false" @back="activeTab = 'overview'" @retry="overview && loadLoadingDetail(detail, overview)" />
+        <LoadingListDetailDrawer dense :mode="loadingListMode" back-label="返回货柜概览" :loading="loadingDetailLoading" :detail="loadingDetail" :error="loadingDetailError" :can-edit="false" @back="activeTab = 'overview'" @retry="overview && loadLoadingDetail(detail, overview)" />
       </section>
 
       <section v-if="canViewFirstLegFees && firstLegFeesOpened" v-show="activeTab === 'first-leg-fees'" v-loading="loadingDetailLoading" class="detail-section surface-panel" aria-label="头程计费">
@@ -612,6 +601,10 @@ onMounted(async () => { await load(); if (isOverseas.value && route.query.action
 </template>
 
 <style scoped>
+.loading-list-heading { margin-bottom: var(--admin-space-5); }
+.loading-list-heading h2 { margin: 0; font-size: var(--admin-font-title); }
+.loading-list-heading p { margin: var(--admin-space-2) 0 0; color: var(--cc-muted); font-size: var(--admin-font-caption); }
+.loading-list-heading ~ .container-customs, .loading-list-heading ~ .loading-detail-content { margin-top: var(--admin-space-6); padding-top: var(--admin-space-5); border-top: 1px solid var(--cc-border); }
 .workbench-tab-label { display:inline-flex; align-items:center; justify-content:center; gap:var(--admin-space-3); white-space:nowrap; }
 .container-detail-page { display:grid; min-width:0; gap:var(--admin-space-5); }.container-overview { overflow:hidden; }.container-overview__header { display:grid; grid-template-columns:auto minmax(0,1fr) auto; align-items:center; gap:var(--admin-space-5); padding:var(--admin-space-4) var(--admin-space-5); }.container-overview__header h1 { margin:0; font-size:var(--admin-font-title); }.container-overview__header p { margin:2px 0 0; color:var(--cc-muted); font-size:var(--admin-font-caption); }.container-overview__summary { border-top:1px solid var(--cc-border); display:flex; flex-wrap:wrap; }.container-overview__summary>div { display:flex; min-width:0; padding:var(--admin-space-3) var(--admin-space-5); border-right:1px solid var(--cc-border); align-items:baseline; gap:var(--admin-space-2); }.container-overview__summary>div:last-child { border-right:0; }.container-overview__summary span,dt { color:var(--cc-muted); font-size:var(--admin-font-caption); }.container-overview__summary strong,dd { margin:0; white-space:normal; overflow-wrap:anywhere; }.detail-section{display:grid;min-width:0;gap:var(--admin-space-5);padding:var(--admin-space-5) var(--admin-space-5)}.detail-section>h2{margin:0;font-size:var(--admin-font-section)}.detail-fields { padding:0; }.outbound-panel{padding:var(--admin-space-5) 0 0;border-top:1px solid var(--cc-border)}.outbound-panel__header{display:flex;align-items:center;justify-content:space-between;gap:var(--admin-space-5)}.outbound-panel__header h2{margin:0;font-size:var(--admin-font-section)}.outbound-panel__header p,.outbound-panel__hint{margin:3px 0 0;color:var(--cc-muted);font-size:var(--admin-font-caption)}.outbound-panel__hint--success{color:var(--el-color-success)}.outbound-panel__actions{display:flex;align-items:center;gap:var(--admin-space-3)}.outbound-panel__loading{padding:var(--admin-space-3) 0}.gate-summary{display:flex;align-items:center;gap:var(--admin-space-5);margin-top:var(--admin-space-3);color:var(--cc-muted);font-size:var(--admin-font-caption)}.gate-summary__passed strong{color:var(--el-color-success)}.gate-summary__blocked strong{color:var(--el-color-danger)}.gate-summary__reference{margin-left:auto;padding-left:var(--admin-space-4);border-left:1px solid var(--cc-border)}.gate-list{display:grid;grid-template-columns:repeat(2,minmax(0,1fr));gap:var(--admin-space-2) var(--admin-space-5);margin-top:7px}.gate-row{display:grid;grid-template-columns:auto minmax(130px,.9fr) minmax(100px,1fr);align-items:center;gap:var(--admin-space-2) var(--admin-space-3);min-width:0;padding:var(--admin-space-2) var(--admin-space-3);border:1px solid var(--cc-border);border-radius:var(--admin-radius);background:var(--cc-surface-muted)}.gate-row__actual,.gate-row small{color:var(--cc-muted);font-size:var(--admin-font-caption);white-space:normal;overflow-wrap:anywhere}.gate-row small{grid-column:2/-1}.gate-row__coverage{display:flex;grid-column:2/-1;min-width:0;align-items:center;gap:5px;overflow:hidden}.gate-row__coverage>span{flex:0 0 auto;color:var(--cc-muted);font-size:var(--admin-font-caption)}.gate-row__coverage :deep(.el-tag){max-width:120px;overflow:hidden;text-overflow:ellipsis}.carrier-panel{padding-top:var(--admin-space-1)}@media(max-width:1200px){.gate-list{grid-template-columns:1fr}}@media(max-width:720px){.container-overview__header{grid-template-columns:auto minmax(0,1fr)}.container-overview__header>:last-child{grid-column:2}.container-overview__summary,.detail-fields dl{grid-template-columns:repeat(2,minmax(0,1fr))}.outbound-panel__header{align-items:flex-start;flex-direction:column}.outbound-panel__actions,.gate-summary{flex-wrap:wrap}.gate-summary__reference{width:100%;margin-left:0;padding-left:0;border-left:0}.gate-row{grid-template-columns:auto minmax(0,1fr)}.gate-row__actual,.gate-row small,.gate-row__coverage{grid-column:2}}
 .detail-section__heading { display:flex; align-items:center; justify-content:space-between; gap:var(--admin-space-5); }

src/modules/container-loading/pages/ContainerWorkbenchView.test.ts

@@ -0,0 +1,33 @@
+import { mount } from '@vue/test-utils'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import ContainerWorkbenchView from './ContainerWorkbenchView.vue'
+
+const mocks = vi.hoisted(() => ({ permissions: new Set<string>(), push: vi.fn() }))
+vi.mock('@/core/access/accessPreview', () => ({ useAccessPreviewStore: () => ({ can: (permission: string) => mocks.permissions.has(permission) }) }))
+vi.mock('vue-router', () => ({ useRouter: () => ({ push: mocks.push }) }))
+vi.mock('./ContainersView.vue', () => ({ default: { props: ['workbench'], template: '<div data-testid="workbench">{{ workbench }}</div>' } }))
+
+function render(stage: 'DOMESTIC' | 'OVERSEAS' = 'DOMESTIC') {
+  return mount(ContainerWorkbenchView, { props: { stage }, global: { stubs: { ElButton: { template: '<button><slot /></button>' } } } })
+}
+
+describe('container stage entry permissions', () => {
+  beforeEach(() => { mocks.permissions.clear(); mocks.push.mockReset() })
+  it('opens overseas operations for an overseas-only user entering the common menu', () => {
+    mocks.permissions.add('platform:firstleg:terminal-drayage:list')
+    const wrapper = render()
+    expect(wrapper.get('[data-testid="workbench"]').text()).toBe('OVERSEAS')
+    expect(wrapper.text()).not.toContain('国内装柜')
+  })
+  it('preserves a direct overseas visit and allows switching back to domestic', async () => {
+    mocks.permissions.add('platform:firstleg:terminal-drayage:list')
+    mocks.permissions.add('platform:firstleg:container:list')
+    const wrapper = render('OVERSEAS')
+    expect(wrapper.get('[data-testid="workbench"]').text()).toBe('OVERSEAS')
+    await wrapper.findAll('button')[0]!.trigger('click')
+    expect(mocks.push).toHaveBeenCalledWith({ name: 'domestic-container-workbench' })
+  })
+  it('does not mount data consumers without either list permission', () => {
+    expect(render().find('[data-testid="workbench"]').exists()).toBe(false)
+  })
+})

src/modules/container-loading/pages/ContainerWorkbenchView.vue

@@ -0,0 +1,24 @@
+<script setup lang="ts">
+import '@/styles/adminDensity.css'
+import { computed } from 'vue'
+import { useRouter } from 'vue-router'
+import { useAccessPreviewStore } from '@/core/access/accessPreview'
+import ContainersView from './ContainersView.vue'
+
+const props = defineProps<{ stage: 'DOMESTIC' | 'OVERSEAS' }>()
+const access = useAccessPreviewStore()
+const router = useRouter()
+const canDomestic = computed(() => access.can('platform:firstleg:container:list'))
+const canOverseas = computed(() => access.can('platform:firstleg:terminal-drayage:list'))
+const current = computed(() => props.stage === 'DOMESTIC' && !canDomestic.value && canOverseas.value ? 'OVERSEAS' : props.stage)
+</script>
+
+<template>
+  <div class="admin-density">
+    <nav class="density-status-tabs" aria-label="货柜业务阶段">
+      <el-button v-if="canDomestic" :class="{ 'is-active': current === 'DOMESTIC' }" :aria-current="current === 'DOMESTIC' ? 'page' : undefined" @click="router.push({ name: 'domestic-container-workbench' })">📦 国内装柜</el-button>
+      <el-button v-if="canOverseas" :class="{ 'is-active': current === 'OVERSEAS' }" :aria-current="current === 'OVERSEAS' ? 'page' : undefined" @click="router.push({ name: 'overseas-container-workbench' })">🚢 海外清关提柜</el-button>
+    </nav>
+    <ContainersView v-if="canDomestic || canOverseas" :key="current" :workbench="current" />
+  </div>
+</template>

src/modules/container-loading/pages/ContainersView.test.ts

@@ -75,9 +75,9 @@ describe('ContainersView', () => {
     vi.mocked(recordTerminalDrayageEmptyReturn).mockReset().mockResolvedValue({ ...drayage, status: 'EMPTY_RETURNED', actualEmptyReturnAt: '2026-09-11T13:00:00', version: 4, emptyReturnWarning: { status: 'RESOLVED', deadlineAt: '2026-09-10T10:00:00', overdueHours: 0, overdueDays: 0 }, allowedActions: ['SELECT_FLEET'] })
     vi.mocked(listContainerArrivalTimes).mockReset().mockResolvedValue([{ sourceContainerBookingId: '9001', estimatedWarehouseArrivalAt: '2026-09-25T15:31:00', actualWarehouseArrivalAt: '2026-09-26T09:00:00', version: 0 }])
     vi.mocked(updateContainerExpectedArrival).mockReset().mockResolvedValue({ sourceContainerBookingId: '9001', estimatedWarehouseArrivalAt: '2026-09-25T16:00:00', actualWarehouseArrivalAt: '2026-09-26T09:00:00', version: 1 })
-    vi.mocked(listContainers).mockResolvedValue({ records: [{ id: '9001', planId: null, bookingNo: 'BK-1', cabinetNo: 'CB-1', containerNo: 'MSCU-1', sourceType: 'SIMULATION', allowedActions: ['EDIT_CONTAINER', 'SELECT_FLEET', 'SCHEDULE_PICKUP', 'RECORD_EMPTY_RETURN'], terminalDrayage: drayage, oceanBookingId: null, warehouseId: '8', warehouseName: '义乌仓', channelGroupCode: 'MATSON_CLX', channelCode: null, channelName: null, containerType: '40HQ', planStatus: 'WAIT_LOADING', version: 0, billOfLadingNo: null, vesselName: null, voyageNo: null, shippingCompanyId: null, shippingCompanyName: null, departurePortCode: null, departurePortName: '宁波', destinationPortCode: null, destinationPortName: '长滩', destinationWarehouseCode: null, destinationWarehouseName: null, capacityCbm: 68, maxWeightKg: 19500, terminalTruckingCompanyId: null, terminalTruckingCompany: null, loadingAt: null, estimatedSailingAt: null, actualSailingAt: null, estimatedPortArrivalAt: null, actualPortArrivalAt: null, estimatedWarehouseArrivalAt: null, actualWarehouseArrivalAt: null }], page: 1, size: 20, total: 1, pages: 1 })
-    vi.mocked(getContainer).mockResolvedValue({ id: '9001', planId: null, bookingNo: 'BK-1', cabinetNo: 'CB-1', containerNo: 'MSCU-1', sourceType: 'SIMULATION', allowedActions: ['EDIT_CONTAINER'], oceanBookingId: null, warehouseId: '8', warehouseName: '义乌仓', channelGroupCode: 'MATSON_CLX', channelCode: null, channelName: null, containerType: '40HQ', planStatus: 'WAIT_LOADING', version: 0, billOfLadingNo: null, vesselName: null, voyageNo: null, shippingCompanyId: null, shippingCompanyName: null, departurePortCode: null, departurePortName: '宁波', destinationPortCode: null, destinationPortName: '长滩', destinationWarehouseCode: null, destinationWarehouseName: null, capacityCbm: 68, maxWeightKg: 19500, terminalTruckingCompanyId: null, terminalTruckingCompany: null, loadingAt: null, estimatedSailingAt: null, actualSailingAt: null, estimatedPortArrivalAt: null, actualPortArrivalAt: null, estimatedWarehouseArrivalAt: null, actualWarehouseArrivalAt: null })
-    vi.mocked(getContainerOverview).mockResolvedValue({ container: { id: '9001', bookingNo: 'BK-1', cabinetNo: 'CB-1', containerNo: 'MSCU-1', status: 'WAIT_LOADING', warehouseId: '8', warehouseName: '义乌仓', voyageNo: null, vesselName: null, version: 0 }, loadingPlanId: null, pda: null, documents: [], exception: { active: false, reason: null, markedBy: null, markedByName: null, markedAt: null }, exceptionHistory: [], timeline: [] })
+    vi.mocked(listContainers).mockResolvedValue({ records: [{ id: '9001', planId: null, cabinetNo: 'CB-1', containerNo: 'MSCU-1', sourceType: 'SIMULATION', allowedActions: ['EDIT_CONTAINER', 'SELECT_FLEET', 'SCHEDULE_PICKUP', 'RECORD_EMPTY_RETURN'], terminalDrayage: drayage, oceanBookingId: null, warehouseId: '8', warehouseName: '义乌仓', channelGroupCode: 'MATSON_CLX', channelCode: null, channelName: null, containerType: '40HQ', planStatus: 'WAIT_LOADING', version: 0, billOfLadingNo: null, vesselName: null, voyageNo: null, shippingCompanyId: null, shippingCompanyName: null, departurePortCode: null, departurePortName: '宁波', destinationPortCode: null, destinationPortName: '长滩', destinationWarehouseCode: null, destinationWarehouseName: null, capacityCbm: 68, maxWeightKg: 19500, terminalTruckingCompanyId: null, terminalTruckingCompany: null, loadingAt: null, estimatedSailingAt: null, actualSailingAt: null, estimatedPortArrivalAt: null, actualPortArrivalAt: null, estimatedWarehouseArrivalAt: null, actualWarehouseArrivalAt: null }], page: 1, size: 20, total: 1, pages: 1 })
+    vi.mocked(getContainer).mockResolvedValue({ id: '9001', planId: null, cabinetNo: 'CB-1', containerNo: 'MSCU-1', sourceType: 'SIMULATION', allowedActions: ['EDIT_CONTAINER'], oceanBookingId: null, warehouseId: '8', warehouseName: '义乌仓', channelGroupCode: 'MATSON_CLX', channelCode: null, channelName: null, containerType: '40HQ', planStatus: 'WAIT_LOADING', version: 0, billOfLadingNo: null, vesselName: null, voyageNo: null, shippingCompanyId: null, shippingCompanyName: null, departurePortCode: null, departurePortName: '宁波', destinationPortCode: null, destinationPortName: '长滩', destinationWarehouseCode: null, destinationWarehouseName: null, capacityCbm: 68, maxWeightKg: 19500, terminalTruckingCompanyId: null, terminalTruckingCompany: null, loadingAt: null, estimatedSailingAt: null, actualSailingAt: null, estimatedPortArrivalAt: null, actualPortArrivalAt: null, estimatedWarehouseArrivalAt: null, actualWarehouseArrivalAt: null })
+    vi.mocked(getContainerOverview).mockResolvedValue({ container: { id: '9001', cabinetNo: 'CB-1', containerNo: 'MSCU-1', status: 'WAIT_LOADING', warehouseId: '8', warehouseName: '义乌仓', voyageNo: null, vesselName: null, version: 0 }, loadingPlanId: null, pda: null, documents: [], exception: { active: false, reason: null, markedBy: null, markedByName: null, markedAt: null }, exceptionHistory: [], timeline: [] })
   })
 
   it('loads the real paged contract and renders core container fields', async () => {
@@ -296,7 +296,7 @@ describe('ContainersView', () => {
 
   it('uses stable view labels when cabinetNo is missing', async () => {
     const base = {
-      id: '9001', planId: null, bookingNo: 'BK-1', cabinetNo: 'CB-1', containerNo: 'MSCU-1', warehouseId: '8', warehouseName: '义乌仓', containerType: '40HQ', planStatus: 'WAIT_LOADING' as const, version: 0,
+      id: '9001', planId: null, cabinetNo: 'CB-1', containerNo: 'MSCU-1', warehouseId: '8', warehouseName: '义乌仓', containerType: '40HQ', planStatus: 'WAIT_LOADING' as const, version: 0,
       billOfLadingNo: null, vesselName: null, voyageNo: null, shippingCompanyId: null, shippingCompanyName: null,
       departurePortCode: null, departurePortName: '宁波', destinationPortCode: null, destinationPortName: '长滩',
       destinationWarehouseCode: null, destinationWarehouseName: null, capacityCbm: 68, maxWeightKg: 19500,
@@ -305,9 +305,9 @@ describe('ContainersView', () => {
     }
     vi.mocked(listContainers).mockResolvedValueOnce({
       records: [
-        { ...base, id: '9002', cabinetNo: undefined, containerNo: 'MSCU-2', bookingNo: 'BK-2' },
-        { ...base, id: '9003', cabinetNo: '', containerNo: null, bookingNo: 'BK-3' },
-        { ...base, id: '9004', cabinetNo: null, containerNo: null, bookingNo: '' },
+        { ...base, id: '9002', cabinetNo: undefined, containerNo: 'MSCU-2' },
+        { ...base, id: '9003', cabinetNo: '', containerNo: null },
+        { ...base, id: '9004', cabinetNo: null, containerNo: null },
       ],
       page: 1, size: 20, total: 3, pages: 1,
     } as never)
@@ -319,13 +319,13 @@ describe('ContainersView', () => {
     const labels = wrapper.findAll('.el-table__body button')
       .map((button) => button.attributes('aria-label'))
       .filter((label): label is string => Boolean(label))
-    expect(labels).toEqual(expect.arrayContaining(['查看 MSCU-2', '查看 BK-3', '查看货柜详情']))
+    expect(labels).toEqual(['查看 MSCU-2', '查看货柜详情', '查看货柜详情'])
     expect(labels.every((label) => !/undefined|null/.test(label))).toBe(true)
   })
 
   it('routes each plan status to its owning workflow without reopening pushed drafts', async () => {
     const base = {
-      id: '9001', planId: '9101', bookingNo: 'BK-1', cabinetNo: 'CB-1', containerNo: 'MSCU-1', warehouseId: '8', warehouseName: '义乌仓', channelGroupCode: 'MATSON_CLX', channelCode: null, channelName: null, containerType: '40HQ', version: 0,
+      id: '9001', planId: '9101', cabinetNo: 'CB-1', containerNo: 'MSCU-1', warehouseId: '8', warehouseName: '义乌仓', channelGroupCode: 'MATSON_CLX', channelCode: null, channelName: null, containerType: '40HQ', version: 0,
       billOfLadingNo: null, vesselName: null, voyageNo: null, shippingCompanyId: null, shippingCompanyName: null,
       departurePortCode: null, departurePortName: '宁波', destinationPortCode: null, destinationPortName: '长滩',
       destinationWarehouseCode: null, destinationWarehouseName: null, capacityCbm: 68, maxWeightKg: 19500,
@@ -456,7 +456,7 @@ describe('ContainersView', () => {
     expect(source).toContain("import RowActions, { type RowActionItem } from '@/shared/components/RowActions.vue'")
     expect(source).toContain("{ key: 'view', label: '查看', ariaLabel: containerViewLabel(row), priority: 500")
     expect(source).toContain("hasAction(row, 'EDIT_CONTAINER')")
-    expect(source).toContain('<RowActions :actions="containerRowActions(row as ContainerWorkbenchRow)"')
+    expect(source).toContain('<RowActions text-actions :actions="containerRowActions(row as ContainerWorkbenchRow)"')
     expect(source).not.toContain("row.containerNo ? '修改集装箱号' : '录入集装箱号'")
     expect(source).toContain('货柜基础资料不提供柜号写入')
     expect(source).toContain('containerNo: optional(detail.value?.containerNo || null)')
@@ -465,7 +465,8 @@ describe('ContainersView', () => {
     expect(source).toContain("row.planStatus === 'EDITING' ? canSmartLoading.value")
     expect(source).not.toContain('canSmartLoading && row.containerNo')
     expect(source).not.toContain('link type="primary" :aria-label="containerViewLabel')
-    expect(source).toContain(':loading="loading" stripe preference-key="container-loading-table"')
+    expect(source).toContain(':loading="loading" preference-key="container-loading-table"')
+    expect(source).toContain('appearance="integrated" :stripe="false"')
   })
 
   it('updates an ACTIVE TRUCKING fleet inline and records actual empty return once', async () => {
@@ -579,7 +580,7 @@ describe('ContainersView', () => {
     try {
       await flushPromises()
       const actions = wrapper.find('.el-table__body .row-actions')
-      expect(actions.findAll('button').map((button) => button.text())).toEqual(['查看', '编辑', ({ EDITING: '装柜', LOADING: '预装清单', COMPLETED: '装柜清单' })[planStatus], ''])
+      expect(actions.findAll('button').map((button) => button.text())).toEqual(['查看', '编辑', ({ EDITING: '装柜', LOADING: '预装清单', COMPLETED: '装柜清单' })[planStatus], '更多'])
       await actions.find('button[aria-label="更多货柜操作"]').trigger('click')
       await flushPromises()
       const link = Array.from(document.body.querySelectorAll<HTMLElement>('.el-dropdown-menu__item'))
@@ -631,7 +632,7 @@ describe('ContainersView', () => {
 
   it('filters OB-260825-0183 for CAB-260825-0215 because the real warehouses differ', async () => {
     vi.mocked(listContainers).mockResolvedValue({ records: [{
-      id: '215', planId: null, bookingNo: 'CB-260825-0215', cabinetNo: 'CAB-260825-0215', containerNo: null,
+      id: '215', planId: null, cabinetNo: 'CAB-260825-0215', containerNo: null,
       sourceType: 'SIMULATION', allowedActions: ['EDIT_CONTAINER'], oceanBookingId: null, warehouseId: '193000000000200002', warehouseName: '东莞仓',
       channelGroupCode: 'EXX', channelCode: null, channelName: null, containerType: '45HQ', planStatus: 'EDITING',
       capacityCbm: 86, maxWeightKg: 29000, version: 7,
@@ -678,7 +679,7 @@ describe('ContainersView', () => {
   it('keeps a three-field match selectable when only capacity snapshots differ and blocks duplicate waves', async () => {
     let resolveCandidates!: (value: Awaited<ReturnType<typeof listOceanBookingLinkCandidates>>) => void
     vi.mocked(listContainers).mockResolvedValue({ records: [{
-      id: '315', planId: null, bookingNo: 'CB-CAPACITY-SNAPSHOT', cabinetNo: 'CAB-CAPACITY-SNAPSHOT', containerNo: null,
+      id: '315', planId: null, cabinetNo: 'CAB-CAPACITY-SNAPSHOT', containerNo: null,
       sourceType: 'SIMULATION', allowedActions: ['EDIT_CONTAINER'], oceanBookingId: null, warehouseId: '193000000000200002', warehouseName: '东莞仓',
       channelGroupCode: 'EXX', channelCode: null, channelName: null, containerType: '45HQ', planStatus: 'WAIT_LOADING',
       capacityCbm: 86, maxWeightKg: 29000, version: 7,

src/modules/container-loading/pages/ContainersView.vue

@@ -2,7 +2,7 @@
 import '@/styles/adminDensity.css'
 import { computed, onMounted, reactive, ref, watch } from 'vue'
 import ContainerSimulationCreate from '../components/ContainerSimulationCreate.vue'
-import { useRouter } from 'vue-router'
+import { useRoute, useRouter } from 'vue-router'
 import { ElMessage, ElMessageBox, type FormInstance, type FormRules } from 'element-plus'
 import { useAccessPreviewStore } from '@/core/access/accessPreview'
 import { listPlatformTenants, type PlatformTenantResource } from '@/modules/iam'
@@ -23,6 +23,7 @@ import { getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
 import { getContainer, listContainers, updateContainer } from '../api/platformContainerLoading'
 import OceanBookingLinkDialog from '../components/OceanBookingLinkDialog.vue'
 import { getSmartLoadingChannelGroup } from '../smartLoadingChannelGroups'
+import { containerChannelLabel } from '../containerChannelLabel'
 import {
   getTerminalDrayageEmails,
   sendTerminalDrayageEmail,
@@ -45,6 +46,7 @@ type ContainerForm = ContainerSaveRequest & Pick<ContainerBookingResource, 'cabi
 const props = withDefaults(defineProps<{ workbench?: 'DOMESTIC' | 'OVERSEAS' }>(), { workbench: 'DOMESTIC' })
 
 const router = useRouter()
+const route = useRoute()
 const access = useAccessPreviewStore()
 const rows = ref<ContainerWorkbenchRow[]>([])
 const customers = ref<PlatformTenantResource[]>([])
@@ -66,7 +68,7 @@ const page = ref(1)
 const pageSize = ref(20)
 const total = ref(0)
 const scope = ref<'ACTIVE' | 'HISTORY'>('ACTIVE')
-const filters = ref<Filters>({ customerId: '', keyword: '', containerType: '', status: '', sailingRange: [] })
+const filters = ref<Filters>({ customerId: '', keyword: typeof route.query.keyword === 'string' ? route.query.keyword : '', containerType: '', status: '', sailingRange: [] })
 const applied = ref<Filters>({ ...filters.value })
 const detail = ref<ContainerBookingResource | null>(null)
 const editorOpen = ref(false)
@@ -244,7 +246,7 @@ const allColumns: DataTableColumn[] = [
   { key: 'oceanBooking', label: '真实订舱', minWidth: 170, slotName: 'oceanBooking' },
   { key: 'warehouseName', prop: 'warehouseName', label: '装柜仓库', minWidth: 160 },
   { key: 'channelGroupCode', label: '计划渠道', minWidth: 140, formatter: (row: ContainerBookingResource) => getSmartLoadingChannelGroup(row.channelGroupCode)?.name || '—' },
-  { key: 'channelName', label: '实际渠道', minWidth: 160, formatter: (row: ContainerBookingResource) => row.channelName || '待关联订舱' },
+  { key: 'channelName', label: '实际渠道', minWidth: 160, formatter: (row: ContainerBookingResource) => containerChannelLabel(row) },
   { key: 'terminalTruckingCompany', label: '码头车队', width: 190, slotName: 'terminalTruckingCompany' },
   { key: 'pickupAppointmentAt', label: '预计到仓', width: 210, slotName: 'pickupAppointmentAt' },
   { key: 'actualPickupAt', label: '实际到仓', width: 165, slotName: 'actualPickupAt' },
@@ -311,7 +313,7 @@ function localDateTimeValue() {
   return now.toISOString().slice(0, 19)
 }
 function containerViewLabel(row: ContainerBookingResource) {
-  const reference = [row.cabinetNo, row.containerNo, row.bookingNo]
+  const reference = [row.cabinetNo, row.containerNo]
     .find((value) => typeof value === 'string' && value.trim())
   return reference ? `查看 ${reference}` : '查看货柜详情'
 }
@@ -730,22 +732,26 @@ onMounted(async () => { await Promise.all([loadCustomers(), loadRows()]) })
   <AdminPage class="admin-density" as="div">
     <section class="container-page">
       <ListPageLayout :ariaLabel="isDomestic ? '送柜报关工作台' : '清关提柜工作台'">
-      <template #toolbar>
-        <div class="container-query-panel">
-          <div class="container-scope-tabs density-tabs" role="tablist" aria-label="货柜完结状态">
-            <button type="button" role="tab" aria-controls="container-workbench-results" :aria-selected="scope === 'ACTIVE'" :tabindex="scope === 'ACTIVE' ? 0 : -1" :class="['container-scope-tab', { active: scope === 'ACTIVE' }]" @click="scope = 'ACTIVE'">未完结</button>
-            <button type="button" role="tab" aria-controls="container-workbench-results" :aria-selected="scope === 'HISTORY'" :tabindex="scope === 'HISTORY' ? 0 : -1" :class="['container-scope-tab', { active: scope === 'HISTORY' }]" @click="scope = 'HISTORY'">已完结</button>
+
+
+        <section id="container-workbench-results" ><DataTable appearance="integrated" :stripe="false" column-settings-mode="show" :results-visible="!loadError" v-model:page="page" v-model:page-size="pageSize" :data="rows" :columns="columns" :total="total" :loading="loading" preference-key="container-loading-table" empty-text="暂无货柜">
+        <template #toolbar-start><h1>{{ isDomestic ? '货柜列表' : '清关提柜' }}</h1></template>
+        <template #filters>
+        <div class="container-query-panel integrated-query-group">
+          <div class="container-scope-tabs density-status-tabs" role="tablist" aria-label="货柜完结状态">
+            <button type="button" role="tab" aria-controls="container-workbench-results" :aria-selected="scope === 'ACTIVE'" :tabindex="scope === 'ACTIVE' ? 0 : -1" :class="['container-scope-tab', { 'is-active': scope === 'ACTIVE' }]" @click="scope = 'ACTIVE'">未完结</button>
+            <button type="button" role="tab" aria-controls="container-workbench-results" :aria-selected="scope === 'HISTORY'" :tabindex="scope === 'HISTORY' ? 0 : -1" :class="['container-scope-tab', { 'is-active': scope === 'HISTORY' }]" @click="scope = 'HISTORY'">已完结</button>
           </div>
           <QueryToolbar v-model="filters" class="container-query-toolbar" ariaLabel="货柜筛选" :fields="queryFields" preference-key="container-loading-query" @search="search" />
         </div>
       </template>
-      <template v-if="loadError" #state>
+        <template #notices><template v-if="loadError">
         <LoadErrorState title="货柜列表加载失败" :message="loadError.message" :loading="loading" @retry="loadRows"><template #details><ApiErrorMeta :details="loadError" /></template></LoadErrorState>
-      </template>
-        <section v-if="!loadError" id="container-workbench-results" class="surface-panel table-panel">
-          <DataTable v-model:page="page" v-model:page-size="pageSize" :data="rows" :columns="columns" :total="total" :loading="loading" stripe preference-key="container-loading-table" empty-text="暂无货柜">
+      </template></template>
+
+
             <template #toolbar-actions><ContainerSimulationCreate dense v-if="isDomestic && canCreate" :load-warehouse-options="loadSimulationWarehouses" @created="loadRows" /></template>
-            <template #actions="{ row }"><RowActions :actions="containerRowActions(row as ContainerWorkbenchRow)" more-label="更多货柜操作" @action="handleContainerRowAction($event, row as ContainerWorkbenchRow)" /></template>
+            <template #actions="{ row }"><RowActions text-actions :actions="containerRowActions(row as ContainerWorkbenchRow)" more-label="更多货柜操作" @action="handleContainerRowAction($event, row as ContainerWorkbenchRow)" /></template>
             <template #emptyReturnWarning="{ row }"><el-tag :type="drayageWarningType(row as ContainerBookingResource)" effect="light" :title="drayageWarningTitle(row as ContainerBookingResource)">{{ drayageWarningText(row as ContainerBookingResource) }}</el-tag></template>
             <template #cabinet="{ row }"><strong>{{ row.cabinetNo }}</strong><small>系统生成</small></template>
             <template #oceanBooking="{ row }"><span v-if="row.oceanBookingId"><strong>{{ row.billOfLadingNo || '已关联订舱' }}</strong><small>{{ row.containerNo ? `集装箱号：${row.containerNo}` : '集装箱号：待补录' }}</small></span><span v-else>未关联</span></template>
@@ -764,8 +770,7 @@ onMounted(async () => { await Promise.all([loadCustomers(), loadRows()]) })
             <template #actualSailingAt="{ row }">{{ formatTime(row.actualFacts?.actualSailingAt) }}</template>
             <template #estimatedPortArrivalAt="{ row }">{{ formatTime(row.estimatedPortArrivalAt) }}</template>
             <template #actualPortArrivalAt="{ row }">{{ formatTime(row.actualFacts?.actualPortArrivalAt) }}</template>
-          </DataTable>
-        </section>
+          </DataTable></section>
       </ListPageLayout>
 
     <OceanBookingLinkDialog v-model="linkOpen" :container="linkTarget" @linked="loadRows" />
@@ -819,7 +824,7 @@ onMounted(async () => { await Promise.all([loadCustomers(), loadRows()]) })
 </template>
 
 <style scoped>
-.container-page { display: grid; gap: var(--admin-space-5); min-width: 0; }.container-page small { display: block; margin-top: var(--admin-space-1); color: var(--cc-muted); }.container-query-panel { overflow: hidden; border: 1px solid var(--cc-border); border-radius: var(--admin-radius); background: var(--admin-surface); }.container-scope-tabs { display: flex; max-width: 100%; overflow-x: auto; margin-bottom: 0; border-bottom: 1px solid #e5e7eb; scrollbar-width: thin; }.container-query-toolbar { border: 0; }.row-actions { flex-wrap: nowrap; white-space: nowrap; }.row-actions :deep(.el-button + .el-button) { margin-left: 0; }.form-grid { display: grid; grid-template-columns: repeat(2, minmax(0, 1fr)); gap: 0 var(--admin-space-5); }.form-grid :deep(.el-select),.form-grid :deep(.el-date-editor),.form-grid :deep(.el-input-number),.simulation-form :deep(.el-select),.simulation-form :deep(.el-input-number),.fleet-select { width: 100%; }.arrival-time-cell { display: flex; align-items: center; width: 100%; min-width: 0; padding-right: var(--admin-space-1); box-sizing: border-box; }.arrival-time-picker { width: 200px !important; max-width: 100%; min-width: 0; box-sizing: border-box; }.details :deep(.el-descriptions__label) { width: 120px; }.drayage-load-alert { margin-bottom: var(--admin-space-5); }.drayage-summary { margin-bottom: var(--admin-space-5); }
+.container-page { display: grid; gap: var(--admin-space-5); min-width: 0; }.container-page small { display: block; margin-top: var(--admin-space-1); color: var(--cc-muted); }.container-query-panel { min-width: 0; }.container-query-toolbar { border: 0; }.row-actions { flex-wrap: nowrap; white-space: nowrap; }.row-actions :deep(.el-button + .el-button) { margin-left: 0; }.form-grid { display: grid; grid-template-columns: repeat(2, minmax(0, 1fr)); gap: 0 var(--admin-space-5); }.form-grid :deep(.el-select),.form-grid :deep(.el-date-editor),.form-grid :deep(.el-input-number),.simulation-form :deep(.el-select),.simulation-form :deep(.el-input-number),.fleet-select { width: 100%; }.arrival-time-cell { display: flex; align-items: center; width: 100%; min-width: 0; padding-right: var(--admin-space-1); box-sizing: border-box; }.arrival-time-picker { width: 200px !important; max-width: 100%; min-width: 0; box-sizing: border-box; }.details :deep(.el-descriptions__label) { width: 120px; }.drayage-load-alert { margin-bottom: var(--admin-space-5); }.drayage-summary { margin-bottom: var(--admin-space-5); }
 .container-query-panel { width: 100%; max-width: 100%; min-width: 0; box-sizing: border-box; }
 .container-query-toolbar :deep(.query-toolbar__tail) { width: 100%; flex: 0 0 100%; }
 .container-page .table-panel { width: 100%; max-width: 100%; min-width: 0; }

src/modules/container-loading/pages/DomesticContainersView.vue

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