fix(router): 修复运单管理详情路由及合同详情路由重复定义问题

- 为 waybill-manage-page、transport-plan-page 等组件增加 routePathLocked 变量锁定路由路径
- 添加 isOwnedRouteActive 计算属性，防止缓存实例错误读取其它路由的 detailId 导致误请求
- watcher 和 openDetail 方法中添加路由守卫，避免多余的请求和误开详情标签
- 修改宿主视图绑定 detailId，避免直接绑定全局 $route.query 导致缓存污染
- 删除 router/views/index.js 中合同管理详情路由重复定义，防止内容区空白问题
- 优化 waybill-import-dialog 组件样式和结构，增加 section-card 包裹表单区域
- 调整相关组件 data、computed、watch 使用，确保第一次立即 watcher 正确读取路由数据
- 验证所有改动后相关页面 HTTP 200，标签页行为正常，解决「运单管理不存在」和合同详情空白问题

.workbuddy/memory/2026-09-10.md

@@ -0,0 +1,6 @@
+# 2026-09-10
+
+- 移除 project-apply 的 fund-risk-stats 请求（后端未实现端点，每次列表加载都弹 No endpoint 报错）：删除 onLoad 内 refreshFundRiskStats 调用与该方法、data 中 fundRiskStats；头部风险标签去掉「（数量）」只留「高风险/中风险」；api/business/project-apply.js 保留 getFundRiskStats 定义并注释「后端就绪后恢复」。
+EOF2
+}
+cat >> /Users/gxwebsoft/VUE/tms-erp-web-ws/.workbuddy/memory/2026-09-10.md <<'EOF'

.workbuddy/memory/2026-09-11.md

@@ -0,0 +1,28 @@
+# 2026-09-11
+
+## 上传证件区域固定宽度导致跨机器错位（transportCapacity）
+- 现象：driver.vue 新增弹窗的身份证/大头照上传框在本机对齐，他人电脑不对齐。
+- 根因：`--large` 上传框写死 `width:240px`（ship 写 248px），而弹窗 `width:90%` + `el-col :span=6` 列宽是弹性的、上方输入框 `width:100%`；列宽随分辨率 / Windows 系统缩放 / 浏览器缩放变化，240px 只在特定宽度下恰好等于列宽。叠加 `labelWidth:auto` 靠 JS 实测字体（苹方 vs 微软雅黑）宽度，label 列宽也不同 → 起始位置漂移。
+- 修复：三个文件改为 `width:100%; max-width:240px; flex:none`（ship 保留 248px 上限），窄屏跟随列宽、宽屏保持比例上限，左边缘恒与输入框对齐。
+  - `src/views/transportCapacity/driver.vue`（.driver-uploader--large）
+  - `src/views/transportCapacity/vehicle.vue`（.vehicle-uploader--large）
+  - `src/views/transportCapacity/ship.vue`（.ship-uploader--large）
+- 用 @vue/compiler-sfc（脚本放项目根目录）验证三个 SFC 编译通过。
+- 教训：本项目所有「固定 px 宽度的上传/控件」都要配 `max-width` + `width:100%`，否则高分屏/低分屏下必然错位。
+
+## 合同详情由弹窗改为独立页面（contract-manage）
+- 路由：新增 `/business/contract-manage/detail`（`src/router/views/index.js`，name『合同详情』，meta `keepAlive:false` + `activeMenu:'/business/contract-manage'`），组件仍复用 `contract-manage.vue`（与 form 页同一套路）。
+- 页面内三分支：`v-if="!isFormPage && !isDetailPage"`（列表）/ `v-else-if="isFormPage"`（表单）/ `v-else`（详情）。**v-else 必须紧邻 form 分支的 `</template>`**，中间不能插其它组件，否则 Vue 编译报「v-else 无相邻 v-if」——弹窗类组件（billing-plan-editor / 附件预览 / 变更记录详情 / 流程）放在三个分支之后。
+- 关键改动：`openDetail` 改 `router.push({ path:'/business/contract-manage/detail', query:{ id, name } })`；新增 `initDetailPage()`（按 query.id 拉详情，`resetDetailState()` 先清空）、`closeDetailPage()`（closeTag + 回列表）、`isDetailPage` / `detailPageTitle` computed；`created` 与 `$route.fullPath` watch 都要加 `else if (this.isDetailPage)`。
+- 样式：`.contract-manage-detail--page { max-height:none; overflow:visible }`，去掉弹窗的 74vh 限制；底栏复用 `.contract-manage-page__footer`（fixed 浮动），只读详情页按钮保留「关闭」。
+- 校验方式：dev server 已运行时 `curl "http://localhost:2889/src/views/business/contract-manage.vue"` 返回 200 即 Vite 编译通过（比整包 build 快）。
+
+## 只给「查看弹窗」加宽 label（temporary-credit-limit）
+- 场景：详情页长 label（「剩余项目资金使用额度（万元）」）换行超 2 行撑坏详情表格，但又不能影响新增/编辑页。
+- **关键发现：Avue 的 `avue-form` 在 detail 模式下根节点会挂 `.avue--detail` 类**（源码 `node_modules/@smallwei/avue/lib/packages/element-plus/form/index3.js` 中 `class: normalizeClass([b(), { 'avue--detail': isDetail }])`）。所以「只针对详情态」的选择器就是：
+  ```scss
+  .temporary-credit-limit-dialog .avue--detail .el-form-item__label { width:210px !important; flex:0 0 210px !important; }
+  ```
+  新增/编辑弹窗无 `.avue--detail`，天然不受影响，不需要在 option 里做 mode 判断。
+- 校验样式块编译：dev server 请求 `?vue&type=style&index=1&lang.scss`（**lang 必须写 scss，写 css 会 500**），grep 规则确认产物。
+- 结论备忘：长 label 优先「加宽 + 换行 ≤2 行」，不要用单行省略 + tooltip —— 详情是纯阅读场景，hover 才能看全字段名的可发现性差。

.workbuddy/memory/2026-09-17.md

@@ -0,0 +1,63 @@
+# 2026-09-17 工作日志
+
+## 配载管理（loading-manage）：弹窗全部改为独立表单页/详情页
+
+- 需求：`/business/loading-manage` 不再用弹窗，改成与新增合同（`/business/contract-manage/form?mode=add&name=新增合同管理`）一致的独立页面。
+- 现状：新增/编辑**已经**是独立页（组件内 `isStandaloneFormPage` + `/business/loading-manage/form` 路由），但「详情」和「重新派单」仍是 el-dialog（用户截图即详情弹窗）。
+- 改动（3 个文件）：
+  1. `src/router/views/index.js`：新增 `/business/loading-manage/detail`（name 配载单详情，`meta.keepAlive:false, activeMenu:'/business/loading-manage'`），组件仍是 `loading-manage.vue`。
+  2. `src/views/business/loading-manage.vue`：
+     - computed 新增 `isStandaloneDetailPage`（path==='/business/loading-manage/detail'）、`isStandalonePage`（form|detail 并集，作为隐藏列表容器的统一开关）、`detailPageTitle`、`formPageDefaultTitle`（add/edit/reassign 映射）；`isStandaloneFormPage` 放行 `mode=reassign`。
+     - 模板中所有控制「是否独立页/是否弹窗」的 `isStandaloneFormPage` 改为 `isStandalonePage`；顶部标题按详情/表单取 `detailPageTitle`/`formPageTitle`。
+     - 新增 `gotoLoadingDetail(row)`（push `/detail?id=&name=配载单详情`，替换「配载单号」链接与操作列「详情」）、`gotoLoadingReassign(row)`（push `/form?mode=reassign&id=&name=重新派单`）、`initStandaloneDetailPage()`；`initStandaloneFormPage` 模式透传 edit/reassign；`openLoadingDialog` 对 add/edit/reassign 一律转独立页；`closeLoadingDialog` 判据改 `isStandalonePage`。
+     - `mounted` / `watch $route` 增加详情页分支（直接打开与页内切换都要 init）；detail 分支除 id 变化外，`dialogMode !== 'view'` 也重新 init（防止从表单页切详情时残留表单态）。
+     - 兼容旧链接：`/business/loading-manage?detailId=x` 仍可用，会 replace 到详情页。
+     - 样式：底栏去掉写死的 `gap:8px`（全站统一 12px）；页面模式的内容区解除 `max-height:78vh` 内嵌滚动盒 —— 原 `:global(.loading-manage-form-page .loading-manage-dialog__body)` 权重 (0,2,0) 低于 scoped 规则 (0,3,0) 一直没生效，改为 `.loading-manage-page .loading-manage-form-dialog.loading-manage-form-page .loading-manage-dialog__body` (0,4,0)，内容改随 `#avue-view` 自然滚动（与合同页一致）。
+  3. `src/views/business/components/waybill-manage-page.vue`：`openLoadingDetail` 由 `/business/loading-manage?detailId=` 改为 push `/business/loading-manage/detail?id=&name=配载单详情`。
+- 校验：dev server（2889）单独编译 4 个模块均 HTTP 200（含 scoped scss）；`vite build` 仍会在无关文件 `src/page/login/facelogin.vue` 被沙箱敏感内容保护中断。
+- 踩坑：**`<style scoped lang="scss">` 顶层写 `//` 注释**会让该样式模块编译 500（`Unexpected '/'. Escaping special characters with \ may help.`），已实测确认；顶层必须用 `/* */`。
+- 未做：登录态无法在浏览器实测（无测试账号），需用户点 `/business/loading-manage` → 详情/重新派单 自测；`voucher-manage-detail` 跳配载时带的 `?loadingNo=` 参数本来就未被列表消费（历史遗留）。
+
+## 运单管理详情：打卡时间轴改为按打卡顺序展示
+
+- 文件：`src/views/business/components/waybill-manage-page.vue`（详情页「执行详情 → 打卡详情」tab）
+- 需求：时间轴不再固定按流程节点顺序（发货/在途/到货/卸货/签收/回单），改为按打卡时间先后展示。
+- 实现（不改后端、不改原始数据）：
+  1. 新增 computed `orderedWaybillPunchRecords`：映射出 `punchedAt`（毫秒时间戳）后排序 —— **已打卡记录按打卡时间升序排在前**，未打卡记录保持后端返回的节点顺序排在其后；时间相同用原索引稳定排序。
+  2. 新增 method `waybillPunchRecordTimestamp(record)`：`punched === false` 或 `statusName === '未打卡'` 直接返回 null（防止后端返回计划时间造成误序）；优先 `this.$dayjs(text).valueOf()`，失败兜底 `new Date(text.replace(/-/g,'/'))`（兼容 Safari）。
+  3. 模板 `el-timeline` 的 `v-for` 改用 `orderedWaybillPunchRecords`；`key` 由 `record.nodeCode || record.id || index` 改为 `${nodeCode||id||'punch'}-${index}`，避免同节点多次打卡（在途）时 key 重复。
+- 校验：项目根目录临时脚本 `_verify-sfc.mjs`（@vue/compiler-sfc parse + compileScript + compileTemplate）通过，已删除脚本。
+- 注意：`getPunchRecords`（`src/api/business/waybill-manage.js` → `/punch-records`）后端未提供节点排序字段，排序只能在前端做。
+
+## 保险记录批量导入：前端归一化日期格式
+
+- 文件：`src/views/vehicle/insurance-record.vue`（仅此一个文件）
+- 背景：保险记录批量导入是**后端驱动**——前端 `handleImport` 经 `importBlob` 把原始 Excel 直接 POST 到 `/blade-transport/insurance-record/import-insurance-record`，前端不解析行。后端只认 `2026-09-01`，`2026-9-1` 导入失败。
+- 决策：用户选择**前端归一化**（不动后端）。把 `openImportDialog` 改为自写 `httpRequest`：用 `xlsx` 读取 Excel → 把日期列（开始日期/结束日期/开票日期）`2026-9-1` 归一为 `2026-09-01` → 重写成新 File 再交给 `handleImportExcel` 上传；复用其失败明细下载与成功刷新逻辑。无日期列时回退为原文件（行为不变）。
+- 关键方法：`normalizeExcelDates` / `readExcelRows` / `writeExcelFile` / `normalizeDateString`（正则 `^(\d{4})[-/.年](\d{1,2})[-/.月](\d{1,2})日?$`，用 `new Date` 校验合法性后补零；非法/已标准格式返回 null 保持原值）。
+- 校验：本机 dev（localhost:2889）待用户部署自测。注意所有单元格经 `sheet_to_json(raw:false)` 后均为字符串，与 transport-plan-import 的客户端解析模式一致。
+
+## 车/船务模块导出 xlsx「创建时间/更新时间」为空（后端 tms-api 修复）
+
+- 现象：`/vehicle/insurance-record` 批量导出的 xlsx 里「创建时间」「更新时间」两列空白，「更新人」有值。用户要求车/船务模块所有页面统一修。
+- 定位：导出由**后端**生成（前端只传查询参数，`exportColumns` 参数后端未使用）。实测 `~/Downloads/保险记录2026-09-17 20_46_08.xlsx`：K/M 列单元格无 `<v>` 节点（值 null），E/F/J 日期列是数值 46266.0（带 numFmt `yyyy-MM-dd`，WPS 显示为日期）。
+- 根因：Service 用 BladeX `org.springblade.core.tool.utils.BeanUtil`（**继承 Spring `BeanUtils`**）做 `copyProperties`。实体 `TenantEntity.createTime/updateTime` 是 `java.util.Date`，导出类字段是 `java.time.LocalDateTime` → Spring BeanUtils **类型不兼容静默跳过**，值为 null。而「更新人」是手动 `UserCache.getUserRealName(...)` 赋值的，所以有值。（Hutool 的 BeanUtil 能转 Date→LocalDateTime，但本项目用的是 BladeX 版本，不能。）
+- 佐证：项目里正常的导出（Waybill / LoadingManage / CustomerArchive / CommonCargo）时间字段一律用 `java.util.Date`，并在 Service 里手动 `excel.setCreateTime(record.getCreateTime())`。
+- 修复（后端仓库 `/Users/gxwebsoft/JAVA/tms-api`，blade-transport 模块）：在 13 个导出方法里补显式赋值（Date→LocalDateTime 用 BladeX `DateUtil.fromDate`，`Func.isEmpty` 判空），不改 Excel 类字段类型（避免影响自定义 converter 与导入模板）。
+  ```java
+  excel.setCreateTime(Func.isEmpty(x.getCreateTime()) ? null : DateUtil.fromDate(x.getCreateTime()));
+  excel.setUpdateTime(Func.isEmpty(x.getUpdateTime()) ? null : DateUtil.fromDate(x.getUpdateTime()));
+  ```
+- 涉及文件（13 个 Service + 1 新建 Excel 类 + 设备台账 controller/接口）：InsuranceRecord / ViolationRecord / MaintenanceRecord / MaintenancePlan / TireReplacementRecord / AccidentRecord / AnnualInspectionRecord / MileageRecord / TransportChangeRecord / EtcRecord / OilElectricRecord / OtherExpenseRecord / EquipmentLedger。
+- 设备台账特殊：原 `EquipmentLedgerExcel` 根本没有审计列（前端列表有），新建 `EquipmentLedgerExportExcel extends EquipmentLedgerExcel`（创建时间/更新人/更新时间），导出链路改用新类，**导入模板仍用旧类不受影响**。
+- 未验证：本机无 mvn（仅 IDEA 内置），且离线模式缺 `blade-bom` 无法编译；用 javap 确认 `DateUtil.fromDate(Date)` 存在 + 逐行 grep 复核代替。需用户在 IDEA 里编译并重新部署后自测。
+- 同类隐患（本次未改，其他模块）：TemporaryCreditLimit、ProcessConfig、CommonRoute、CommonAddress、ContractManage、ProjectApply、ShippingTemplate 的导出 Excel 也是 LocalDateTime 且未手动 set 时间。
+
+## 保险记录保额 -1 问题排查（未结案，待用户验证 DB 环境）
+
+- 症状：新增弹窗保额不填 → 再开编辑弹窗显示 -1，触发「不能小于 0」校验。
+- 已排除：前端（源码/dist 构建/git 全历史）、后端 tms-api + tms-erp-api-ws（源码/编译产物 javap/git 历史）均无任何 -1 赋值逻辑；保额为 formslot el-input，空值传 ''。
+- 关键链路：编辑弹窗 beforeOpen 走 `/detail` 接口（getOne 原生查询），**不经过**列表 SQL 的 `CASE WHEN insured_amount<0 THEN 0` 兜底——所以表格显示 0、弹窗显示原始值。
+- 数据库截图（用户 Navicat）：该行 insured_amount=NULL，全表无负数 → 说明用户浏览的库与后端实际连接的库**不是同一个/DDL 不一致**。系统存在「空数值=-1」惯例（MaintenanceRecordMapper 里程 `CASE WHEN mileage=-1 THEN NULL`；前端 waybill-manage.js/process-config.js 均有 `Number(v)===-1?'':v` 掩码）→ 后端真实库的 insured_amount 列默认值很可能是 -1，MP 插入排除 null 列 → 默认值 -1 入库。
+- 待验证：在后端 Nacos 数据源指向的库执行 `SHOW CREATE TABLE blade_insurance_record` + `SELECT insured_amount FROM blade_insurance_record WHERE policy_no='11111' AND vehicle_no='沪AE31312'`。
+- 修复方案（待确认）：1) ALTER 列默认值改 NULL + UPDATE 存量负数为 NULL；2) 前端 beforeOpen 对 insuredAmount/premium 做 null/-1 → '' 归一（参照 waybill-manage normalizeNumericDisplayValue）；3) 列表 SQL 的 CASE 兜底与 detail 不一致，可顺手统一。

.workbuddy/memory/2026-09-18.md

@@ -0,0 +1,122 @@
+# 2026-09-18
+
+## 修复：改成独立整页后点左侧菜单仍弹出旧弹窗（loading-manage / project-apply）
+
+**现象**：配载单管理、项目管理已改为「新增/编辑/详情走独立整页」，但从独立页返回或直接点左侧菜单时，页面上仍会盖出一个老的 `el-dialog`（新增项目管理 / 配载单）。
+
+**根因**（已读 Vue runtime-core 源码确认）：
+- `src/router/tab.js` 按 `tabKey`（默认 fullPath）为每个标签建一个具名 wrapper 组件放进 `wrapperMap`，`src/page/index/layout.vue` 用 `<keep-alive :include="$store.getters.tagsKeep">` 缓存 —— 每个标签页一个实例，全部缓存不销毁。
+- 组件被 deactivate 后**仍会随 `$route`（全局响应式）重新渲染**；此时 `isStandalonePage` 变 false，`<component :is="isStandalonePage ? 'div' : 'el-dialog'">` 由 div 翻回 `el-dialog`，而 `v-model`（`projectBox`/`dialogVisible`）仍是 true，`append-to-body` 使弹窗 Teleport 到 body。
+- `KeepAlive.deactivate` 调 `move(vnode, storageContainer, ..., moveType=OUT)`，但 `TeleportImpl.move`（`moveTeleport`）忽略传入的 moveType、一律按 REORDER 处理 → **teleport 出去的 DOM 不会被搬回 storage container**，永久残留在 `document.body` 上并显示出来。
+
+**修法**（不回退 tab.js 的 `return wrapper` 提交 c1c4fa1，改修根因）：
+- 独立页容器固定为 `<div v-if="isXxxPage">`，不再按路由回退成 `el-dialog`。
+- 页内其它 `append-to-body` 二级弹窗加 `deactivated()` / `beforeUnmount()` → `closeInnerDialogs()` 把 v-model 置 false。
+
+**改动文件**：
+- `src/views/business/loading-manage.vue`：容器改 `<div v-if="isStandalonePage">`；删 `dialogVisible`、`dialogTitle`、`resetLoadingDialog`、`clearLoadingDialog`、页脚弹窗分支（含「清空」）；`watch.$route` 简化；新增 `closeInnerDialogs()`（routeChange / commonAddress / candidateSearch）+ `deactivated`/`beforeUnmount`。
+- `src/views/business/project-apply.vue`：容器改 `<div v-if="isProjectFormPage">`；删 `projectFormContainer`/`projectFormContainerProps`、`projectBox`、`resetProjectDialog`、`handleCancelProject`；`closeProjectForm` 简化为直接 push 列表；新增 `closeInnerDialogs()`（changeRecordDetail / 附件文档预览 / 图片预览 / 选人）+ `deactivated`/`beforeUnmount`。
+
+**校验**：dev server(2889) curl 两个 .vue 及其 scoped style 模块，均 HTTP 200（500 才是编译失败）。`vite build` 因沙箱敏感内容保护会在 facelogin.vue 中断，未用。
+
+**遗留同类风险（未改，已告知用户）**：`business/components/waybill-manage-page.vue`（`detailContainer` 在 PageDetail / el-dialog 间切）、`settlement/components/{pre,formal}-settlement-editor.vue`、`transport-reconciliation-editor.vue`（`pageMode ? 'div':'el-dialog'`）、`business/components/waybill-import-dialog.vue`（`standalone`/`createPage`）。统一修法：容器类型在 `created()` 锁定，不随路由/prop 翻转。
+
+---
+
+## 追加修复：运单详情弹窗残留（waybill-manage-page.vue）
+
+用户复现路径：打开 `/business/waybill-manage/detail?id=xxx` → 点「配载管理」菜单 → 页面上又冒出运单详情弹窗。与上面同一根因：`detailContainer()` 随 `isStandaloneWaybillDetailPage` 在 PageDetail / el-dialog 间翻转，`:append-to-body="!isStandaloneWaybillDetailPage"` 随之为 true，`v-model="detailBox"` 仍 true → Teleport 进 body 搬不回来。
+
+**改动**（`src/views/business/components/waybill-manage-page.vue`）：
+- data 新增三个锁定标志 `formPageLocked` / `detailPageLocked` / `formModeLocked`，在 `created()` 一次性从 `isStandaloneWaybillFormPage` / `isStandaloneWaybillDetailPage` / `$route.query.mode` 取值。
+- 模板里所有形态判定（根 class、`v-if="!detailPageLocked"` 的列表容器、`form-page-title`、`status`、独立表单页按钮块、分页 `v-show`、`:append-to-body`、detail-page class、内容 `v-if="detailBox || detailPageLocked"`、独立页 footer / 弹窗 footer slot）全部改读锁定标志。
+- `detailContainer()` / `crudContainer()` / `pageFormOption()`（含 `boxType`）改读锁定标志，避免缓存实例的 option 变形。
+- 新增 `closeInnerDialogs()`（关 detailBox、里程补录、附件文档/图片预览、变更路线、常用地址、流程图、运输路线/地址/站点/地图、常用货物、货物导入、过程配置、Excel 导入）+ `deactivated()` / `beforeUnmount()`。
+
+**关键验证**：`onDeactivated` 在子组件里也会触发 —— apiLifecycle 的 `injectHook` 会向上遍历父链，发现 KeepAlive 父级就把钩子注入到根实例（runtime-core 的 `injectToKeepAliveRoot`），所以写在子组件 waybill-manage-page 上的 `deactivated` 有效。
+
+**校验**：dev server curl 该 .vue 与 scoped style 均 200。仍未 commit。
+
+**未提交**：上述改动 + 上一轮 loading-manage 独立页改造均未 commit。
+
+---
+
+## 排查（未改码）：配载单详情页反复弹「运单管理不存在」
+
+用户截图：打开 `/business/loading-manage/detail?id=2097607162718441474&name=配载单详情`，连续弹出 6-7 条红色「运单管理不存在」，标签栏堆了一串「运单管理详情」。
+
+**文案来源**：前端 src 里没有这句话，是后端 `BusinessException` 的 msg，被 `src/axios.js` 的响应拦截器（`status !== 200` → `ElMessage.error(message)`）统一弹出。
+
+**主因（通道 A）**：`views/business/waybill-manage-detail.vue` 只有 23 行，写了 `:detail-id="$route.query.id"` —— 直接绑全局 `$route`，**没有路径守卫**。`waybill-manage-page.vue` 的 `detailId` watcher 是 `immediate` 且对任何非空 id 都 `openDetail({id})`。于是：
+1. 之前打开过的每个运单详情标签（`/business/waybill-manage/detail?id=A`、`?id=B`…）各是一个被 keep-alive 缓存的独立实例；
+2. 跳到配载单详情后，这些实例被 deactivate 但仍随 `$route` 重渲染 → `$route.query.id` 变成配载单 id；
+3. prop 变化 → `openDetail({id: 配载单id})` → `getDetail(配载单id)` 去查运单 → 后端「运单管理不存在」→ 拦截器弹一次。**几个旧标签就几条提示**；
+4. 且被污染实例的 `isStandaloneWaybillDetailPage` 仍是 live computed(false) → `openDetail` 走 `$router.push` 分支 → 又生成新的「运单管理详情」标签（标签栏那串的来源）。
+
+同理风险：`waybill-manage.vue:6` 与 `transport-plan.vue:6` 的 `:detail-id="$route.query.detailId"`（`business-crud-page.vue:7356` 会 push `/business/loading-manage?detailId=id`，正好会污染运单列表实例）。
+
+**次因（通道 B）**：`loading-manage.vue` 的 `restoreWaybillRows` 会用 `waybillIdsJson` 里的每个运单 id 并发 `getWaybillDetail(id)`，若历史运单已被删/失效，也会报同一句文案且并发多条。单条 `.catch(() => null)` 挡不住拦截器已弹出的提示。
+
+**区分方法**：Network 里看报错请求的 `id` —— 等于 `2097607162718441474`（配载单 id）→ 通道 A；是别的数字（运单 id）→ 通道 B。或先关掉所有「运单管理详情」标签再复现，通道 A 会消失。
+
+**待确认的修法**（用户要求先报不改）：
+1. `waybill-manage-page.vue`：`created()` 锁 `routePathLocked = this.$route.path`，`detailId` watcher 首行加 `if (this.$route.path !== this.routePathLocked) return;`。
+2. `openDetail()` 的 push 分支加同样守卫（防其它调用路径）。
+3. 宿主 view 绑定加路径守卫（`waybill-manage-detail.vue` / `waybill-manage.vue` / `transport-plan.vue`）双保险。
+4. 可选：`getWaybillDetail` 支持静默模式，供 `restoreWaybillRows` 用，避免历史脏数据刷屏。
+
+## 修复（已执行）：「运单管理不存在」误报 + 误开标签
+
+用户确认后按上方案落地，5 个文件：
+
+1. `src/views/business/components/waybill-manage-page.vue`
+   - `data()` 新增 `routePathLocked: this.$route.path` —— **必须放 data，不能放 created**：Vue Options API 顺序是 data → computed → watch(immediate) → created（已在 runtime-core `applyOptions` 源码中核实）。放 created 会让首个 immediate watcher 读到空值。
+   - 新增 computed `isOwnedRouteActive() { return this.$route.path === this.routePathLocked; }`
+   - `detailId` watcher 首行加 `if (!this.isOwnedRouteActive) return;`
+   - `openDetail` 的 `$router.push` 分支同样加守卫。
+2. `src/views/business/components/transport-plan-page.vue`：完全同构的写法（`:detail-id` host 一致），加同样的 `routePathLocked` + `isOwnedRouteActive` + watcher 守卫。
+3. `src/views/business/waybill-manage-detail.vue`：`:detail-id="$route.query.id"` → `:detail-id="detailId"`，computed 做 `this.$route.path === '/business/waybill-manage/detail'` 守卫。
+4. `src/views/business/waybill-manage.vue`：同上，守卫 `/business/waybill-manage`（保留旧链接 `?detailId=` 兼容）。
+5. `src/views/business/transport-plan.vue`：同上，守卫 `/business/transport-plan`。
+
+**验证**：
+- dev server curl 5 个 .vue + 2 个 scoped style 全部 HTTP 200。
+- 用 `@vue/server-renderer` 写了临时 mjs（已删）模拟带 `$route` 的 app，确认 **data() 里访问 `this.$route` 可行**：immediate watcher 触发时 `routePathLocked` 已是正确路径、首次加载不被拦截。
+- `$route` 是 vue-router 挂在 `app.config.globalProperties` 上的 getter（vue-router.mjs:1498），组件实例化时已就绪。
+
+**未做（第 4 条可选）**：给 `getWaybillDetail` 加静默模式供 `restoreWaybillRows` 使用（历史失效运单仍会刷多条红字），待用户定夺。
+
+**另注**：`business-crud-page.vue:6651` 有同构的 `detailId` immediate watcher，但全项目只有上述 3 个宿主 view 传 `:detail-id`，它暂无调用方，未动。
+
+**仍未 commit。**
+
+## 修复（已执行）：合同详情页整页空白 —— 路由表重复定义
+
+**现象**：主订单详情点合同编号 → `/business/contract-manage/detail?id=...&name=合同详情` 内容区空白（侧栏/标签正常）。
+
+**定位过程（关键：真实浏览器复现，不猜）**
+1. 静态排查全部排除：`contract-manage.vue` 及其 26 个依赖 HTTP 200、模块 `import()` 成功、无循环依赖、详情分支引用的 24 个成员全部有定义。
+2. dev 环境登录态无法直接拿（验证码 + `admin/admin` 报 `error_code 2004 用户密码强度过低`），改为**注入式复现**：
+   - `agent-browser open <目标 URL>`（落 `/login`）；
+   - eval 取 `document.getElementById('app').__vue_app__.config.globalProperties` 拿 `$router` / `$store`；
+   - 写 cookie `saber3-access-token`（注意 token 走 **js-cookie**，不是 localStorage）+ `$store.state.user.token`；
+   - 覆写 `XMLHttpRequest.prototype.open/send` 让所有 `/api/**` 返回 `{code:200,data:{...}}`（defineProperty 伪造 readyState/status/responseText 后手动触发 `onloadend`）。
+   - 再 `$router.push(...)` 做 SPA 跳转。
+3. 复现出空白，并拿到决定性证据：
+   - `/business/contract-manage/detail` → `$route.matched.length === 1`（只有 Layout，name undefined），`#avue-view.children.length === 0`，innerHTML 为 `<!---->`。
+   - 对照 `/business/contract-manage/change`（结构相同但未重复定义）→ `matched.length === 2`（Layout + 合同变更），内容完整渲染。
+   - `$router.getRoutes()` 里 detail 有 **3 条**记录：2 个 Layout 父记录 + 1 个子记录（`合同详情`）。
+
+**根因**：`src/router/views/index.js` 中 `/business/contract-manage/detail` **被复制粘贴定义了两次**，两次的子路由都叫 `合同详情`。vue-router 的 `addRoute` 遇到重名会 `removeRoute(name)` 把先注册的子记录删掉，但**不会把它从父记录的 `children` 数组里摘除**；于是第一条 Layout 壳记录留在 matcher 列表里且排在前面，`resolve('/business/contract-manage/detail')` 命中这个"无有效子路由"的壳 → matched 只有 1 层 → `page/index/index.vue` 里 `#avue-view` 的二级 `<router-view>` 无匹配 → 内容区空白。
+（`getRoutes()` 计数是判据：form / change 都是 2 条 = 父 + 子（健康），detail 是 3 条 = 2 父 + 1 子（坏）。）
+
+**修复**：删除重复块（原 314-325 行），只保留 159-169 行那一份。
+
+**验证**：
+- 重复扫描脚本（正则匹配「顶层 path + `component: Layout` + 首个子路由 name」）：views/index.js 27 条 Layout 子路由中仅 `合同详情` 重复；page/index.js 无重复 → 已清零。
+- 修复后浏览器复验：detail → `matched.length === 2`（Layout + 合同详情）、`#avue-view.children.length === 1`，正文完整渲染「基本信息 / 签约类型 / 合同编号 HT-2026-001 / … / 变更记录」。
+- 全量回归：48 条 business/vehicle/payment/settlement 路由 `resolve()` 后 `matched.length` 全部 ≥ 2，`bad: []`。
+- `curl` 校验：`views/index.js`、`contract-manage.vue` 均 200。
+- 残留报错均为 mock 数据形状不符所致（所有接口都返回同一个合同对象，导致 `tree.reduce` / `feeCategories.find` 之类失败），非真实缺陷。
+
+**未 commit**（连同 1、2 轮改动一起待确认）。

.workbuddy/memory/MEMORY.md

@@ -1,108 +1,27 @@
-# 项目长期记忆（tms-erp-web-ws / Saber3 客商模块）
+# 项目长期记忆（tms-erp-web-ws / Saber3）
 
-## 设计约定（已确认）
+后端：`/Users/gxwebsoft/JAVA/tms-api`（`tms-erp-api-ws` 滞后，别看错仓库）。
 
-### 表单 placeholder 统一为「请输入 / 请选择」（不带字段名）
+## 列表 / 表单 / 详情三态同组件分流
-- **规范**：输入框 placeholder 只写动作词 `请输入` / `请选择`，**后面不跟字段名称**（label 已说明是什么字段，重复无意义）。
+`/xxx`、`/xxx/form`、`/xxx/detail` 指向同一 `.vue`；form/detail 在 `src/router/views/index.js` 是 `component: Layout` + 空 `children.path` + `meta:{keepAlive:false}`（detail 另带 `activeMenu`）。组件内按 `$route.path` 分流，必须 `watch:{$route}` 重新 init；标签标题取 `query.name`；独立页容器固定 `<div v-if>`，不用 `el-dialog`。
-- 已生效页面：waybill-manage、transport-plan、shipping-template、temporary-credit-limit（搜索栏 + 弹窗表单）、**driver.vue**（2026-09-09 补齐 18 处）。
-- **3 类例外必须保留，不要误简化**：
-  1. 复合操作：如 `请输入或选择车辆`（既可键盘输入又可点按钮弹窗选车），丢掉会损失语义。
-  2. 日期区间的 `起` / `止`：是起止标记，不是字段提示。
-  3. 默认值说明：如资格证号 `默认身份证号`、车牌号 `如：京A12345`，属于示例/默认值提示，非「请输入」格式。
-- **校验错误提示 message 保持带字段名**（如「请选择准驾车型」「请输入档案编号」），与 placeholder 定位不同——报错必须指明具体哪个字段，不能只说「请选择」。
-- Avue 配置化表单：在 option 各列加 `placeholder`；搜索栏可用通用工具 `withSearchPlaceholders([...])`（见 temporary-credit-limit.js）。
-- 批量改法：Python 脚本按**完整 placeholder 字符串**做精确替换，每规则校验 `count > 0` 否则中断，避免误伤；改完用 `@vue/compiler-sfc` 的 parse + compileTemplate + compileScript 验证（脚本须放项目根目录下跑，放 /tmp 解析不到 node_modules）。
 
-### 弹窗分组：统一用全局 `<section-card>`
+## ⚠️ keep-alive 三坑
-- 弹窗 body 背景由 `src/styles/element-ui.scss` 全局 `.el-dialog__body { background:#f5f6fa; padding:16px }` 统一灰底。
+背景（`router/tab.js` + `page/index/index.vue`）：按 `fullPath` 建 wrapper，`<keep-alive :include="tagsKeep">` 缓存，**每标签一实例、永不销毁**，deactivate 后**仍随全局 `$route` 重渲染**。
-- 每组 = 白底卡片：4px 主色竖条 + 8px 间距 + 圆角 6px + 淡阴影。组件全局注册 `<section-card title="...">`，支持 `#title` / `#extra` slot。
-- 仅 3 项的小分组用 `el-col :span="8"` 均分一行。
 
-### Avue 内置弹窗用 section-card：dialogCustomClass 透明化 avue-form
+**坑一：独立页容器禁用 `<component :is>` 在 div / el-dialog 间切换。** `append-to-body` 走 Teleport，`TeleportImpl.move` 忽略 `moveType`，不会把 DOM 搬回缓存容器 → 切菜单冒出旧弹窗。修法：固定 `<div v-if>` + `deactivated(){closeInnerDialogs()}` + `beforeUnmount()`（写在子组件也生效）。已修 loading-manage / project-apply / waybill-manage-page；未修 `settlement/components/{pre,formal}-settlement-editor.vue`、`transport-reconciliation-editor.vue`、`waybill-import-dialog.vue`。
-- option 顶层加 `dialogCustomClass:'xxx-dialog'`，再在 `element-ui.scss` 写三条：
-  1. `.xxx-dialog .avue-form { background:transparent; box-shadow:none; padding:0 }`
-  2. `.xxx-dialog .avue-form__group > .el-col > .el-form-item { margin-bottom:0 }`
-  3. `.xxx-dialog .avue-dialog__footer, .avue-crud__dialog .xxx-dialog .avue-dialog__footer { margin-top:0 !important }`
 
-### 弹窗底部操作栏浮动（全局 CSS）
+**坑二：宿主 view 直绑全局 `$route.query.*` 给子组件 prop。** 缓存实例被灌入当前页 id → 拿错 id 查后端（批量弹「运单管理不存在」），live computed 还会误 push 标签。修法：`routePathLocked` 锁路径 + watcher / push 前判 `isOwnedRouteActive` + 宿主绑定加路径守卫。⚠️ `routePathLocked` **必须放 `data()`**（Options API 顺序 data → computed → watch(immediate) → created；放 created 会读到空值、挡掉首次加载）。已修 waybill-manage-page / transport-plan-page + 三个宿主 view。
-- `.el-dialog__body { max-height:calc(100vh - 200px); overflow-y:auto; overflow-x:hidden }`
-- `.el-dialog__footer { margin:0; padding:12px 20px; background:#fff; border-top:1px solid #ebeef5; box-shadow:0 -2px 8px rgba(0,0,0,.04) }`
-- Avue 内置弹窗 footer 真实 class 是 `.avue-dialog__footer`，须 `position:sticky; bottom:0; flex:none; background:#fff` 贴底。
 
-### 上传证件区域尺寸（transportCapacity）
+**坑三：路由表重复定义 → 内容区整页空白（2026-09-18）。** `/business/contract-manage/detail` 在 `router/views/index.js` 定义两次、子路由同名 `合同详情`。重名 `addRoute` 会 `removeRoute(name)` 移除旧子记录，但**不从父记录 children 里摘除**，第一条 Layout 壳记录留在 matcher 且靠前 → `resolve()` 命中它 → `$route.matched.length === 1` → 二级 router-view 无匹配 → 侧栏/标签正常但内容空白。修法：删重复定义。排查：扫「顶层 path + 首个子路由 name」重复项。
-- 身份证/行驶证/道路运输证等固定 **240×151px**（1.586:1）。
-- scoped 覆盖 `.xxx-uploader--large { width:240px }` 与 `--large .el-upload { width:100%; height:151px }`。
 
-### 上传图片点击放大预览
+## 样式硬规则
-- `src/components/image-upload-field/main.vue` 用 `<el-image preview-src-list fit="contain" preview-teleported :z-index="3000" @click.stop>`，阻止冒泡到 el-upload。
+- 底栏 `flex; justify-content:flex-end`，**不写 gap**（靠 EP 默认 `.el-button+.el-button{margin-left:12px}`）；浮动底栏必须 `position:fixed`（祖先 overflow:hidden 使 sticky 失效）+ `:global(.avue--collapse .x){left:60px}`、`:global(.avue-layout--horizontal .x){left:0}`，`:global()` 要包整个选择器。
+- 按钮层级：次要=无 type；中间步骤=`primary plain`；主操作=`primary`（禁绿、禁两个蓝实心）。顺序 `[辅助][取消][保存草稿][提交]`。
+- 独立页标题 `.archive-page-form__title`；分组用全局 `<section-card>`；上传证件区 `width:100%; max-width:240px` + `.el-upload{height:151px}`。
+- ⚠️ `<style scoped lang="scss">` 顶层禁 `//` 注释（Vite5 + sass `Unexpected '/'` → 500），顶层用 `/* */`。其余见 `src/styles/element-ui.scss` 与 `AGENTS.md` 4.4。
 
-### 独立表单页标题 `archive-page-form__title`
+## 表单 / 自检 / 导出
-- 样式全局化到 `src/styles/element-ui.scss`：18px/600/#303133 + margin-bottom:20px + 4px 主色竖条 + 8px 间距。
+- placeholder 只写 `请输入`/`请选择`；例外：`请输入或选择车辆`、日期区间 `起`/`止`、示例值。校验 message 须带字段名。
-- business-crud-page 系列通过 `formPageTitle` prop 注入；loading-manage / master-order 手写前置标题。
+- `business-crud-page.vue`：option 经 `cloneOption` 克隆，独立表单页走 `PageAvueForm`。
-
+- 自检：`curl "localhost:2889/src/xxx.vue"` 与 `"...?vue&type=style&index=0&scoped=true&lang.scss"`（200 / 500）。`vite build` 在 `facelogin.vue` 被沙箱中断，不能作唯一校验。dev `VITE_APP_API=/api` 代理 `172.16.203.228:8000`。
-### 表格列内嵌输入控件全宽
+- 导出：前端 `exportColumns` 后端未用，以 `XxxExportExcel.java` 为准；BladeX `BeanUtil` 类型不兼容静默跳过（`Date` → `LocalDateTime` 丢值，用 `DateUtil.fromDate`）。
-- `element-ui.scss` 全局兜底：`.el-table .el-table__body td.el-table__cell .cell > .el-input-number/.el-input/.el-select/.el-date-editor/.el-cascader { width:100% }`。
-
-### 业务状态标签文字化
-- 全站"状态语义"的 `el-tag` 加 `class="status-text"`，转为普通文字，不带颜色/背景/边框/圆点。
-- 实现：`element-ui.scss` 末尾 `.el-tag.status-text { ... }`。
-
-### 弹窗 / 独立表单页底栏按钮统一规则
-- **排序**：从左到右按次→主排（次要居左、主操作居右），主操作永远放最后。
-  - 顺序模板：`[可选辅助工具(如同步/导入)][取消][保存草稿][提交/确认]`
-- **容器布局（2026-08-27 改为「去 gap」）**：`display:flex; justify-content:flex-end;`（**不写 `gap`**）。按钮间距统一由 Element Plus 全局默认的相邻按钮 `.el-button+.el-button{margin-left:12px}` 提供，全站恒为 12px。原各 footer 写死的 `gap:8/12px` 已全部移除。`src/styles/element-ui.scss` 里 `.el-dialog__footer .el-button + .el-button` 也已从 `8px` 改 `12px`，与之一致。弹窗关闭按钮继承 Element Plus 自带 `.el-dialog__footer` 全局规则（见上条），独立页用 `.archive-form__footer` 配 `.archive-page-form & { position:fixed; right:0; left:230px; bottom:0; z-index:10; margin:0; padding:12px 24px; border-top:1px solid #eff1f7; background:#fff; box-shadow:0 -2px 8px rgba(0,0,0,.06); }`。
-- **⚠️ 浮动底部必须用 `position:fixed`，不能用 `position:sticky`**：本项目布局 `.app-main` / `.basic-container` 祖先带 `overflow:hidden`，会导致 `sticky` 永不触发（footer 不吸底）。固定写法照搬 customer-archive：
-  ```scss
-  .xxx-actions {
-    position: fixed; right: 0; left: 230px; bottom: 0; margin: 0; z-index: 10;
-    /* flex-end + padding + border-top + 白底 + 上投影 */
-  }
-  :global(.avue--collapse .xxx-actions) { left: 60px; }      /* 侧栏折叠 */
-  :global(.avue-layout--horizontal .xxx-actions) { left: 0; } /* 横向布局 */
-  ```
-  注意 `:global()` 要把「整个选择器」包进去（customer-archive 写法），不要只包前缀，否则 scoped 会在中间选择器上追加 data 属性导致不匹配。
-- **颜色层级 3 档**：
-  | 语义 | type | 备注 |
-  | --- | --- | --- |
-  | 次要（取消 / 关闭） | 不写 type（默认） | 灰描边 |
-  - **全站底部操作栏「返回」已统一改为「取消」**：独立表单页返回列表、弹窗关闭、主从编辑器返回等场景一律写「取消」；仅只读查看 / 纯关闭场景保留「关闭」。
-  | 中间步骤（保存草稿 / 按匹配结果更新） | `type="primary" plain` | 蓝描边 |
-  | 主操作（提交 / 完成对账 / 复评确认） | `type="primary"` | 蓝实心 |
-- **禁区**：
-  - 保存草稿和主操作不允许同为 `type="primary"`，否则两个蓝实心无视觉层级。
-  - 主操作禁止用 `type="success"`（绿）。全站统一深蓝实心。
-- **生效页面（已按规则统一）**：
-  - `business/project-apply.vue`（footer + 变更 footer）
-  - `vehicle/customer-archive.vue` 全部 5 处 footer（`archive-form__footer` 主表单页 + `contact-dialog`/`receipt-dialog`/`invoice-dialog` 子弹窗 + `score-detail-dialog` 含总分合计）
-  - `business/components/business-crud-page.vue` 的 PageAvueForm 独立表单页（`#menu-form-before` slot 新增 `取消` 按钮，shipping-template 模式验证通过；影响 `/business/waybill-manage/form`、`/business/transport-plan/form`、`/business/shipping-template/form` 三处独立表单页）
-  - `business/components/master-order-editor.vue` 主 `<footer>`（取消 default + 暂存/确认创建 plain + 创建并调度 primary；`position:fixed` 浮动，含 `avue--collapse`/`avue-layout--horizontal` 左偏移）
-  - **payment 模块**表单页（`__actions` 均 `flex-end` + `position:fixed` 浮动，含 `avue--collapse`/`avue-layout--horizontal` 左偏移）：
-    - `payment-application-form.vue`（`[取消][保存 plain][提交]`）
-    - `invoice-application-form.vue` / `invoice-receipt-form.vue`（`[取消][同步 plain][保存 plain][提交]`）
-    - `bill-ledger-form.vue`（`[取消][确认 primary]`）
-    - `bill-payment-form.vue`（`[取消][保存 plain][提交]`）
-    - `receipt-flow-form.vue`（`[取消][确认 primary]`）
-    - `receipt-claim-record-form.vue`（单「关闭」按钮，居中→右对齐浮动）
-  - **settlement 模块**：
-    - `settlement/components/pre-settlement-editor.vue`（弹窗 + pageMode 两处 footer：保存加 `plain`；`&__page-actions` 加 `position:fixed` 浮动，含 `avue--collapse`/`avue-layout--horizontal` 左偏移）
-    - `settlement/components/formal-settlement-editor.vue`（`.formal-editor__page-actions` 加 `position:fixed` 浮动，含 `avue--collapse`/`avue-layout--horizontal` 左偏移；按钮已 `[取消][提交]` 合规）
-    - `settlement/receivable-payable-detail.vue`（生成费用弹窗「上一步」改 `plain`）
-- **已合规未动**：`settlement/components/transport-reconciliation-editor.vue`（`[取消][保存草稿 plain][按匹配结果更新账单 plain][完成对账 primary]`）、`settlement/components/settlement-adjustment-editor.vue`（弹窗 `[取消][保存 primary]`）、`business/temporary-credit-limit.vue`。
-- **Avue-form footer 结构注意**：`#menu-form-before` slot 内容在 Avue 内置按钮之**左**；`#menu-form` slot 在 Avue 内置按钮之**右**。要实现 `[次要][Avue 主操作]` 顺序，把次要按钮放进 `#menu-form-before`，主操作保留 Avue 内置即可。
-- **Avue 表单 footer 按钮去图标（统一纯文字）**：Avue 的 `avue-form` 提交/清空按钮内置图标（`submitIcon: 'el-icon-check'`、`emptyIcon: 'el-icon-delete'`），且 Avue 源码用 `|| 'el-icon-xxx'` 兜底，无法通过 option 配置去掉。已在 `business-crud-page.vue` 样式里用 `:global(.business-crud-form-page-dialog .avue-form__menu .el-icon){display:none}` 统一隐藏，仅作用于独立表单页（PageAvueForm 容器），不影响其它弹窗。新增/编辑弹窗内的 Avue 表单若也要去图标，复用此选择器即可。
-- **复杂 footer 例外**：当 footer 需要在按钮组左侧展示「总分合计 / 数量统计」等聚合信息时，块用 `flex:1` 推自己到最左，按钮组按上述规则排在右半边（参考 `score-detail-dialog`）。
-
-## 关键文件
-- `src/components/section-card/main.vue`
-- `src/styles/element-ui.scss`
-- `src/views/vehicle/customer-archive.vue`
-- `src/views/transportCapacity/{driver,vehicle,ship}.vue`
-- `src/views/business/project-apply.vue`
-
-## 环境注意
-- Vite 代理跨域：`axios.withCredentials=true`，改 `.env`/`vite.config.mjs` 须重启 dev。
-
-## business-crud-page 复用模式
-- option 由 prop `crudOption` 经 `cloneOption` 克隆。
-- 独立表单页走 `PageAvueForm`，不包 el-dialog。
-- 自定义详情弹窗：`config.detailButton=true` + `detailSections:[{title, fields}]`。

index.html

@@ -13,6 +13,8 @@
     <meta name="apple-mobile-web-app-capable" content="yes" />
     <meta name="apple-mobile-web-app-status-bar-style" content="black" />
     <meta name="format-detection" content="telephone=no" />
+    <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
+    <meta http-equiv="Pragma" content="no-cache" />
     <link rel="stylesheet" href="/iconfont/index.css" />
     <link rel="stylesheet" href="/iconfont/avue/iconfont.css" />
     <link rel="stylesheet" href="/iconfont/saber/iconfont.css" />

oaLogin.html

@@ -0,0 +1,52 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>oa登录</title>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/1.10.2/jquery.min.js">
+</script>
+<script>
+    // 获取URL查询字符串
+    const queryString = window.location.search;
+
+    // 使用URLSearchParams解析查询字符串
+    const urlParams = new URLSearchParams(queryString);
+
+    // 获取特定的参数值
+    var userid = urlParams.get('userid'); // 用户id
+    var username = urlParams.get('username'); // 用户名
+    var redirectUrl = urlParams.get('redirectUrl'); // 重定向地址
+
+    if(userid==null){
+        userid="";
+    }
+    if(username==null){
+        username="";
+    }
+
+    $.get("/oaApi/getToken?userid="+userid+"&username="+username,function(result){
+        debugger
+        //成功返回token
+        if(result.data.token){
+            //设置系统的cookie
+            document.cookie = "X-AUTH-TOKEN="+result.data.token;
+
+            if(redirectUrl==null){
+                //如果是登录就跳转到系统首页
+                window.location.href = "./";
+            }else {
+                //如果是待办有重定向就跳转
+                window.location.href = redirectUrl;
+            }
+        }else {
+            alert("该业务系统未同步当前oa用户");
+        }
+    });
+
+</script>
+</head>
+<body>
+
+
+</body>
+</html>

src/api/base/currency.js

@@ -58,14 +58,3 @@ export const changeStatus = (id, status) => {
     },
   });
 };
-
-export const getBfiExchangeRate = (currencyCode, effectdate) => {
-  return request({
-    url: '/blade-transport/bfi/exchange-rate',
-    method: 'get',
-    params: {
-      currencyCode,
-      effectdate,
-    },
-  });
-};

src/api/business/loading-manage.js

@@ -79,6 +79,15 @@ export const cancel = id =>
     },
   });
 
+export const start = id =>
+  request({
+    url: `${baseUrl}/start`,
+    method: 'post',
+    params: {
+      id,
+    },
+  });
+
 export const complete = id =>
   request({
     url: `${baseUrl}/complete`,

src/api/business/project-apply.js

@@ -16,6 +16,7 @@ export const submit = api.submit;
 export const remove = api.remove;
 
 // 项目资金使用风险统计（高风险 / 中风险数量），供列表头部快速筛选标签使用
+// 暂未启用：后端 /fund-risk-stats 端点尚未实现，列表页已移除调用，等后端就绪后恢复
 export const getFundRiskStats = params =>
   request({
     url: `${baseUrl}/fund-risk-stats`,

src/api/payment/paymentApplication.js

@@ -20,8 +20,6 @@ export const syncKingdee = id =>
   request({ url: `${baseUrl}/sync-kingdee`, method: 'post', params: { id } });
 export const syncKingdeeBatch = ids =>
   request({ url: `${baseUrl}/sync-kingdee-batch`, method: 'post', data: ids });
-export const syncKingdeeResult = () =>
-  request({ url: `${baseUrl}/sync-kingdee-result`, method: 'post' });
 
 export const paymentTypeOptions = [
   { label: '项目预付', value: 'project_advance' },
@@ -38,8 +36,5 @@ export const approvalStatusOptions = [
 export const kingdeeStatusOptions = [
   { label: '未生成', value: 'unsynced' },
   { label: '已生成', value: 'synced' },
-  { label: '付款中', value: 'paying' },
-  { label: '已付款', value: 'paid' },
-  { label: '已关闭', value: 'closed' },
   { label: '生成失败', value: 'failed' },
 ];

src/api/system/dept.js

@@ -41,6 +41,13 @@ export const add = row => {
   });
 };
 
+export const syncIamOrganizations = () => {
+  return request({
+    url: '/blade-system/dept/sync-iam-organizations',
+    method: 'post',
+  });
+};
+
 export const update = row => {
   return request({
     url: '/blade-system/dept/submit',

src/api/system/user.js

@@ -31,6 +31,13 @@ export const add = row => {
   });
 };
 
+export const syncIamAccounts = () => {
+  return request({
+    url: '/blade-system/user/sync-iam-accounts',
+    method: 'post',
+  });
+};
+
 export const update = row => {
   return request({
     url: '/blade-system/user/update',

src/docker/Dockerfile

@@ -1,6 +1,7 @@
 FROM nginx
 VOLUME /tmp
 ENV LANG en_US.UTF-8
+ADD ./src/docker/nginx.conf /etc/nginx/conf.d/default.conf
 ADD ./dist/ /usr/share/nginx/html/
 EXPOSE 80
 EXPOSE 443

src/docker/nginx.conf

@@ -0,0 +1,19 @@
+server {
+    listen 80;
+    server_name localhost;
+    root /usr/share/nginx/html;
+    index index.html;
+
+    gzip on;
+    gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript;
+
+    location /assets/ {
+        add_header Cache-Control "public, max-age=31536000, immutable";
+        try_files $uri =404;
+    }
+
+    location / {
+        add_header Cache-Control "no-store, no-cache, must-revalidate";
+        try_files $uri $uri/ /index.html;
+    }
+}

src/error.js

@@ -1,8 +1,12 @@
 import store from './store';
+import { isChunkLoadError, reloadForChunkError } from './utils/chunk-reload';
 
 export default {
   install: app => {
     app.config.errorHandler = (err, vm, info) => {
+      if (isChunkLoadError(err) && reloadForChunkError()) {
+        return;
+      }
       store.commit('ADD_LOGS', {
         type: 'error',
         message: err.message,

src/main.js

@@ -1,4 +1,5 @@
 import { createApp } from 'vue';
+import { installChunkReload } from './utils/chunk-reload';
 import website from './config/website';
 import axios from './axios';
 import router from './router/';
@@ -46,6 +47,7 @@ import sectionCard from './components/section-card/main.vue';
 import mapSearchResults from './components/map-search-results/main.vue';
 
 window.$crudCommon = crudCommon;
+installChunkReload();
 debug();
 window.axios = axios;
 const app = createApp(App);

src/option/business/shipping-template.js

@@ -55,8 +55,8 @@ export const config = {
     'templateType',
     'transportType',
     'createUserName',
-    'remark',
     'updateTime',
+    'remark',
     'createTime',
   ],
   exportColumns: [
@@ -65,8 +65,8 @@ export const config = {
     { prop: 'templateType', label: '模板类型' },
     { prop: 'transportType', label: '运输方式' },
     { prop: 'createUserName', label: '创建人' },
-    { prop: 'remark', label: '备注' },
     { prop: 'updateTime', label: '更新时间' },
+    { prop: 'remark', label: '备注' },
     { prop: 'createTime', label: '创建时间' },
   ],
   enableAllDept: false,
@@ -82,12 +82,14 @@ export const config = {
   detailAttachmentDescriptionPlain: true,
   enableTransportPlanForm: true,
   enableShippingTemplateFreight: true,
-  editableRoadAddress: true,
+  editableRoadAddress: false,
   fixedTransportAddressType: true,
   enableTemplateCodePreview: true,
   attachmentTitle: '附件',
   defaultForm: {
     templateType: '运输计划',
+    transportType: '公路运输',
+    transportTypeName: '公路运输',
   },
   transportFormRequiredFields: [
     ['projectName', '项目'],
@@ -119,15 +121,16 @@ export const option = {
         labelWidth: 0,
       },
       {
-        label: '模板编号',
+        label: '模板类型',
-        prop: 'templateCode',
+        prop: 'templateType',
+        type: 'select',
         search: true,
-        searchOrder: 4,
+        searchOrder: 2,
         span: 8,
         order: 390,
-        minWidth: 170,
+        dicData: templateTypeOptions,
-        disabled: true,
+        minWidth: 120,
-        placeholder: '系统自动生成',
+        rules: selectRule('模板类型'),
         display: true,
       },
       {
@@ -142,16 +145,15 @@ export const option = {
         display: true,
       },
       {
-        label: '模板类型',
+        label: '模板编号',
-        prop: 'templateType',
+        prop: 'templateCode',
-        type: 'select',
         search: true,
-        searchOrder: 2,
+        searchOrder: 4,
         span: 8,
         order: 370,
-        dicData: templateTypeOptions,
+        minWidth: 170,
-        minWidth: 120,
+        disabled: true,
-        rules: selectRule('模板类型'),
+        placeholder: '系统自动生成',
         display: true,
       },
       {

src/option/business/transport-plan.js

@@ -209,12 +209,12 @@ export const config = {
   attachmentTitle: '附件',
   searchRangeMap: {
     planStartDateRange: ['planStartDateStart', 'planStartDateEnd'],
-    planEndDateRange: ['planEndDateStart', 'planEndDateEnd'],
+    createTimeRange: ['createTimeStart', 'createTimeEnd', '00:00:00', '23:59:59'],
   },
   actions: ['copy', 'complete'],
   statusProp: 'businessStatus',
   statusTextProp: 'businessStatusName',
-  deleteStatus: ['draft', 'waiting_dispatch'],
+  deleteStatus: ['draft'],
   editStatus: ['draft', 'waiting_dispatch', 'dispatching'],
   detailButton: true,
   detailSections: [
@@ -341,6 +341,7 @@ export const option = {
       {
         label: '发货地址',
         prop: 'departureAddress',
+        slot: true,
         formslot: true,
         search: true,
         searchOrder: 7,
@@ -352,6 +353,7 @@ export const option = {
       {
         label: '到货地址',
         prop: 'arrivalAddress',
+        slot: true,
         formslot: true,
         search: true,
         searchOrder: 6,
@@ -577,8 +579,8 @@ export const option = {
         viewDisplay: false,
       },
       {
-        label: '计划结束日期',
+        label: '创建时间',
-        prop: 'planEndDateRange',
+        prop: 'createTimeRange',
         type: 'date',
         format: 'YYYY-MM-DD',
         valueFormat: 'YYYY-MM-DD',

src/page/index/layout.vue

@@ -1,7 +1,18 @@
 <template>
   <router-view #="{ Component }">
     <keep-alive :include="$store.getters.tagsKeep">
-      <component :is="Component" />
+      <component :is="tabView($route, Component)" />
     </keep-alive>
   </router-view>
 </template>
+
+<script>
+import { tabView } from '@/router/tab';
+
+export default {
+  name: 'layout',
+  methods: {
+    tabView,
+  },
+};
+</script>

src/permission.js

@@ -3,6 +3,8 @@ import store from './store';
 import { tabKeyOf } from '@/router/tab';
 import { getToken } from '@/utils/auth';
 import {
+  consumeReloadQuery,
+  hasReloadQuery,
   isChunkLoadError,
   reloadForChunkError,
   setPendingRoutePath,
@@ -17,19 +19,20 @@ const lockPage = '/lock'; //锁屏页
 router.onError(error => {
   if (!isChunkLoadError(error)) return;
   if (reloadForChunkError()) {
-    ElMessage.warning('页面资源加载失败，正在重新加载…');
+    ElMessage.warning('页面资源已更新，正在重新加载…');
-  }
-});
-
-window.addEventListener('unhandledrejection', event => {
-  if (!isChunkLoadError(event.reason)) return;
-  if (reloadForChunkError()) {
-    event.preventDefault();
-    ElMessage.warning('页面资源加载失败，正在重新加载…');
   }
 });
 
 router.beforeEach((to, from, next) => {
+  if (hasReloadQuery(to.query)) {
+    next({
+      path: to.path,
+      query: consumeReloadQuery(to.query),
+      hash: to.hash,
+      replace: true,
+    });
+    return;
+  }
   setPendingRoutePath(to.fullPath);
   const meta = to.meta || {};
   const isMenu = meta.menu === undefined ? to.query.menu : meta.menu;
@@ -59,7 +62,7 @@ router.beforeEach((to, from, next) => {
             fullPath: tabKeyOf(to),
             params: to.params,
             query: to.query,
-            meta: meta,
+            meta: { ...meta, keepAlive: true },
           });
         }
         next();

src/router/avue-router.js

@@ -2,6 +2,7 @@ import website from '@/config/website';
 import { getToken } from '@/utils/auth';
 import store from '@/store';
 import { generateIframePath, processUrlForQuery, isURL } from './router';
+import { wrapViewLoader } from '@/utils/chunk-reload';
 const modules = import.meta.glob('../**/**/*.vue');
 
 // 将多级路由扁平化为二级路由，支持 keep-alive 跨层级缓存
@@ -96,21 +97,23 @@ RouterPlugin.install = function (option = {}) {
           component: (() => {
             // 判断是否为首路由
             if (first) {
-              return modules[
+              return wrapViewLoader(
-                option.store.getters.isMacOs || !website.setting.menu
+                modules[
-                  ? '../page/index/layout.vue'
+                  option.store.getters.isMacOs || !website.setting.menu
-                  : '../page/index/index.vue'
+                    ? '../page/index/layout.vue'
-              ];
+                    : '../page/index/index.vue'
+                ]
+              );
               // 判断是否为多层路由
             } else if (isChild && !first) {
-              return modules['../page/index/layout.vue'];
+              return wrapViewLoader(modules['../page/index/layout.vue']);
               // 判断是否为最终的页面视图
             } else {
               let result = modules[`../${component}.vue`];
               if (!result) {
                 isComponent = false;
               }
-              return result;
+              return wrapViewLoader(result);
             }
           })(),
           name,
@@ -127,7 +130,7 @@ RouterPlugin.install = function (option = {}) {
                 if (first) {
                   oMenu[propsDefault.path] = `${path}`;
                   let componentPath = oMenu.component || component;
-                  let result = modules[`../${componentPath}.vue`];
+                  let result = wrapViewLoader(modules[`../${componentPath}.vue`]);
                   if (!result) {
                     isComponent = false;
                   }
@@ -173,7 +176,7 @@ export const formatPath = (ele, first) => {
   const icon = ele[propsDefault.icon];
   ele[propsDefault.icon] = icon || '';
   ele.meta = {
-    keepAlive: ele.isOpen === 2,
+    keepAlive: true,
   };
   const iframeComponent = 'components/iframe/main';
   const iframeSrc = href => {
@@ -215,7 +218,7 @@ export const formatPath = (ele, first) => {
       ele[propsDefault.children].forEach(child => {
         child.component = 'views' + child[propsDefault.path];
         child.meta = {
-          keepAlive: child.isOpen === 2,
+          keepAlive: true,
         };
         if (isURL(child[propsDefault.href])) {
           let href = child[propsDefault.href];

src/router/tab.js

@@ -128,5 +128,5 @@ export function tabView(route, Component) {
     };
     wrapperMap.set(tabKey, wrapper);
   }
-  return h(wrapper);
+  return wrapper;
 }

src/router/views/index.js

@@ -239,6 +239,18 @@ export default [
       },
     ],
   },
+  {
+    path: '/business/loading-manage/detail',
+    component: Layout,
+    children: [
+      {
+        path: '',
+        name: '配载单详情',
+        meta: { keepAlive: false, activeMenu: '/business/loading-manage' },
+        component: () => import('@/views/business/loading-manage.vue'),
+      },
+    ],
+  },
   {
     path: '/business/transport-plan/form',
     component: Layout,

src/store/getters.js

@@ -16,11 +16,8 @@ const getters = {
   lockPasswd: state => state.common.lockPasswd,
   tagList: state => state.tags.tagList,
   tagsKeep: (state, getters) => {
-    return getters.tagList
+    // 所有已打开标签均纳入 keep-alive，关闭标签后自动从白名单移除并释放实例
-      .filter(ele => {
+    return getters.tagList.map(ele => ele.fullPath).filter(Boolean);
-        return (ele.meta || {}).keepAlive;
-      })
-      .map(ele => ele.fullPath);
   },
   tagWel: state => state.tags.tagWel,
   token: state => state.user.token,

src/utils/chunk-reload.js

@@ -1,38 +1,168 @@
 /**
  * 懒加载 chunk / CSS preload 失败后的整页恢复。
  * 常见于：部署后旧 hash 失效、静态服务空闲断连、代理 CONNECTION_RESET。
+ *
+ * 失败后必须整页刷新：旧入口里的 hashed 资源地址不会自行更新，
+ * 仅捕获路由错误而不刷新时，未打开过的页面会一直无法进入。
  */
 
 const RELOAD_FLAG = 'app:chunk-reload-ts';
-const RELOAD_COOLDOWN_MS = 10000;
+const RELOAD_QUERY = '_chunkreload';
+const RELOAD_COOLDOWN_MS = 15000;
 
 const CHUNK_ERROR_RE =
-  /Failed to fetch dynamically imported module|Importing a module script failed|Unable to preload CSS|error loading dynamically imported module|Loading CSS chunk|Loading chunk .+ failed|ChunkLoadError/i;
+  /Failed to fetch dynamically imported module|Importing a module script failed|Unable to preload CSS|error loading dynamically imported module|Loading CSS chunk|Loading chunk .+ failed|ChunkLoadError|Unable to preload|error loading module|Load failed/i;
 
 /** 最近一次路由跳转目标，供 onError 时整页落到正确地址 */
 let pendingFullPath = '';
+let installed = false;
+let reloading = false;
 
 export function setPendingRoutePath(fullPath = '') {
   pendingFullPath = fullPath || '';
 }
 
+function collectErrorText(error, depth = 0) {
+  if (!error || depth > 3) return '';
+  if (typeof error === 'string') return error;
+  const parts = [
+    error.message,
+    error.msg,
+    error.name,
+    error.stack,
+    error.error && collectErrorText(error.error, depth + 1),
+    error.reason && collectErrorText(error.reason, depth + 1),
+    error.cause && collectErrorText(error.cause, depth + 1),
+    error.payload && collectErrorText(error.payload, depth + 1),
+  ];
+  const target = error.target;
+  if (target && (target.src || target.href)) {
+    parts.push(target.src || target.href);
+  }
+  try {
+    parts.push(String(error));
+  } catch (e) {
+    /* ignore */
+  }
+  return parts.filter(Boolean).join(' ');
+}
+
 export function isChunkLoadError(error) {
-  if (!error) return false;
+  const text = collectErrorText(error);
-  const message = error.message || String(error);
+  if (!text) return false;
-  return CHUNK_ERROR_RE.test(message);
+  if (CHUNK_ERROR_RE.test(text)) return true;
+  return /Failed to fetch/i.test(text) && /\.m?js(\?|$|:)/i.test(text);
+}
+
+export function hasReloadQuery(query = {}) {
+  return !!(query && query[RELOAD_QUERY] !== undefined);
+}
+
+export function consumeReloadQuery(query = {}) {
+  if (!hasReloadQuery(query)) return query;
+  const next = { ...query };
+  delete next[RELOAD_QUERY];
+  return next;
+}
+
+function buildReloadUrl(targetPath) {
+  const url = new URL(targetPath, window.location.origin);
+  url.searchParams.set(RELOAD_QUERY, String(Date.now()));
+  return url.pathname + url.search + url.hash;
 }
 
 /**
  * @returns {boolean} 是否已触发刷新（冷却期内返回 false，避免死循环）
  */
 export function reloadForChunkError(targetPath) {
+  if (reloading) return false;
   const now = Date.now();
   const last = Number(sessionStorage.getItem(RELOAD_FLAG) || 0);
   if (now - last < RELOAD_COOLDOWN_MS) {
     return false;
   }
+  reloading = true;
   sessionStorage.setItem(RELOAD_FLAG, String(now));
-  const path = targetPath || pendingFullPath || window.location.pathname + window.location.search + window.location.hash;
+  const path =
-  window.location.assign(path);
+    targetPath ||
+    pendingFullPath ||
+    `${window.location.pathname}${window.location.search}${window.location.hash}`;
+  const dest = buildReloadUrl(path);
+  // cache: 'reload' 会回写 HTTP 缓存，降低 index.html 仍指向旧 hash 资源的概率
+  fetch(`${window.location.pathname}?${RELOAD_QUERY}=${now}`, {
+    cache: 'reload',
+    credentials: 'same-origin',
+    headers: {
+      Pragma: 'no-cache',
+      'Cache-Control': 'no-cache',
+    },
+  })
+    .catch(() => {})
+    .finally(() => {
+      window.location.replace(dest);
+    });
   return true;
 }
+
+export function wrapViewLoader(loader) {
+  if (typeof loader !== 'function') return loader;
+  return () =>
+    Promise.resolve()
+      .then(() => loader())
+      .catch(error => {
+        if (isChunkLoadError(error)) {
+          reloadForChunkError();
+        }
+        throw error;
+      });
+}
+
+export function installChunkReload() {
+  if (installed || typeof window === 'undefined') return;
+  installed = true;
+
+  window.addEventListener('vite:preloadError', event => {
+    if (reloadForChunkError()) {
+      event.preventDefault();
+    }
+  });
+
+  window.addEventListener('unhandledrejection', event => {
+    if (!isChunkLoadError(event.reason)) return;
+    if (reloadForChunkError()) {
+      event.preventDefault();
+    }
+  });
+
+  window.addEventListener(
+    'error',
+    event => {
+      const el = event.target;
+      const isAssetNode =
+        el &&
+        el !== window &&
+        (el.tagName === 'SCRIPT' ||
+          (el.tagName === 'LINK' && /modulepreload|stylesheet/i.test(el.rel || '')));
+      if (isAssetNode || isChunkLoadError(event.error || event.message)) {
+        if (reloadForChunkError()) {
+          event.preventDefault();
+        }
+      }
+    },
+    true
+  );
+
+  document.addEventListener('visibilitychange', () => {
+    if (document.visibilityState === 'visible') checkDeployedAssets();
+  });
+}
+
+function checkDeployedAssets() {
+  const el = document.querySelector('script[type="module"][src*="/assets/"]');
+  if (!el || !el.src) return;
+  fetch(el.src, { method: 'HEAD', cache: 'no-store', credentials: 'same-origin' })
+    .then(res => {
+      if (res.status === 404) reloadForChunkError();
+    })
+    .catch(() => {});
+}

src/views/business/components/master-order-detail.vue

@@ -1,8 +1,51 @@
 <template>
   <div v-loading="loading" class="master-detail">
     <section v-if="master" class="detail-overview">
-      <div class="detail-heading"><div><h2>多联总单详情 <span>|</span> {{ master.masterNo }}</h2><el-tag :type="statusType(master.businessStatus)" class="status-text">{{ statusName(master.businessStatus) }}</el-tag><el-tag v-if="transportFlowLabel" type="info" class="transport-flow-tag">{{ transportFlowLabel }}</el-tag></div><el-button @click="$emit('back')">取消</el-button></div>
+      <div class="detail-heading"><div><h2>多联总单详情 <span>|</span> {{ master.masterNo }}</h2><el-tag :type="statusType(master.businessStatus)" class="status-text">{{ statusName(master.businessStatus) }}</el-tag><el-tag v-if="transportFlowLabel" type="info" class="transport-flow-tag">{{ transportFlowLabel }}</el-tag></div></div>
-      <dl class="detail-meta"><div><dt>客户</dt><dd>{{ master.customerName || '-' }}</dd></div><div><dt>合同编号</dt><dd>{{ master.contractNo || '-' }}</dd></div><div><dt>项目</dt><dd>{{ master.projectName || '-' }}</dd></div><div class="detail-meta__attachments"><dt>附件</dt><dd><template v-if="attachments.length"><el-link v-for="file in attachments" :key="file.url || file.link || file.name || file.originalName" type="primary" @click="previewAttachment(file)">{{ attachmentName(file) }}</el-link></template><span v-else>-</span></dd></div></dl>
+      <dl class="detail-meta">
+        <div>
+          <dt>客户</dt>
+          <dd>
+            <el-link v-if="master.customerName" type="primary" @click="openCustomer">{{
+              master.customerName
+            }}</el-link>
+            <span v-else>-</span>
+          </dd>
+        </div>
+        <div>
+          <dt>合同编号</dt>
+          <dd>
+            <el-link v-if="master.contractNo && master.contractId" type="primary" @click="openContract">{{
+              master.contractNo
+            }}</el-link>
+            <span v-else>{{ master.contractNo || '-' }}</span>
+          </dd>
+        </div>
+        <div>
+          <dt>项目</dt>
+          <dd>
+            <el-link v-if="master.projectName && master.projectId" type="primary" @click="openProject">{{
+              master.projectName
+            }}</el-link>
+            <span v-else>{{ master.projectName || '-' }}</span>
+          </dd>
+        </div>
+        <div class="detail-meta__attachments">
+          <dt>附件</dt>
+          <dd>
+            <template v-if="attachments.length">
+              <el-link
+                v-for="file in attachments"
+                :key="file.url || file.link || file.name || file.originalName"
+                type="primary"
+                @click="previewAttachment(file)"
+                >{{ attachmentName(file) }}</el-link
+              >
+            </template>
+            <span v-else>-</span>
+          </dd>
+        </div>
+      </dl>
       <div class="route-map"><template v-for="(route, index) in segments" :key="route.segmentNo"><div class="route-map__node"><span :class="['route-badge', index ? 'middle' : 'start']">{{ index ? '经' : '起' }}</span><strong>{{ segmentLocationName(route, 'departure') }}</strong><small>{{ route.departureAddress || '-' }}</small><small class="route-map__progress">{{ index ? `已到达 ${quantity(segments[index - 1].arrivedQuantity)}/${quantity(master.totalQuantity)} ${plannedUnit(segments[index - 1])}` : `已调度 ${quantity(route.dispatchedQuantity)}/${quantity(master.totalQuantity)} ${plannedUnit(route)}` }}</small><small v-if="index" class="route-map__progress">已调度 {{ quantity(route.dispatchedQuantity) }}/{{ quantity(master.totalQuantity) }} {{ plannedUnit(route) }}</small></div><div class="route-map__line"></div><div v-if="index === segments.length - 1" class="route-map__node"><span class="route-badge end">终</span><strong>{{ segmentLocationName(route, 'arrival') }}</strong><small>{{ route.arrivalAddress || '-' }}</small><small class="route-map__progress">已到达 {{ quantity(route.arrivedQuantity) }}/{{ quantity(master.totalQuantity) }} {{ plannedUnit(route) }}</small></div></template></div>
     </section>
 
@@ -42,6 +85,8 @@
 
 <script>
 import * as api from '@/api/business/master-order';
+import { getDetail as getProjectDetail } from '@/api/business/project-apply';
+import { getList as getCustomerArchiveList } from '@/api/vehicle/customer-archive';
 import { CaretBottom, CaretTop } from '@element-plus/icons-vue';
 import { ElImageViewer } from 'element-plus';
 import { OpenFileViewer } from '@open-file-viewer/vue';
@@ -51,10 +96,26 @@ import pdfWorkerSrc from 'pdfjs-dist/build/pdf.worker.mjs?url';
 
 const viewerPlugins = [imagePlugin(), pdfPlugin({ workerSrc: pdfWorkerSrc, useFetchData: true }), officePlugin({ pdf: { workerSrc: pdfWorkerSrc, useFetchData: true } }), textPlugin(), fallbackPlugin()];
 
+const parseJsonArray = value => {
+  if (Array.isArray(value)) return value;
+  if (!value) return [];
+  try {
+    const parsed = JSON.parse(value);
+    if (Array.isArray(parsed)) return parsed;
+    return parsed && typeof parsed === 'object' ? [parsed] : [];
+  } catch (error) {
+    return [];
+  }
+};
+
+const customerRowLabel = (row = {}) =>
+  row.customer || row.fullName || row.shortName || row.customerName || row.customerCode || '';
+
+const customerRowId = (row = {}) => row.id || row.customerId || '';
+
 export default {
   components: { ElImageViewer, OpenFileViewer },
   props: { id: [String, Number] },
-  emits: ['back'],
   data() { return { loading: false, master: null, expandedSegments: {}, CaretBottom, CaretTop, imagePreviewVisible: false, imagePreviewUrls: [], imagePreviewIndex: 0, documentPreviewVisible: false, previewFile: {}, viewerPlugins, viewerToolbar: { download: true, fullscreen: true, print: true, rotate: true, zoom: true } }; },
   computed: {
     segments() {
@@ -148,6 +209,68 @@ export default {
       this.$router.push({ path: '/business/waybill-manage/detail', query: { id: row.id } });
     },
     openPlan(row) { this.$router.push({ path: '/business/transport-plan', query: { detailId: row.id } }); },
+    openContract() {
+      if (!this.master?.contractId) {
+        this.$message.warning('合同信息缺失，无法打开');
+        return;
+      }
+      this.$router.push({
+        path: '/business/contract-manage/detail',
+        query: { id: this.master.contractId, name: '合同详情' },
+      });
+    },
+    openProject() {
+      if (!this.master?.projectId) {
+        this.$message.warning('项目信息缺失，无法打开');
+        return;
+      }
+      this.$router.push({
+        path: '/business/project-apply/form',
+        query: { mode: 'view', id: this.master.projectId, name: '查看项目管理' },
+      });
+    },
+    async resolveCustomerId() {
+      if (this.master?.customerId) return this.master.customerId;
+      const name = String(this.master?.customerName || '').trim();
+      if (!name) return '';
+      if (this.master?.projectId) {
+        try {
+          const res = await getProjectDetail(this.master.projectId);
+          const rows = parseJsonArray(res.data?.data?.customerJson);
+          const matched =
+            rows.find(row => customerRowLabel(row) === name) ||
+            rows.find(row => {
+              const label = customerRowLabel(row);
+              return label && (name.includes(label) || label.includes(name));
+            });
+          const id = customerRowId(matched);
+          if (id) return id;
+        } catch (error) {
+          // 项目客户解析失败时回退到客商档案检索
+        }
+      }
+      try {
+        const res = await getCustomerArchiveList(1, 20, { fullName: name });
+        const records = res.data?.data?.records || [];
+        const exact =
+          records.find(item => item.fullName === name || item.shortName === name) || records[0];
+        return exact?.id || '';
+      } catch (error) {
+        return '';
+      }
+    },
+    async openCustomer() {
+      if (!this.master?.customerName) return;
+      const customerId = await this.resolveCustomerId();
+      if (!customerId) {
+        this.$message.warning('未找到对应客商档案，无法打开');
+        return;
+      }
+      this.$router.push({
+        path: '/vehicle/customer-archive/form',
+        query: { id: String(customerId), name: '查看客商档案', view: '1' },
+      });
+    },
     waybillStatusName(value) { return ({ pending: '待执行', waiting: '待执行', running: '进行中', processing: '进行中', completed: '已完成', cancelled: '已取消' })[value] || value || '-'; },
     waybillStatusType(value) { return ({ pending: 'info', waiting: 'info', running: 'warning', processing: 'warning', completed: 'success', cancelled: 'danger' })[value] || 'info'; },
     statusName(value) { return ({ waiting_dispatch: '待调度', dispatching: '调度中', completed: '调度完成', closed: '调度关闭' })[value] || value || '-'; },
@@ -161,7 +284,7 @@ export default {
 .detail-overview, .execution-detail-card { margin-bottom: 8px; border: 1px solid #eff1f7; background: #fff; }
 .detail-heading { display: flex; align-items: center; justify-content: space-between; padding: 18px 24px; h2 { display: inline-block; margin: 0 16px 0 0; font-size: 20px; } h2 span { margin: 0 8px; color: #909399; font-weight: 400; } }
 .transport-flow-tag { margin-left: 8px; }
-.detail-meta { display: grid; grid-template-columns: repeat(4, minmax(0, 1fr)); gap: 18px 24px; margin: 0; padding: 0 24px 20px; dt { margin-bottom: 6px; color: #909399; font-size: 13px; } dd { display: flex; flex-wrap: wrap; gap: 8px 16px; margin: 0; color: #409eff; font-size: 14px; word-break: break-all; } }
+.detail-meta { display: grid; grid-template-columns: repeat(4, minmax(0, 1fr)); gap: 18px 24px; margin: 0; padding: 0 24px 20px; dt { margin-bottom: 6px; color: #909399; font-size: 13px; } dd { display: flex; flex-wrap: wrap; gap: 8px 16px; margin: 0; color: #303133; font-size: 14px; word-break: break-all; } :deep(.el-link) { font-size: 14px; } }
 .route-map { display: flex; align-items: flex-start; padding: 16px 24px 20px; border-top: 1px solid #eff1f7; overflow-x: auto; }
 .route-map__node { display: grid; flex: 0 0 150px; justify-items: center; gap: 6px; text-align: center; strong { font-size: 16px; white-space: nowrap; } small { color: #606266; white-space: nowrap; } }
 .route-map__progress { color: #303133 !important; }

src/views/business/components/master-order-dispatch.vue

@@ -95,10 +95,51 @@
         <div class="goods-heading"><h3>货物信息</h3><div><el-link type="primary" @click="addGoods(route)">新增货物</el-link></div></div>
         <el-table :data="route.goods" border class="goods-table">
           <el-table-column type="index" label="序号" width="64" />
-          <el-table-column min-width="180"><template #header><span>货物类型<span class="goods-required-mark">*</span></span></template><template #default="{ row }"><el-cascader v-model="row.cargoTypePath" class="goods-table__cargo-type" :options="cargoTypeOptions" :props="cargoTypeCascaderProps" placeholder="请选择货物类型" clearable filterable @change="value => handleCargoTypeChange(route, row, value)" /></template></el-table-column>
+          <el-table-column min-width="180"
-          <el-table-column min-width="180"><template #header><span>货物名称<span class="goods-required-mark">*</span></span></template><template #default="{ row }"><el-select v-model="row.sourceIndex" class="goods-table__cargo-name" placeholder="请选择总单货物" @change="selectGoods(route, row)"><el-option v-for="item in masterGoodsByCargoType(row)" :key="item.sourceIndex" :label="item.cargoName" :value="item.sourceIndex" /></el-select></template></el-table-column>
+            ><template #header
-          <el-table-column prop="remainingQuantity" column-key="remainingQuantity" label="剩余数量" width="150" class-name="goods-table__remaining"><template #default="{ row }">{{ formatQuantity(goodsRemainingQuantity(route, row)) }}</template></el-table-column>
+              ><span>货物类型<span class="goods-required-mark">*</span></span></template
-          <el-table-column prop="dispatchQuantity" column-key="dispatchQuantity" width="200" class-name="goods-table__dispatch"><template #header><span>本次数量<span class="goods-required-mark">*</span></span></template><template #default="{ row }"><el-input :model-value="row.dispatchQuantity" inputmode="decimal" placeholder="请输入" @input="value => handleDispatchQuantityInput(route, row, value)" /></template></el-table-column>
+            ><template #default="{ row }"
+              ><el-autocomplete
+                v-model="row.cargoType"
+                class="goods-table__cargo-type"
+                clearable
+                :debounce="300"
+                placeholder="请输入货物类型"
+                :fetch-suggestions="fetchCargoTypeSuggestions"
+                @select="item => handleCargoTypeSelect(route, row, item)"
+                @change="value => handleCargoTypeChange(route, row, value)"
+            /></template>
+          </el-table-column>
+          <el-table-column min-width="180"
+            ><template #header
+              ><span>货物名称<span class="goods-required-mark">*</span></span></template
+            ><template #default="{ row }"
+              ><el-select
+                v-model="row.sourceIndex"
+                class="goods-table__cargo-name"
+                placeholder="请选择总单货物"
+                @change="selectGoods(route, row)"
+                ><el-option
+                  v-for="item in masterGoodsByCargoType(row)"
+                  :key="item.sourceIndex"
+                  :label="item.cargoName"
+                  :value="item.sourceIndex" /></el-select
+            ></template>
+          </el-table-column>
+          <el-table-column
+            prop="dispatchQuantity"
+            column-key="dispatchQuantity"
+            width="200"
+            class-name="goods-table__dispatch"
+            ><template #header
+              ><span>本次数量<span class="goods-required-mark">*</span></span></template
+            ><template #default="{ row }"
+              ><el-input
+                :model-value="row.dispatchQuantity"
+                inputmode="decimal"
+                placeholder="请输入"
+                @input="value => handleDispatchQuantityInput(route, row, value)" /></template
+          ></el-table-column>
           <el-table-column prop="quantityUnit" width="110"><template #header><span>数量单位<span class="goods-required-mark">*</span></span></template></el-table-column>
           <el-table-column prop="packageType" label="包装" min-width="110" />
           <el-table-column prop="brand" label="品牌" min-width="110" />
@@ -208,7 +249,7 @@ export default {
   props: { id: [String, Number] },
   emits: ['back'],
   data() {
-    return { loading: false, submitting: false, master: null, routes: [], pending: [], pendingExpanded: false, editingId: null, driverInputs: {}, carrierOptions: [], driverOptions: [], carrierLoading: false, driverLoading: false, escortLoading: false, cargoTypeOptions: [], cargoTypeCascaderProps: { label: 'cargoName', value: 'id', children: 'children', emitPath: true }, quantityUnitOptions: ['吨', '千克', '立方米', '件', '车', '箱', '托盘'] };
+    return { loading: false, submitting: false, master: null, routes: [], pending: [], pendingExpanded: false, editingId: null, driverInputs: {}, carrierOptions: [], driverOptions: [], carrierLoading: false, driverLoading: false, escortLoading: false, quantityUnitOptions: ['吨', '千克', '立方米', '件', '车', '箱', '托盘'] };
   },
   computed: {
     totalQuantity() { return (this.master?.goods || []).reduce((sum, item) => sum + Number(item.quantity || 0), 0); },
@@ -216,6 +257,9 @@ export default {
     goodsNames() { return (this.master?.goods || []).map(item => item.cargoName).filter(Boolean).join('、') || '-'; },
     goodsTypes() { return [...new Set((this.master?.goods || []).map(item => item.cargoType).filter(Boolean))].join('、') || '-'; },
     masterGoods() { return (this.master?.goods || []).map((item, sourceIndex) => ({ ...item, sourceIndex, label: [item.cargoName, item.cargoType].filter(Boolean).join(' / ') })); },
+    cargoTypeSelectOptions() {
+      return [...new Set((this.master?.goods || []).map(item => item.cargoType).filter(Boolean))];
+    },
     dateRange() { return this.master?.planStartTime && this.master?.planEndTime ? `${String(this.master.planStartTime).slice(0, 10)} ~ ${String(this.master.planEndTime).slice(0, 10)}` : '-'; },
     pendingGroups() {
       return this.pending.reduce((groups, item, index) => {
@@ -256,7 +300,6 @@ export default {
         const res = await api.getDetail(this.id);
         this.master = res.data?.data || res.data || res;
         await this.loadContractCurrency();
-        this.cargoTypeOptions = this.buildMasterCargoTypeOptions(this.master.goods || []);
         this.routes = this.dispatchRouteNodes().map((node, index) => this.createRoute(node, index));
       } finally { this.loading = false; }
     },
@@ -318,46 +361,42 @@ export default {
       this.syncFreightItems(route);
       return route;
     },
-    buildMasterCargoTypeOptions(goods = []) {
-      return [...new Set(goods.map(item => item.cargoType).filter(Boolean))].map(cargoType => ({
-        id: cargoType,
-        cargoName: cargoType,
-      }));
-    },
     masterGoodsByCargoType(row = {}) {
-      return this.masterGoods.filter(item => !row.cargoType || item.cargoType === row.cargoType);
+      const cargoType = String(row.cargoType || '').trim();
+      if (!cargoType) return this.masterGoods;
+      const matched = this.masterGoods.filter(item => item.cargoType === cargoType);
+      return matched.length ? matched : this.masterGoods;
     },
-    findCargoTypeByPath(path = []) {
+    fetchCargoTypeSuggestions(queryString, callback) {
-      let options = this.cargoTypeOptions;
+      const keyword = String(queryString || '').trim().toLowerCase();
-      let selected;
+      const options = this.cargoTypeSelectOptions.map(item => ({ value: item }));
-      (path || []).forEach(id => {
+      callback(
-        selected = (options || []).find(item => String(item.id) === String(id));
+        keyword ? options.filter(item => String(item.value).toLowerCase().includes(keyword)) : options
-        options = selected?.children || [];
+      );
-      });
-      return selected;
     },
-    findCargoTypePath(cargoType, options = this.cargoTypeOptions, parentPath = []) {
+    handleCargoTypeSelect(route, row, item = {}) {
-      for (const option of options || []) {
+      this.handleCargoTypeChange(route, row, item.value || '');
-        const path = [...parentPath, option.id];
-        if (option.cargoName === cargoType) return path;
-        if (option.children?.length) {
-          const result = this.findCargoTypePath(cargoType, option.children, path);
-          if (result.length) return result;
-        }
-      }
-      return [];
     },
     handleCargoTypeChange(route, row, value) {
-      const path = Array.isArray(value) ? value : [];
+      row.cargoType = String(value ?? row.cargoType ?? '').trim();
-      const cargoType = this.findCargoTypeByPath(path);
+      const matched = this.masterGoods.filter(item => item.cargoType === row.cargoType);
-      row.cargoTypePath = path;
+      const firstGoods = matched[0];
-      row.cargoType = cargoType?.cargoName || '';
-      const firstGoods = this.masterGoodsByCargoType(row)[0];
       if (firstGoods) {
         row.sourceIndex = firstGoods.sourceIndex;
         this.selectGoods(route, row);
+      } else {
+        Object.assign(row, {
+          sourceIndex: undefined,
+          cargoName: '',
+          quantity: '',
+          quantityUnit: '',
+          packageType: '',
+          brand: '',
+          specification: '',
+          model: '',
+          materialCode: '',
+        });
       }
-      else Object.assign(row, { sourceIndex: undefined, cargoName: '', quantity: '', quantityUnit: '' });
       this.syncFreightItems(route);
     },
     isRoad(route) {
@@ -542,53 +581,48 @@ export default {
       );
       return false;
     },
-    pendingGoodsQuantity(route, row) {
-      const goodsIndex = this.masterGoodsIndex(row);
-      return this.pending.reduce((sum, item) => {
-        if (!this.isSameRouteSegment(route, item)) return sum;
-        const pendingGoodsIndex = this.masterGoodsIndex(item);
-        if (
-          (goodsIndex >= 0 && pendingGoodsIndex >= 0 && pendingGoodsIndex !== goodsIndex) ||
-          (goodsIndex < 0 && !this.isSameGoods(item, row))
-        ) {
-          return sum;
-        }
-        return sum + this.quantityNumber(item.quantity);
-      }, 0);
-    },
     isSameRouteSegment(route = {}, item = {}) {
       const routeSegment = route.segmentNo || route.relationNo || '';
       const itemSegment = item.segmentNo || item.relationNo || '';
       return String(routeSegment) === String(itemSegment);
     },
-    editingGoodsQuantity(route, row) {
-      return (route.goods || []).reduce((sum, item) => {
-        if (item === row || !this.isSameGoods(item, row)) return sum;
-        return sum + this.quantityNumber(item.dispatchQuantity);
-      }, 0);
-    },
-    goodsRemainingQuantity(route, row) {
-      return Math.max(
-        0,
-        this.baseGoodsRemainingQuantity(route, row) -
-          this.pendingGoodsQuantity(route, row) -
-          this.editingGoodsQuantity(route, row)
-      );
-    },
-    availableDispatchQuantity(route, row) { return this.goodsRemainingQuantity(route, row); },
     handleDispatchQuantityInput(route, row, value) {
       const [integer = '', decimal = ''] = String(value || '').replace(/[^\d.]/g, '').split('.');
-      const nextValue = decimal || String(value || '').includes('.') ? `${integer}.${decimal.slice(0, 3)}` : integer;
+      row.dispatchQuantity =
-      const availableQuantity = this.availableDispatchQuantity(route, row);
+        decimal || String(value || '').includes('.') ? `${integer}.${decimal.slice(0, 3)}` : integer;
-      if (Number(nextValue || 0) > availableQuantity) {
-        row.dispatchQuantity = this.formatQuantity(availableQuantity);
-        this.syncFreightItems(route);
-        this.$message.warning('本次数量不能超过剩余数量');
-        return;
-      }
-      row.dispatchQuantity = nextValue;
       this.syncFreightItems(route);
     },
+    validatePendingTotals() {
+      for (const route of this.routes) {
+        const items = this.pending.filter(item => this.isSameRouteSegment(route, item));
+        if (!items.length) continue;
+        if (!this.validatePreviousSegmentCompletedQuantity(route, [])) return false;
+
+        const totals = new Map();
+        for (const item of items) {
+          const index = this.masterGoodsIndex(item);
+          const key = index >= 0 ? `i:${index}` : this.goodsKey(item);
+          totals.set(key, (totals.get(key) || 0) + this.quantityNumber(item.quantity));
+        }
+        for (const [key, qty] of totals.entries()) {
+          if (!key.startsWith('i:')) continue;
+          const sourceIndex = Number(key.slice(2));
+          const masterGoods = this.master?.goods?.[sourceIndex];
+          if (!masterGoods) continue;
+          const available = this.baseGoodsRemainingQuantity(route, {
+            ...masterGoods,
+            sourceIndex,
+          });
+          if (qty > available) {
+            this.$message.warning(
+              `${route.segmentNo}「${masterGoods.cargoName || ''}」调度总量不能超过剩余数量（${this.formatQuantity(available)} ${masterGoods.quantityUnit || this.quantityUnitLabel}）`
+            );
+            return false;
+          }
+        }
+      }
+      return true;
+    },
     handleFreightUnitPriceInput(item, value) {
       const [integer = '', decimal = ''] = String(value || '').replace(/[^\d.]/g, '').split('.');
       item.unitPrice = decimal || String(value || '').includes('.') ? `${integer}.${decimal.slice(0, 2)}` : integer;
@@ -618,7 +652,7 @@ export default {
         const index = (route.goods || []).indexOf(item) + 1;
         const fields = [
           [!String(item.cargoName || '').trim() || item.sourceIndex === undefined || item.sourceIndex === null || item.sourceIndex === '', '货物名称'],
-          [!String(item.cargoType || '').trim() && !(item.cargoTypePath || []).length, '货物类型'],
+          [!String(item.cargoType || '').trim(), '货物类型'],
           [item.dispatchQuantity === undefined || item.dispatchQuantity === null || item.dispatchQuantity === '' || Number(item.dispatchQuantity) <= 0, '本次数量'],
           [!String(item.quantityUnit || '').trim(), '数量单位'],
         ];
@@ -650,7 +684,6 @@ export default {
       return {
         ...goods,
         sourceIndex,
-        cargoTypePath: this.findCargoTypePath(goods.cargoType),
         dispatchQuantity: undefined,
       };
     },
@@ -666,7 +699,8 @@ export default {
     selectGoods(route, row) {
       const source = (this.master.goods || [])[Number(row.sourceIndex)];
       if (!source) return;
-      Object.assign(row, this.createGoodsRow(source, Number(row.sourceIndex)));
+      const cargoType = String(row.cargoType || '').trim() || source.cargoType;
+      Object.assign(row, this.createGoodsRow(source, Number(row.sourceIndex)), { cargoType });
       this.syncFreightItems(route);
     },
     removeGoods(route, index) { route.goods.splice(index, 1); this.syncFreightItems(route); },
@@ -854,8 +888,6 @@ export default {
       const goods = route.goods.filter(item => Number(item.dispatchQuantity) > 0);
       if (!goods.length) return this.$message.warning('请填写本次数量');
       if (!this.validateDispatchGoods(route, goods)) return;
-      if (goods.some(item => Number(item.dispatchQuantity) > this.availableDispatchQuantity(route, item))) return this.$message.warning('本次数量不能超过剩余数量');
-      if (!this.validatePreviousSegmentCompletedQuantity(route, goods)) return;
       this.syncFreightItems(route);
       if (!this.validateFreightItems(route)) return;
       if (!this.validateRoutePhones(route)) return;
@@ -954,6 +986,7 @@ export default {
     async submit() {
       if (!this.pending.length) return this.$message.warning('请加入待提交调度清单');
       if (this.pending.some(item => !this.validateRoutePhones(item))) return;
+      if (!this.validatePendingTotals()) return;
       this.submitting = true;
       try { await api.dispatch({ id: this.master.id, dispatches: this.pending.map(({ id, ...item }) => ({ ...item, mileage: this.normalizeMileage(item.mileage) })) }); this.$message.success('调度成功'); this.$emit('back'); } finally { this.submitting = false; }
     },
@@ -985,7 +1018,7 @@ export default {
 .transport-type-field :deep(.el-input) { width: 240px; }
 .goods-heading { display: flex; align-items: center; justify-content: space-between; margin: 0 -24px 12px; padding: 14px 24px; border-top: 1px solid #eff1f7; border-bottom: 1px solid #eff1f7; h3 { margin: 0; padding-left: 12px; border-left: 4px solid #409eff; font-size: 16px; } span { color: #909399; font-size: 13px; } }
 .freight-heading { margin: 16px 0 12px; h3 { margin: 0; padding-left: 12px; border-left: 4px solid #409eff; font-size: 16px; } }
-.goods-table { :deep(th.el-table__cell), :deep(td.el-table__cell) { border-color: #eff1f7; } :deep(.el-table__row--striped td.el-table__cell) { background: #fafafa; } :deep(.goods-table__remaining .cell) { white-space: nowrap; } :deep(.goods-table__dispatch .el-input) { width: 100%; min-width: 0; } :deep(.goods-table__cargo-type .el-input__inner), :deep(.goods-table__cargo-name .el-select__selected-item) { color: #303133; } }
+.goods-table { :deep(th.el-table__cell), :deep(td.el-table__cell) { border-color: #eff1f7; } :deep(.el-table__row--striped td.el-table__cell) { background: #fafafa; } :deep(.goods-table__dispatch .el-input) { width: 100%; min-width: 0; } :deep(.goods-table__cargo-type), :deep(.goods-table__cargo-name) { width: 100%; } :deep(.goods-table__cargo-type .el-input__inner), :deep(.goods-table__cargo-name .el-select__selected-item) { color: #303133; } }
 .goods-required-mark { margin-left: 2px; color: #f56c6c; }
 .freight-form { :deep(.freight-unit-select) { width: 92px; flex: 0 0 92px; min-width: 0; } }
 .carrier-type-form { margin-top: 16px; }

src/views/business/components/shipping-template-page.vue

@@ -146,8 +146,9 @@
           />
           <el-input
             v-model="form.departureAddress"
-            placeholder="请输入发货地址"
+            class="shipping-template-page__address-map-input"
-            :readonly="transportStationMode || !config.editableRoadAddress"
+            readonly
+            placeholder="请选择发货地址"
             :disabled="transportAddressSelectDisabled"
             @click="handleTransportSecondaryAddressInputClick('departure')"
           >
@@ -189,8 +190,9 @@
           />
           <el-input
             v-model="form.arrivalAddress"
-            placeholder="请输入收货地址"
+            class="shipping-template-page__address-map-input"
-            :readonly="transportStationMode || !config.editableRoadAddress"
+            readonly
+            placeholder="请选择收货地址"
             :disabled="transportAddressSelectDisabled"
             @click="handleTransportSecondaryAddressInputClick('arrival')"
           >
@@ -1131,7 +1133,7 @@ const defaultCargo = () => ({
   cargoTypePath: [],
   packageType: '',
   quantity: '',
-  quantityUnit: '',
+  quantityUnit: '吨',
   brand: '',
   specification: '',
   model: '',
@@ -1258,6 +1260,7 @@ export default {
       crudDialogType: '',
       standaloneFormKey: '',
       copyingRow: null,
+      suppressTransportTypeClear: false,
       detailBox: false,
       detailLoading: false,
       detailRow: {},
@@ -1511,10 +1514,10 @@ export default {
       },
     },
     'form.transportType'(value, oldValue) {
-      if (value !== oldValue) {
+      if (this.suppressTransportTypeClear) return;
-        this.handleTransportTypeChange(value);
+      if (String(value ?? '') === String(oldValue ?? '')) return;
-        this.syncFreightItems();
+      this.handleTransportTypeChange(value);
-      }
+      this.syncFreightItems();
     },
   },
   created() {
@@ -1527,6 +1530,20 @@ export default {
   methods: {
     buildOption(option) {
       const next = { ...option, column: (option.column || []).map(column => ({ ...column })) };
+      const tableOrder = this.config.tableColumnOrder || [];
+      if (tableOrder.length) {
+        const orderMap = new Map(tableOrder.map((prop, index) => [prop, index]));
+        next.column.sort((left, right) => {
+          const leftOrder = orderMap.has(left.prop) ? orderMap.get(left.prop) : tableOrder.length;
+          const rightOrder = orderMap.has(right.prop)
+            ? orderMap.get(right.prop)
+            : tableOrder.length;
+          return leftOrder - rightOrder;
+        });
+        next.column.forEach(column => {
+          if (column.prop) column.hide = !orderMap.has(column.prop);
+        });
+      }
       if (this.menuWidth != null) next.menuWidth = this.menuWidth;
       if (
         this.standaloneFormPage &&
@@ -1790,6 +1807,7 @@ export default {
           console.log('进入复制模式分支');
           const copyData = { ...this.copyingRow };
           this.copyingRow = null;
+          this.suppressTransportTypeClear = true;
           this.form = { ...(this.config.defaultForm || {}), ...copyData };
           console.log('合并后的 form:', this.form);
           // 删除模板编号，等待系统生成
@@ -1842,7 +1860,11 @@ export default {
       done?.();
     },
     applyFormDetail(row) {
+      this.suppressTransportTypeClear = true;
       this.form = { ...(row || {}) };
+      this.$nextTick(() => {
+        this.suppressTransportTypeClear = false;
+      });
       this.selectedProjectId = this.form.projectId || '';
       this.transportCargoRows = this.parseJsonArray(this.form.goodsJson).map(item =>
         this.normalizeCargo(item)
@@ -1924,14 +1946,6 @@ export default {
           this.$message.warning(`第${index + 1}行货物类型不能为空`);
           return false;
         }
-        if (!String(row.cargoName || '').trim() || !row.quantity || !row.quantityUnit) {
-          this.$message.warning(`第${index + 1}行货物信息不完整`);
-          return false;
-        }
-        if (Number(row.quantity) <= 0) {
-          this.$message.warning(`第${index + 1}行数量必须大于0`);
-          return false;
-        }
         if (String(row.remark || '').length > 200) {
           this.$message.warning(`第${index + 1}行备注不能超过200个字符`);
           return false;
@@ -2013,6 +2027,8 @@ export default {
           delete detail.updateUser;
           delete detail.updateUserName;
           delete detail.status;
+          // 模板名称追加「-副本」
+          detail.templateName = `${detail.templateName || ''}-副本`;
 
           console.log('处理后的数据:', detail);
           console.log('isStandaloneBusinessPage:', this.isStandaloneBusinessPage);
@@ -2286,13 +2302,60 @@ export default {
     },
     handleTransportTypeChange(value) {
       this.form.transportTypeName = this.getTransportTypeLabel(value);
+      this.clearTransportShippingInfo();
+    },
+    clearTransportShippingInfo() {
+      [
+        'departureName',
+        'departureAddress',
+        'departureAddressCode',
+        'departureSiteCode',
+        'departureLongitude',
+        'departureLatitude',
+        'departureContact',
+        'departurePhone',
+        'arrivalName',
+        'arrivalAddress',
+        'arrivalAddressCode',
+        'arrivalSiteCode',
+        'arrivalLongitude',
+        'arrivalLatitude',
+        'arrivalContact',
+        'arrivalPhone',
+      ].forEach(prop => {
+        this.form[prop] = '';
+      });
+      this.transportMapSelected = {};
+      this.transportRouteBox = false;
+      this.transportAddressBox = false;
+      this.transportStationBox = false;
+      this.transportMapBox = false;
+      this.transportAddressTarget = '';
+      this.transportStationTarget = '';
+      this.transportMapTarget = '';
+      this.transportMapKeyword = '';
+      this.transportMapStatus = '可搜索地址或点击地图选点';
+      if (this.transportAmapMarker) {
+        this.transportAmapMarker.setMap(null);
+        this.transportAmapMarker = null;
+      }
+      this.$refs.crud?.clearValidate?.([
+        'departureAddress',
+        'arrivalAddress',
+        'departureName',
+        'arrivalName',
+        'departureContact',
+        'departurePhone',
+        'arrivalContact',
+        'arrivalPhone',
+      ]);
     },
     openTransportPrimaryAddressPicker(target) {
       if (this.transportStationMode) this.openTransportStationDialog(target);
     },
     handleTransportSecondaryAddressInputClick(target) {
-      if (this.transportStationMode || !this.config.editableRoadAddress)
+      if (this.transportAddressSelectDisabled) return;
-        this.openTransportSecondaryAddressPicker(target);
+      this.openTransportSecondaryAddressPicker(target);
     },
     openTransportSecondaryAddressPicker(target) {
       this.transportStationMode
@@ -3328,6 +3391,13 @@ export default {
   gap: 8px;
   align-items: center;
 }
+.shipping-template-page__address-map-input {
+  cursor: pointer;
+  :deep(.el-input__wrapper),
+  :deep(.el-input__inner) {
+    cursor: pointer;
+  }
+}
 .shipping-template-page__section-actions {
   display: flex;
   gap: 12px;

src/views/business/components/transport-plan-page.vue

@@ -85,15 +85,23 @@
       </template>
 
       <template #departureAddress="{ row }">
-        <el-tooltip v-if="row.departureAddress" :content="row.departureAddress" placement="top">
+        <el-tooltip
-          <span>{{ formatTransportPlanProvinceCityDistrict(row.departureAddress) }}</span>
+          v-if="row.departureAddress || row.departureName"
+          :content="row.departureAddress || row.departureName"
+          placement="top"
+        >
+          <span>{{ formatTransportPlanListAddress(row, 'departure') }}</span>
         </el-tooltip>
         <span v-else>-</span>
       </template>
 
       <template #arrivalAddress="{ row }">
-        <el-tooltip v-if="row.arrivalAddress" :content="row.arrivalAddress" placement="top">
+        <el-tooltip
-          <span>{{ formatTransportPlanProvinceCityDistrict(row.arrivalAddress) }}</span>
+          v-if="row.arrivalAddress || row.arrivalName"
+          :content="row.arrivalAddress || row.arrivalName"
+          placement="top"
+        >
+          <span>{{ formatTransportPlanListAddress(row, 'arrival') }}</span>
         </el-tooltip>
         <span v-else>-</span>
       </template>
@@ -574,7 +582,7 @@
           >
           <el-link
             type="primary"
-            v-if="hasPermission(`${config.permission}_view`) && !showDetailButton(row)"
+            v-if="showViewButton(row)"
             @click="$refs.crud.rowView(row, index)"
           >
             查看
@@ -1492,27 +1500,38 @@
               <el-input
                 v-model="dispatchItemForm.departureName"
                 :placeholder="dispatchStationNamePlaceholder"
-                :suffix-icon="dispatchStationMode ? Search : undefined"
+                :readonly="dispatchStationMode"
-                disabled
+                @click="openDispatchPrimaryAddressPicker('departure')"
-              />
+              >
+                <template v-if="dispatchStationMode" #suffix>
+                  <el-icon
+                    class="transport-plan-page__map-suffix"
+                    @click.stop="openDispatchSecondaryAddressPicker('departure')"
+                  >
+                    <Search />
+                  </el-icon>
+                </template>
+              </el-input>
               <el-input
                 v-model="dispatchItemForm.departureAddress"
                 :placeholder="dispatchAddressDetailPlaceholder"
-                disabled
+                :readonly="dispatchStationMode"
+                @click="handleDispatchSecondaryAddressInputClick('departure')"
               >
                 <template v-if="!dispatchStationMode" #suffix>
                   <el-link
                     type="primary"
                     :underline="false"
                     class="transport-plan-page__address-choose-link"
+                    @click.stop="openTransportMapDialog('departure')"
                     >选择</el-link
                   >
                 </template>
               </el-input>
               <span class="transport-plan-page__route-label">联系人</span>
-              <el-input v-model="dispatchItemForm.departureContact" placeholder="请输入" disabled />
+              <el-input v-model="dispatchItemForm.departureContact" placeholder="请输入" />
               <span class="transport-plan-page__route-label">联系方式</span>
-              <el-input v-model="dispatchItemForm.departurePhone" placeholder="请输入" disabled />
+              <el-input v-model="dispatchItemForm.departurePhone" placeholder="请输入" />
             </div>
           </el-form-item>
           <el-form-item label="收货地址" required>
@@ -1520,27 +1539,38 @@
               <el-input
                 v-model="dispatchItemForm.arrivalName"
                 :placeholder="dispatchStationNamePlaceholder"
-                :suffix-icon="dispatchStationMode ? Search : undefined"
+                :readonly="dispatchStationMode"
-                disabled
+                @click="openDispatchPrimaryAddressPicker('arrival')"
-              />
+              >
+                <template v-if="dispatchStationMode" #suffix>
+                  <el-icon
+                    class="transport-plan-page__map-suffix"
+                    @click.stop="openDispatchSecondaryAddressPicker('arrival')"
+                  >
+                    <Search />
+                  </el-icon>
+                </template>
+              </el-input>
               <el-input
                 v-model="dispatchItemForm.arrivalAddress"
                 :placeholder="dispatchAddressDetailPlaceholder"
-                disabled
+                :readonly="dispatchStationMode"
+                @click="handleDispatchSecondaryAddressInputClick('arrival')"
               >
                 <template v-if="!dispatchStationMode" #suffix>
                   <el-link
                     type="primary"
                     :underline="false"
                     class="transport-plan-page__address-choose-link"
+                    @click.stop="openTransportMapDialog('arrival')"
                     >选择</el-link
                   >
                 </template>
               </el-input>
               <span class="transport-plan-page__route-label">联系人</span>
-              <el-input v-model="dispatchItemForm.arrivalContact" placeholder="请输入" disabled />
+              <el-input v-model="dispatchItemForm.arrivalContact" placeholder="请输入" />
               <span class="transport-plan-page__route-label">联系方式</span>
-              <el-input v-model="dispatchItemForm.arrivalPhone" placeholder="请输入" disabled />
+              <el-input v-model="dispatchItemForm.arrivalPhone" placeholder="请输入" />
             </div>
           </el-form-item>
         </div>
@@ -1576,20 +1606,15 @@
                   ><span class="transport-plan-page__required-column">货物类型</span></template
                 >
                 <template #default="{ row }">
-                  <el-select
+                  <el-autocomplete
                     v-model="row.cargoType"
-                    placeholder="请选择货物类型"
+                    placeholder="请输入货物类型"
                     clearable
-                    filterable
+                    :debounce="300"
+                    :fetch-suggestions="fetchDispatchConfiguredCargoTypeSuggestions"
+                    @select="item => handleDispatchConfiguredCargoTypeSelect(row, item)"
                     @change="value => handleDispatchConfiguredCargoTypeChange(row, value)"
-                  >
+                  />
-                    <el-option
-                      v-for="item in getDispatchConfiguredCargoTypeOptions()"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"
-                    />
-                  </el-select>
                 </template>
               </el-table-column>
               <el-table-column min-width="240" align="center">
@@ -1597,20 +1622,18 @@
                   ><span class="transport-plan-page__required-column">货物名称</span></template
                 >
                 <template #default="{ row }">
-                  <el-select
+                  <el-autocomplete
                     v-model="row.cargoName"
-                    placeholder="请选择货物名称"
+                    placeholder="请输入货物名称"
                     clearable
-                    filterable
+                    :debounce="300"
+                    :fetch-suggestions="
+                      (queryString, callback) =>
+                        fetchDispatchConfiguredCargoNameSuggestions(queryString, callback, row)
+                    "
+                    @select="item => handleDispatchConfiguredCargoNameSelect(row, item)"
                     @change="value => handleDispatchConfiguredCargoNameChange(row, value)"
-                  >
+                  />
-                    <el-option
-                      v-for="item in getDispatchConfiguredCargoNameOptions(row)"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"
-                    />
-                  </el-select>
                 </template>
               </el-table-column>
               <el-table-column label="包装" min-width="130" align="center">
@@ -1627,7 +1650,11 @@
               </el-table-column>
               <el-table-column label="剩余数量" min-width="130" align="center">
                 <template #default="{ row }">
-                  {{ formatDispatchQuantity(dispatchItemRemainingQuantity(row)) }}
+                  {{
+                    isDispatchPlanQuantityUnlimited(row)
+                      ? '-'
+                      : formatDispatchQuantity(dispatchItemRemainingQuantity(row))
+                  }}
                 </template>
               </el-table-column>
               <el-table-column min-width="130" align="center">
@@ -1848,36 +1875,33 @@
               <el-input v-model="dispatchItemForm.escortPhone" placeholder="请输入" />
             </el-form-item>
             <el-form-item label="货物类型" required>
-              <el-select
+              <el-autocomplete
                 v-model="dispatchItemForm.cargoType"
-                placeholder="请选择货物类型"
+                placeholder="请输入货物类型"
                 clearable
-                filterable
+                :debounce="300"
-                @change="handleDispatchConfiguredCargoTypeChange(dispatchItemForm, $event)"
+                :fetch-suggestions="fetchDispatchConfiguredCargoTypeSuggestions"
-              >
+                @select="item => handleDispatchConfiguredCargoTypeSelect(dispatchItemForm, item)"
-                <el-option
+                @change="value => handleDispatchConfiguredCargoTypeChange(dispatchItemForm, value)"
-                  v-for="item in getDispatchConfiguredCargoTypeOptions()"
+              />
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                />
-              </el-select>
             </el-form-item>
             <el-form-item label="货物名称" required>
-              <el-select
+              <el-autocomplete
                 v-model="dispatchItemForm.cargoName"
-                placeholder="请选择货物名称"
+                placeholder="请输入货物名称"
                 clearable
-                filterable
+                :debounce="300"
-                @change="handleDispatchConfiguredCargoNameChange(dispatchItemForm, $event)"
+                :fetch-suggestions="
-              >
+                  (queryString, callback) =>
-                <el-option
+                    fetchDispatchConfiguredCargoNameSuggestions(
-                  v-for="item in getDispatchConfiguredCargoNameOptions(dispatchItemForm)"
+                      queryString,
-                  :key="item.value"
+                      callback,
-                  :label="item.label"
+                      dispatchItemForm
-                  :value="item.value"
+                    )
-                />
+                "
-              </el-select>
+                @select="item => handleDispatchConfiguredCargoNameSelect(dispatchItemForm, item)"
+                @change="value => handleDispatchConfiguredCargoNameChange(dispatchItemForm, value)"
+              />
             </el-form-item>
             <el-form-item label="规格">
               <el-input v-model="dispatchItemForm.specification" placeholder="请输入" />
@@ -1902,7 +1926,10 @@
                   </el-select>
                 </template>
               </el-input>
-              <div class="transport-plan-page__dispatch-quantity-hint">
+              <div
+                v-if="!isDispatchPlanQuantityUnlimited(dispatchItemForm)"
+                class="transport-plan-page__dispatch-quantity-hint"
+              >
                 剩余数量：{{
                   formatDispatchQuantity(dispatchItemRemainingQuantity(dispatchItemForm))
                 }}
@@ -2993,6 +3020,10 @@ export default {
       Location,
       OfficeBuilding,
       Search,
+      // 实例所属路由的路径快照，用于在 watcher / 跳转前判断当前路由是否还是自己的。
+      // 必须放 data：Options API 的顺序是 data → computed → watch(immediate) → created，
+      // 放 created 的话首个 immediate watcher 会读到空值，把首次加载也挡掉。
+      routePathLocked: this.$route.path,
       form: {},
       suppressTransportTypeClear: false,
       query: {},
@@ -3412,15 +3443,21 @@ export default {
       }));
     },
     dispatchHasAddableQuantity() {
-      return this.dispatchTableQuantityItems.some(
+      const items = this.dispatchTableQuantityItems;
-        item => item.total > 0 && item.listed < item.total - 1e-8
+      if (!items.length) return true;
-      );
+      // 计划总量为 0 时不限制新增调度
+      if (items.every(item => item.total <= 0)) return true;
+      return items.some(item => item.total > 0 && item.listed < item.total - 1e-8);
     },
     dispatchSummaryText() {
       const formatSummary = field =>
         this.dispatchSummaryItems
           .map(item => `${this.formatDispatchQuantity(item[field])}${item.unit}`)
           .join('、');
+      const unlimited = this.dispatchSummaryItems.every(item => item.total <= 0);
+      if (unlimited) {
+        return `已调度 ${formatSummary('assigned') || `0${TRANSPORT_PLAN_QUANTITY_UNIT}`}`;
+      }
       return `共${formatSummary('total')} | 已调度 ${formatSummary(
         'assigned'
       )}，剩余${formatSummary('remaining')}`;
@@ -3563,6 +3600,11 @@ export default {
         !this.dialogReadonly
       );
     },
+    // 当前路由是否仍属于本实例（tab.js 按 fullPath 建实例，一个实例只对应一个 path）。
+    // 实例被 keep-alive 缓存后 $route 已跑到别的页面时，不能用「当前页面的 id」去查本页数据。
+    isOwnedRouteActive() {
+      return this.$route.path === this.routePathLocked;
+    },
     billingCargoTypeCascaderProps() {
       return {
         label: 'cargoName',
@@ -3606,12 +3648,13 @@ export default {
       return ['water', 'rail', 'air'].includes(this.transportMode);
     },
     transportStationTypeLabel() {
+      const mode = this.dispatchItemBox ? this.dispatchTransportMode : this.transportMode;
       const labelMap = {
         water: '港口/码头',
         rail: '铁路车站',
         air: '空港机场',
       };
-      return labelMap[this.transportMode] || '';
+      return labelMap[mode] || '';
     },
     transportStationNamePlaceholder() {
       if (!this.transportStationMode) return '行政区划自动带出';
@@ -3639,6 +3682,9 @@ export default {
     detailId: {
       immediate: true,
       handler(id) {
+        // 宿主 view 传的是全局 $route.query.detailId，必须确认当前路由还是自己的，
+        // 否则跳到别的页面后会把「别人的 id」灌进来触发详情请求。
+        if (!this.isOwnedRouteActive) return;
         if (id !== undefined && id !== null && id !== '') {
           this.$nextTick(() => this.openDetail({ id }));
         }
@@ -3798,6 +3844,37 @@ export default {
       const cityMatch = text.match(/市/);
       return cityMatch ? text.slice(0, cityMatch.index + 1) : text;
     },
+    formatTransportPlanListAddress(row = {}, field) {
+      const address = String(row[`${field}Address`] || '').trim();
+      const name = String(row[`${field}Name`] || '').trim();
+      const fromAddress = this.extractTransportPlanProvinceCityDistrict(address);
+      if (fromAddress) return fromAddress;
+      const fromName = this.extractTransportPlanProvinceCityDistrict(name);
+      if (fromName) return fromName;
+      return name || address || '-';
+    },
+    extractTransportPlanProvinceCityDistrict(value) {
+      const text = String(value || '')
+        .trim()
+        .replace(/[\\/|｜、,，\s]+/g, '');
+      if (!text) return '';
+      const districtPattern = '(?:自治县|自治旗|林区|矿区|新区|开发区|区|县|旗)';
+      const parts = [];
+      let remainder = text;
+      const province = text.match(/^(.+?(?:省|自治区|特别行政区))/);
+      if (province) {
+        parts.push(province[1]);
+        remainder = text.slice(province[1].length);
+      }
+      const city = remainder.match(/^(.+?市)/);
+      if (city) {
+        parts.push(city[1]);
+        remainder = remainder.slice(city[1].length);
+      }
+      const district = remainder.match(new RegExp(`^(.+?${districtPattern})`));
+      if (district) parts.push(district[1]);
+      return parts.length ? parts.join('/') : '';
+    },
     formatTransportPlanRoadCityDistrict(value) {
       const text = String(value || '').trim();
       if (!text) return '-';
@@ -3955,6 +4032,11 @@ export default {
       const status = this.statusValue(row);
       return status !== 'draft';
     },
+    showViewButton(row) {
+      if (!this.hasPermission(`${this.config.permission}_view`)) return false;
+      if (this.statusValue(row) === 'draft') return false;
+      return !this.showDetailButton(row);
+    },
     formatDetailValue(row, prop) {
       if (!row) return '-';
       if (prop === 'businessStatus') return this.displayStatus(row, prop);
@@ -4540,6 +4622,37 @@ export default {
     getDispatchRemainingQuantity(unit) {
       return this.getDispatchSummaryItem(unit)?.remaining || 0;
     },
+    /** 计划总量为 0 时不限制调度数量 */
+    isDispatchPlanQuantityUnlimited(row = {}) {
+      const unit = this.getDispatchQuantityUnit(row);
+      const hasCargoIdentity = Boolean(
+        String(row.cargoName || row.goodsName || row.name || '').trim() ||
+          String(row.cargoType || row.secondCargoTypeName || row.goodsType || row.type || '').trim()
+      );
+      const planGoodsRows = this.dispatchPlanGoodsRows;
+      if (planGoodsRows.length && hasCargoIdentity) {
+        const cargoKey = this.getDispatchCargoIdentity(row);
+        const matchedPlanRows = planGoodsRows.filter(
+          goods => this.getDispatchCargoIdentity(goods) === cargoKey
+        );
+        if (!matchedPlanRows.length) {
+          return (this.getDispatchSummaryItem(unit)?.total || 0) <= 0;
+        }
+        const total = matchedPlanRows.reduce(
+          (sum, goods) =>
+            sum +
+            this.parseDispatchQuantity(
+              goods.quantity || goods.cargoQuantity || goods.goodsQuantity
+            ),
+          0
+        );
+        return total <= 0;
+      }
+      if (!planGoodsRows.length) {
+        return Number(this.dispatchRow.totalQuantity || this.dispatchRow.quantity || 0) <= 0;
+      }
+      return (this.getDispatchSummaryItem(unit)?.total || 0) <= 0;
+    },
     formatDispatchQuantity(value) {
       const number = Number(value || 0);
       if (!Number.isFinite(number)) return '0';
@@ -5238,6 +5351,13 @@ export default {
       }
     },
     ensureTransportTypeBeforeAddress() {
+      if (this.dispatchItemBox) {
+        const transportType =
+          this.dispatchItemForm.transportType || this.dispatchRow?.transportType || '';
+        if (!this.isBillingFieldEmpty(transportType)) return true;
+        this.$message.warning('请先选择运输方式');
+        return false;
+      }
       if (!this.shippingInfoFormEnabled || !this.isBillingFieldEmpty(this.form.transportType)) {
         return true;
       }
@@ -5314,19 +5434,21 @@ export default {
     },
     openTransportStationDialog(target) {
       if (!this.ensureTransportTypeBeforeAddress()) return;
-      if (!this.transportStationMode) return;
+      const stationMode = this.dispatchItemBox ? this.dispatchStationMode : this.transportStationMode;
+      if (!stationMode) return;
       this.transportStationTarget = target;
       this.transportStationQuery = {};
       this.transportStationPage.currentPage = 1;
       this.transportStationBox = true;
     },
     getTransportStationListRequest() {
+      const mode = this.dispatchItemBox ? this.dispatchTransportMode : this.transportMode;
       const requestMap = {
         water: getPortTerminalList,
         rail: getRailwayStationList,
         air: getAirportMasterList,
       };
-      return requestMap[this.transportMode];
+      return requestMap[mode];
     },
     loadTransportStationList() {
       const request = this.getTransportStationListRequest();
@@ -5436,7 +5558,28 @@ export default {
         water: '港口/码头',
         air: '空港机场',
       };
-      return typeMap[this.transportMode] || '';
+      const mode = this.dispatchItemBox ? this.dispatchTransportMode : this.transportMode;
+      return typeMap[mode] || '';
+    },
+    getTransportAddressForm() {
+      return this.dispatchItemBox ? this.dispatchItemForm : this.form;
+    },
+    openDispatchPrimaryAddressPicker(target) {
+      if (this.dispatchStationMode) {
+        this.openTransportStationDialog(target);
+      }
+    },
+    openDispatchSecondaryAddressPicker(target) {
+      if (this.dispatchStationMode) {
+        this.openTransportStationDialog(target);
+        return;
+      }
+      this.openTransportMapDialog(target);
+    },
+    handleDispatchSecondaryAddressInputClick(target) {
+      if (this.dispatchStationMode) {
+        this.openDispatchSecondaryAddressPicker(target);
+      }
     },
     loadTransportAddressList() {
       this.transportAddressLoading = true;
@@ -5487,35 +5630,39 @@ export default {
     },
     applyTransportAddress(target, address = {}) {
       const prefix = target === 'departure' ? 'departure' : 'arrival';
-      this.form[`${prefix}Name`] = address.preferRegionName
+      const addressForm = this.getTransportAddressForm();
+      addressForm[`${prefix}Name`] = address.preferRegionName
         ? address.regionName || address.addressName || ''
         : address.addressName || address.regionName || '';
-      this.form[`${prefix}Address`] = address.detailAddress || address.address || '';
+      addressForm[`${prefix}Address`] = address.detailAddress || address.address || '';
-      this.form[`${prefix}AddressCode`] = address.addressCode || '';
+      addressForm[`${prefix}AddressCode`] = address.addressCode || '';
-      this.form[`${prefix}SiteCode`] =
+      addressForm[`${prefix}SiteCode`] =
         address.addressType === '常规地址'
           ? '/'
           : address.siteCodeDisplay || address.siteCode || '';
-      this.form[`${prefix}Longitude`] = address.longitude || '';
+      addressForm[`${prefix}Longitude`] = address.longitude || '';
-      this.form[`${prefix}Latitude`] = address.latitude || '';
+      addressForm[`${prefix}Latitude`] = address.latitude || '';
-      this.form[`${prefix}Contact`] = address.contactName || this.form[`${prefix}Contact`] || '';
+      addressForm[`${prefix}Contact`] =
-      this.form[`${prefix}Phone`] = address.contactPhone || this.form[`${prefix}Phone`] || '';
+        address.contactName || addressForm[`${prefix}Contact`] || '';
+      addressForm[`${prefix}Phone`] = address.contactPhone || addressForm[`${prefix}Phone`] || '';
       // 地址值在本轮响应式更新后再清理校验状态，避免 Avue 以旧空值重新触发必填提示。
       this.$nextTick(() => {
         this.$refs.crud?.clearValidate?.([`${prefix}Address`]);
       });
     },
     openTransportMapDialog(target) {
-      if (this.dialogReadonly) return;
+      if (this.dialogReadonly && !this.dispatchItemBox) return;
       if (!this.ensureTransportTypeBeforeAddress()) return;
       const prefix = target === 'departure' ? 'departure' : 'arrival';
+      const addressForm = this.getTransportAddressForm();
       this.transportMapTarget = prefix;
-      this.transportMapKeyword = this.form[`${prefix}Address`] || this.form[`${prefix}Name`] || '';
+      this.transportMapKeyword =
+        addressForm[`${prefix}Address`] || addressForm[`${prefix}Name`] || '';
       this.transportMapSelected = this.buildTransportMapSelection({
-        lng: this.form[`${prefix}Longitude`],
+        lng: addressForm[`${prefix}Longitude`],
-        lat: this.form[`${prefix}Latitude`],
+        lat: addressForm[`${prefix}Latitude`],
-        address: this.form[`${prefix}Address`],
+        address: addressForm[`${prefix}Address`],
-        regionName: this.form[`${prefix}Name`],
+        regionName: addressForm[`${prefix}Name`],
       });
       this.transportMapStatus = this.transportMapSelected.longitude
         ? '已加载当前选点，可重新选点'
@@ -5673,12 +5820,13 @@ export default {
         return;
       }
       const prefix = this.transportMapTarget;
-      this.form[`${prefix}Address`] =
+      const addressForm = this.getTransportAddressForm();
-        this.transportMapSelected.detailAddress || this.form[`${prefix}Address`];
+      addressForm[`${prefix}Address`] =
-      this.form[`${prefix}Name`] =
+        this.transportMapSelected.detailAddress || addressForm[`${prefix}Address`];
-        this.transportMapSelected.regionName || this.form[`${prefix}Name`];
+      addressForm[`${prefix}Name`] =
-      this.form[`${prefix}Longitude`] = this.transportMapSelected.longitude;
+        this.transportMapSelected.regionName || addressForm[`${prefix}Name`];
-      this.form[`${prefix}Latitude`] = this.transportMapSelected.latitude;
+      addressForm[`${prefix}Longitude`] = this.transportMapSelected.longitude;
+      addressForm[`${prefix}Latitude`] = this.transportMapSelected.latitude;
       this.transportMapBox = false;
       this.$nextTick(() => {
         this.$refs.crud?.clearValidate?.([`${prefix}Address`]);
@@ -7287,8 +7435,9 @@ export default {
               item.cargoTypePath.join('/') === rowTypePath.join('/')
           )
         : goodsOptions;
+      const source = filtered.length ? filtered : goodsOptions;
       const options = new Map();
-      filtered.forEach(item => {
+      source.forEach(item => {
         if (!item.cargoName || options.has(item.cargoName)) return;
         options.set(item.cargoName, {
           label: item.cargoName,
@@ -7302,26 +7451,73 @@ export default {
       });
       return Array.from(options.values());
     },
-    handleDispatchConfiguredCargoTypeChange(row, value) {
+    fetchDispatchConfiguredCargoTypeSuggestions(queryString, callback) {
-      const option = this.getDispatchConfiguredCargoTypeOptions().find(
+      const keyword = String(queryString || '').trim().toLowerCase();
-        item => String(item.value) === String(value || '')
+      const options = this.getDispatchConfiguredCargoTypeOptions().map(item => ({
+        ...item,
+        value: item.label,
+      }));
+      callback(
+        keyword
+          ? options.filter(item => String(item.value).toLowerCase().includes(keyword))
+          : options
       );
-      row.cargoType = option?.label || '';
+    },
-      row.cargoTypeCode = option?.cargoTypeCode || '';
+    fetchDispatchConfiguredCargoNameSuggestions(queryString, callback, row = {}) {
-      row.cargoTypePath = option?.cargoTypePath || [];
+      const keyword = String(queryString || '').trim().toLowerCase();
+      const options = this.getDispatchConfiguredCargoNameOptions(row).map(item => ({
+        ...item,
+        value: item.label,
+      }));
+      callback(
+        keyword
+          ? options.filter(item => String(item.value).toLowerCase().includes(keyword))
+          : options
+      );
+    },
+    handleDispatchConfiguredCargoTypeSelect(row, item = {}) {
+      this.handleDispatchConfiguredCargoTypeChange(row, item.value || item.label || '');
+    },
+    handleDispatchConfiguredCargoNameSelect(row, item = {}) {
+      this.handleDispatchConfiguredCargoNameChange(row, item.value || item.label || '');
+    },
+    handleDispatchConfiguredCargoTypeChange(row, value) {
+      const nextValue = String(value ?? row.cargoType ?? '').trim();
+      const option = this.getDispatchConfiguredCargoTypeOptions().find(
+        item => String(item.value) === nextValue || item.label === nextValue
+      );
+      if (option) {
+        row.cargoType = option.label || '';
+        row.cargoTypeCode = option.cargoTypeCode || '';
+        row.cargoTypePath = option.cargoTypePath || [];
+      } else {
+        row.cargoType = nextValue;
+        row.cargoTypeCode = '';
+        row.cargoTypePath = [];
+      }
       row.cargoName = '';
       row.specification = '';
       row.model = '';
     },
     handleDispatchConfiguredCargoNameChange(row, value) {
+      const nextValue = String(value ?? row.cargoName ?? '').trim();
       const option = this.getDispatchConfiguredCargoNameOptions(row).find(
-        item => String(item.value) === String(value || '')
+        item => String(item.value) === nextValue || item.label === nextValue
       );
-      row.cargoName = option?.value || '';
+      if (!option) {
-      if (!option) return;
+        row.cargoName = nextValue;
-      row.cargoType = option.cargoTypeLabel || row.cargoType || '';
+        return;
-      row.cargoTypeCode = option.cargoTypeCode || row.cargoTypeCode || '';
+      }
-      row.cargoTypePath = option.cargoTypePath || row.cargoTypePath || [];
+      const previousType = String(row.cargoType || '').trim();
+      const isKnownType = this.getDispatchConfiguredCargoTypeOptions().some(
+        item => item.label === previousType || String(item.value) === previousType
+      );
+      row.cargoName = option.value || '';
+      if (!previousType || isKnownType) {
+        row.cargoType = option.cargoTypeLabel || previousType;
+        row.cargoTypeCode = option.cargoTypeCode || row.cargoTypeCode || '';
+        row.cargoTypePath = option.cargoTypePath || row.cargoTypePath || [];
+      }
       row.specification = option.specification || row.specification || '';
       row.model = option.model || row.model || '';
     },
@@ -7345,10 +7541,7 @@ export default {
         vehicleNo: this.dispatchRow.vehicleNo || '',
         cargoName: defaultGoods.cargoName || this.dispatchRow.cargoName || '',
         cargoType: defaultGoods.cargoType || this.dispatchRow.cargoType || '',
-        quantity:
+        quantity: '',
-          index >= 0
-            ? defaultGoods.quantity || ''
-            : this.formatDispatchQuantity(this.getDispatchRemainingQuantity(defaultUnit)),
         quantityUnit: defaultUnit,
         specification: defaultGoods.specification || '',
         model: defaultGoods.model || '',
@@ -8003,6 +8196,7 @@ export default {
         quantityGroups.set(key, group);
       });
       for (const { row: goods, quantity } of quantityGroups.values()) {
+        if (this.isDispatchPlanQuantityUnlimited(goods)) continue;
         const unit = this.getDispatchQuantityUnit(goods);
         const remaining = this.dispatchItemRemainingQuantity(goods);
         if (quantity - remaining > 1e-8) {

src/views/business/components/waybill-import-dialog.vue

@@ -10,109 +10,206 @@
     :class="{ 'waybill-import-page': standalone }"
     @closed="handleClosed"
   >
-    <div class="waybill-import-toolbar">
+    <section v-show="searchVisible" class="waybill-import-toolbar__search">
-      <div class="waybill-import-toolbar__search">
+      <el-form :model="query" label-position="right" label-width="88px" @submit.prevent>
-        <el-form :inline="true" :model="query" label-width="auto">
+        <div class="waybill-import-toolbar__search-grid">
-          <el-form-item label="运单批次号"
+          <el-form-item label="运单批次号">
-            ><el-input v-model="query.batchNo" clearable
+            <el-input v-model="query.batchNo" clearable placeholder="请输入" />
-          /></el-form-item>
+          </el-form-item>
-          <el-form-item label="承运商"
+          <el-form-item label="承运商">
-            ><el-select v-model="query.carrierId" clearable filterable
+            <el-select v-model="query.carrierId" clearable filterable placeholder="请选择">
-              ><el-option
+              <el-option
                 v-for="item in queryCarriers"
                 :key="item.id"
                 :label="item.name"
-                :value="item.id" /></el-select
+                :value="item.id"
-          ></el-form-item>
+              />
-          <el-form-item label="创建时间"
+            </el-select>
-            ><el-date-picker
+          </el-form-item>
+          <el-form-item label="创建时间">
+            <el-date-picker
               v-model="query.createTimeRange"
               type="datetimerange"
               value-format="YYYY-MM-DD HH:mm:ss"
-          /></el-form-item>
+              range-separator="~"
-          <el-form-item label="创建人"
+              start-placeholder="开始时间"
-            ><el-select v-model="query.createUser" clearable filterable
+              end-placeholder="结束时间"
-              ><el-option
+              clearable
+            />
+          </el-form-item>
+          <el-form-item label="创建人">
+            <el-select v-model="query.createUser" clearable filterable placeholder="请选择">
+              <el-option
                 v-for="item in creators"
                 :key="item.id"
                 :label="item.name"
-                :value="item.id" /></el-select
+                :value="item.id"
-          ></el-form-item>
+              />
-        </el-form>
+            </el-select>
-        <div class="waybill-import-toolbar__search-actions">
+          </el-form-item>
-          <el-button type="primary" @click="loadBatches">查询</el-button
-          ><el-button @click="resetQuery">重置</el-button>
         </div>
-      </div>
+        <div class="waybill-import-toolbar__search-actions">
-      <div class="waybill-import-toolbar__actions">
+          <el-button type="primary" @click="loadBatches">查询</el-button>
-        <el-button type="primary" @click="handleCreate">新建导入</el-button
+          <el-button @click="resetQuery">重置</el-button>
-        ><el-button type="danger" plain :disabled="!selected.length" @click="removeBatches"
+        </div>
+      </el-form>
+    </section>
+    <div class="avue-crud__header waybill-import-toolbar__actions">
+      <div class="avue-crud__left">
+        <el-button type="primary" @click="handleCreate">新建导入</el-button>
+        <el-button type="danger" plain :disabled="!selected.length" @click="removeBatches"
           >批量删除</el-button
         >
       </div>
+      <div class="avue-crud__right">
+        <el-button icon="el-icon-refresh" circle @click="loadBatches" />
+        <el-button icon="el-icon-operation" circle @click="columnSettingVisible = true" />
+        <el-button icon="el-icon-search" circle @click="searchVisible = !searchVisible" />
+        <el-button icon="el-icon-grid" circle @click="toggleTableSize" />
+      </div>
     </div>
-    <el-table :data="batches" border @selection-change="selected = $event">
+    <section class="waybill-import-toolbar__table-panel">
-      <el-table-column type="selection" width="50" /><el-table-column
+      <el-table
-        type="index"
+        :data="batches"
-        label="序号"
+        :size="tableSize"
-        width="70"
+        border
-      />
+        @selection-change="selected = $event"
-      <el-table-column prop="batchNo" label="运单批次号" min-width="150" /><el-table-column
-        prop="projectName"
-        label="项目名称"
-        min-width="150"
-      />
-      <el-table-column prop="carrierName" label="承运商" min-width="140" /><el-table-column
-        prop="carrierType"
-        label="承运类型"
-        min-width="120"
-      />
-      <el-table-column prop="waybillCount" label="运单数" width="90" /><el-table-column
-        prop="importTypeName"
-        label="导入方式"
-        width="100"
-      />
-      <el-table-column
-        prop="createTime"
-        label="创建时间"
-        min-width="170"
-        sortable
-      /><el-table-column prop="updateTime" label="更新时间" min-width="170" sortable />
-      <el-table-column prop="statusName" label="状态" width="100" /><el-table-column
-        label="操作"
-        width="180"
-        fixed="right"
       >
-        <template #default="{ row }"
+        <el-table-column type="selection" width="50" /><el-table-column
-          ><el-link type="primary" @click="openDetail(row)">查看</el-link
+          type="index"
-          ><el-link
+          label="序号"
-            v-if="row.importStatus === 'draft'"
+          width="70"
-            type="primary"
+        />
-            @click="editBatch(row)"
+        <el-table-column
-            >编辑</el-link
+          v-if="columnVisible.batchNo"
-          ><el-link type="danger" @click="removeBatch(row)">删除</el-link></template
+          prop="batchNo"
+          label="运单批次号"
+          min-width="150"
+        /><el-table-column
+          v-if="columnVisible.projectName"
+          prop="projectName"
+          label="项目名称"
+          min-width="150"
+        />
+        <el-table-column
+          v-if="columnVisible.carrierName"
+          prop="carrierName"
+          label="承运商"
+          min-width="140"
+        /><el-table-column
+          v-if="columnVisible.carrierType"
+          prop="carrierType"
+          label="承运类型"
+          min-width="120"
+        />
+        <el-table-column
+          v-if="columnVisible.waybillCount"
+          prop="waybillCount"
+          label="运单数"
+          width="90"
+        />        <el-table-column
+          v-if="columnVisible.importTypeName"
+          prop="importTypeName"
+          label="导入方式"
+          width="100"
+        />
+        <el-table-column
+          v-if="columnVisible.createUserName"
+          prop="createUserName"
+          label="创建人"
+          min-width="120"
         >
-      </el-table-column>
+          <template #default="{ row }">{{ row.createUserName || '-' }}</template>
-    </el-table>
+        </el-table-column>
-    <el-pagination
+        <el-table-column
-      v-model:current-page="page.current"
+          v-if="columnVisible.statusName"
-      v-model:page-size="page.size"
+          prop="statusName"
-      layout="total, prev, pager, next, sizes"
+          label="状态"
-      :page-sizes="[10, 20, 50]"
+          width="100"
-      :total="page.total"
+        />
-      @current-change="loadBatches"
+        <el-table-column
-      @size-change="loadBatches"
+          v-if="columnVisible.createTime"
-    />
+          prop="createTime"
+          label="创建时间"
+          min-width="170"
+          sortable
+        /><el-table-column
+          v-if="columnVisible.updateTime"
+          prop="updateTime"
+          label="更新时间"
+          min-width="170"
+          sortable
+        />
+        <el-table-column
+          label="操作"
+          width="180"
+          fixed="right"
+        >
+          <template #default="{ row }">
+            <el-link
+              v-if="row.importStatus !== 'draft'"
+              type="primary"
+              @click="openDetail(row)"
+              >查看</el-link
+            >
+            <el-link
+              v-if="row.importStatus === 'draft'"
+              type="primary"
+              @click="editBatch(row)"
+              >编辑</el-link
+            >
+            <el-link
+              v-if="row.importStatus === 'draft'"
+              type="danger"
+              @click="removeBatch(row)"
+              >删除</el-link
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="waybill-import-toolbar__pagination">
+        <el-pagination
+          background
+          v-model:current-page="page.current"
+          v-model:page-size="page.size"
+          layout="total, sizes, prev, pager, next, jumper"
+          :page-sizes="[10, 20, 50, 100]"
+          :total="page.total"
+          @current-change="loadBatches"
+          @size-change="loadBatches"
+        />
+      </div>
+    </section>
   </component>
 
+  <el-dialog
+    v-model="columnSettingVisible"
+    title="列设置"
+    width="360px"
+    append-to-body
+  >
+    <el-checkbox-group v-model="visibleColumnKeys" class="waybill-import-toolbar__column-setting">
+      <el-checkbox v-for="item in columnOptions" :key="item.prop" :label="item.prop">
+        {{ item.label }}
+      </el-checkbox>
+    </el-checkbox-group>
+    <template #footer>
+      <el-button @click="columnSettingVisible = false">关闭</el-button>
+    </template>
+  </el-dialog>
+
   <el-dialog v-model="detailVisible" title="导入运单详情" width="90%" append-to-body>
-    <el-form :inline="true" :model="detailQuery"
+    <section-card class="waybill-search">
-      ><el-form-item label="车牌号/船号"
+      <el-form :inline="true" :model="detailQuery"
+      >
+        <el-form-item label="车牌号/船号"
         ><el-input v-model="detailQuery.vehicleNo" clearable /></el-form-item
-      ><el-form-item label="货物名称"
+        ><el-form-item label="司机/船长姓名"
-        ><el-input v-model="detailQuery.cargoName" clearable /></el-form-item
+      ><el-input v-model="detailQuery.driverName" clearable placeholder="请输入" /></el-form-item
       ><el-button type="primary" @click="loadDetails">查询</el-button></el-form
-    >
+      >
+    </section-card>
+
     <el-table :data="details" border
       ><el-table-column type="index" label="序号" width="65" /><el-table-column
         prop="batchNo"
@@ -126,7 +223,10 @@
         prop="vehicleNo"
         label="车牌号/航班号/船号/班列号"
         min-width="190"
-      /><el-table-column prop="transportType" label="运输方式" width="110" /><el-table-column
+      /><el-table-column prop="transportType" label="运输方式" width="110">
+        <template #default="{ row }">{{ transportTypeLabel(row.transportType) }}</template>
+      </el-table-column>
+      <el-table-column
         prop="driverName"
         label="司机/船长姓名"
         min-width="120"
@@ -200,17 +300,20 @@
         prop="waybillIdentifier"
         label="同一运单标识号"
         min-width="140"
-      /><el-table-column label="操作" width="80">-</el-table-column></el-table
+      /></el-table
     >
-    <el-pagination
+    <div class="waybill-import-toolbar__pagination">
-      v-model:current-page="detailPage.current"
+      <el-pagination
-      v-model:page-size="detailPage.size"
+        background
-      layout="total, prev, pager, next, sizes"
+        v-model:current-page="detailPage.current"
-      :page-sizes="[10, 20, 50]"
+        v-model:page-size="detailPage.size"
-      :total="detailPage.total"
+        layout="total, sizes, prev, pager, next, jumper"
-      @current-change="loadDetails"
+        :page-sizes="[10, 20, 50, 100]"
-      @size-change="loadDetails"
+        :total="detailPage.total"
-    />
+        @current-change="loadDetails"
+        @size-change="loadDetails"
+      />
+    </div>
   </el-dialog>
 
   <component
@@ -494,6 +597,7 @@ import { getList as getDriverList } from '@/api/transportCapacity/driver';
 import { getDictionary } from '@/api/system/dictbiz';
 import * as api from '@/api/business/waybill-manage';
 import { downloadXls } from '@/utils/util';
+import SectionCard from '@/components/section-card/main.vue';
 
 const props = defineProps({ modelValue: Boolean, standalone: Boolean, createPage: Boolean });
 const emit = defineEmits(['update:modelValue', 'closed']);
@@ -506,8 +610,32 @@ const handleClosed = () => emit('closed');
 const createVisible = ref(props.createPage),
   detailVisible = ref(false),
   formRef = ref();
+const searchVisible = ref(true);
+const columnSettingVisible = ref(false);
+const tableSize = ref('default');
+const tableSizeOptions = ['default', 'large', 'small'];
+const columnOptions = [
+  { prop: 'batchNo', label: '运单批次号' },
+  { prop: 'projectName', label: '项目名称' },
+  { prop: 'carrierName', label: '承运商' },
+  { prop: 'carrierType', label: '承运类型' },
+  { prop: 'waybillCount', label: '运单数' },
+  { prop: 'importTypeName', label: '导入方式' },
+  { prop: 'createUserName', label: '创建人' },
+  { prop: 'statusName', label: '状态' },
+  { prop: 'createTime', label: '创建时间' },
+  { prop: 'updateTime', label: '更新时间' },
+];
+const visibleColumnKeys = ref(columnOptions.map(item => item.prop));
+const columnVisible = computed(() =>
+  Object.fromEntries(columnOptions.map(item => [item.prop, visibleColumnKeys.value.includes(item.prop)]))
+);
+const toggleTableSize = () => {
+  const index = tableSizeOptions.indexOf(tableSize.value);
+  tableSize.value = tableSizeOptions[(index + 1) % tableSizeOptions.length];
+};
 const query = reactive({ batchNo: '', carrierId: '', createUser: '', createTimeRange: [] });
-const detailQuery = reactive({ vehicleNo: '', cargoName: '' });
+const detailQuery = reactive({ vehicleNo: '', driverName: '' });
 const createDefaultForm = () => ({
   id: '',
   batchNo: '',
@@ -862,6 +990,20 @@ const loadEditorOptions = async () => {
   cargoTypeFlatOptions.value = flattenCargoTypeOptions(cargoTypeOptions.value);
   driverOptions.value = extractRecords(driverRes);
 };
+const ensureTransportTypeOptions = async () => {
+  if (transportTypeOptions.value.length) return;
+  const dictRes = await getDictionary({ code: 'transport_type' });
+  transportTypeOptions.value = extractRecords(dictRes).map(item => ({
+    label: item.dictValue || item.label,
+    value: item.dictKey || item.value,
+  }));
+};
+const transportTypeLabel = value => {
+  if (value === null || value === undefined || value === '') return '-';
+  return (
+    transportTypeOptions.value.find(item => String(item.value) === String(value))?.label || value
+  );
+};
 const loadBatches = async () => {
   const res = await api.getImportBatches({ ...query, current: page.current, size: page.size });
   batches.value = res.data?.data?.records || [];
@@ -922,9 +1064,13 @@ const closeCreate = () => {
   }
   createVisible.value = false;
 };
-const openDetail = row => {
+const openDetail = async row => {
   detailQuery.batchId = row.id;
+  detailQuery.vehicleNo = '';
+  detailQuery.driverName = '';
+  detailPage.current = 1;
   detailVisible.value = true;
+  await ensureTransportTypeOptions();
   loadDetails();
 };
 // 草稿明细已落库为草稿运单，编辑时回填到明细表，避免重新上传附件。
@@ -1329,34 +1475,81 @@ const confirmImport = async () => {
 
 <style scoped lang="scss">
 .waybill-import-toolbar {
-  margin-bottom: 12px;
-
   &__search {
-    display: flex;
+    padding: 18px 18px 8px;
-    align-items: flex-start;
+    margin-bottom: 8px;
-    gap: 12px;
+    background: #fff;
+    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.04);
+  }
 
-    .el-form {
+  &__search-grid {
-      flex: 1;
+    display: grid;
-      margin-bottom: 0;
+    grid-template-columns: repeat(4, minmax(0, 1fr));
-    }
+    gap: 8px 24px;
+  }
+
+  &__search :deep(.el-form-item) {
+    margin-bottom: 8px;
+  }
+
+  &__search :deep(.el-form-item__label) {
+    white-space: nowrap;
+  }
+
+  &__search :deep(.el-input),
+  &__search :deep(.el-select),
+  &__search :deep(.el-date-editor),
+  &__search :deep(.el-date-editor.el-input),
+  &__search :deep(.el-date-editor.el-input__wrapper),
+  &__search :deep(.el-date-editor--datetimerange) {
+    width: 100%;
   }
 
   &__search-actions {
     display: flex;
-    flex: none;
+    justify-content: flex-end;
     gap: 8px;
+    margin-bottom: 8px;
   }
 
   &__actions {
-    margin-top: 8px;
+    margin-top: 12px;
+    background: transparent;
+  }
+
+  &__column-setting {
+    display: flex;
+    flex-direction: column;
+    gap: 8px;
+  }
+
+  &__table-panel {
+    padding: 0 12px 12px;
+    background: #fff;
+    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.04);
+  }
+
+  &__pagination {
+    display: flex;
+    justify-content: flex-end;
+    width: 100%;
+    box-sizing: border-box;
+    padding: 16px 0;
+  }
+
+  &__table-panel :deep(.el-table) {
+    --el-table-border-color: #eff1f7;
+  }
+
+  &__table-panel :deep(.el-table__body tr:nth-child(even) > td.el-table__cell),
+  &__table-panel :deep(.el-table__body tr:nth-child(even) > td.el-table-fixed-column--left),
+  &__table-panel :deep(.el-table__body tr:nth-child(even) > td.el-table-fixed-column--right) {
+    background: #fafafa;
   }
 }
 
 .waybill-import-page {
   min-height: calc(100vh - 120px);
-  padding: 12px 24px 24px;
-  background: #fff;
 }
 
 .waybill-import-create {
@@ -1429,4 +1622,7 @@ const confirmImport = async () => {
 :global(.avue-layout--horizontal .waybill-import-create__footer) {
   left: 0;
 }
+.waybill-search .el-form-item{
+  margin-bottom: 0 !important;
+}
 </style>

src/views/business/components/waybill-manage-page.vue

@@ -3,21 +3,21 @@
     :class="[
       'waybill-manage-page',
       {
-        'waybill-manage-page--form-page': isStandaloneWaybillFormPage,
+        'waybill-manage-page--form-page': formPageLocked,
-        'waybill-manage-page--detail-page': isStandaloneWaybillDetailPage,
+        'waybill-manage-page--detail-page': detailPageLocked,
       },
     ]"
   >
     <component
-      v-if="!isStandaloneWaybillDetailPage"
+      v-if="!detailPageLocked"
       :is="crudContainer"
       :option="pageFormOption"
-      :form-page-title="isStandaloneWaybillFormPage ? formPageTitle : undefined"
+      :form-page-title="formPageLocked ? formPageTitle : undefined"
       :table-loading="loading"
       :data="data"
       v-model:page="page"
       v-model="form"
-      :status="isStandaloneWaybillFormPage ? dialogReadonly : undefined"
+      :status="formPageLocked ? dialogReadonly : undefined"
       ref="crud"
       :permission="permissionList"
       :before-open="beforeOpen"
@@ -1546,7 +1546,7 @@
           </el-link>
         </div>
         <div
-          v-if="isStandaloneWaybillFormPage"
+          v-if="formPageLocked"
           class="waybill-manage-page__standalone-menu-actions"
         >
           <el-button class="waybill-manage-page__form-close" @click="closeCrudDialog">
@@ -1747,7 +1747,7 @@
     </el-dialog>
 
     <empty-pagination
-      v-show="!isStandaloneWaybillFormPage && !isStandaloneWaybillDetailPage"
+      v-show="!formPageLocked && !detailPageLocked"
       :page="page"
       @size-change="sizeChange"
       @current-change="currentChange"
@@ -1758,18 +1758,18 @@
       :is="detailContainer"
       v-model="detailBox"
       :title="`${config.title}详情`"
-      :append-to-body="!isStandaloneWaybillDetailPage"
+      :append-to-body="!detailPageLocked"
       top="10px"
       width="96%"
       show-close
       :class="[
         'waybill-manage-page__detail-dialog',
-        { 'waybill-manage-page__detail-page': isStandaloneWaybillDetailPage },
+        { 'waybill-manage-page__detail-page': detailPageLocked },
         $attrs.option?.dialogCustomClass,
       ]"
     >
       <div v-loading="detailLoading" class="waybill-manage-page__detail-content">
-        <template v-if="detailBox || isStandaloneWaybillDetailPage">
+        <template v-if="detailBox || detailPageLocked">
           <section-card class="waybill-manage-page__waybill-detail-summary">
             <div class="waybill-manage-page__waybill-heading">
               <strong>运单详情</strong>
@@ -1923,6 +1923,12 @@
                     }}</strong
                   >
                 </div>
+                <div
+                  v-if="!waybillIsCarrier(detailRow)"
+                  class="waybill-manage-page__waybill-detail-field"
+                >
+                  <span>里程(km)</span><strong>{{ detailRow.mileage || '-' }}</strong>
+                </div>
               </template>
               <template v-else-if="waybillIsNonRoadTransport(detailRow)">
                 <div class="waybill-manage-page__waybill-detail-field">
@@ -2029,8 +2035,8 @@
                   <div v-loading="waybillPunchRecordsLoading">
                     <el-timeline v-if="waybillPunchRecords.length">
                       <el-timeline-item
-                        v-for="(record, index) in waybillPunchRecords"
+                        v-for="(record, index) in orderedWaybillPunchRecords"
-                        :key="record.nodeCode || record.id || index"
+                        :key="`${record.nodeCode || record.id || 'punch'}-${index}`"
                         :timestamp="record.punchTime || record.statusName || '未打卡'"
                         :type="record.punched ? 'primary' : 'info'"
                         :color="record.punched ? '#2b6ce8' : '#c0c4cc'"
@@ -2217,10 +2223,10 @@
           </div>
         </template>
       </div>
-      <div v-if="isStandaloneWaybillDetailPage" class="waybill-manage-page__detail-footer">
+      <div v-if="detailPageLocked" class="waybill-manage-page__detail-footer">
         <el-button type="primary" @click="closeDetail">关闭</el-button>
       </div>
-      <template v-if="!isStandaloneWaybillDetailPage" #footer>
+      <template v-if="!detailPageLocked" #footer>
         <el-button type="primary" @click="closeDetail">关闭</el-button>
       </template>
     </component>
@@ -3512,9 +3518,26 @@ export default {
       selectionList: [],
       attachmentUploadMode: false,
       standaloneFormKey: '',
+      // 实例所属路由的路径快照：用于判断当前 $route 是否还是「本实例自己的路由」。
+      // 必须在 data 里初始化，不能放 created —— Vue 的 Options API 执行顺序是
+      // data → computed → watch(immediate) → created，放 created 会被首个
+      // immediate watcher 读到空值，把本该执行的首次加载也挡掉。
+      routePathLocked: this.$route.path,
+      // 页面形态（列表 / 独立表单页 / 独立详情页）在实例创建时锁定一次，之后不再随 $route 变化。
+      // 原因：标签页 keep-alive 只会让实例 deactivate，实例仍会随 $route（全局响应式）重新渲染；
+      // 若形态跟着路由翻回列表/弹窗态，缓存实例会渲染出 append-to-body 的 el-dialog —— 弹窗被
+      // Teleport 到 body 后，KeepAlive.deactivate 的 move 搬不动它，DOM 会永久残留在页面上，
+      // 表现为“从运单详情/独立表单离开后点其它菜单，详情弹窗又冒出来”。
+      formPageLocked: false,
+      detailPageLocked: false,
+      // 同上：表单模式（add / edit）也一次性锁定，避免缓存实例随 $route 变 query 导致 option 变形
+      formModeLocked: '',
     };
   },
   created() {
+    this.formPageLocked = this.isStandaloneWaybillFormPage;
+    this.detailPageLocked = this.isStandaloneWaybillDetailPage;
+    this.formModeLocked = this.$route.query.mode || '';
     if (this.config.enableAllDept && this.isAdmin) {
       this.allDept = 1;
     }
@@ -3538,6 +3561,14 @@ export default {
       this.consumeTemplateCreatePayload();
     }
   },
+  // 标签切走（实例被 keep-alive 缓存）或销毁时，收起本页所有 append-to-body 的弹窗。
+  // 否则 Teleport 出去的弹窗 DOM 会一直留在 body 上，盖住后续打开的页面。
+  deactivated() {
+    this.closeInnerDialogs();
+  },
+  beforeUnmount() {
+    this.closeInnerDialogs();
+  },
   computed: {
     ...mapGetters(['permission', 'userInfo']),
     permissionList() {
@@ -3545,6 +3576,25 @@ export default {
         addBtn: this.canCreate,
       };
     },
+    // 打卡时间轴按打卡时间先后展示：已打卡记录按打卡时间升序在前，
+    // 未打卡记录保持流程节点原顺序排在其后。
+    orderedWaybillPunchRecords() {
+      const records = Array.isArray(this.waybillPunchRecords) ? this.waybillPunchRecords : [];
+      return records
+        .map((record, index) => ({
+          record,
+          index,
+          punchedAt: this.waybillPunchRecordTimestamp(record),
+        }))
+        .sort((a, b) => {
+          const aPunched = a.punchedAt !== null;
+          const bPunched = b.punchedAt !== null;
+          if (aPunched && bPunched) return a.punchedAt - b.punchedAt || a.index - b.index;
+          if (aPunched !== bPunched) return aPunched ? -1 : 1;
+          return a.index - b.index;
+        })
+        .map(item => item.record);
+    },
     isStandaloneWaybillPage() {
       return this.standaloneFormPage && standaloneWaybillFormPaths.includes(this.$route.path);
     },
@@ -3554,8 +3604,15 @@ export default {
     isStandaloneWaybillDetailPage() {
       return this.standaloneDetailPage && this.$route.path === standaloneWaybillDetailRoute;
     },
+    // 容器形态读实例创建时锁定的标志，不随 $route 翻转（详见 data 中 formPageLocked 的说明）
+    // 当前路由是否仍属于本实例（tab.js 按 fullPath 建实例，一个实例只对应一个 path）。
+    // 被 keep-alive 缓存后如果 $route 已经跑到别的页面上，就不该再用「当前页面的 id」
+    // 去触发本实例的请求或跳转，否则会拿别的单据 id 查自己的接口。
+    isOwnedRouteActive() {
+      return this.$route.path === this.routePathLocked;
+    },
     detailContainer() {
-      return this.isStandaloneWaybillDetailPage ? 'PageDetail' : 'el-dialog';
+      return this.detailPageLocked ? 'PageDetail' : 'el-dialog';
     },
     formPageTitle() {
       if (this.isStandaloneWaybillFormPage) {
@@ -3567,13 +3624,13 @@ export default {
       return '';
     },
     crudContainer() {
-      return this.isStandaloneWaybillFormPage ? 'PageAvueForm' : 'avue-crud';
+      return this.formPageLocked ? 'PageAvueForm' : 'avue-crud';
     },
     pageFormOption() {
-      if (!this.isStandaloneWaybillFormPage) return this.option;
+      if (!this.formPageLocked) return this.option;
       const base = {
         ...this.option,
-        boxType: this.$route.query.mode === 'edit' ? 'edit' : 'add',
+        boxType: this.formModeLocked === 'edit' ? 'edit' : 'add',
         menuBtn: true,
         submitBtn: true,
         emptyBtn: false,
@@ -3821,6 +3878,10 @@ export default {
     detailId: {
       immediate: true,
       handler(id) {
+        // 宿主 view 传的是全局 $route.query.id / detailId，实例被缓存后仍会被重渲染，
+        // 必须确认当前路由还是自己的：否则跳到别的详情页时会把「别的单据 id」灌进来，
+        // 触发 openDetail 用错 id 查运单 → 报「运单管理不存在」。
+        if (!this.isOwnedRouteActive) return;
         if (id !== undefined && id !== null && id !== '') {
           this.$nextTick(() => this.openDetail({ id }));
         }
@@ -3837,6 +3898,25 @@ export default {
     },
   },
   methods: {
+    // 页面被 keep-alive 缓存/卸载时调用，关闭本页所有 append-to-body 的弹窗，
+    // 避免 Teleport 出去的 DOM 残留在 body 上盖住后续页面（详见 data 里的说明）。
+    closeInnerDialogs() {
+      this.detailBox = false;
+      this.mileageDialog.visible = false;
+      this.attachmentDocumentPreviewVisible = false;
+      this.attachmentImagePreviewVisible = false;
+      this.waybillRouteChangeBox = false;
+      this.waybillCommonAddressBox = false;
+      this.flowBox = false;
+      this.transportRouteBox = false;
+      this.transportAddressBox = false;
+      this.transportStationBox = false;
+      this.transportMapBox = false;
+      this.commonCargoBox = false;
+      this.cargoImportBox = false;
+      this.waybillProcessConfigBox = false;
+      this.excelBox = false;
+    },
     initStandaloneFormPage() {
       if (!this.isStandaloneWaybillFormPage) return;
       const mode = this.$route.query.mode === 'edit' ? 'edit' : 'add';
@@ -4384,6 +4464,9 @@ export default {
     },
     openDetail(row) {
       if (!this.isStandaloneWaybillDetailPage) {
+        // 已不在自己的路由上（被缓存后路由切走）：此时 row.id 极可能是别的单据的 id，
+        // 再 push 会生成一堆错误的「运单管理详情」标签
+        if (!this.isOwnedRouteActive) return;
         this.$router.push({ path: standaloneWaybillDetailRoute, query: { id: row.id } });
         return;
       }
@@ -4463,7 +4546,10 @@ export default {
         this.$message.info('当前配载单暂无详情数据');
         return;
       }
-      this.$router.push({ path: '/business/loading-manage', query: { detailId: id } });
+      this.$router.push({
+        path: '/business/loading-manage/detail',
+        query: { id, name: '配载单详情' },
+      });
     },
     loadWaybillDetailProcessNodes(projectId) {
       this.waybillDetailProcessNodes = [];
@@ -4492,6 +4578,19 @@ export default {
         })
         .catch(() => []);
     },
+    // 解析打卡时间（支持常见日期字符串格式），未打卡或无有效时间返回 null
+    waybillPunchRecordTimestamp(record = {}) {
+      if (record.punched === false || record.statusName === '未打卡') return null;
+      const raw = record.punchTime || record.punchAt || record.punchDateTime || '';
+      const text = String(raw).trim();
+      if (!text) return null;
+      const parsed = this.$dayjs ? this.$dayjs(text) : null;
+      if (parsed && typeof parsed.isValid === 'function' && parsed.isValid()) {
+        return parsed.valueOf();
+      }
+      const fallback = new Date(text.replace(/-/g, '/')).getTime();
+      return Number.isNaN(fallback) ? null : fallback;
+    },
     loadWaybillPunchRecords() {
       const waybillId = this.detailRow?.id;
       if (!waybillId || this.waybillPunchRecordsLoading) return;
@@ -5172,19 +5271,28 @@ export default {
       if (type === 'add' && copyId) {
         this.api.getDetail(copyId).then(res => {
           const sourceData = res.data.data || {};
-          // 清除不应该复制的字段
+          // 清除不应该复制的字段（业务状态与原运单保持一致）
           delete sourceData.id;
           delete sourceData.code;
           delete sourceData.waybillNo;
           delete sourceData.waybillStatus;
+          delete sourceData.driverAcceptStatus;
+          delete sourceData.driverAcceptTime;
+          delete sourceData.driverAcceptDriverId;
+          delete sourceData.driverRejectTime;
+          delete sourceData.driverRejectReason;
+          delete sourceData.loadingNo;
+          delete sourceData.masterNo;
           delete sourceData.createTime;
           delete sourceData.updateTime;
           delete sourceData.createUser;
           delete sourceData.updateUser;
           delete sourceData.createDept;
+          delete sourceData.createUserName;
+          delete sourceData.updateUserName;
 
           this.applyFormDetail(sourceData);
-          // 标记为手工创建
+          // 标记为手工创建；业务状态沿用原运单
           this.form.dataSource = '手工创建';
           done();
         });

src/views/business/master-order.vue

@@ -1,57 +1,58 @@
 <template>
   <basic-container class="master-order-page">
     <template v-if="mode === 'list'">
-      <el-form :model="query" class="master-search" label-width="160px" @submit.prevent>
+      <div class="master-order-page__search">
-        <el-row :gutter="16">
+        <el-form :model="query" label-position="right" label-width="88px" @submit.prevent>
-          <el-col v-for="field in primaryFields" :key="field.prop" :span="6"
+          <div class="master-order-page__search-grid">
-            ><el-form-item :label="field.label"
+            <el-form-item v-for="field in primaryFields" :key="field.prop" :label="field.label">
-              ><el-input v-model="query[field.prop]" placeholder="请输入" /></el-form-item
+              <el-input v-model="query[field.prop]" clearable placeholder="请输入" />
-          ></el-col>
+            </el-form-item>
-          <el-col :span="6"
+            <el-form-item label="状态">
-            ><el-form-item label="状态"
+              <el-select v-model="query.businessStatus" clearable placeholder="全部">
-              ><el-select v-model="query.businessStatus" placeholder="全部"
+                <el-option label="全部" value="" />
-                ><el-option label="全部" value="" /><el-option
+                <el-option
                   v-for="item in statuses"
                   :key="item.value"
                   :label="item.label"
-                  :value="item.value" /></el-select></el-form-item
+                  :value="item.value"
-          ></el-col>
+                />
-          <template v-if="searchExpanded">
+              </el-select>
-            <el-col v-for="field in secondaryFields" :key="field.prop" :span="6"
+            </el-form-item>
-              ><el-form-item :label="field.label"
+            <template v-if="searchExpanded">
-                ><el-input v-model="query[field.prop]" placeholder="请输入" /></el-form-item
+              <el-form-item v-for="field in secondaryFields" :key="field.prop" :label="field.label">
-            ></el-col>
+                <el-input v-model="query[field.prop]" clearable placeholder="请输入" />
-            <el-col :span="6"
+              </el-form-item>
-              ><el-form-item label="计划开始日期"
+              <el-form-item label="计划开始日期">
-                ><el-date-picker
+                <el-date-picker
                   v-model="query.planStartRange"
                   type="datetimerange"
                   format="YYYY-MM-DD HH:mm"
                   value-format="YYYY-MM-DD HH:mm:ss"
                   start-placeholder="请选择"
-                  end-placeholder="请选择" /></el-form-item
+                  end-placeholder="请选择"
-            ></el-col>
+                />
-            <el-col :span="6"
+              </el-form-item>
-              ><el-form-item label="计划结束日期"
+              <el-form-item label="计划结束日期">
-                ><el-date-picker
+                <el-date-picker
                   v-model="query.planEndRange"
                   type="datetimerange"
                   format="YYYY-MM-DD HH:mm"
                   value-format="YYYY-MM-DD HH:mm:ss"
                   start-placeholder="请选择"
-                  end-placeholder="请选择" /></el-form-item
+                  end-placeholder="请选择"
-            ></el-col>
+                />
-          </template>
+              </el-form-item>
-          <el-col :span="24" class="search-actions"
+            </template>
-            ><el-button type="primary" @click="search">查询</el-button
+            <div class="master-order-page__search-actions">
-            ><el-button @click="reset">重置</el-button
+              <el-button type="primary" @click="search">查询</el-button>
-            ><el-link type="primary" @click="searchExpanded = !searchExpanded"
+              <el-button @click="reset">重置</el-button>
-              ><el-icon><component :is="searchExpanded ? ArrowUp : ArrowDown" /></el-icon
+              <el-link type="primary" @click="searchExpanded = !searchExpanded">{{
-              >{{ searchExpanded ? '折叠' : '展开' }}</el-link
+                searchExpanded ? '收起' : '展开'
-            ></el-col
+              }}</el-link>
-          >
+            </div>
-        </el-row>
+          </div>
-      </el-form>
+        </el-form>
+      </div>
       <section class="master-list-panel">
         <div class="toolbar">
           <el-button type="primary" @click="goCreate()">新建多联总单</el-button
@@ -76,7 +77,13 @@
                   <div class="route-point">
                     <span :class="['route-node', node.type]">{{ node.text }}</span>
                     <div class="route-detail">
-                      <el-tooltip placement="top"><template #content>{{ node.name }}</template><strong>{{ node.name }}</strong></el-tooltip>
+                      <el-tooltip
+                        :content="node.address || node.name || '-'"
+                        placement="top"
+                        :show-after="120"
+                      >
+                        <strong>{{ node.name }}</strong>
+                      </el-tooltip>
                       <span v-for="line in node.lines" :key="line">{{ line }}</span>
                     </div>
                   </div>
@@ -125,7 +132,7 @@
       />
     </template>
     <master-order-dispatch v-else-if="mode === 'dispatch'" :id="routeId" @back="goList" />
-    <master-order-detail v-else :id="routeId" @back="goList" />
+    <master-order-detail v-else :id="routeId" />
     <el-dialog v-model="confirm.visible" title="提示" width="400px"
       ><span>{{ confirm.message }}</span
       ><template #footer
@@ -138,7 +145,6 @@
 
 <script>
 import * as api from '@/api/business/master-order';
-import { ArrowDown, ArrowUp } from '@element-plus/icons-vue';
 import MasterOrderEditor from './components/master-order-editor.vue';
 import MasterOrderDispatch from './components/master-order-dispatch.vue';
 import MasterOrderDetail from './components/master-order-detail.vue';
@@ -147,8 +153,6 @@ export default {
   components: { MasterOrderEditor, MasterOrderDispatch, MasterOrderDetail },
   data() {
     return {
-      ArrowDown,
-      ArrowUp,
       searchExpanded: false,
       loading: false,
       records: [],
@@ -303,7 +307,7 @@ export default {
     },
     timeRange(row) {
       return row.planStartTime && row.planEndTime
-        ? `${String(row.planStartTime).slice(0, 16)} - ${String(row.planEndTime).slice(0, 16)}`
+        ? `${String(row.planStartTime).slice(0, 10)} - ${String(row.planEndTime).slice(0, 10)}`
         : '-';
     },
     goodsSummary(row) {
@@ -334,6 +338,19 @@ export default {
       const value = String(type || '').trim().toLowerCase();
       return value === 'road' || value.includes('公路');
     },
+    isStationLikeName(value) {
+      const text = String(value || '').trim();
+      if (!text) return false;
+      return /(?:火车站|高铁站|客运站|货运站|港口|码头|机场|空港|航站楼)$/.test(text) || /(?<!市|州|盟|区|县|旗)站$/.test(text);
+    },
+    isNonRoadLocation({ name, siteCode, transportType, nextTransportType } = {}) {
+      const code = String(siteCode || '').trim();
+      if (code && code !== '/') return true;
+      if (this.isStationLikeName(name)) return true;
+      if (transportType && !this.isRoadTransportType(transportType)) return true;
+      if (nextTransportType && !this.isRoadTransportType(nextTransportType)) return true;
+      return false;
+    },
     formatRoadAddress(value) {
       const text = String(value || '').replace(/\s+/g, '');
       if (!text) return '-';
@@ -355,10 +372,16 @@ export default {
     routeNodeName(value, address, transportType, region = {}) {
       const text = String(value || '').trim();
       if (!text) return '-';
-      const siteCode = String(region.siteCode || '').trim();
+      if (
-      // 运输方式切换不应改变地址本身的展示模式：有站点编码时显示站点名称，
+        this.isNonRoadLocation({
-      // 没有站点编码的区域地址统一按“市 区县”格式展示。
+          name: text,
-      if (siteCode && siteCode !== '/') return text;
+          siteCode: region.siteCode,
+          transportType,
+          nextTransportType: region.nextTransportType,
+        })
+      ) {
+        return text;
+      }
       // 优先从完整的地址名称/详细地址解析，避免后端只返回“梅州”等不完整的市名称时
       // 提前返回城市，导致区县被遗漏。
       const parsedText = this.formatRoadAddress(text);
@@ -383,86 +406,149 @@ export default {
       const source = /省|自治区|特别行政区|市|州|盟/.test(text) ? text : address || text;
       const formatted = this.formatRoadAddress(source);
       if (/(?:区|县|旗)$/.test(text) && !formatted.includes(text)) {
-        const city = formatted.split(' ')[0];
+        const cityName = formatted.split(' ')[0];
-        return city && city !== formatted ? `${city} ${text}` : formatted;
+        return cityName && cityName !== formatted ? `${cityName} ${text}` : formatted;
       }
       return formatted;
     },
+    resolveRouteNodeLocation({
+      name,
+      address,
+      transportType,
+      nextTransportType,
+      cityName,
+      districtName,
+      siteCode,
+    } = {}) {
+      const rawName = String(name || '').trim();
+      const rawAddress = String(address || '').trim();
+      const regionText = [cityName, districtName].filter(Boolean).join(' ');
+      const nonRoad = this.isNonRoadLocation({
+        name: rawName,
+        siteCode,
+        transportType,
+        nextTransportType,
+      });
+      if (nonRoad) {
+        // 非公路：展示站点名称，悬停展示详细地址。
+        // 兼容历史数据把站点名称写在 address、区域信息写在 name 的情况。
+        if (this.isStationLikeName(rawAddress) && !this.isStationLikeName(rawName)) {
+          return {
+            name: rawAddress,
+            address: rawName || regionText || rawAddress,
+          };
+        }
+        const displayName = rawName || rawAddress || '-';
+        const tipAddress =
+          (rawAddress && rawAddress !== displayName ? rawAddress : '') ||
+          regionText ||
+          rawAddress ||
+          displayName;
+        return { name: displayName, address: tipAddress };
+      }
+      return {
+        name: this.routeNodeName(rawName || rawAddress, rawAddress, transportType, {
+          cityName,
+          districtName,
+          siteCode,
+          nextTransportType,
+        }),
+        address: rawAddress || rawName || regionText || '-',
+      };
+    },
     routeNodes(row = {}) {
       const routes = row.routeProgress || [];
       const total = this.routeNumber(row.totalQuantity);
       const firstTransportType = routes[0]?.transportType || row.routes?.[0]?.transportType || row.transportType || '';
       if (!routes.length) {
+        const start = this.resolveRouteNodeLocation({
+          name: row.departureName || row.departureAddress,
+          address: row.departureAddress,
+          transportType: firstTransportType,
+          cityName: row.departureCityName,
+          districtName: row.departureDistrictName,
+          siteCode: row.departureSiteCode,
+        });
+        const end = this.resolveRouteNodeLocation({
+          name: row.arrivalName || row.arrivalAddress,
+          address: row.arrivalAddress,
+          transportType: row.finalTransportType || firstTransportType,
+          cityName: row.arrivalCityName,
+          districtName: row.arrivalDistrictName,
+          siteCode: row.arrivalSiteCode,
+        });
         return [
           {
             key: 'start',
             type: 'start',
             text: '起',
-            name: this.routeNodeName(
+            ...start,
-              row.departureName || row.departureAddress,
-              row.departureAddress,
-              firstTransportType,
-              {
-                cityName: row.departureCityName,
-                districtName: row.departureDistrictName,
-                siteCode: row.departureSiteCode,
-              }
-            ),
             lines: [`已调度0/${total}吨`],
           },
           {
             key: 'end',
             type: 'end',
             text: '终',
-            name: this.routeNodeName(
+            ...end,
-              row.arrivalName || row.arrivalAddress,
-              row.arrivalAddress,
-              row.finalTransportType || firstTransportType,
-              {
-                cityName: row.arrivalCityName,
-                districtName: row.arrivalDistrictName,
-                siteCode: row.arrivalSiteCode,
-              }
-            ),
             lines: [`到达0/${total}吨`],
           },
         ];
       }
+      const start = this.resolveRouteNodeLocation({
+        name: row.departureName || row.departureAddress,
+        address: row.departureAddress,
+        transportType: firstTransportType,
+        nextTransportType: firstTransportType,
+        cityName: row.departureCityName,
+        districtName: row.departureDistrictName,
+        siteCode: row.departureSiteCode,
+      });
       return [
         {
           key: 'start',
           type: 'start',
           text: '起',
-          name: this.routeNodeName(
+          ...start,
-            row.departureName || row.departureAddress,
-            row.departureAddress,
-            firstTransportType,
-            {
-              cityName: row.departureCityName,
-              districtName: row.departureDistrictName,
-              siteCode: row.departureSiteCode,
-            }
-          ),
           lines: [`已调度${this.routeNumber(routes[0]?.dispatchedQuantity)}/${total}吨`],
         },
         ...routes.map((route, index) => {
           const isEnd = index === routes.length - 1;
           const arrived = this.routeNumber(this.routeArrivedQuantity(route));
           const dispatched = this.routeNumber(routes[index + 1]?.dispatchedQuantity);
+          const address =
+            route.arrivalAddress ||
+            route.departureAddress ||
+            (isEnd ? row.arrivalAddress : '') ||
+            '';
+          const location = this.resolveRouteNodeLocation({
+            name:
+              route.arrivalName ||
+              route.departureName ||
+              (isEnd ? row.arrivalName : '') ||
+              '',
+            address,
+            transportType: route.transportType,
+            nextTransportType: isEnd
+              ? row.finalTransportType || route.transportType
+              : routes[index + 1]?.transportType || '',
+            cityName:
+              route.arrivalCityName ||
+              route.departureCityName ||
+              (isEnd ? row.arrivalCityName : ''),
+            districtName:
+              route.arrivalDistrictName ||
+              route.departureDistrictName ||
+              (isEnd ? row.arrivalDistrictName : ''),
+            siteCode:
+              route.arrivalSiteCode ||
+              route.departureSiteCode ||
+              (isEnd ? row.arrivalSiteCode : ''),
+          });
           return {
             key: route.segmentNo || `route-${index}`,
             type: isEnd ? 'end' : 'middle',
             text: isEnd ? '终' : '经',
-            name: this.routeNodeName(
+            ...location,
-              route.arrivalName || route.departureName || row.arrivalName,
-              route.arrivalAddress || route.departureAddress,
-              route.transportType,
-              {
-                cityName: route.arrivalCityName || route.departureCityName,
-                districtName: route.arrivalDistrictName || route.departureDistrictName,
-                siteCode: route.arrivalSiteCode || route.departureSiteCode,
-              }
-            ),
             lines: isEnd
               ? [`到达${arrived}/${total}吨`]
               : [`到达 ${arrived}/${total}吨`, `已调度 ${dispatched}/到达${arrived}/${total}吨`],
@@ -494,31 +580,43 @@ export default {
 </script>
 
 <style scoped lang="scss">
-.master-search {
+.master-order-page {
-  margin-bottom: 12px;
+  &__search {
-  padding: 12px 12px 4px;
+    padding: 12px 12px 4px;
-  background: #fff;
+    margin-bottom: 8px;
-  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.04);
+    background: #fff;
-  .el-form-item {
+    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.04);
+  }
+
+  &__search-grid {
+    display: grid;
+    grid-template-columns: repeat(4, minmax(0, 1fr));
+    gap: 8px 24px;
+  }
+
+  &__search-actions {
+    display: flex;
+    grid-column: 1 / -1;
+    justify-content: flex-end;
+    align-items: center;
+    gap: 8px;
+    min-height: 32px;
+  }
+
+  :deep(.el-form-item) {
     margin-bottom: 8px;
   }
-  .el-input,
+
-  .el-select,
-  .el-date-editor {
-    width: 100%;
-  }
   :deep(.el-form-item__label) {
     white-space: nowrap;
   }
-  .search-actions {
+
-    display: flex;
+  :deep(.el-input),
-    justify-content: flex-end;
+  :deep(.el-select),
-    align-items: center;
+  :deep(.el-date-editor.el-input),
-    gap: 12px;
+  :deep(.el-date-editor.el-input__wrapper),
-    min-height: 40px;
+  :deep(.el-date-editor--datetimerange) {
-    .el-icon {
+    width: 100%;
-      margin-right: 4px;
-    }
   }
 }
 .master-list-panel {
@@ -612,10 +710,16 @@ export default {
     line-height: 1.8;
     white-space: nowrap;
     strong {
+      display: inline-block;
+      max-width: 150px;
+      overflow: hidden;
       font-size: 14px;
       font-weight: 600;
       line-height: 1.4;
-      max-width: 180px;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      vertical-align: bottom;
+      cursor: default;
     }
   }
   .route-connector {

src/views/business/project-apply.vue

@@ -140,14 +140,15 @@
       @load="onLoad(page, query)"
     />
 
-    <component
+    <!--
-      :is="projectFormContainer"
+      项目新增/编辑/查看/变更/补录全部是独立整页（openProjectDialog 一律 push /business/project-apply/form），
-      v-if="projectBox"
+      这里固定渲染普通容器，不再按 $route 在 div 与 el-dialog 之间切换。
-      v-bind="projectFormContainerProps"
+      原因：标签页 keep-alive 会缓存本页实例，若容器在离开本页后又变回 el-dialog，
-      @update:model-value="projectBox = $event"
+      缓存实例会把 append-to-body 的弹窗渲染进 body 并永久停留（Vue 的 KeepAlive.deactivate →
-      @closed="resetProjectDialog"
+      Teleport.move 不会搬走 append-to-body 的弹窗 DOM），表现为“点左侧菜单又弹出新增项目管理弹窗”。
-    >
+    -->
-      <div v-if="isProjectFormPage" class="archive-page-form__title">
+    <div v-if="isProjectFormPage" class="project-apply-page-form">
+      <div class="archive-page-form__title">
         {{ projectDialogTitle }}
       </div>
       <el-form
@@ -318,7 +319,7 @@
           <el-form-item prop="fundLimit" class="project-apply-form__tip-label">
             <template #label>
               <span>项目资金使用额度</span>
-              <el-tooltip content="实际业务回款周期内付款" placement="top">
+              <el-tooltip content="实际业务回款周期内付款额度" placement="top">
                 <el-icon class="project-apply-form__label-tip"><QuestionFilled /></el-icon>
               </el-tooltip>
             </template>
@@ -788,8 +789,7 @@
         :class="{ 'project-apply-dialog__footer--change': isChangeDialog }"
       >
           <template v-if="isChangeDialog">
-            <el-button v-if="!isProjectFormPage" @click="handleCancelProject">取消</el-button>
+            <el-button @click="closeProjectForm">取消</el-button>
-            <el-button v-if="isProjectFormPage" @click="closeProjectForm">取消</el-button>
             <el-button type="primary" plain :loading="submitLoading" @click="saveChangeProject">
               保存
             </el-button>
@@ -798,8 +798,7 @@
             </el-button>
           </template>
           <template v-else>
-            <el-button v-if="!isProjectFormPage" @click="handleCancelProject">取消</el-button>
+            <el-button @click="closeProjectForm">取消</el-button>
-            <el-button v-if="isProjectFormPage" @click="closeProjectForm">取消</el-button>
             <el-button
               v-if="!dialogReadonly"
               type="primary"
@@ -819,7 +818,7 @@
             </el-button>
           </template>
       </div>
-    </component>
+    </div>
 
     <el-dialog
       v-model="attachmentDocumentPreviewVisible"
@@ -1116,7 +1115,6 @@ export default {
         total: 0,
       },
       selectionList: [],
-      projectBox: false,
       dialogType: 'add',
       dialogReadonly: false,
       submitLoading: false,
@@ -1310,21 +1308,6 @@ export default {
     isProjectFormPage() {
       return this.$route.path === '/business/project-apply/form';
     },
-    projectFormContainer() {
-      return this.isProjectFormPage ? 'div' : 'el-dialog';
-    },
-    projectFormContainerProps() {
-      if (this.isProjectFormPage) return { class: 'project-apply-page-form' };
-      return {
-        modelValue: this.projectBox,
-        title: this.projectDialogTitle,
-        appendToBody: true,
-        destroyOnClose: true,
-        width: '1440px',
-        top: '4vh',
-        class: 'project-apply-dialog',
-      };
-    },
     isBasicInfoReadonly() {
       return this.dialogReadonly || this.isChangeDialog;
     },
@@ -1363,6 +1346,12 @@ export default {
       this.openProjectFormPage();
     }
   },
+  deactivated() {
+    this.closeInnerDialogs();
+  },
+  beforeUnmount() {
+    this.closeInnerDialogs();
+  },
   methods: {
     buildTableOption() {
       return {
@@ -1390,7 +1379,6 @@ export default {
       const id = this.$route.query.id;
       this.dialogType = type;
       this.dialogReadonly = type === 'view';
-      this.projectBox = true;
       if (['add', 'majorSupplement'].includes(type)) {
         this.applyProjectDetail({
           ...emptyForm(),
@@ -1411,11 +1399,15 @@ export default {
       });
     },
     closeProjectForm() {
-      if (this.isProjectFormPage) {
+      this.$router.push('/business/project-apply');
-        this.$router.push('/business/project-apply');
+    },
-      } else {
+    // 页面被 keep-alive 缓存/卸载时，关闭本页所有 append-to-body 的二级弹窗。
-        this.projectBox = false;
+    // 若不关闭，Teleport 出去的弹窗 DOM 在实例失活时不会被搬离 body，会残留盖在后续页面上。
-      }
+    closeInnerDialogs() {
+      this.changeRecordDetailVisible = false;
+      this.attachmentDocumentPreviewVisible = false;
+      this.attachmentImagePreviewVisible = false;
+      this.userBox = false;
     },
     statusValue(row) {
       return row[this.config.statusProp || 'status'];
@@ -1634,17 +1626,6 @@ export default {
       else if (type === 'change') query.name = '项目变更';
       this.$router.push({ path: '/business/project-apply/form', query });
     },
-    resetProjectDialog() {
-      this.$refs.projectForm?.clearValidate();
-      this.form = emptyForm();
-      this.customerRows = [];
-      this.carrierRows = [];
-      this.attachmentRows = [];
-      this.selectedAttachmentRows = [];
-      this.changeRows = [];
-      this.selectedCustomerId = [];
-      this.selectedCarrierIds = [];
-    },
     applyProjectDetail(row) {
       const displayRow = {
         ...row,
@@ -1767,23 +1748,6 @@ export default {
           this.submitLoading = false;
         });
     },
-    handleCancelProject() {
-      if (this.isProjectFormPage) {
-        this.closeProjectForm();
-        return;
-      }
-      if (!['add', 'majorSupplement', 'change'].includes(this.dialogType)) {
-        this.closeProjectForm();
-        return;
-      }
-      this.$confirm('确认后直接关闭弹窗，列表无数据变更，是否继续？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-      }).then(() => {
-        this.closeProjectForm();
-      });
-    },
     saveChangeProject() {
       this.submitChangeForm(false);
     },

src/views/business/transport-plan-dispatch.vue

@@ -1,116 +1,113 @@
 <template>
   <basic-container class="transport-plan-dispatch-page">
     <div v-loading="loading" class="transport-plan-dispatch-page__shell">
-      <!-- 顶部信息区 -->
+      <!-- 顶部信息区：对齐运单详情汇总样式 -->
-      <div class="transport-plan-dispatch-page__top">
+      <section-card class="transport-plan-dispatch-page__summary">
         <div class="transport-plan-dispatch-page__heading">
-          <div class="transport-plan-dispatch-page__heading-title">
+          <el-button icon="el-icon-arrow-left" text @click="handleBack">返回</el-button>
-            <el-button icon="el-icon-arrow-left" text @click="handleBack">返回</el-button>
+          <strong>计划调度</strong>
-            <span class="transport-plan-dispatch-page__heading-name">计划调度</span>
+          <span>{{ planData.planNo || planData.loadingNo || '-' }}</span>
-            <span class="transport-plan-dispatch-page__heading-no">
+          <span class="detail-status-text" :class="statusTextClass">
-              {{ planData.planNo || planData.loadingNo || '-' }}
+            {{ planData.businessStatusName || '-' }}
+          </span>
+          <span class="detail-status-text detail-transport-type">
+            {{ planData.transportTypeName || '公路整车' }}
+          </span>
+        </div>
+        <div class="transport-plan-dispatch-page__summary-grid">
+          <div class="transport-plan-dispatch-page__summary-item">
+            <span class="transport-plan-dispatch-page__summary-label">客户</span>
+            <span class="transport-plan-dispatch-page__summary-value">
+              {{ planData.customerName || '-' }}
             </span>
-            <el-tag :type="getStatusTagType(planData.businessStatus)" effect="light" class="status-text">
+          </div>
-              {{ planData.businessStatusName || '-' }}
+          <div class="transport-plan-dispatch-page__summary-item">
-            </el-tag>
+            <span class="transport-plan-dispatch-page__summary-label">合同编号</span>
-            <el-tag type="primary" effect="light">
+            <span class="transport-plan-dispatch-page__summary-value is-link">
-              {{ planData.transportTypeName || '公路整车' }}
+              {{ planData.contractNo || '-' }}
-            </el-tag>
+            </span>
+          </div>
+          <div class="transport-plan-dispatch-page__summary-item">
+            <span class="transport-plan-dispatch-page__summary-label">项目</span>
+            <span class="transport-plan-dispatch-page__summary-value">
+              {{ planData.projectName || '-' }}
+            </span>
+          </div>
+          <div class="transport-plan-dispatch-page__summary-item">
+            <span class="transport-plan-dispatch-page__summary-label">计划执行时间</span>
+            <span class="transport-plan-dispatch-page__summary-value">
+              {{ formatDateRange(planData.planStartDate, planData.planEndDate) }}
+            </span>
+          </div>
+          <div class="transport-plan-dispatch-page__summary-item is-goods">
+            <span class="transport-plan-dispatch-page__summary-label">货物信息</span>
+            <span class="transport-plan-dispatch-page__summary-value is-wrap">
+              {{ planData.goodsInfo || formatGoodsInfo(planData) }}
+            </span>
+          </div>
+          <div class="transport-plan-dispatch-page__route">
+            <div class="transport-plan-dispatch-page__route-item is-start">
+              <div class="transport-plan-dispatch-page__route-marker">起</div>
+              <div class="transport-plan-dispatch-page__route-detail">
+                <strong class="transport-plan-dispatch-page__route-name">
+                  {{
+                    formatRouteCityDistrict(planData.departureAddress || planData.departureName)
+                  }}
+                </strong>
+                <el-tooltip
+                  :content="planData.departureAddress || planData.departureName || '-'"
+                  placement="top"
+                >
+                  <span class="transport-plan-dispatch-page__route-addr">
+                    {{ planData.departureAddress || planData.departureName || '-' }}
+                  </span>
+                </el-tooltip>
+                <div class="transport-plan-dispatch-page__route-contact">
+                  <span>联系人：{{ planData.departureContact || '-' }}</span>
+                  <span>联系方式：{{ planData.departurePhone || '-' }}</span>
+                </div>
+              </div>
+            </div>
+            <span class="transport-plan-dispatch-page__route-line" aria-hidden="true" />
+            <div class="transport-plan-dispatch-page__route-item is-end">
+              <div class="transport-plan-dispatch-page__route-marker">终</div>
+              <div class="transport-plan-dispatch-page__route-detail">
+                <strong class="transport-plan-dispatch-page__route-name">
+                  {{ formatRouteCityDistrict(planData.arrivalAddress || planData.arrivalName) }}
+                </strong>
+                <el-tooltip
+                  :content="planData.arrivalAddress || planData.arrivalName || '-'"
+                  placement="top"
+                >
+                  <span class="transport-plan-dispatch-page__route-addr">
+                    {{ planData.arrivalAddress || planData.arrivalName || '-' }}
+                  </span>
+                </el-tooltip>
+                <div class="transport-plan-dispatch-page__route-contact">
+                  <span>联系人：{{ planData.arrivalContact || '-' }}</span>
+                  <span>联系方式：{{ planData.arrivalPhone || '-' }}</span>
+                </div>
+              </div>
+            </div>
+          </div>
+          <div class="transport-plan-dispatch-page__attachments">
+            <span class="transport-plan-dispatch-page__summary-label">附件</span>
+            <div>
+              <el-link
+                v-for="(item, index) in attachmentList"
+                :key="index"
+                type="primary"
+                :href="item.url"
+                :underline="false"
+                target="_blank"
+              >
+                {{ item.name || item.originalName || '附件' }}
+              </el-link>
+              <span v-if="!attachmentList.length">-</span>
+            </div>
           </div>
         </div>
-
+      </section-card>
-        <div class="transport-plan-dispatch-page__summary">
-          <section-card title="基本信息" class="transport-plan-dispatch-page__summary-card">
-            <div class="transport-plan-dispatch-page__summary-grid">
-              <div class="transport-plan-dispatch-page__summary-item">
-                <div class="transport-plan-dispatch-page__summary-label">客户</div>
-                <div class="transport-plan-dispatch-page__summary-value">
-                  {{ planData.customerName || '-' }}
-                </div>
-              </div>
-              <div class="transport-plan-dispatch-page__summary-item">
-                <div class="transport-plan-dispatch-page__summary-label">项目</div>
-                <div class="transport-plan-dispatch-page__summary-value">
-                  {{ planData.projectName || '-' }}
-                </div>
-              </div>
-              <div class="transport-plan-dispatch-page__summary-item">
-                <div class="transport-plan-dispatch-page__summary-label">合同编号</div>
-                <div class="transport-plan-dispatch-page__summary-value">
-                  {{ planData.contractNo || '-' }}
-                </div>
-              </div>
-              <div class="transport-plan-dispatch-page__summary-item">
-                <div class="transport-plan-dispatch-page__summary-label">计划执行时间</div>
-                <div class="transport-plan-dispatch-page__summary-value">
-                  {{ formatDateRange(planData.planStartDate, planData.planEndDate) }}
-                </div>
-              </div>
-              <div class="transport-plan-dispatch-page__summary-item is-wide">
-                <div class="transport-plan-dispatch-page__summary-label">货物信息</div>
-                <div class="transport-plan-dispatch-page__summary-value">
-                  {{ planData.goodsInfo || formatGoodsInfo(planData) }}
-                </div>
-              </div>
-              <div class="transport-plan-dispatch-page__summary-item">
-                <div class="transport-plan-dispatch-page__summary-label">附件</div>
-                <div class="transport-plan-dispatch-page__summary-value">
-                  <template v-if="attachmentList.length">
-                    <el-link
-                      v-for="(item, index) in attachmentList"
-                      :key="index"
-                      type="primary"
-                      :href="item.url"
-                      :underline="false"
-                      target="_blank"
-                      class="transport-plan-dispatch-page__attachment-link"
-                    >
-                      {{ item.name || item.originalName || '附件' }}
-                    </el-link>
-                  </template>
-                  <span v-else>-</span>
-                </div>
-              </div>
-            </div>
-          </section-card>
-
-          <section-card title="收发货路线" class="transport-plan-dispatch-page__route-card">
-            <div class="transport-plan-dispatch-page__route">
-              <div class="transport-plan-dispatch-page__route-item">
-                <span class="transport-plan-dispatch-page__route-badge is-start">起</span>
-                <div class="transport-plan-dispatch-page__route-body">
-                  <div class="transport-plan-dispatch-page__route-title">
-                    {{ planData.departureName || '-' }}
-                  </div>
-                  <div class="transport-plan-dispatch-page__route-address">
-                    {{ formatAddress(planData.departureAddress) }}
-                  </div>
-                  <div class="transport-plan-dispatch-page__route-contact">
-                    {{ formatContact(planData.departureContact, planData.departurePhone) }}
-                  </div>
-                </div>
-              </div>
-              <div class="transport-plan-dispatch-page__route-vehicle">
-                <el-icon><Van /></el-icon>
-              </div>
-              <div class="transport-plan-dispatch-page__route-item">
-                <span class="transport-plan-dispatch-page__route-badge is-end">终</span>
-                <div class="transport-plan-dispatch-page__route-body">
-                  <div class="transport-plan-dispatch-page__route-title">
-                    {{ planData.arrivalName || '-' }}
-                  </div>
-                  <div class="transport-plan-dispatch-page__route-address">
-                    {{ formatAddress(planData.arrivalAddress) }}
-                  </div>
-                  <div class="transport-plan-dispatch-page__route-contact">
-                    {{ formatContact(planData.arrivalContact, planData.arrivalPhone) }}
-                  </div>
-                </div>
-              </div>
-            </div>
-          </section-card>
-        </div>
-      </div>
 
       <!-- 调度列表 -->
       <section-card class="transport-plan-dispatch-page__list-card">
@@ -204,7 +201,6 @@
 </template>
 
 <script>
-import { Van } from '@element-plus/icons-vue';
 import { getDetail, dispatch } from '@/api/business/transport-plan';
 import SectionCard from '@/components/section-card/main.vue';
 import TransportPlanPage from './components/transport-plan-page.vue';
@@ -216,7 +212,6 @@ const TRANSPORT_PLAN_QUANTITY_UNIT = '吨';
 export default {
   name: 'TransportPlanDispatch',
   components: {
-    Van,
     SectionCard,
     TransportPlanPage,
   },
@@ -237,11 +232,21 @@ export default {
     planId() {
       return this.$route.query.planId;
     },
+    statusTextClass() {
+      const status = this.planData.businessStatus;
+      if (status === 2 || status === '2') return 'status-text-success';
+      if (status === 1 || status === '1') return 'is-dispatching';
+      if (status === 3 || status === '3') return 'is-danger';
+      return 'is-info';
+    },
     summaryText() {
       const goodsList = this.parseGoodsList(this.planData.goodsJson);
       if (!goodsList.length) {
         const total = Number(this.planData.totalQuantity || 0);
         const dispatched = this.calculateDispatchedQuantity();
+        if (total <= 0) {
+          return `已调度 ${dispatched.toFixed(2)}吨`;
+        }
         const remaining = Math.max(total - dispatched, 0);
         return `共${total}吨 | 已调度 ${dispatched.toFixed(2)}吨，剩余${remaining.toFixed(2)}吨`;
       }
@@ -264,6 +269,9 @@ export default {
       });
 
       const parts = Object.entries(summary).map(([unit, data]) => {
+        if (data.total <= 0) {
+          return `已调度 ${data.dispatched.toFixed(2)}${unit}`;
+        }
         const remaining = Math.max(data.total - data.dispatched, 0);
         return `${data.total}${unit} | 已调度 ${data.dispatched.toFixed(2)}${unit}，剩余${remaining.toFixed(
           2
@@ -276,13 +284,20 @@ export default {
       const goodsList = this.parseGoodsList(this.planData.goodsJson);
       if (!goodsList.length) {
         const total = Number(this.planData.totalQuantity || 0);
+        if (total <= 0) return true;
         const dispatched = this.calculateDispatchedQuantity();
         return dispatched < total;
       }
 
+      const hasPositiveTotal = goodsList.some(
+        goods => Number(goods.quantity || 0) > 0
+      );
+      if (!hasPositiveTotal) return true;
+
       return goodsList.some(goods => {
         const unit = goods.quantityUnit || TRANSPORT_PLAN_QUANTITY_UNIT;
         const totalQty = Number(goods.quantity || 0);
+        if (totalQty <= 0) return true;
         const dispatchedQty = this.dispatchList
           .filter(item => item.quantityUnit === unit)
           .reduce((sum, item) => sum + Number(item.quantity || 0), 0);
@@ -364,15 +379,6 @@ export default {
     calculateDispatchedQuantity() {
       return this.dispatchList.reduce((sum, item) => sum + Number(item.quantity || 0), 0);
     },
-    getStatusTagType(status) {
-      const statusMap = {
-        0: 'info',
-        1: 'warning',
-        2: 'success',
-        3: 'danger',
-      };
-      return statusMap[status] || 'info';
-    },
     formatDateRange(startDate, endDate) {
       const dates = [startDate, endDate].filter(Boolean);
       return dates.length ? dates.join(' ~ ') : '-';
@@ -382,9 +388,30 @@ export default {
       const match = address.match(/^(.*?省)?(.*?市)?(.*?区|.*?县)?/);
       return match ? match[0] || address : address;
     },
-    formatContact(contact, phone) {
+    formatProvinceCityDistrict(value) {
-      const parts = [contact, phone].filter(Boolean);
+      const text = String(value || '').trim();
-      return parts.length ? parts.join(' / ') : '-';
+      if (!text) return '-';
+      const districtMatch = text.match(/(?:自治县|自治旗|林区|矿区|新区|开发区|区|县|旗)/);
+      if (districtMatch) {
+        return text.slice(0, districtMatch.index + districtMatch[0].length);
+      }
+      const cityMatch = text.match(/市/);
+      return cityMatch ? text.slice(0, cityMatch.index + 1) : text;
+    },
+    formatRouteCityDistrict(value) {
+      const text = String(value || '').trim();
+      if (!text) return '-';
+      const provinceMatch = text.match(/^.+?(?:省|自治区|特别行政区)/);
+      const cityRegion = provinceMatch ? text.slice(provinceMatch[0].length) : text;
+      const cityMatch = cityRegion.match(/^(.+?市)/);
+      if (!cityMatch) return this.formatProvinceCityDistrict(text);
+      const city = cityMatch[1];
+      const remainder = cityRegion.slice(city.length);
+      const districtMatch = remainder.match(
+        /^(.+?(?:自治县|自治旗|林区|矿区|新区|开发区|区|县|旗){1,2})/
+      );
+      const district = districtMatch ? districtMatch[1] : '';
+      return [city, district].filter(Boolean).join(' ');
     },
     formatDriver(row) {
       const parts = [row.driverName, row.driverPhone].filter(Boolean);
@@ -419,32 +446,33 @@ export default {
         this.$message.warning('待调度列表货物总量已达到计划总量，不能新增调度明细');
         return;
       }
-
+      this.openPageDispatchItemDialog(-1);
-      // 调用 transport-plan-page 组件的方法打开弹窗
-      this.$nextTick(() => {
-        const component = this.$refs.transportPlanPageRef;
-        if (component) {
-          // 设置调度数据
-          component.dispatchRow = this.planData;
-          component.dispatchRows = [...this.dispatchList];
-          // 打开新增弹窗
-          component.openDispatchItemDialog(-1);
-        }
-      });
     },
     handleEdit(row, index) {
-      // 调用 transport-plan-page 组件的方法打开弹窗
+      this.openPageDispatchItemDialog(index, row);
+    },
+    openPageDispatchItemDialog(index = -1, row) {
       this.$nextTick(() => {
         const component = this.$refs.transportPlanPageRef;
-        if (component) {
+        if (!component) return;
-          // 设置调度数据
+        component.dispatchRow = this.planData;
-          component.dispatchRow = this.planData;
+        component.dispatchRows = [...this.dispatchList];
-          component.dispatchRows = [...this.dispatchList];
+        this.bindDispatchItemSaveSync(component);
-          // 打开编辑弹窗
+        if (index >= 0) component.openDispatchItemDialog(index, row);
-          component.openDispatchItemDialog(index, row);
+        else component.openDispatchItemDialog(-1);
-        }
       });
     },
+    bindDispatchItemSaveSync(component) {
+      if (component.__dispatchListSaveSynced) return;
+      const originalSave = component.saveDispatchItem;
+      component.saveDispatchItem = (...args) => {
+        originalSave.apply(component, args);
+        if (!component.dispatchItemBox) {
+          this.dispatchList = [...(component.dispatchRows || [])];
+        }
+      };
+      component.__dispatchListSaveSynced = true;
+    },
     handleDelete(index) {
       this.$confirm('确定删除该调度明细?', '提示', {
         confirmButtonText: '确定',
@@ -551,126 +579,189 @@ export default {
     height: 100%;
   }
 
-  &__top {
+  &__summary {
-    display: flex;
+    :deep(.el-card__body) {
-    flex-direction: column;
+      padding: 18px 22px;
-    gap: 16px;
+    }
   }
 
   &__heading {
-    padding: 16px;
-    background: #fff;
-    border-radius: 4px;
-
-    &-title {
-      display: flex;
-      align-items: center;
-      gap: 12px;
-      font-size: 18px;
-      font-weight: 600;
-    }
-
-    &-name {
-      font-size: 18px;
-    }
-
-    &-no {
-      font-size: 14px;
-      color: #606266;
-    }
-  }
-
-  &__summary {
     display: flex;
-    gap: 16px;
+    align-items: center;
+    flex-wrap: wrap;
+    gap: 12px;
+    margin-bottom: 18px;
 
-    &-card {
+    strong {
-      flex: 1;
+      font-size: 20px;
     }
 
-    &-grid {
+    .detail-status-text {
-      display: grid;
+      display: inline-flex;
-      grid-template-columns: repeat(2, 1fr);
+      align-items: center;
-      gap: 16px;
+      height: 28px;
+      padding: 0 12px;
+      border-radius: 8px;
+      font-size: 13px;
+      line-height: 28px;
     }
 
-    &-item {
+    .status-text-success,
-      display: flex;
+    .is-dispatching {
-      flex-direction: column;
+      color: #67c23a;
-      gap: 8px;
+      background: #e1f3d8;
-
-      &.is-wide {
-        grid-column: 1 / -1;
-      }
     }
 
-    &-label {
+    .detail-transport-type {
-      font-size: 14px;
+      color: #409eff;
+      background: #ecf5ff;
+    }
+
+    .is-danger {
+      color: #f56c6c;
+      background: #fef0f0;
+    }
+
+    .is-info {
       color: #909399;
-    }
+      background: #f4f4f5;
-
-    &-value {
-      font-size: 14px;
-      color: #303133;
     }
   }
 
-  &__route-card {
+  &__summary-grid {
-    flex: 1;
+    display: grid;
+    grid-template-columns: repeat(4, minmax(120px, 1fr)) minmax(360px, 1.5fr);
+    gap: 16px 24px;
+  }
+
+  &__summary-item {
+    display: flex;
+    flex-direction: column;
+    gap: 8px;
+    min-width: 0;
+
+    &.is-goods {
+      grid-column: 1 / 5;
+    }
+  }
+
+  &__summary-label {
+    color: #909399;
+  }
+
+  &__summary-value {
+    overflow: hidden;
+    color: #303133;
+    font-weight: 500;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+
+    &.is-link {
+      color: #409eff;
+    }
+
+    &.is-wrap {
+      white-space: normal;
+      word-break: break-word;
+    }
   }
 
   &__route {
+    display: grid;
+    grid-template-columns: minmax(100px, 1fr) minmax(36px, 0.7fr) minmax(100px, 1fr);
+    grid-row: 1 / span 3;
+    grid-column: 5;
+    align-items: start;
+    min-width: 0;
+    padding: 4px 0;
+  }
+
+  &__route-item {
     display: flex;
+    min-width: 0;
+    flex-direction: column;
     align-items: center;
-    gap: 24px;
+    text-align: center;
+  }
 
-    &-item {
+  &__route-marker {
-      flex: 1;
+    display: inline-flex;
+    width: 36px;
+    height: 36px;
+    align-items: center;
+    justify-content: center;
+    color: #fff;
+    border-radius: 8px;
+    background: #409eff;
+    font-size: 18px;
+    font-weight: 600;
+
+    .is-end & {
+      background: #67c23a;
+    }
+  }
+
+  &__route-line {
+    width: 100%;
+    height: 6px;
+    margin-top: 15px;
+    border-radius: 1px;
+    background: #e4e7ed;
+  }
+
+  &__route-detail {
+    display: flex;
+    min-width: 0;
+    flex-direction: column;
+    align-items: center;
+    gap: 5px;
+    margin-top: 8px;
+    width: 100%;
+  }
+
+  &__route-name {
+    max-width: 100%;
+    overflow: hidden;
+    color: #303133;
+    font-size: 18px;
+    font-weight: 600;
+    line-height: 1.35;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+
+  &__route-addr {
+    display: block;
+    max-width: 100%;
+    overflow: hidden;
+    color: #606266;
+    font-size: 12px;
+    line-height: 1.5;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+
+  &__route-contact {
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: center;
+    gap: 2px 8px;
+    max-width: 100%;
+    color: #909399;
+    font-size: 12px;
+    line-height: 1.5;
+  }
+
+  &__attachments {
+    grid-column: 1 / 5;
+    display: flex;
+    flex-direction: column;
+    gap: 8px;
+
+    div {
       display: flex;
-      gap: 12px;
+      flex-wrap: wrap;
-    }
+      gap: 16px;
-
-    &-badge {
-      width: 32px;
-      height: 32px;
-      border-radius: 50%;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      color: #fff;
-      font-size: 14px;
-      flex-shrink: 0;
-
-      &.is-start {
-        background: #67c23a;
-      }
-
-      &.is-end {
-        background: #409eff;
-      }
-    }
-
-    &-body {
-      flex: 1;
-      display: flex;
-      flex-direction: column;
-      gap: 4px;
-    }
-
-    &-title {
-      font-size: 16px;
-      font-weight: 600;
-    }
-
-    &-address,
-    &-contact {
-      font-size: 14px;
-      color: #606266;
-    }
-
-    &-vehicle {
-      font-size: 24px;
-      color: #909399;
     }
   }
 
@@ -706,12 +797,42 @@ export default {
     border-radius: 4px;
   }
 
-  &__attachment-link {
+  @media (max-width: 1200px) {
-    margin-right: 12px;
+    &__summary-grid {
+      grid-template-columns: repeat(4, minmax(130px, 1fr));
+    }
+
+    &__summary-item.is-goods,
+    &__attachments {
+      grid-column: 1 / -1;
+    }
+
+    &__route {
+      grid-column: 1 / -1;
+      grid-row: auto;
+    }
+  }
+
+  @media (max-width: 800px) {
+    &__summary-grid {
+      grid-template-columns: 1fr;
+    }
+
+    &__route {
+      grid-template-columns: minmax(0, 1fr);
+      gap: 16px;
+    }
+
+    &__route-line {
+      width: 10px;
+      height: 32px;
+      margin: 0 auto;
+    }
+
+    &__summary-item.is-goods,
+    &__attachments {
+      grid-column: auto;
+    }
   }
 }
-
-.status-text {
-  font-size: 12px;
-}
 </style>

src/views/business/transport-plan.vue

@@ -1,9 +1,11 @@
 <template>
+  <!-- 同 waybill-manage-detail.vue：只在当前路由属于本页时才透传 detailId，
+       避免标签页缓存的实例被其它页面的 detailId 污染后误开详情。 -->
   <transport-plan-page
     :api="api"
     :config="config"
     :crud-option="option"
-    :detail-id="$route.query.detailId"
+    :detail-id="detailId"
     :menu-width="220"
     standalone-form-page
   />
@@ -14,6 +16,8 @@ import TransportPlanPage from './components/transport-plan-page.vue';
 import * as api from '@/api/business/transport-plan';
 import { config, option } from '@/option/business/transport-plan';
 
+const listRoutePath = '/business/transport-plan';
+
 export default {
   components: { TransportPlanPage },
   data() {
@@ -23,5 +27,10 @@ export default {
       option,
     };
   },
+  computed: {
+    detailId() {
+      return this.$route.path === listRoutePath ? this.$route.query.detailId : '';
+    },
+  },
 };
 </script>

src/views/business/voucher-manage.vue

@@ -16,7 +16,9 @@
             ><el-select v-model="query.processStatus" clearable placeholder="全部"
               ><el-option label="上传中" value="上传中" /><el-option
                 label="处理中"
-                value="处理中" /><el-option label="处理完成" value="处理完成" /></el-select
+                value="处理中" /><el-option label="处理完成" value="处理完成" /><el-option
+                label="处理失败"
+                value="处理失败" /></el-select
           ></el-form-item>
           <el-form-item label="运单批次号"
             ><el-input v-model="query.waybillBatchNo" clearable placeholder="请输入"
@@ -84,7 +86,14 @@
           min-width="160"
           ><template #default="{ row }">{{ row.carrierName || '-' }}</template></el-table-column
         >
-        <el-table-column prop="processStatus" label="处理状态" width="120" /><el-table-column
+        <el-table-column prop="processStatus" label="处理状态" width="120"
+          ><template #default="{ row }"
+            ><span
+              :class="{ 'voucher-manage-page__process-failed': row.processStatus === '处理失败' }"
+              >{{ row.processStatus }}</span
+            ></template
+          ></el-table-column
+        ><el-table-column
           prop="voucherCount"
           label="凭证数量"
           width="100"
@@ -109,7 +118,7 @@
                 placement="top"
               ><el-icon class="voucher-manage-page__audit-reject-icon"><WarnTriangleFilled /></el-icon
               ></el-tooltip></span></template
-        ></el-table-column><el-table-column label="操作" width="320" fixed="right" align="center"
+        ></el-table-column><el-table-column label="操作" width="220" fixed="right" align="center"
           ><template #default="{ row }"
             ><div class="voucher-manage-page__actions">
               <el-link
@@ -130,7 +139,7 @@
                 @click="download(row)"
                 >下载</el-link
               ><el-link
-                v-if="row.auditStatus === '审核驳回'"
+                v-if="row.auditStatus === '审核驳回' || row.processStatus === '处理失败'"
                 type="primary"
                 @click="openUpload(row, 'reupload')"
                 >重新上传</el-link
@@ -145,7 +154,7 @@
                 @click="openBatchDialog(row)"
                 >更换运单批次</el-link
               ><el-link
-                v-if="row.processStatus === '上传中' || row.auditStatus === '审核驳回'"
+                v-if="row.processStatus === '上传中' || row.processStatus === '处理失败' || row.auditStatus === '审核驳回'"
                 type="danger"
                 @click="removeRow(row)"
                 >删除</el-link
@@ -1238,7 +1247,15 @@ const view = async row => {
     query: { id: row.id, batchNo: row.voucherBatchNo },
   });
 };
-const download = row => window.open(row.fileUrl, '_blank');
+const download = row => {
+  const url = row?.fileUrl;
+  if (!url) {
+    ElMessage.warning('附件地址为空，无法下载');
+    return;
+  }
+  // 去掉 URL 中 ? 后的临时鉴权参数，避免签名过期导致无法下载
+  window.open(String(url).split('?')[0], '_blank');
+};
 const handleAuditPass = row =>
   ElMessageBox.confirm(`确认审核通过凭证批次"${row.voucherBatchNo}"吗？`, '提示', {
     type: 'warning',
@@ -1329,6 +1346,9 @@ load();
     color: #f56c6c;
     cursor: help;
   }
+  &__process-failed {
+    color: #f56c6c;
+  }
   &__actions {
     display: flex;
     flex-wrap: wrap;

src/views/business/waybill-import.vue

@@ -1,6 +1,5 @@
 <template>
   <basic-container class="waybill-import-page-container">
-    <div class="waybill-import-page-title">导入运单</div>
     <waybill-import-dialog standalone />
   </basic-container>
 </template>
@@ -11,28 +10,14 @@ import WaybillImportDialog from './components/waybill-import-dialog.vue';
 
 <style scoped lang="scss">
 .waybill-import-page-container {
+  :deep(.basic-container__card) {
+    background: transparent;
+    border: none;
+    box-shadow: none;
+  }
+
   :deep(.basic-container__card > .el-card__body) {
     padding: 0;
   }
 }
-
-.waybill-import-page-title {
-  position: relative;
-  padding: 16px 24px 12px 36px;
-  border-bottom: 1px solid #eff1f7;
-  color: #303133;
-  font-size: 18px;
-  font-weight: 600;
-
-  &::before {
-    position: absolute;
-    top: 16px;
-    left: 24px;
-    width: 4px;
-    height: 22px;
-    border-radius: 2px;
-    background: #409eff;
-    content: '';
-  }
-}
 </style>

src/views/business/waybill-manage-detail.vue

@@ -1,9 +1,15 @@
 <template>
+  <!--
+    detailId 必须做路由守卫：本组件对应 /business/waybill-manage/detail，
+    而 $route 是全局响应式的。标签页 keep-alive 会缓存本实例，路由切到别的详情页后
+    实例仍会重渲染，若无守卫就会把「当前页面的 id」灌进子组件，导致它拿别的单据 id
+    去查运单 → 报「运单管理不存在」，并误生成一个又一个运单详情标签。
+  -->
   <waybill-manage-page
     :api="api"
     :config="config"
     :crud-option="option"
-    :detail-id="$route.query.id"
+    :detail-id="detailId"
     :menu-width="250"
     standalone-detail-page
   />
@@ -14,10 +20,17 @@ import WaybillManagePage from './components/waybill-manage-page.vue';
 import * as api from '@/api/business/waybill-manage';
 import { config, option } from '@/option/business/waybill-manage';
 
+const detailRoutePath = '/business/waybill-manage/detail';
+
 export default {
   components: { WaybillManagePage },
   data() {
     return { api, config, option };
   },
+  computed: {
+    detailId() {
+      return this.$route.path === detailRoutePath ? this.$route.query.id : '';
+    },
+  },
 };
 </script>

src/views/business/waybill-manage.vue

@@ -1,9 +1,11 @@
 <template>
+  <!-- 同 waybill-manage-detail.vue：保留旧链接 /business/waybill-manage?detailId=xxx 的能力，
+       但只在当前路由确实属于本页时才透传，避免被其它页面的 detailId 污染。 -->
   <waybill-manage-page
     :api="api"
     :config="config"
     :crud-option="option"
-    :detail-id="$route.query.detailId"
+    :detail-id="detailId"
     :menu-width="250"
     standalone-form-page
   />
@@ -14,6 +16,8 @@ import WaybillManagePage from './components/waybill-manage-page.vue';
 import * as api from '@/api/business/waybill-manage';
 import { config, option } from '@/option/business/waybill-manage';
 
+const listRoutePath = '/business/waybill-manage';
+
 export default {
   components: { WaybillManagePage },
   data() {
@@ -23,5 +27,10 @@ export default {
       option,
     };
   },
+  computed: {
+    detailId() {
+      return this.$route.path === listRoutePath ? this.$route.query.detailId : '';
+    },
+  },
 };
 </script>

src/views/payment/invoice-application-form.vue

@@ -882,7 +882,7 @@ export default {
           item.receiverName !== first.receiverName
       );
       if (incompatible) {
-        this.$message.warning('合并开票的结算单必须属于同一合同、项目、组织及收付款方');
+        this.$message.warning('合并开票的结算单必须属于同一合同');
         return;
       }
       this.form.settlements = rows.map(item => ({
@@ -1260,7 +1260,7 @@ export default {
 }
 .invoice-form-page__dialog-search {
   display: flex;
-  justify-content: flex-end;
+  justify-content: flex-start;
   gap: 8px;
   margin-bottom: 12px;
 }

src/views/payment/invoice-receipt-form.vue

@@ -216,7 +216,7 @@
         <el-input
           v-model="settlementDialog.keyword"
           clearable
-          placeholder="结算单号、项目或合同"
+          placeholder="3结算单号、项目或合同"
           @keyup.enter="loadSettlementCandidates"
         />
         <el-button type="primary" @click="loadSettlementCandidates">查询</el-button>

src/views/payment/payment-application.vue

@@ -84,13 +84,6 @@
             @click="handleSync"
             >批量同步</el-button
           >
-          <el-button
-            v-if="hasPermission('payment_application_sync')"
-            type="primary"
-            plain
-            @click="handleSyncResult"
-            >同步付款结果</el-button
-          >
           <el-button
             v-if="hasPermission('payment_application_add')"
             type="primary"
@@ -403,22 +396,8 @@ export default {
         this.$message.warning('请选择至少一条审批通过的付款申请');
         return;
       }
-      const data = this.unwrapData(await api.syncKingdeeBatch(rows.map(row => row.id))) || [];
+      await api.syncKingdeeBatch(rows.map(row => row.id));
-      const failedList = data.filter(item => String(item).includes('同步失败'));
+      this.$message.success(`已同步${rows.length}条付款申请`);
-      if (failedList.length) {
-        this.$message({
-          type: 'warning',
-          message: `同步完成：成功${data.length - failedList.length}条，失败${failedList.length}条。${failedList.join('；')}`,
-          duration: 8000,
-        });
-      } else {
-        this.$message.success(`已同步${data.length}条付款申请`);
-      }
-      this.loadTable();
-    },
-    async handleSyncResult() {
-      const data = this.unwrapData(await api.syncKingdeeResult());
-      this.$message.success(data || '金蝶付款结果回写完成');
       this.loadTable();
     },
     handleExport() {

src/views/settlement/components/formal-settlement-editor.vue

@@ -22,7 +22,6 @@
                   type="date"
                   value-format="YYYY-MM-DD"
                   placeholder="请选择"
-                  @change="fetchBfiExchangeRate"
                 />
                 <el-select
                   v-else-if="field.type === 'project' && editable"
@@ -948,7 +947,6 @@ import {
   getDetailFees as getPreSettlementDetailFees,
 } from '@/api/settlement/preSettlement';
 import { calculateAdjustedFee, getFeeDetail } from '@/api/settlement/receivable-payable-detail';
-import { getBfiExchangeRate } from '@/api/base/currency';
 import {
   createFormalSettlementForm,
   formalSettlementFormFields,
@@ -1252,7 +1250,6 @@ export default {
         if (this.initialData) await this.applyInitialData();
         Object.assign(this.form, newRecordAudit);
         await this.refreshFormalSettlementNo();
-        await this.fetchBfiExchangeRate();
         return;
       }
       this.loading = true;
@@ -1485,7 +1482,6 @@ export default {
           (settlementType === 'receivable' ? contract.partyA : contract.partyB),
         settlementType,
         settlementTypeName: settlementType === 'receivable' ? '应收' : '应付',
-        currency: contract.settlementCurrency || 'RMB',
       });
       this.sources = [];
       this.details = [];
@@ -1493,23 +1489,6 @@ export default {
       this.form.sourcePreSettlementIds = [];
       this.form.sourceDetailIds = [];
       if (refreshSettlementNo) this.refreshFormalSettlementNo();
-      if (this.form.currency !== 'RMB') this.fetchBfiExchangeRate();
-    },
-    async fetchBfiExchangeRate() {
-      const currency = this.form.currency;
-      if (!currency || currency === 'RMB') return;
-      if (!this.form.exchangeRateDate) return;
-      try {
-        const { data } = await getBfiExchangeRate(currency, this.form.exchangeRateDate);
-        const rateData = data?.data;
-        if (rateData?.excval != null) {
-          this.form.exchangeRate = Number(rateData.excval);
-        } else {
-          this.$message.warning(`未查询到 ${currency} 的BFI汇率数据`);
-        }
-      } catch (e) {
-        this.$message.warning('查询BFI汇率失败，请手动输入结算汇率');
-      }
     },
     openCandidateDialog() {
       this.candidate.visible = true;

src/views/settlement/components/pre-settlement-editor.vue

@@ -42,7 +42,7 @@
                   format="YYYY-MM-DD"
                   :disabled="!editable || form.currency === 'RMB'"
                   placeholder="请选择"
-                  @change="handleExchangeRateDateChange"
+                  @change="recalculateLocalAmount"
                 />
                 <el-input-number
                   v-else-if="field.type === 'number'"
@@ -934,7 +934,6 @@ import {
   submit,
 } from '@/api/settlement/preSettlement';
 import { calculateAdjustedFee, getFeeDetail } from '@/api/settlement/receivable-payable-detail';
-import { getBfiExchangeRate } from '@/api/base/currency';
 import { getDictionary } from '@/api/system/dictbiz';
 import {
   emptyPreSettlementForm,
@@ -1243,11 +1242,7 @@ export default {
       await this.loadFeeCategoryOptions();
       await this.loadTransportTypeOptions();
       if (this.recordId) await this.loadDetail();
-      else if (this.initialData) {
+      else if (this.initialData) await this.applyInitialData();
-        await this.applyInitialData();
-        this.form.exchangeRateDate = this.$dayjs().format('YYYY-MM-DD');
-        await this.fetchBfiExchangeRate();
-      }
     },
     async applyInitialData() {
       const rows = Array.isArray(this.initialData?.rows) ? this.initialData.rows : [];
@@ -1532,12 +1527,7 @@ export default {
       this.form.settlementType = contract.settlementType || 'payable';
       this.form.payerName = contract.partyA;
       this.form.payeeName = contract.partyB;
-      this.form.currency = contract.settlementCurrency || 'RMB';
       this.summaryFees = [];
-      if (this.form.currency !== 'RMB') {
-        this.form.exchangeRateDate = this.$dayjs().format('YYYY-MM-DD');
-        this.fetchBfiExchangeRate();
-      }
     },
     async saveDraft(shouldSubmit) {
       await this.$refs.formRef?.validate();
@@ -1804,26 +1794,6 @@ export default {
           .toFixed(2)
       );
     },
-    handleExchangeRateDateChange() {
-      this.fetchBfiExchangeRate();
-      this.recalculateLocalAmount();
-    },
-    async fetchBfiExchangeRate() {
-      if (!this.form.currency || this.form.currency === 'RMB') return;
-      if (!this.form.exchangeRateDate) return;
-      try {
-        const { data } = await getBfiExchangeRate(this.form.currency, this.form.exchangeRateDate);
-        const rateData = data?.data;
-        if (rateData?.excval != null) {
-          this.form.exchangeRate = Number(rateData.excval);
-          this.recalculateLocalAmount();
-        } else {
-          this.$message.warning(`未查询到 ${this.form.currency} 的BFI汇率数据`);
-        }
-      } catch (e) {
-        this.$message.warning('查询BFI汇率失败，请手动输入结算汇率');
-      }
-    },
     recalculateLocalAmount() {
       const rate = this.form.currency === 'RMB' ? 1 : Number(this.form.exchangeRate || 0);
       this.form.localSettlementAmount = (Number(this.form.settlementAmount || 0) * rate).toFixed(2);

src/views/settlement/receivable-payable-detail.vue

@@ -169,12 +169,6 @@
                   </template>
                 </el-table-column>
               </el-table>
-              <div
-                v-if="!latestChangeLoading && !latestChangeRows.length"
-                class="settlement-detail-page__empty"
-              >
-                暂无变更记录
-              </div>
             </el-tab-pane>
           </el-tabs>
         </div>
@@ -2734,12 +2728,6 @@ export default {
   padding: 16px 0;
 }
 
-.settlement-detail-page__empty {
-  padding: 24px 0;
-  color: #909399;
-  text-align: center;
-}
-
 .settlement-detail-page__dialog-form {
   padding: 16px 20px;
   background: #fff;

src/views/system/dept.vue

@@ -22,6 +22,14 @@
       @tree-load="treeLoad"
     >
       <template #menu-left>
+        <el-button
+          type="primary"
+          plain
+          :loading="iamSyncLoading"
+          v-if="userInfo.authority.includes('admin')"
+          @click="handleIamOrganizationSync"
+          >同步组织
+        </el-button>
         <el-button
           type="danger"
           icon="el-icon-delete"
@@ -120,7 +128,15 @@
 </template>
 
 <script>
-import { getLazyList, remove, update, add, getDept, getDeptTree } from '@/api/system/dept';
+import {
+  getLazyList,
+  remove,
+  update,
+  add,
+  getDept,
+  getDeptTree,
+  syncIamOrganizations,
+} from '@/api/system/dept';
 import { getLeaderList } from '@/api/system/user';
 import { getList as getCustomerArchiveList } from '@/api/vehicle/customer-archive';
 import { mapGetters } from 'vuex';
@@ -152,6 +168,7 @@ export default {
       selectionList: [],
       query: {},
       loading: true,
+      iamSyncLoading: false,
       parentId: 0,
       page: {
         pageSize: 10,
@@ -691,6 +708,26 @@ export default {
           done(row);
         });
     },
+    handleIamOrganizationSync() {
+      this.$confirm('确定从IAM同步组织信息?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          this.iamSyncLoading = true;
+          return syncIamOrganizations();
+        })
+        .then(res => {
+          const count = res?.data?.data ?? 0;
+          this.$message.success(`IAM组织同步完成，共处理${count}条`);
+          this.parentId = 0;
+          this.onLoad(this.page, this.query);
+        })
+        .finally(() => {
+          this.iamSyncLoading = false;
+        });
+    },
     handleDelete() {
       if (this.selectionList.length === 0) {
         this.$message.warning('请选择至少一条数据');

src/views/system/user.vue

@@ -56,6 +56,14 @@
               @click="handleAudit"
               >审 核
             </el-button>
+            <el-button
+              type="primary"
+              plain
+              :loading="iamSyncLoading"
+              v-if="userInfo.authority.includes('admin') && !auditMode"
+              @click="handleIamSync"
+              >同步人员
+            </el-button>
             <el-button
               type="success"
               plain
@@ -348,6 +356,7 @@ import {
   remove,
   update,
   add,
+  syncIamAccounts,
   grant,
   resetPassword,
   setPassword,
@@ -393,6 +402,7 @@ export default {
       selectionList: [],
       query: {},
       loading: true,
+      iamSyncLoading: false,
       page: {
         pageSize: 10,
         currentPage: 1,
@@ -553,6 +563,25 @@ export default {
         this.handleExport();
       }
     },
+    handleIamSync() {
+      this.$confirm('确定从IAM同步人员信息?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          this.iamSyncLoading = true;
+          return syncIamAccounts();
+        })
+        .then(res => {
+          const count = res?.data?.data ?? 0;
+          this.$message.success(`IAM人员同步完成，共处理${count}条`);
+          this.onLoad(this.page, this.query);
+        })
+        .finally(() => {
+          this.iamSyncLoading = false;
+        });
+    },
     handleSetLeader(row) {
       const tip = row.isLeader === 1 ? '确定取消用户的主管职务?' : '确定设置用户为主管职务?';
       const message = row.isLeader === 1 ? '取消主管成功!' : '设置主管成功!';

src/views/transportCapacity/driver.vue

@@ -1892,10 +1892,13 @@ export default {
   overflow: hidden;
 }
 
-// 大尺寸模式：缩成 1.586:1 比例，左对齐（不再 100% 占栏）
+// 大尺寸模式：跟随列宽自适应（最大 240px，约 1.586:1 证件比例），
+// 保证不同分辨率 / 系统缩放下都与上方输入框左右对齐
 :deep(.driver-uploader--large) {
   display: block;
-  width: 240px;
+  width: 100%;
+  max-width: 240px;
+  flex: none;
   margin: 0;
 }
 

src/views/transportCapacity/ship.vue

@@ -1349,9 +1349,13 @@ export default {
   height: 151px;
 }
 
+// 大尺寸模式：跟随列宽自适应（最大 248px），
+// 保证不同分辨率 / 系统缩放下都与上方输入框左右对齐
 :deep(.ship-uploader--large) {
   display: block;
-  width: 248px;
+  width: 100%;
+  max-width: 248px;
+  flex: none;
   margin: 0;
 }
 

src/views/vehicle/customer-archive.vue

@@ -4758,7 +4758,7 @@ export default {
     },
     selectionClear() {
       this.selectionList = [];
-      this.$refs.crud.toggleSelection();
+      this.$refs.crud?.toggleSelection();
     },
     currentChange(currentPage) {
       this.page.currentPage = currentPage;

src/views/vehicle/equipment-ledger.vue

@@ -21,6 +21,15 @@
       @on-load="onLoad"
     >
       <template #menu-left>
+        <el-button
+          v-if="hasPermission('equipment_ledger_delete')"
+          type="danger"
+          icon="el-icon-delete"
+          plain
+          @click="handleDelete"
+        >
+          批量删除
+        </el-button>
         <el-button
           v-if="hasPermission('equipment_ledger_import')"
           type="primary"
@@ -310,6 +319,23 @@ export default {
           this.$message.success('操作成功');
         });
     },
+    handleDelete() {
+      if (this.selectionList.length === 0) {
+        this.$message.warning('请选择至少一条数据');
+        return;
+      }
+      this.$confirm('确认删除选中的数据？删除后将不可恢复！', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => remove(this.ids))
+        .then(() => {
+          this.onLoad(this.page);
+          this.$message.success('操作成功');
+          this.$refs.crud.toggleSelection();
+        });
+    },
     beforeOpen(done, type) {
       this.boxType = type;
       if (type === 'add') {

src/views/vehicle/insurance-record.vue

@@ -217,7 +217,7 @@ import { getList as getOcrTemplateList } from '@/api/base/insurance-ocr-template
 import { getDeptTree } from '@/api/system/dept';
 import { exportBlob } from '@/api/common';
 import { downloadXls } from '@/utils/util';
-import { openImportDialog } from '@/utils/import-excel';
+import { handleImportExcel } from '@/utils/import-excel';
 import { getToken } from '@/utils/auth';
 import { getUploadHeaders } from '@/utils/upload';
 import { normalizeSearchRangeParams } from '@/utils/search-range';
@@ -540,7 +540,96 @@ export default {
         });
     },
     handleImport() {
-      openImportDialog(this, '保险记录');
+      const column = this.findColumn(this.excelOption.column, 'excelFile');
+      if (!column) {
+        this.$message.error('导入配置异常，请稍后重试');
+        return;
+      }
+      // 上传前先归一化日期列（2026-9-1 → 2026-09-01），兼容两种格式
+      column.httpRequest = async (uploadOption, uploadColumn) => {
+        try {
+          const normalizedFile = await this.normalizeExcelDates(uploadOption.file);
+          await handleImportExcel(
+            this,
+            { ...uploadOption, file: normalizedFile },
+            uploadColumn,
+            '保险记录',
+            null,
+            { timeout: 60000 }
+          );
+        } catch (error) {
+          this.$message.error(error.message || '导入失败');
+          if (typeof uploadOption.onError === 'function') {
+            uploadOption.onError(error);
+          }
+        }
+      };
+      this.excelBox = true;
+    },
+    // 读取 Excel，把指定日期列统一归一化为 YYYY-MM-DD，再写回新文件
+    async normalizeExcelDates(file) {
+      const rows = await this.readExcelRows(file);
+      const dateHeaders = ['开始日期', '结束日期', '开票日期'];
+      const headerIndex = (rows[0] || []).reduce((map, label, index) => {
+        const key = String(label || '').trim();
+        if (key) map[key] = index;
+        return map;
+      }, {});
+      const targetIndexes = dateHeaders
+        .map(label => headerIndex[label])
+        .filter(index => index !== undefined);
+      if (!targetIndexes.length) return file;
+      rows.forEach((row, rowIndex) => {
+        if (rowIndex === 0) return;
+        targetIndexes.forEach(index => {
+          if (row[index] !== undefined && row[index] !== '') {
+            const normalized = this.normalizeDateString(String(row[index]));
+            if (normalized) row[index] = normalized;
+          }
+        });
+      });
+      return this.writeExcelFile(rows, file.name);
+    },
+    async readExcelRows(file) {
+      const XLSX = await import('xlsx');
+      const buffer = await file.arrayBuffer();
+      const workbook = XLSX.read(buffer, { type: 'array', cellDates: false });
+      const worksheet = workbook.Sheets[workbook.SheetNames[0]];
+      return XLSX.utils.sheet_to_json(worksheet, {
+        header: 1,
+        defval: '',
+        raw: false,
+        blankrows: false,
+      });
+    },
+    async writeExcelFile(rows, fileName) {
+      const XLSX = await import('xlsx');
+      const workbook = XLSX.utils.book_new();
+      XLSX.utils.book_append_sheet(workbook, XLSX.utils.aoa_to_sheet(rows), 'Sheet1');
+      const binary = XLSX.write(workbook, { bookType: 'xlsx', type: 'array' });
+      return new File([binary], fileName || 'insurance-record.xlsx', {
+        type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+      });
+    },
+    // 兼容 YYYY-M-D / YYYY-MM-DD / YYYY/M/D / YYYY.年.月.日，非法或已标准格式原样返回 null
+    normalizeDateString(value) {
+      const text = String(value || '').trim();
+      if (!text) return null;
+      const match = text.match(/^(\d{4})[-/.年](\d{1,2})[-/.月](\d{1,2})日?$/);
+      if (!match) return null;
+      const year = Number(match[1]);
+      const month = Number(match[2]);
+      const day = Number(match[3]);
+      const date = new Date(year, month - 1, day);
+      if (
+        date.getFullYear() !== year ||
+        date.getMonth() !== month - 1 ||
+        date.getDate() !== day
+      ) {
+        return null;
+      }
+      const pad = n => String(n).padStart(2, '0');
+      return `${year}-${pad(month)}-${pad(day)}`;
     },
     handleExport() {
       this.$confirm('是否导出保险记录数据?', '提示', {

vite.config.mjs

@@ -47,26 +47,26 @@ export default ({ mode, command }) => {
       __VUE_I18N_LEGACY_API__: true,
       __INTLIFY_PROD_DEVTOOLS__: false,
     },
-    server: {
-      port: 2888,
-      proxy: {
-        '/api': {
-          target: 'http://localhost',
-          //target: 'https://saber3.bladex.cn/api',
-          changeOrigin: true,
-          rewrite: path => path.replace(/^\/api/, ''),
-        },
-      },
-    },
     // server: {
-    //   port: 2889,
+    //   port: 2888,
     //   proxy: {
     //     '/api': {
-    //       target: 'http://172.16.203.228:8000',
+    //       target: 'http://localhost',
+    //       //target: 'https://saber3.bladex.cn/api',
     //       changeOrigin: true,
+    //       rewrite: path => path.replace(/^\/api/, ''),
     //     },
     //   },
     // },
+    server: {
+      port: 2889,
+      proxy: {
+        '/api': {
+          target: 'http://172.16.203.228:8000',
+          changeOrigin: true,
+        },
+      },
+    },
     resolve: {
       alias: {
         '~': resolve(__dirname, './'),