diff --git a/.workbuddy/memory/2026-10-14.md b/.workbuddy/memory/2026-10-14.md
index 2cde316..61827c9 100644
--- a/.workbuddy/memory/2026-10-14.md
+++ b/.workbuddy/memory/2026-10-14.md
@@ -124,3 +124,19 @@
   另：自定义组件接模板字符串时，切出的模板里 `row.content` 要替换成 `content`（插槽作用域不存在于独立组件里），否则报 `Cannot read properties of undefined (reading 'content')`。
 - 校验：编译三个 .vue 的 template + scss 全过；临时验证页 `__route-change-verify.html` 与 8899 端口静态服务已删除/停止。
 - 未处理（等用户确认）：备注列的 `show-overflow-tooltip` 保持原样（属全站约定），用户若要求连备注一起去掉再单独改。
+
+## 16:45 付款申请表单「结算单号」字段交互歧义修复（方案 A）
+- 现象（用户截图圈出）：`/payment/payment-application/form` 结算单号是 `el-select multiple`，placeholder 写「请输入」但**打不进去字**，必须先猜到要点右边「选择」才有效。
+- 根因（双重的）：
+  1. 该 `el-select` 的 `:model-value` 绑只读 computed `referenceSettlementNos`（= 已选单号本身），**options 就是它自己** → 点开下拉、点选项，值不变；代码里 `handleSettlementSelectVisible` 甚至主动 blur 掉下拉。真正改值的只有右侧「选择」按钮。
+  2. placeholder 写「请输入」但控件不可输入（未开 `filterable`），且 `.el-tag__close{display:none}` 藏了删除叉 → 视觉上更像输入框。全站规矩是「请输入/请选择」二选一，这里是选择语义。
+- 落地（只改 `views/payment/payment-application-form.vue`，全站 `openReference`/`referenceSettlementNos` 无第二处引用）：
+  - 模板：`el-select` → `el-input readonly` + 外层 `el-tooltip`，`:model-value="referenceDisplayText"`，`placeholder="请输入"`，`:disabled="readonly"`，**`@click="!readonly && openReference()"` 让整框可点开弹窗**；右侧「选择」按钮保留。
+  - 新增 computed：`referenceSettlementCount`、`referenceDisplayText`（单张显示单号；**多张只显示 `已选 N 张结算单`**，完整单号靠 tooltip，明细看下方「结算信息」表）。
+  - 删除 `handleSettlementSelectVisible` 方法与 `settlementNoSelectRef`；样式 `.payment-form-page__settlement-select{,:deep(...)}` → `.payment-form-page__settlement-input`（+ `cursor:pointer` / disabled 时 `not-allowed`）。
+- ⚠️ 踩坑：第一版把「共 N 张」做成 `el-input` 的 `#suffix` 插槽 → span=6 的窄列里后缀挤占宽度，单号被截成 `JS202610`，比不改还差。**窄列（≤span6）不要在输入框内塞后缀/前缀，把信息编进 `:model-value` 文本本身**。
+- 验证（项目根临时 html + `vue/dist/vue.esm-bundler.js`，用完即删）：
+  - ⚠️ 临时页必须 import `vue/dist/vue.esm-bundler.js`，默认 `vue` 是 runtime-only，字符串 template 报 “runtime compilation is not supported”。
+  - 4 态实测：空值 placeholder 正确 / 单张显单号 / 多张显「已选 3 张结算单」且不截断 / 查看态 disabled 且按钮隐藏；输入框宽 132px、行高 32px。
+  - 点击探针验证：可编辑态点 `.el-input` 命中 1 次（el-tooltip 不拦截 click），查看态命中 0 次 ✓。
+
diff --git a/.workbuddy/memory/2026-10-15.md b/.workbuddy/memory/2026-10-15.md
new file mode 100644
index 0000000..fcab706
--- /dev/null
+++ b/.workbuddy/memory/2026-10-15.md
@@ -0,0 +1,7 @@
+# 2026-10-15
+
+## 10:46 付款申请表单「结算单号」修复丢失 → 重放并提交
+- 现象：用户反馈昨天改好的「结算单号」（只读输入框 + 整框可点开选择弹窗）今天又变回旧的 `el-select` 写法。
+- 根因：昨天的改动**一直没有 commit**，是纯工作区改动；用户 pull（HEAD 到 9919fb9，两个 settlement 样式提交包含该文件旧版）后被覆盖。教训同 2026-09-18「漏提交新文件」一役：**本仓库改动必须尽快显式 commit**，`git status` 干净 ≠ 改动还在。
+- 处理：按昨天方案 A 原样重放 4 处修改（模板 el-select→el-input readonly+tooltip+整框可点、新增 `referenceSettlementCount`/`referenceDisplayText` computed、删 `handleSettlementSelectVisible`、样式类改名 `__settlement-input` + cursor 规则），curl 自检 vue/style 均 200。
+- **这次只提交该单文件**：`git commit -m ":bug: ..." -- src/views/payment/payment-application-form.vue` → `db03ced`（`.workbuddy/memory` 不入库，留在工作区）。尚未 push，等用户确认。
diff --git a/.workbuddy/memory/2026-10-20.md b/.workbuddy/memory/2026-10-20.md
new file mode 100644
index 0000000..cd8d847
--- /dev/null
+++ b/.workbuddy/memory/2026-10-20.md
@@ -0,0 +1,31 @@
+# 2026-10-20
+
+## settlement-import 列表页工具栏对齐 receipt-settlement
+
+- `src/views/settlement/settlement-import.vue`：
+  - 左侧只保留「新增」（`type="primary"`），删掉原来的 `plain` 文字「刷新」按钮（刷新统一收进右侧图标组，与 receipt-settlement / settlement-adjustment 一致）。
+  - 右侧接入 `<settlement-table-tools>`（`./components/settlement-table-tools.vue`，即 `table-header-tools` 包装）：刷新 / 列设置 / 搜索显隐 / 表格尺寸 4 键，`@refresh="refreshTable"`。
+  - 表格列改为配置化，新增 `src/option/settlement/settlementImportTable.js`（`settlementImportTableColumns`），页面加 `tableColumns / visibleColumnKeys / tableSize / columnSettingOptions / visibleTableColumns`，`el-table` 加 `:size="tableSize"`。
+  - 列渲染标志：`link / status / enum / billType / count`（注意**不能用 `type` 作 key**，`type` 是 el-table-column 真实 prop，会把列变成 selection/index 列）。
+  - 新增 `displayValue()`；`settlementBillTypeLabel('')` 返回 `-`。
+  - 序号列改 `fixed="left"`；数据列与操作列统一 `align: 'center'`，操作链接 `justify-content: center`。
+- 校验方式（无 dev server 时）：项目根目录临时 `sfc-check.mjs` 用 `vue/compiler-sfc` 的 `parse + compileTemplate + compileScript`；SCSS 用 `sass.compileString`。用完即删。
+
+## 追加：用户要求「列显隐 + 显示方式」→ 两个页面改 avue-crud
+
+用户反馈上面那版不对：右侧工具按钮必须是 **avue-crud 原生**的 4 键，第 2 键是「列显隐」抽屉（不是「列设置」勾选弹窗），第 4 键是「显示方式」（表格↔卡片），不是表格尺寸循环。确认后范围：`settlement-import` + `formal-settlement`（receipt/payment 共用）都改 avue-crud。
+
+- 关键结论：**「列显隐 + 显示方式」只有 avue-crud 原生才有**，avue 的 `dialog-column` 依赖 `inject: ['crud']`，脱离 avue-crud 拿不出来；`table-header-tools` 只是仿制件，做不到。所以目标页只能整页改 avue-crud。
+- avue 右侧按钮源码：`node_modules/@smallwei/avue/lib/packages/element-plus/crud/menu/header-menu3.js`（refreshBtn/columnBtn/searchBtn/gridBtn，`gridBtn` → `handleGridShow()` 切 `gridShow` 表格↔卡片）；图标默认配置在同目录 `config.js`。
+- 新增 `src/option/settlement/settlementImport.js`（`settlementImportOption`）、`src/option/settlement/formalSettlement.js`（`formalSettlementOption`，表格列复用 `formalSettlementTable.js` 的 `formalSettlementTableColumns` + `COLUMN_EXTRA` 增量配置，避免两处维护）。
+- `settlement-import.vue` 整页改 avue-crud（删除手写的搜索区/表格/分页）；`formal-settlement-table-panel.vue` 由 el-table 改成包一层 `<avue-crud>`，父页面保留数据加载与全部业务动作。
+- ⚠️ **avue 的搜索自定义控件要用 `column.renderSearch`（`h()` 渲染），不能用 `searchslot`** —— avue 3.9.2 根本不读 `searchslot`（全库无此字段），而 `searchslot: true` 还会被 `header-search2.js` 的 `searchXxx → xxx` 映射成 `slot: true`。真正的搜索插槽是 avue-crud 上 `${prop}-search`（`crud.searchSlot`，见 `index2.js` `getSlotList(["-search"])`），但其作用域**没有 `row`**（只有 value/column/label/size/readonly/disabled/dic），`mileage-record.vue` 用 `{ row }` 是错的。已用于批次号下拉（filterable + allowCreate）。
+- avue `formatter` 签名确认：`detail.js` → `column.formatter(row, row[column.prop], result, column)`。
+- `on-load` 由 `table-page2.js` 在 created / 翻页 / 改页容量时触发，参数是内部 `defaultPage`（已 `Object.assign` 合并外部 page）。
+- 分页透传写法（父持 page、子包 avue-crud）：子组件用 computed `crudPage{get/set}`，setter 里 `Object.assign(this.page, value)` 原地回写，避免 prop 直接赋值告警。
+- ⚠️ `src/option/settlement/formalSettlementTable.js` **不能删** —— `formal-settlement-editor.vue` 还从它导入 `candidateColumns/candidateDetailColumns/detailColumns/sourceColumns/summaryColumns`（我一度删掉，Vite 转换报错后从 HEAD 恢复）。
+- 校验方式升级：沙箱里 curl 不通 dev server（502），改用 `vite.createServer({ middlewareMode:true })` + `server.transformRequest(path)` 就地转换，能同时暴露依赖解析失败（如上面误删文件）。脚本用完即删。
+
+## 遗留未改（仍用 table-header-tools 仿制件）
+
+pre-settlement、settlement-adjustment、receivable-payable-detail、transport-reconciliation-table-panel、business/{master-order,loading-manage,voucher-manage}、payment/* 手写页。若用户要全站一致，需逐页改 avue-crud。
diff --git a/.workbuddy/memory/MEMORY.md b/.workbuddy/memory/MEMORY.md
index ef1ee3f..647e2d9 100644
--- a/.workbuddy/memory/MEMORY.md
+++ b/.workbuddy/memory/MEMORY.md
@@ -66,9 +66,21 @@
 ## 表单 / 自检 / 导出
 - placeholder 只写 `请输入`/`请选择`；例外：`请输入或选择车辆`、日期区间 `起`/`止`、示例值。校验 message 须带字段名。
 - `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`。
+- 自检：`curl "localhost:2888/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`）。
 
+## avue-crud 才是「右侧 4 键」的唯一来源（2026-10-20 定论）
+用户要的右侧工具栏是 **avue-crud 原生**：刷新 / **列显隐**（el-drawer，含 隐藏/冻结/过滤/排序 + 行拖拽）/ 搜索显隐 / **显示方式**（表格↔卡片）。
+- 源码：`node_modules/@smallwei/avue/lib/packages/element-plus/crud/menu/header-menu3.js`（refreshBtn/columnBtn/searchBtn/gridBtn），`gridBtn` → `handleGridShow()` 切 `gridShow`；图标默认在同目录 `config.js`。「列显隐」文案来自 avue 语言包 `crud.showTitle`（项目 `src/lang/zh.js` 已覆盖）。
+- **列显隐抽屉依赖 `inject: ['crud']`，脱离 avue-crud 拿不出来**；`components/table-header-tools` 的「列设置勾选弹窗 + 表格尺寸循环」是仿制件，**做不到这两点**。所以「要和 avue 一致」= 整页改用 avue-crud，没有中间方案。
+- ⚠️ 搜索自定义控件用 `column.renderSearch = scope => h(...)`（`scope.row` 可用，同 `mixins/organization-search.js`）。**不要用 `searchslot`**：avue 3.9.2 全库无此字段，且 `header-search2.js` 的 `searchXxx → xxx` 映射会把 `searchslot` 变成 `slot: true`。
+- avue-crud 上的 `${prop}-search` 插槽确实存在（`index2.js` 的 `getSlotList(["-search"])`），但**作用域没有 `row`**（只有 value/column/label/size/readonly/disabled/dic）——`mileage-record.vue` 里 `{ row }` 是错的写法，别照抄。
+- `formatter` 签名：`detail.js` → `column.formatter(row, row[column.prop], result, column)`。
+- `on-load` 由 `table-page2.js` 在 created / 翻页 / 改页容量时触发，参数是内部 `defaultPage`（已合并外部 page）。分页若由父组件持有、子组件包一层 avue-crud，用 computed `crudPage{get/set}` + setter 里 `Object.assign(this.page, value)` 原地回写。
+- 已改：settlement-import.vue、formal-settlement.vue + components/formal-settlement-table-panel.vue（receipt/payment 共用）。未改：pre-settlement、settlement-adjustment、receivable-payable-detail、transport-reconciliation-table-panel、business 与 payment 的手写页。
+- ⚠️ `src/option/settlement/formalSettlementTable.js` 别删：`formal-settlement-editor.vue` 还依赖它的 candidate/detail/source/summary 列。
+- 沙箱里 curl 打不通本地 dev server（一律 502）。改用 `vite.createServer({middlewareMode:true})` + `server.transformRequest(path)` 就地转换校验，还能暴露依赖解析失败。
+
 ## Element Plus 图标两种用法的机制差异（易误判）
 `main.js` 里 `for (...ElementPlusIconsVue) app.component(key, component)` 全局注册了全部图标，因此模板里可以写标签形式 `<Location />`（靠全局注册解析）。
 但 `:icon="OfficeBuilding"` 是**表达式**，编译成 `_ctx.OfficeBuilding`，只会从 data / props / computed / setup 返回值里取 —— **组件对象必须放进 `data()`**；放进 `components: {}` 注册里模板取不到，会静默渲染不出图标（不报错，只是空白）。
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 864311c..697277b 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -4,40 +4,43 @@ settings:
   autoInstallPeers: true
   excludeLinksFromLockfile: false
 
+patchedDependencies:
+  '@smallwei/avue': 5ba15ad41b2c301250bf24adf39da2ed526b8375143da2c5a495361b29e862db
+
 importers:
 
   .:
     dependencies:
       '@element-plus/icons-vue':
         specifier: ^2.3.1
-        version: 2.3.2(vue@3.5.34)
+        version: 2.3.2(vue@3.5.34(typescript@7.0.2))
       '@open-file-viewer/core':
         specifier: ^0.1.27
         version: 0.1.27(pdfjs-dist@6.1.200)
       '@open-file-viewer/vue':
         specifier: ^0.1.27
-        version: 0.1.27(@open-file-viewer/core@0.1.27(pdfjs-dist@6.1.200))(vue@3.5.34)
+        version: 0.1.27(@open-file-viewer/core@0.1.27(pdfjs-dist@6.1.200))(vue@3.5.34(typescript@7.0.2))
       '@saber/nf-design-base-elp':
         specifier: ^1.3.0
         version: 1.3.0
       '@saber/nf-form-design-elp':
         specifier: ^1.6.1
-        version: 1.6.1(vue@3.5.34)
+        version: 1.6.1(vue@3.5.34(typescript@7.0.2))
       '@saber/nf-form-elp':
         specifier: ^1.6.3
         version: 1.7.0
       '@smallwei/avue':
         specifier: ~3.9.2
-        version: 3.9.2(@element-plus/icons-vue@2.3.2(vue@3.5.34))(element-plus@2.14.2(vue@3.5.34))(vue@3.5.34)
+        version: 3.9.2(patch_hash=5ba15ad41b2c301250bf24adf39da2ed526b8375143da2c5a495361b29e862db)(@element-plus/icons-vue@2.3.2(vue@3.5.34(typescript@7.0.2)))(debug@4.4.3(supports-color@7.2.0))(element-plus@2.14.2(vue@3.5.34(typescript@7.0.2)))(vue@3.5.34(typescript@7.0.2))
       animate.css:
         specifier: ^4.1.1
         version: 4.1.1
       avue-plugin-ueditor:
         specifier: ^1.0.4
-        version: 1.0.4(axios@1.16.0)(vue@3.5.34)
+        version: 1.0.4(axios@1.16.0(debug@4.4.3(supports-color@7.2.0)))(vue@3.5.34(typescript@7.0.2))
       axios:
         specifier: ^1.13.5
-        version: 1.16.0
+        version: 1.16.0(debug@4.4.3(supports-color@7.2.0))
       codemirror:
         specifier: ^5.65.21
         version: 5.65.21
@@ -55,7 +58,7 @@ importers:
         version: 6.1.0
       element-plus:
         specifier: ^2.14.2
-        version: 2.14.2(vue@3.5.34)
+        version: 2.14.2(vue@3.5.34(typescript@7.0.2))
       exceljs:
         specifier: ^4.4.0
         version: 4.4.0
@@ -82,29 +85,29 @@ importers:
         version: 0.4.0
       vue:
         specifier: ^3.5.13
-        version: 3.5.34
+        version: 3.5.34(typescript@7.0.2)
       vue-i18n:
         specifier: ^11.4.2
-        version: 11.4.2(vue@3.5.34)
+        version: 11.4.2(vue@3.5.34(typescript@7.0.2))
       vue-pdf-embed:
         specifier: ^2.1.6
-        version: 2.1.6(vue@3.5.34)
+        version: 2.1.6(vue@3.5.34(typescript@7.0.2))
       vue-router:
         specifier: ^4.3.2
-        version: 4.6.4(vue@3.5.34)
+        version: 4.6.4(vue@3.5.34(typescript@7.0.2))
       vue3-clipboard:
         specifier: ^1.0.0
-        version: 1.0.0(vue@3.5.34)
+        version: 1.0.0(vue@3.5.34(typescript@7.0.2))
       vuex:
         specifier: ^4.1.0
-        version: 4.1.0(vue@3.5.34)
+        version: 4.1.0(vue@3.5.34(typescript@7.0.2))
       xlsx:
         specifier: 0.18.5
         version: 0.18.5
     devDependencies:
       '@vitejs/plugin-vue':
         specifier: ^5.2.4
-        version: 5.2.4(vite@5.4.21(sass@1.99.0)(terser@5.46.2))(vue@3.5.34)
+        version: 5.2.4(vite@5.4.21(sass@1.99.0)(terser@5.46.2))(vue@3.5.34(typescript@7.0.2))
       '@vue/compiler-sfc':
         specifier: ^3.4.27
         version: 3.5.34
@@ -117,18 +120,24 @@ importers:
       terser:
         specifier: ^5.31.1
         version: 5.46.2
+      typescript:
+        specifier: ^7.0.2
+        version: 7.0.2
       unplugin-auto-import:
         specifier: ^0.11.2
-        version: 0.11.5(@vueuse/core@14.3.0(vue@3.5.34))(rollup@4.60.3)
+        version: 0.11.5(@vueuse/core@14.3.0(vue@3.5.34(typescript@7.0.2)))(rollup@4.60.3)
       vite:
         specifier: ^5.4.19
         version: 5.4.21(sass@1.99.0)(terser@5.46.2)
       vite-plugin-compression:
         specifier: ^0.5.1
-        version: 0.5.1(vite@5.4.21(sass@1.99.0)(terser@5.46.2))
+        version: 0.5.1(supports-color@7.2.0)(vite@5.4.21(sass@1.99.0)(terser@5.46.2))
       vite-plugin-vue-setup-extend:
         specifier: ^0.4.0
         version: 0.4.0(vite@5.4.21(sass@1.99.0)(terser@5.46.2))
+      vue-tsc:
+        specifier: ^3.3.11
+        version: 3.3.13(typescript@7.0.2)
 
 packages:
 
@@ -404,30 +413,35 @@ packages:
     engines: {node: '>= 10'}
     cpu: [arm64]
     os: [linux]
+    libc: [glibc]
 
   '@napi-rs/canvas-linux-arm64-musl@1.0.2':
     resolution: {integrity: sha512-qwROoDIC9upfvDoRLuPn2aNg9CGW1x0Ygr4k2Or+8paA9d0qBLwk87U+g8KQpoOviKoPoiwl97kvBYuYD7qZoA==}
     engines: {node: '>= 10'}
     cpu: [arm64]
     os: [linux]
+    libc: [musl]
 
   '@napi-rs/canvas-linux-riscv64-gnu@1.0.2':
     resolution: {integrity: sha512-fXRjnPihdnbO6qy1QQOgxAonb68A0TCEG7rj1x7v7rxNElsE8EVIKIEUTvyDtU+sthYSbX+8e7g3oZiLGnOmxw==}
     engines: {node: '>= 10'}
     cpu: [riscv64]
     os: [linux]
+    libc: [glibc]
 
   '@napi-rs/canvas-linux-x64-gnu@1.0.2':
     resolution: {integrity: sha512-nPR97DXhbWIAy7yazF3jc06kEPMqYMLmPzFOVNlwKPfIoSChnI+x7dc0hTLaihz3jxrjL6j4BbA7earxfx4X3g==}
     engines: {node: '>= 10'}
     cpu: [x64]
     os: [linux]
+    libc: [glibc]
 
   '@napi-rs/canvas-linux-x64-musl@1.0.2':
     resolution: {integrity: sha512-l7zZY5+jL5qnBZtDz7CoBtY6p7EkHu422g/0zWwrOrzIwWyWxZFRfZZORY1UG7YApymPLx+UbOkN206xXn/c1Q==}
     engines: {node: '>= 10'}
     cpu: [x64]
     os: [linux]
+    libc: [musl]
 
   '@napi-rs/canvas-win32-arm64-msvc@1.0.2':
     resolution: {integrity: sha512-yE0koHCFF4PIbMc2o2SEALhnipz7WBISh5glLvQiomtIoCcW0np3H4Lw93ceJAfJttTTeIIWFbwH84F7EVzjMQ==}
@@ -503,36 +517,42 @@ packages:
     engines: {node: '>= 10.0.0'}
     cpu: [arm]
     os: [linux]
+    libc: [glibc]
 
   '@parcel/watcher-linux-arm-musl@2.5.6':
     resolution: {integrity: sha512-Ve3gUCG57nuUUSyjBq/MAM0CzArtuIOxsBdQ+ftz6ho8n7s1i9E1Nmk/xmP323r2YL0SONs1EuwqBp2u1k5fxg==}
     engines: {node: '>= 10.0.0'}
     cpu: [arm]
     os: [linux]
+    libc: [musl]
 
   '@parcel/watcher-linux-arm64-glibc@2.5.6':
     resolution: {integrity: sha512-f2g/DT3NhGPdBmMWYoxixqYr3v/UXcmLOYy16Bx0TM20Tchduwr4EaCbmxh1321TABqPGDpS8D/ggOTaljijOA==}
     engines: {node: '>= 10.0.0'}
     cpu: [arm64]
     os: [linux]
+    libc: [glibc]
 
   '@parcel/watcher-linux-arm64-musl@2.5.6':
     resolution: {integrity: sha512-qb6naMDGlbCwdhLj6hgoVKJl2odL34z2sqkC7Z6kzir8b5W65WYDpLB6R06KabvZdgoHI/zxke4b3zR0wAbDTA==}
     engines: {node: '>= 10.0.0'}
     cpu: [arm64]
     os: [linux]
+    libc: [musl]
 
   '@parcel/watcher-linux-x64-glibc@2.5.6':
     resolution: {integrity: sha512-kbT5wvNQlx7NaGjzPFu8nVIW1rWqV780O7ZtkjuWaPUgpv2NMFpjYERVi0UYj1msZNyCzGlaCWEtzc+exjMGbQ==}
     engines: {node: '>= 10.0.0'}
     cpu: [x64]
     os: [linux]
+    libc: [glibc]
 
   '@parcel/watcher-linux-x64-musl@2.5.6':
     resolution: {integrity: sha512-1JRFeC+h7RdXwldHzTsmdtYR/Ku8SylLgTU/reMuqdVD7CtLwf0VR1FqeprZ0eHQkO0vqsbvFLXUmYm/uNKJBg==}
     engines: {node: '>= 10.0.0'}
     cpu: [x64]
     os: [linux]
+    libc: [musl]
 
   '@parcel/watcher-win32-arm64@2.5.6':
     resolution: {integrity: sha512-3ukyebjc6eGlw9yRt678DxVF7rjXatWiHvTXqphZLvo7aC5NdEgFufVwjFfY51ijYEWpXbqF5jtrK275z52D4Q==}
@@ -599,66 +619,79 @@ packages:
     resolution: {integrity: sha512-DV6fJoxEYWJOvaZIsok7KrYl0tPvga5OZ2yvKHNNYyk/2roMLqQAbGhr78EQ5YhHpnhLKJD3S1WFusAkmUuV5g==}
     cpu: [arm]
     os: [linux]
+    libc: [glibc]
 
   '@rollup/rollup-linux-arm-musleabihf@4.60.3':
     resolution: {integrity: sha512-mQKoJAzvuOs6F+TZybQO4GOTSMUu7v0WdxEk24krQ/uUxXoPTtHjuaUuPmFhtBcM4K0ons8nrE3JyhTuCFtT/w==}
     cpu: [arm]
     os: [linux]
+    libc: [musl]
 
   '@rollup/rollup-linux-arm64-gnu@4.60.3':
     resolution: {integrity: sha512-Whjj2qoiJ6+OOJMGptTYazaJvjOJm+iKHpXQM1P3LzGjt7Ff++Tp7nH4N8J/BUA7R9IHfDyx4DJIflifwnbmIA==}
     cpu: [arm64]
     os: [linux]
+    libc: [glibc]
 
   '@rollup/rollup-linux-arm64-musl@4.60.3':
     resolution: {integrity: sha512-4YTNHKqGng5+yiZt3mg77nmyuCfmNfX4fPmyUapBcIk+BdwSwmCWGXOUxhXbBEkFHtoN5boLj/5NON+u5QC9tg==}
     cpu: [arm64]
     os: [linux]
+    libc: [musl]
 
   '@rollup/rollup-linux-loong64-gnu@4.60.3':
     resolution: {integrity: sha512-SU3kNlhkpI4UqlUc2VXPGK9o886ZsSeGfMAX2ba2b8DKmMXq4AL7KUrkSWVbb7koVqx41Yczx6dx5PNargIrEA==}
     cpu: [loong64]
     os: [linux]
+    libc: [glibc]
 
   '@rollup/rollup-linux-loong64-musl@4.60.3':
     resolution: {integrity: sha512-6lDLl5h4TXpB1mTf2rQWnAk/LcXrx9vBfu/DT5TIPhvMhRWaZ5MxkIc8u4lJAmBo6klTe1ywXIUHFjylW505sg==}
     cpu: [loong64]
     os: [linux]
+    libc: [musl]
 
   '@rollup/rollup-linux-ppc64-gnu@4.60.3':
     resolution: {integrity: sha512-BMo8bOw8evlup/8G+cj5xWtPyp93xPdyoSN16Zy90Q2QZ0ZYRhCt6ZJSwbrRzG9HApFabjwj2p25TUPDWrhzqQ==}
     cpu: [ppc64]
     os: [linux]
+    libc: [glibc]
 
   '@rollup/rollup-linux-ppc64-musl@4.60.3':
     resolution: {integrity: sha512-E0L8X1dZN1/Rph+5VPF6Xj2G7JJvMACVXtamTJIDrVI44Y3K+G8gQaMEAavbqCGTa16InptiVrX6eM6pmJ+7qA==}
     cpu: [ppc64]
     os: [linux]
+    libc: [musl]
 
   '@rollup/rollup-linux-riscv64-gnu@4.60.3':
     resolution: {integrity: sha512-oZJ/WHaVfHUiRAtmTAeo3DcevNsVvH8mbvodjZy7D5QKvCefO371SiKRpxoDcCxB3PTRTLayWBkvmDQKTcX/sw==}
     cpu: [riscv64]
     os: [linux]
+    libc: [glibc]
 
   '@rollup/rollup-linux-riscv64-musl@4.60.3':
     resolution: {integrity: sha512-Dhbyh7j9FybM3YaTgaHmVALwA8AkUwTPccyCQ79TG9AJUsMQqgN1DDEZNr4+QUfwiWvLDumW5vdwzoeUF+TNxQ==}
     cpu: [riscv64]
     os: [linux]
+    libc: [musl]
 
   '@rollup/rollup-linux-s390x-gnu@4.60.3':
     resolution: {integrity: sha512-cJd1X5XhHHlltkaypz1UcWLA8AcoIi1aWhsvaWDskD1oz2eKCypnqvTQ8ykMNI0RSmm7NkTdSqSSD7zM0xa6Ig==}
     cpu: [s390x]
     os: [linux]
+    libc: [glibc]
 
   '@rollup/rollup-linux-x64-gnu@4.60.3':
     resolution: {integrity: sha512-DAZDBHQfG2oQuhY7mc6I3/qB4LU2fQCjRvxbDwd/Jdvb9fypP4IJ4qmtu6lNjes6B531AI8cg1aKC2di97bUxA==}
     cpu: [x64]
     os: [linux]
+    libc: [glibc]
 
   '@rollup/rollup-linux-x64-musl@4.60.3':
     resolution: {integrity: sha512-cRxsE8c13mZOh3vP+wLDxpQBRrOHDIGOWyDL93Sy0Ga8y515fBcC2pjUfFwUe5T7tqvTvWbCpg1URM/AXdWIXA==}
     cpu: [x64]
     os: [linux]
+    libc: [musl]
 
   '@rollup/rollup-openbsd-x64@4.60.3':
     resolution: {integrity: sha512-QaWcIgRxqEdQdhJqW4DJctsH6HCmo5vHxY0krHSX4jMtOqfzC+dqDGuHM87bu4H8JBeibWx7jFz+h6/4C8wA5Q==}
@@ -738,6 +771,126 @@ packages:
   '@types/web-bluetooth@0.0.21':
     resolution: {integrity: sha512-oIQLCGWtcFZy2JW77j9k8nHzAOpqMHLQejDA48XXMWH6tjCQHz5RCFz1bzsmROyL6PUm+LLnUiI4BCn221inxA==}
 
+  '@typescript/typescript-aix-ppc64@7.0.2':
+    resolution: {integrity: sha512-MTKKkWB7p/0E9xi1d1tHtZ5PiLkGEMIq88pK2CubZjOsLtYTLqhgIgi6zepFa+9GHZ6h05NMCkQxGKiPXMxXtQ==}
+    engines: {node: '>=16.20.0'}
+    cpu: [ppc64]
+    os: [aix]
+
+  '@typescript/typescript-darwin-arm64@7.0.2':
+    resolution: {integrity: sha512-gowzar9MwS/aRWp6f3a4KUqzRjAZjOsmGNCM6LcTgXum+dBfgsBVMN+AgvOCCbguXyick6LJhpBszxMebJ8syA==}
+    engines: {node: '>=16.20.0'}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@typescript/typescript-darwin-x64@7.0.2':
+    resolution: {integrity: sha512-SZ9xZInqApNlNGc9s0W1VSsktYSOe9cFqNOIqmN1Gs8SmkjKZYFt017G4VwPxASInODuAdbTW7sXiFUf893RgA==}
+    engines: {node: '>=16.20.0'}
+    cpu: [x64]
+    os: [darwin]
+
+  '@typescript/typescript-freebsd-arm64@7.0.2':
+    resolution: {integrity: sha512-W5NH4y/J0plIIS5b2xvTEkU7JFxyqdMAOgf+Ilhl0vHQXKO5dZoxd+C/jEtq56c4F3wk71RB4BMRQ2XdI+bwYQ==}
+    engines: {node: '>=16.20.0'}
+    cpu: [arm64]
+    os: [freebsd]
+
+  '@typescript/typescript-freebsd-x64@7.0.2':
+    resolution: {integrity: sha512-UMGDx5sTpzNw3WiPebH7l90IWfJggEd+egHt/q6p7/Cm3zqoV7VxkGXt+3DxPIw8CcmvAB0j3sVVfbhX+M4Tpw==}
+    engines: {node: '>=16.20.0'}
+    cpu: [x64]
+    os: [freebsd]
+
+  '@typescript/typescript-linux-arm64@7.0.2':
+    resolution: {integrity: sha512-Qh4eU4/y3yDjnfjjyPYihMj5/ODIlmt+Bzu17OI+fiSRDW57QmU5SiN63exPRNJPKUzcc1INa1NXdrJ+MqHjUQ==}
+    engines: {node: '>=16.20.0'}
+    cpu: [arm64]
+    os: [linux]
+
+  '@typescript/typescript-linux-arm@7.0.2':
+    resolution: {integrity: sha512-gffT3xPz9sR7j/YJExkyPntrI0P2EP9XbOyWzth2/Gs0RstK+90RBcO0ncXoXy/beYll1SXw846Nf2zdnEz0QQ==}
+    engines: {node: '>=16.20.0'}
+    cpu: [arm]
+    os: [linux]
+
+  '@typescript/typescript-linux-loong64@7.0.2':
+    resolution: {integrity: sha512-uEHck9i8hoAzXPiYRib1O7miOnz23SxIeVl6F4LXox+qov1K35jHcEW6VHKvZI+pyvl7fZEP4MCU5LYvIq1GuQ==}
+    engines: {node: '>=16.20.0'}
+    cpu: [loong64]
+    os: [linux]
+
+  '@typescript/typescript-linux-mips64el@7.0.2':
+    resolution: {integrity: sha512-R4KvAMnE43W5Qeqb0Ly56O3mWMWIAgsMyz36DCaycd5nbg/9kzm0liw3JocfRqyJY0KPmzFjbswozXyW0DnIYA==}
+    engines: {node: '>=16.20.0'}
+    cpu: [mips64el]
+    os: [linux]
+
+  '@typescript/typescript-linux-ppc64@7.0.2':
+    resolution: {integrity: sha512-DORx5b3sd/4S7eayxm4FQv+A7CrkUIGRaHiwI8oiHTAI1fAPWhF4J0vAlkC8biAlHSVVwxMQ3tjZ2/DVbnQiiA==}
+    engines: {node: '>=16.20.0'}
+    cpu: [ppc64]
+    os: [linux]
+
+  '@typescript/typescript-linux-riscv64@7.0.2':
+    resolution: {integrity: sha512-wf0jqEDOjrPRnKwYRyyJDRo11KMbvMFrU+q4zqKyChODBzvlkbhNQfKvLxQCcwTpdDaXSHZTVuh0JoCrKCUMHQ==}
+    engines: {node: '>=16.20.0'}
+    cpu: [riscv64]
+    os: [linux]
+
+  '@typescript/typescript-linux-s390x@7.0.2':
+    resolution: {integrity: sha512-IkwJc3L7yhytWd/ewjyxNDfOmswCm9GWMJT/ue/dU4aZNbwZeYAetq42VyLmsmSjvoX7z74X6ZaYCtzAr0EuGw==}
+    engines: {node: '>=16.20.0'}
+    cpu: [s390x]
+    os: [linux]
+
+  '@typescript/typescript-linux-x64@7.0.2':
+    resolution: {integrity: sha512-EYdf2cNg7rgCWJnxCdJ+F3V39O8ihb37eHAu1LK8oAFizgTQbPOK7zHHXbPt8rX24COqODXeI3sIf0fCXG7H/A==}
+    engines: {node: '>=16.20.0'}
+    cpu: [x64]
+    os: [linux]
+
+  '@typescript/typescript-netbsd-arm64@7.0.2':
+    resolution: {integrity: sha512-+polYF4MF04aPpO5FTkHran9yUQDSXqy5GiSDKpsll5jy3l3+g9QLhpf39T+ePtefhXLOGrLl0QIjkQP6VnelA==}
+    engines: {node: '>=16.20.0'}
+    cpu: [arm64]
+    os: [netbsd]
+
+  '@typescript/typescript-netbsd-x64@7.0.2':
+    resolution: {integrity: sha512-8YIT0EHM/3dq10ZOVF/A7pc/YSMtbcecct4rWtexrnSCHOPcpC2KTLXfTCR6vDpnSiY12heNb1GiN/wu+T/FyA==}
+    engines: {node: '>=16.20.0'}
+    cpu: [x64]
+    os: [netbsd]
+
+  '@typescript/typescript-openbsd-arm64@7.0.2':
+    resolution: {integrity: sha512-APT8+ClYnuYm1u9+kgGXoMj2VzWzcymwh2gNSQVySHfkRDGOTVkoWLjCmOQSaO+PoqQ57B0flRp9SA+7GnnkzQ==}
+    engines: {node: '>=16.20.0'}
+    cpu: [arm64]
+    os: [openbsd]
+
+  '@typescript/typescript-openbsd-x64@7.0.2':
+    resolution: {integrity: sha512-yX7s+Q0Dln0Dt9tEzZsAjXXR/+ytBM7AlglaqyeMPxQszJ1JhlJdZ6jLA+IzldHtflX81em7lDao1xXu+aRRkg==}
+    engines: {node: '>=16.20.0'}
+    cpu: [x64]
+    os: [openbsd]
+
+  '@typescript/typescript-sunos-x64@7.0.2':
+    resolution: {integrity: sha512-dLJDGaLZ1D4HPQn62u1n8mBDkJREwMsAkCdkwd4Ieqw+x3TUyTsqY0YiBCtE6H6OzzgGk3iuZ3vFWRS+E8/d1g==}
+    engines: {node: '>=16.20.0'}
+    cpu: [x64]
+    os: [sunos]
+
+  '@typescript/typescript-win32-arm64@7.0.2':
+    resolution: {integrity: sha512-Gyl1Vy6OsWesLzmq+EP0Fb7b4Nid5232AvcA2SFcdYreldpNtYFFofPjnt62y9hQy7VTaZp65ICJjuAQRaVcIQ==}
+    engines: {node: '>=16.20.0'}
+    cpu: [arm64]
+    os: [win32]
+
+  '@typescript/typescript-win32-x64@7.0.2':
+    resolution: {integrity: sha512-0BQ3HkAHHlKLSp1qRvf3SUhGpGsDuhB/jgFw75guyqbxJqEaS0Cw/VFO8i2nHglJUzQCRtMMR/IBAKE3ETMC4g==}
+    engines: {node: '>=16.20.0'}
+    cpu: [x64]
+    os: [win32]
+
   '@uppy/companion-client@2.2.2':
     resolution: {integrity: sha512-5mTp2iq97/mYSisMaBtFRry6PTgZA6SIL7LePteOV5x0/DxKfrZW3DEiQERJmYpHzy7k8johpm2gHnEKto56Og==}
 
@@ -762,6 +915,20 @@ packages:
       vite: ^5.0.0 || ^6.0.0
       vue: ^3.2.25
 
+  '@volar/language-core@2.4.28':
+    resolution: {integrity: sha512-w4qhIJ8ZSitgLAkVay6AbcnC7gP3glYM3fYwKV3srj8m494E3xtrCv6E+bWviiK/8hs6e6t1ij1s2Endql7vzQ==}
+
+  '@volar/source-map@2.4.28':
+    resolution: {integrity: sha512-yX2BDBqJkRXfKw8my8VarTyjv48QwxdJtvRgUpNE5erCsgEUdI2DsLbpa+rOQVAJYshY99szEcRDmyHbF10ggQ==}
+
+  '@volar/typescript@2.4.28':
+    resolution: {integrity: sha512-Ja6yvWrbis2QtN4ClAKreeUZPVYMARDYZl9LMEv1iQ1QdepB6wn0jTRxA9MftYmYa4DQ4k/DaSZpFPUfxl8giw==}
+    peerDependencies:
+      typescript: '*'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
   '@vue/compiler-core@3.5.34':
     resolution: {integrity: sha512-s9cLyK5mLcvZ4Agva5QgRsQyLKvts9WbU9DB6NqiZkkGEdwmcEiylj5Jbwkp680drF/NNCV8OlAJSe+yMLxaJw==}
 
@@ -777,6 +944,9 @@ packages:
   '@vue/devtools-api@6.6.4':
     resolution: {integrity: sha512-sGhTPMuXqZ1rVOk32RylztWkfXTRhuS7vgAKv0zjqk8gbsHkJ7xfFf+jbySxt7tWObEJwyKaHMikV/WGDiQm8g==}
 
+  '@vue/language-core@3.3.13':
+    resolution: {integrity: sha512-axA0Xemn5LuUKuKWob0/kVq7xQ2mJJM6VqA9Exvt35nM9yRC31goWVve/G/Zb2ZCLsXC8FHYjjfXlnshknSCew==}
+
   '@vue/reactivity@3.5.34':
     resolution: {integrity: sha512-y9XDjCEuBp+98k+UL5dbYkh57AHU4o6cxZedOPXw3bmrZZYLQsVHguGurq7hVrPCSrQtrnz1f9dssyFr+dMXfQ==}
 
@@ -990,6 +1160,9 @@ packages:
   ag-psd@30.2.0:
     resolution: {integrity: sha512-tSAWfNzLl5brFqKEer7egxASZ1a0LwHnReM/D5VVpvrgdwdsa8OVfCQpysK7tGaOuE2tPEqp3mAuH7aIvPhcig==}
 
+  alien-signals@3.2.1:
+    resolution: {integrity: sha512-I8FjmltrfnDFoZedi5CG8DghVYNhzb/Ijluz7tCSJH0xpd0484Kowhbb1XDYOxfJpU1p5wnM2X54dA+IfGyD1g==}
+
   animate.css@4.1.1:
     resolution: {integrity: sha512-+mRmCTv6SbCmtYJCN4faJMNFVNN5EuCTTprDTAo7YzIGji2KADmakjVA3+8mVDkZ2Bf09vayB35lSQIex2+QaQ==}
 
@@ -1701,6 +1874,9 @@ packages:
   ms@2.1.3:
     resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==}
 
+  muggle-string@0.4.1:
+    resolution: {integrity: sha512-VNTrAak/KhO2i8dqqnqnAHOa3cYBwXEZe9h+D5h/1ZqFSTEFHdM65lR7RoIqq3tBBYavsOXV84NoHXZ0AkPyqQ==}
+
   namespace-emitter@2.0.1:
     resolution: {integrity: sha512-N/sMKHniSDJBjfrkbS/tpkPj4RAbvW3mr8UAzvlMHyun93XEm83IAvhWtJVHo+RHn/oO8Job5YN4b+wRjSVp5g==}
 
@@ -1751,6 +1927,9 @@ packages:
   parsedbf@2.0.0:
     resolution: {integrity: sha512-WNjKn/cwgGBkXqQLif+2VMEahcRHkBRU0/RfBWZ7Vj7snRNNW63yW1mVuuHRDyXTRxuGCzAHHBcr/Fn+U/bXjQ==}
 
+  path-browserify@1.0.1:
+    resolution: {integrity: sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==}
+
   path-intersection@2.2.1:
     resolution: {integrity: sha512-9u8xvMcSfuOiStv9bPdnRJQhGQXLKurew94n4GPQCdH1nj9QKC9ObbNoIpiRq8skiOBxKkt277PgOoFgAt3/rA==}
 
@@ -2015,6 +2194,11 @@ packages:
   typedarray@0.0.6:
     resolution: {integrity: sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==}
 
+  typescript@7.0.2:
+    resolution: {integrity: sha512-8FYau96o3NKOhbjKi/qNvG/W5jhzxkbdm5sj9AbZ/5T5sWqn3hJgLfGx27sRKZWTvyzCP8dLRBTf5tBTSRVUNA==}
+    engines: {node: '>=16.20.0'}
+    hasBin: true
+
   ufo@1.6.4:
     resolution: {integrity: sha512-JFNbkD1Svwe0KvGi8GOeLcP4kAWQ609twvCdcHxq1oSL8svv39ZuSvajcD8B+5D0eL4+s1Is2D/O6KN3qcTeRA==}
 
@@ -2095,6 +2279,9 @@ packages:
       terser:
         optional: true
 
+  vscode-uri@3.2.0:
+    resolution: {integrity: sha512-m2gXo3bn0G1kT9InzMf07fTbqMbGtyckj3bH5ktLO+1Ssv+yiATZ4dhwaQv9UZWxJh6E9IFGnQyjgWVDWVBDrg==}
+
   vue-component-type-helpers@3.3.6:
     resolution: {integrity: sha512-FkljacAwJ9BUoSUdpFe3VDy0sGigNlTH9+2zcXUWmZOjN8swiCkl3t48wOJun0OsUd2cEIda1l04tsxMiKIIrQ==}
 
@@ -2114,6 +2301,12 @@ packages:
     peerDependencies:
       vue: ^3.5.0
 
+  vue-tsc@3.3.13:
+    resolution: {integrity: sha512-jE4/bXdOMSHVxEGgQCqNllJy+9N3Gx6tfSAsg0yhFK/MAN6eXqISihupnDEKSCt12VVnjN2gI3AqLYcqoh5x/A==}
+    hasBin: true
+    peerDependencies:
+      typescript: '>=5.0.0'
+
   vue3-clipboard@1.0.0:
     resolution: {integrity: sha512-GUqKh1oO79xDpq0z+cCv/NDVTpcJGNDzeNgT3PmTdTp/WJh3gcTrDqIYKycKhzMFOtIFJ7hO/+usgyWtT+fNhA==}
     peerDependencies:
@@ -2215,9 +2408,9 @@ snapshots:
 
   '@ctrl/tinycolor@4.2.0': {}
 
-  '@element-plus/icons-vue@2.3.2(vue@3.5.34)':
+  '@element-plus/icons-vue@2.3.2(vue@3.5.34(typescript@7.0.2))':
     dependencies:
-      vue: 3.5.34
+      vue: 3.5.34(typescript@7.0.2)
 
   '@esbuild/aix-ppc64@0.21.5':
     optional: true
@@ -2458,10 +2651,10 @@ snapshots:
     transitivePeerDependencies:
       - geotiff
 
-  '@open-file-viewer/vue@0.1.27(@open-file-viewer/core@0.1.27(pdfjs-dist@6.1.200))(vue@3.5.34)':
+  '@open-file-viewer/vue@0.1.27(@open-file-viewer/core@0.1.27(pdfjs-dist@6.1.200))(vue@3.5.34(typescript@7.0.2))':
     dependencies:
       '@open-file-viewer/core': 0.1.27(pdfjs-dist@6.1.200)
-      vue: 3.5.34
+      vue: 3.5.34(typescript@7.0.2)
 
   '@parcel/watcher-android-arm64@2.5.6':
     optional: true
@@ -2613,9 +2806,9 @@ snapshots:
       codemirror: 5.65.21
       randomcolor: 0.6.2
 
-  '@saber/nf-form-design-elp@1.6.1(vue@3.5.34)':
+  '@saber/nf-form-design-elp@1.6.1(vue@3.5.34(typescript@7.0.2))':
     dependencies:
-      vuedraggable: 4.1.0(vue@3.5.34)
+      vuedraggable: 4.1.0(vue@3.5.34(typescript@7.0.2))
     transitivePeerDependencies:
       - vue
 
@@ -2627,16 +2820,16 @@ snapshots:
       countup.js: 2.10.0
       signature_pad: 5.1.3
 
-  '@smallwei/avue@3.9.2(@element-plus/icons-vue@2.3.2(vue@3.5.34))(element-plus@2.14.2(vue@3.5.34))(vue@3.5.34)':
+  '@smallwei/avue@3.9.2(patch_hash=5ba15ad41b2c301250bf24adf39da2ed526b8375143da2c5a495361b29e862db)(@element-plus/icons-vue@2.3.2(vue@3.5.34(typescript@7.0.2)))(debug@4.4.3(supports-color@7.2.0))(element-plus@2.14.2(vue@3.5.34(typescript@7.0.2)))(vue@3.5.34(typescript@7.0.2))':
     dependencies:
-      '@element-plus/icons-vue': 2.3.2(vue@3.5.34)
-      axios: 0.21.4
+      '@element-plus/icons-vue': 2.3.2(vue@3.5.34(typescript@7.0.2))
+      axios: 0.21.4(debug@4.4.3(supports-color@7.2.0))
       countup.js: 1.9.3
       dayjs: 1.11.20
-      element-plus: 2.14.2(vue@3.5.34)
+      element-plus: 2.14.2(vue@3.5.34(typescript@7.0.2))
       lodash: 4.18.1
       lodash-es: 4.18.1
-      vue: 3.5.34
+      vue: 3.5.34(typescript@7.0.2)
     transitivePeerDependencies:
       - debug
 
@@ -2663,6 +2856,66 @@ snapshots:
 
   '@types/web-bluetooth@0.0.21': {}
 
+  '@typescript/typescript-aix-ppc64@7.0.2':
+    optional: true
+
+  '@typescript/typescript-darwin-arm64@7.0.2':
+    optional: true
+
+  '@typescript/typescript-darwin-x64@7.0.2':
+    optional: true
+
+  '@typescript/typescript-freebsd-arm64@7.0.2':
+    optional: true
+
+  '@typescript/typescript-freebsd-x64@7.0.2':
+    optional: true
+
+  '@typescript/typescript-linux-arm64@7.0.2':
+    optional: true
+
+  '@typescript/typescript-linux-arm@7.0.2':
+    optional: true
+
+  '@typescript/typescript-linux-loong64@7.0.2':
+    optional: true
+
+  '@typescript/typescript-linux-mips64el@7.0.2':
+    optional: true
+
+  '@typescript/typescript-linux-ppc64@7.0.2':
+    optional: true
+
+  '@typescript/typescript-linux-riscv64@7.0.2':
+    optional: true
+
+  '@typescript/typescript-linux-s390x@7.0.2':
+    optional: true
+
+  '@typescript/typescript-linux-x64@7.0.2':
+    optional: true
+
+  '@typescript/typescript-netbsd-arm64@7.0.2':
+    optional: true
+
+  '@typescript/typescript-netbsd-x64@7.0.2':
+    optional: true
+
+  '@typescript/typescript-openbsd-arm64@7.0.2':
+    optional: true
+
+  '@typescript/typescript-openbsd-x64@7.0.2':
+    optional: true
+
+  '@typescript/typescript-sunos-x64@7.0.2':
+    optional: true
+
+  '@typescript/typescript-win32-arm64@7.0.2':
+    optional: true
+
+  '@typescript/typescript-win32-x64@7.0.2':
+    optional: true
+
   '@uppy/companion-client@2.2.2':
     dependencies:
       '@uppy/utils': 4.1.3
@@ -2692,10 +2945,24 @@ snapshots:
       '@uppy/utils': 4.1.3
       nanoid: 3.3.12
 
-  '@vitejs/plugin-vue@5.2.4(vite@5.4.21(sass@1.99.0)(terser@5.46.2))(vue@3.5.34)':
+  '@vitejs/plugin-vue@5.2.4(vite@5.4.21(sass@1.99.0)(terser@5.46.2))(vue@3.5.34(typescript@7.0.2))':
     dependencies:
       vite: 5.4.21(sass@1.99.0)(terser@5.46.2)
-      vue: 3.5.34
+      vue: 3.5.34(typescript@7.0.2)
+
+  '@volar/language-core@2.4.28':
+    dependencies:
+      '@volar/source-map': 2.4.28
+
+  '@volar/source-map@2.4.28': {}
+
+  '@volar/typescript@2.4.28(typescript@7.0.2)':
+    dependencies:
+      '@volar/language-core': 2.4.28
+      path-browserify: 1.0.1
+      vscode-uri: 3.2.0
+    optionalDependencies:
+      typescript: 7.0.2
 
   '@vue/compiler-core@3.5.34':
     dependencies:
@@ -2729,6 +2996,16 @@ snapshots:
 
   '@vue/devtools-api@6.6.4': {}
 
+  '@vue/language-core@3.3.13':
+    dependencies:
+      '@volar/language-core': 2.4.28
+      '@vue/compiler-dom': 3.5.34
+      '@vue/shared': 3.5.34
+      alien-signals: 3.2.1
+      muggle-string: 0.4.1
+      path-browserify: 1.0.1
+      picomatch: 4.0.4
+
   '@vue/reactivity@3.5.34':
     dependencies:
       '@vue/shared': 3.5.34
@@ -2745,46 +3022,46 @@ snapshots:
       '@vue/shared': 3.5.34
       csstype: 3.2.3
 
-  '@vue/server-renderer@3.5.34(vue@3.5.34)':
+  '@vue/server-renderer@3.5.34(vue@3.5.34(typescript@7.0.2))':
     dependencies:
       '@vue/compiler-ssr': 3.5.34
       '@vue/shared': 3.5.34
-      vue: 3.5.34
+      vue: 3.5.34(typescript@7.0.2)
 
   '@vue/shared@3.5.34': {}
 
-  '@vueuse/core@14.3.0(vue@3.5.34)':
+  '@vueuse/core@14.3.0(vue@3.5.34(typescript@7.0.2))':
     dependencies:
       '@types/web-bluetooth': 0.0.21
       '@vueuse/metadata': 14.3.0
-      '@vueuse/shared': 14.3.0(vue@3.5.34)
-      vue: 3.5.34
+      '@vueuse/shared': 14.3.0(vue@3.5.34(typescript@7.0.2))
+      vue: 3.5.34(typescript@7.0.2)
 
   '@vueuse/metadata@14.3.0': {}
 
-  '@vueuse/shared@14.3.0(vue@3.5.34)':
+  '@vueuse/shared@14.3.0(vue@3.5.34(typescript@7.0.2))':
     dependencies:
-      vue: 3.5.34
+      vue: 3.5.34(typescript@7.0.2)
 
-  '@wangeditor-next/basic-modules@2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@3.0.0)(lodash.throttle@4.1.1)(nanoid@3.3.12)(slate@0.72.8)(snabbdom@3.6.3)':
+  '@wangeditor-next/basic-modules@2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@3.0.0)(lodash.throttle@4.1.1)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)':
     dependencies:
-      '@wangeditor-next/core': 1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.12)(slate@0.72.8)(snabbdom@3.6.3)
+      '@wangeditor-next/core': 1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)
       dom7: 3.0.0
       is-url: 1.2.4
       lodash.throttle: 4.1.1
-      nanoid: 3.3.12
-      slate: 0.72.8
+      nanoid: 5.1.11
+      slate: 0.123.0
       snabbdom: 3.6.3
 
-  '@wangeditor-next/code-highlight@2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(slate@0.123.0)(snabbdom@3.6.3)':
+  '@wangeditor-next/code-highlight@2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(slate@0.123.0)(snabbdom@3.6.3)':
     dependencies:
-      '@wangeditor-next/core': 1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.12)(slate@0.72.8)(snabbdom@3.6.3)
+      '@wangeditor-next/core': 1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)
       dom7: 4.0.6
       prismjs: 1.30.0
       slate: 0.123.0
       snabbdom: 3.6.3
 
-  '@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.12)(slate@0.72.8)(snabbdom@3.6.3)':
+  '@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)':
     dependencies:
       '@types/event-emitter': 0.3.5
       '@uppy/core': 2.3.4
@@ -2800,9 +3077,9 @@ snapshots:
       lodash.foreach: 4.5.0
       lodash.throttle: 4.1.1
       lodash.toarray: 4.4.0
-      nanoid: 3.3.12
+      nanoid: 5.1.11
       scroll-into-view-if-needed: 3.1.0
-      slate: 0.72.8
+      slate: 0.123.0
       slate-history: 0.115.0(slate@0.123.0)
       snabbdom: 3.6.3
 
@@ -2810,13 +3087,13 @@ snapshots:
     dependencies:
       '@uppy/core': 2.3.4
       '@uppy/xhr-upload': 2.1.3(@uppy/core@2.3.4)
-      '@wangeditor-next/basic-modules': 2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@3.0.0)(lodash.throttle@4.1.1)(nanoid@3.3.12)(slate@0.72.8)(snabbdom@3.6.3)
-      '@wangeditor-next/code-highlight': 2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(slate@0.123.0)(snabbdom@3.6.3)
-      '@wangeditor-next/core': 1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.12)(slate@0.72.8)(snabbdom@3.6.3)
-      '@wangeditor-next/list-module': 2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(slate@0.123.0)(snabbdom@3.6.3)
-      '@wangeditor-next/table-module': 2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(lodash.debounce@4.0.8)(lodash.throttle@4.1.1)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)
-      '@wangeditor-next/upload-image-module': 2.0.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(@wangeditor-next/basic-modules@2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(lodash.throttle@4.1.1)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(lodash.foreach@4.5.0)(slate@0.123.0)(snabbdom@3.6.3)
-      '@wangeditor-next/video-module': 2.0.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)
+      '@wangeditor-next/basic-modules': 2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@3.0.0)(lodash.throttle@4.1.1)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)
+      '@wangeditor-next/code-highlight': 2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(slate@0.123.0)(snabbdom@3.6.3)
+      '@wangeditor-next/core': 1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)
+      '@wangeditor-next/list-module': 2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(slate@0.123.0)(snabbdom@3.6.3)
+      '@wangeditor-next/table-module': 2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(lodash.debounce@4.0.8)(lodash.throttle@4.1.1)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)
+      '@wangeditor-next/upload-image-module': 2.0.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(@wangeditor-next/basic-modules@2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@3.0.0)(lodash.throttle@4.1.1)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(lodash.foreach@4.5.0)(slate@0.123.0)(snabbdom@3.6.3)
+      '@wangeditor-next/video-module': 2.0.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)
       dom7: 4.0.6
       is-hotkey: 0.2.0
       lodash.camelcase: 4.3.0
@@ -2829,16 +3106,16 @@ snapshots:
       slate: 0.123.0
       snabbdom: 3.6.3
 
-  '@wangeditor-next/list-module@2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(slate@0.123.0)(snabbdom@3.6.3)':
+  '@wangeditor-next/list-module@2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(slate@0.123.0)(snabbdom@3.6.3)':
     dependencies:
-      '@wangeditor-next/core': 1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.12)(slate@0.72.8)(snabbdom@3.6.3)
+      '@wangeditor-next/core': 1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)
       dom7: 4.0.6
       slate: 0.123.0
       snabbdom: 3.6.3
 
-  '@wangeditor-next/table-module@2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(lodash.debounce@4.0.8)(lodash.throttle@4.1.1)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)':
+  '@wangeditor-next/table-module@2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(lodash.debounce@4.0.8)(lodash.throttle@4.1.1)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)':
     dependencies:
-      '@wangeditor-next/core': 1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.12)(slate@0.72.8)(snabbdom@3.6.3)
+      '@wangeditor-next/core': 1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)
       dom7: 4.0.6
       lodash.debounce: 4.0.8
       lodash.throttle: 4.1.1
@@ -2846,22 +3123,22 @@ snapshots:
       slate: 0.123.0
       snabbdom: 3.6.3
 
-  '@wangeditor-next/upload-image-module@2.0.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(@wangeditor-next/basic-modules@2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(lodash.throttle@4.1.1)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(lodash.foreach@4.5.0)(slate@0.123.0)(snabbdom@3.6.3)':
+  '@wangeditor-next/upload-image-module@2.0.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(@wangeditor-next/basic-modules@2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@3.0.0)(lodash.throttle@4.1.1)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(lodash.foreach@4.5.0)(slate@0.123.0)(snabbdom@3.6.3)':
     dependencies:
       '@uppy/core': 2.3.4
       '@uppy/xhr-upload': 2.1.3(@uppy/core@2.3.4)
-      '@wangeditor-next/basic-modules': 2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@3.0.0)(lodash.throttle@4.1.1)(nanoid@3.3.12)(slate@0.72.8)(snabbdom@3.6.3)
-      '@wangeditor-next/core': 1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.12)(slate@0.72.8)(snabbdom@3.6.3)
+      '@wangeditor-next/basic-modules': 2.0.0(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@3.0.0)(lodash.throttle@4.1.1)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)
+      '@wangeditor-next/core': 1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)
       dom7: 4.0.6
       lodash.foreach: 4.5.0
       slate: 0.123.0
       snabbdom: 3.6.3
 
-  '@wangeditor-next/video-module@2.0.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@4.0.6)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)':
+  '@wangeditor-next/video-module@2.0.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(@wangeditor-next/core@1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3))(dom7@4.0.6)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)':
     dependencies:
       '@uppy/core': 2.3.4
       '@uppy/xhr-upload': 2.1.3(@uppy/core@2.3.4)
-      '@wangeditor-next/core': 1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.12)(slate@0.72.8)(snabbdom@3.6.3)
+      '@wangeditor-next/core': 1.8.0(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@5.1.11)(slate@0.123.0)(snabbdom@3.6.3)
       dom7: 4.0.6
       nanoid: 5.1.11
       slate: 0.123.0
@@ -2908,10 +3185,10 @@ snapshots:
       slate-history: 0.66.0(slate@0.72.8)
       snabbdom: 3.6.3
 
-  '@wangeditor/editor-for-vue@5.1.12(@wangeditor/editor@5.1.23)(vue@3.5.34)':
+  '@wangeditor/editor-for-vue@5.1.12(@wangeditor/editor@5.1.23)(vue@3.5.34(typescript@7.0.2))':
     dependencies:
       '@wangeditor/editor': 5.1.23
-      vue: 3.5.34
+      vue: 3.5.34(typescript@7.0.2)
 
   '@wangeditor/editor@5.1.23':
     dependencies:
@@ -2986,6 +3263,8 @@ snapshots:
       base64-js: 1.5.1
       pako: 2.1.0
 
+  alien-signals@3.2.1: {}
+
   animate.css@4.1.1: {}
 
   ansi-styles@4.3.0:
@@ -3038,22 +3317,22 @@ snapshots:
 
   asynckit@0.4.0: {}
 
-  avue-plugin-ueditor@1.0.4(axios@1.16.0)(vue@3.5.34):
+  avue-plugin-ueditor@1.0.4(axios@1.16.0(debug@4.4.3(supports-color@7.2.0)))(vue@3.5.34(typescript@7.0.2)):
     dependencies:
       '@wangeditor/editor': 5.1.23
-      '@wangeditor/editor-for-vue': 5.1.12(@wangeditor/editor@5.1.23)(vue@3.5.34)
-      axios: 1.16.0
-      vue: 3.5.34
+      '@wangeditor/editor-for-vue': 5.1.12(@wangeditor/editor@5.1.23)(vue@3.5.34(typescript@7.0.2))
+      axios: 1.16.0(debug@4.4.3(supports-color@7.2.0))
+      vue: 3.5.34(typescript@7.0.2)
 
-  axios@0.21.4:
+  axios@0.21.4(debug@4.4.3(supports-color@7.2.0)):
     dependencies:
-      follow-redirects: 1.16.0
+      follow-redirects: 1.16.0(debug@4.4.3(supports-color@7.2.0))
     transitivePeerDependencies:
       - debug
 
-  axios@1.16.0:
+  axios@1.16.0(debug@4.4.3(supports-color@7.2.0)):
     dependencies:
-      follow-redirects: 1.16.0
+      follow-redirects: 1.16.0(debug@4.4.3(supports-color@7.2.0))
       form-data: 4.0.5
       proxy-from-env: 2.1.0
     transitivePeerDependencies:
@@ -3221,9 +3500,11 @@ snapshots:
 
   dayjs@1.11.20: {}
 
-  debug@4.4.3:
+  debug@4.4.3(supports-color@7.2.0):
     dependencies:
       ms: 2.1.3
+    optionalDependencies:
+      supports-color: 7.2.0
 
   delayed-stream@1.0.0: {}
 
@@ -3294,15 +3575,15 @@ snapshots:
       tslib: 2.3.0
       zrender: 6.1.0
 
-  element-plus@2.14.2(vue@3.5.34):
+  element-plus@2.14.2(vue@3.5.34(typescript@7.0.2)):
     dependencies:
       '@ctrl/tinycolor': 4.2.0
-      '@element-plus/icons-vue': 2.3.2(vue@3.5.34)
+      '@element-plus/icons-vue': 2.3.2(vue@3.5.34(typescript@7.0.2))
       '@floating-ui/dom': 1.7.6
       '@popperjs/core': '@sxzz/popperjs-es@2.11.8'
       '@types/lodash': 4.17.24
       '@types/lodash-es': 4.17.12
-      '@vueuse/core': 14.3.0(vue@3.5.34)
+      '@vueuse/core': 14.3.0(vue@3.5.34(typescript@7.0.2))
       async-validator: 4.2.5
       dayjs: 1.11.20
       lodash: 4.18.1
@@ -3310,7 +3591,7 @@ snapshots:
       lodash-unified: 1.0.3(@types/lodash-es@4.17.12)(lodash-es@4.18.1)(lodash@4.18.1)
       memoize-one: 6.0.0
       normalize-wheel-es: 1.2.0
-      vue: 3.5.34
+      vue: 3.5.34(typescript@7.0.2)
       vue-component-type-helpers: 3.3.6
 
   end-of-stream@1.4.5:
@@ -3431,7 +3712,9 @@ snapshots:
     dependencies:
       to-regex-range: 5.0.1
 
-  follow-redirects@1.16.0: {}
+  follow-redirects@1.16.0(debug@4.4.3(supports-color@7.2.0)):
+    optionalDependencies:
+      debug: 4.4.3(supports-color@7.2.0)
 
   form-data@4.0.5:
     dependencies:
@@ -3763,6 +4046,8 @@ snapshots:
 
   ms@2.1.3: {}
 
+  muggle-string@0.4.1: {}
+
   namespace-emitter@2.0.1: {}
 
   nanoid@3.3.12: {}
@@ -3796,6 +4081,8 @@ snapshots:
 
   parsedbf@2.0.0: {}
 
+  path-browserify@1.0.1: {}
+
   path-intersection@2.2.1: {}
 
   path-is-absolute@1.0.1: {}
@@ -4065,6 +4352,29 @@ snapshots:
 
   typedarray@0.0.6: {}
 
+  typescript@7.0.2:
+    optionalDependencies:
+      '@typescript/typescript-aix-ppc64': 7.0.2
+      '@typescript/typescript-darwin-arm64': 7.0.2
+      '@typescript/typescript-darwin-x64': 7.0.2
+      '@typescript/typescript-freebsd-arm64': 7.0.2
+      '@typescript/typescript-freebsd-x64': 7.0.2
+      '@typescript/typescript-linux-arm': 7.0.2
+      '@typescript/typescript-linux-arm64': 7.0.2
+      '@typescript/typescript-linux-loong64': 7.0.2
+      '@typescript/typescript-linux-mips64el': 7.0.2
+      '@typescript/typescript-linux-ppc64': 7.0.2
+      '@typescript/typescript-linux-riscv64': 7.0.2
+      '@typescript/typescript-linux-s390x': 7.0.2
+      '@typescript/typescript-linux-x64': 7.0.2
+      '@typescript/typescript-netbsd-arm64': 7.0.2
+      '@typescript/typescript-netbsd-x64': 7.0.2
+      '@typescript/typescript-openbsd-arm64': 7.0.2
+      '@typescript/typescript-openbsd-x64': 7.0.2
+      '@typescript/typescript-sunos-x64': 7.0.2
+      '@typescript/typescript-win32-arm64': 7.0.2
+      '@typescript/typescript-win32-x64': 7.0.2
+
   ufo@1.6.4: {}
 
   underscore@1.13.8: {}
@@ -4087,7 +4397,7 @@ snapshots:
 
   universalify@2.0.1: {}
 
-  unplugin-auto-import@0.11.5(@vueuse/core@14.3.0(vue@3.5.34))(rollup@4.60.3):
+  unplugin-auto-import@0.11.5(@vueuse/core@14.3.0(vue@3.5.34(typescript@7.0.2)))(rollup@4.60.3):
     dependencies:
       '@antfu/utils': 0.7.10
       '@rollup/pluginutils': 5.3.0(rollup@4.60.3)
@@ -4096,7 +4406,7 @@ snapshots:
       unimport: 1.3.0(rollup@4.60.3)
       unplugin: 1.16.1
     optionalDependencies:
-      '@vueuse/core': 14.3.0(vue@3.5.34)
+      '@vueuse/core': 14.3.0(vue@3.5.34(typescript@7.0.2))
     transitivePeerDependencies:
       - rollup
 
@@ -4126,10 +4436,10 @@ snapshots:
 
   uuid@8.3.2: {}
 
-  vite-plugin-compression@0.5.1(vite@5.4.21(sass@1.99.0)(terser@5.46.2)):
+  vite-plugin-compression@0.5.1(supports-color@7.2.0)(vite@5.4.21(sass@1.99.0)(terser@5.46.2)):
     dependencies:
       chalk: 4.1.2
-      debug: 4.4.3
+      debug: 4.4.3(supports-color@7.2.0)
       fs-extra: 10.1.0
       vite: 5.4.21(sass@1.99.0)(terser@5.46.2)
     transitivePeerDependencies:
@@ -4151,48 +4461,58 @@ snapshots:
       sass: 1.99.0
       terser: 5.46.2
 
+  vscode-uri@3.2.0: {}
+
   vue-component-type-helpers@3.3.6: {}
 
-  vue-i18n@11.4.2(vue@3.5.34):
+  vue-i18n@11.4.2(vue@3.5.34(typescript@7.0.2)):
     dependencies:
       '@intlify/core-base': 11.4.2
       '@intlify/devtools-types': 11.4.2
       '@intlify/shared': 11.4.2
       '@vue/devtools-api': 6.6.4
-      vue: 3.5.34
+      vue: 3.5.34(typescript@7.0.2)
 
-  vue-pdf-embed@2.1.6(vue@3.5.34):
+  vue-pdf-embed@2.1.6(vue@3.5.34(typescript@7.0.2)):
     dependencies:
       pdfjs-dist: 6.2.108
-      vue: 3.5.34
+      vue: 3.5.34(typescript@7.0.2)
 
-  vue-router@4.6.4(vue@3.5.34):
+  vue-router@4.6.4(vue@3.5.34(typescript@7.0.2)):
     dependencies:
       '@vue/devtools-api': 6.6.4
-      vue: 3.5.34
+      vue: 3.5.34(typescript@7.0.2)
 
-  vue3-clipboard@1.0.0(vue@3.5.34):
+  vue-tsc@3.3.13(typescript@7.0.2):
+    dependencies:
+      '@volar/typescript': 2.4.28(typescript@7.0.2)
+      '@vue/language-core': 3.3.13
+      typescript: 7.0.2
+
+  vue3-clipboard@1.0.0(vue@3.5.34(typescript@7.0.2)):
     dependencies:
       clipboard: 2.0.11
-      vue: 3.5.34
+      vue: 3.5.34(typescript@7.0.2)
 
-  vue@3.5.34:
+  vue@3.5.34(typescript@7.0.2):
     dependencies:
       '@vue/compiler-dom': 3.5.34
       '@vue/compiler-sfc': 3.5.34
       '@vue/runtime-dom': 3.5.34
-      '@vue/server-renderer': 3.5.34(vue@3.5.34)
+      '@vue/server-renderer': 3.5.34(vue@3.5.34(typescript@7.0.2))
       '@vue/shared': 3.5.34
+    optionalDependencies:
+      typescript: 7.0.2
 
-  vuedraggable@4.1.0(vue@3.5.34):
+  vuedraggable@4.1.0(vue@3.5.34(typescript@7.0.2)):
     dependencies:
       sortablejs: 1.14.0
-      vue: 3.5.34
+      vue: 3.5.34(typescript@7.0.2)
 
-  vuex@4.1.0(vue@3.5.34):
+  vuex@4.1.0(vue@3.5.34(typescript@7.0.2)):
     dependencies:
       '@vue/devtools-api': 6.6.4
-      vue: 3.5.34
+      vue: 3.5.34(typescript@7.0.2)
 
   webpack-virtual-modules@0.6.2: {}
 
diff --git a/src/api/payment/billLedger.js b/src/api/payment/billLedger.js
index d268f2b..cace3bb 100644
--- a/src/api/payment/billLedger.js
+++ b/src/api/payment/billLedger.js
@@ -6,17 +6,17 @@ export const getList = (current, size, params) =>
   request({ url: `${baseUrl}/list`, method: 'get', params: { current, size, ...params } });
 export const getDetail = id => request({ url: `${baseUrl}/detail`, method: 'get', params: { id } });
 export const getExpiryCounts = () => request({ url: `${baseUrl}/expiry-counts`, method: 'get' });
-export const getAvailableOptions = (keyword, deptId, selectedId) =>
+export const getAvailableOptions = (keyword, deptId, selectedId, payerName, payeeName) =>
   request({
     url: `${baseUrl}/available-options`,
     method: 'get',
-    params: { keyword, deptId, selectedId },
+    params: { keyword, deptId, selectedId, payerName, payeeName },
   });
-export const getAvailablePage = (current, size, keyword, deptId, selectedId) =>
+export const getAvailablePage = (current, size, keyword, deptId, selectedId, payerName, payeeName) =>
   request({
     url: `${baseUrl}/available-page`,
     method: 'get',
-    params: { current, size, keyword, deptId, selectedId },
+    params: { current, size, keyword, deptId, selectedId, payerName, payeeName },
   });
 export const submit = data => request({ url: `${baseUrl}/submit`, method: 'post', data });
 export const remove = id => request({ url: `${baseUrl}/remove`, method: 'post', params: { id } });
diff --git a/src/api/payment/paymentApplication.js b/src/api/payment/paymentApplication.js
index 3e4c802..59c9aa1 100644
--- a/src/api/payment/paymentApplication.js
+++ b/src/api/payment/paymentApplication.js
@@ -10,6 +10,13 @@ export const getReferenceAmount = (paymentType, referenceId, excludeId) =>
     method: 'get',
     params: { paymentType, referenceId, excludeId: excludeId || undefined },
   });
+/** 按合同查询可选项目预付核销列表（审批通过且仍有可核销余额） */
+export const getProjectAdvanceWriteOffOptions = params =>
+  request({
+    url: `${baseUrl}/project-advance-write-off-options`,
+    method: 'get',
+    params,
+  });
 export const save = data => request({ url: `${baseUrl}/save`, method: 'post', data });
 export const remove = id => request({ url: `${baseUrl}/remove`, method: 'post', params: { id } });
 export const submit = data => request({ url: `${baseUrl}/submit`, method: 'post', data });
diff --git a/src/api/settlement/formalSettlement.js b/src/api/settlement/formalSettlement.js
index 92830f8..ea4cb14 100644
--- a/src/api/settlement/formalSettlement.js
+++ b/src/api/settlement/formalSettlement.js
@@ -31,8 +31,15 @@ export const approve = data => request({ url: `${baseUrl}/approve`, method: 'pos
 export const returnBill = data => request({ url: `${baseUrl}/return`, method: 'post', data });
 export const voidBill = data => request({ url: `${baseUrl}/void`, method: 'post', data });
 // 同步金蝶涉及多次金蝶远程接口调用（A102-4 预检 + A102-2 保存），可达 20s+，覆盖全局 10s 超时
-export const syncKingdee = id =>
-  request({ url: `${baseUrl}/sync-kingdee`, method: 'post', timeout: 30000, params: { id } });
+// config.meta.suppressErrorMessage=true 时由页面弹框汇总结果，避免拦截器重复 toast
+export const syncKingdee = (id, config = {}) =>
+  request({
+    url: `${baseUrl}/sync-kingdee`,
+    method: 'post',
+    timeout: 30000,
+    params: { id },
+    ...config,
+  });
 export const getDetailFees = detailId =>
   request({ url: `${baseUrl}/detail-fees`, method: 'get', params: { detailId } });
 export const getReceiptClaims = formalSettlementId =>
diff --git a/src/api/settlement/preSettlement.js b/src/api/settlement/preSettlement.js
index bb61417..e35f2a6 100644
--- a/src/api/settlement/preSettlement.js
+++ b/src/api/settlement/preSettlement.js
@@ -24,6 +24,8 @@ export const getContractList = (current, size, params) =>
 
 export const getFeeOptions = () => request({ url: `${baseUrl}/fee-options`, method: 'get' });
 
+export const getNextNo = () => request({ url: `${baseUrl}/next-no`, method: 'get' });
+
 export const getCandidateDetails = (current, size, params) =>
   request({
     url: `${baseUrl}/candidate-details`,
diff --git a/src/api/settlement/settlementAdjustment.js b/src/api/settlement/settlementAdjustment.js
index d809bf6..4c7b460 100644
--- a/src/api/settlement/settlementAdjustment.js
+++ b/src/api/settlement/settlementAdjustment.js
@@ -17,6 +17,10 @@ export const approve = id => request({ url: `${baseUrl}/approve`, method: 'post'
 export const returnBill = (id, reason) =>
   request({ url: `${baseUrl}/return`, method: 'post', data: { id, reason } });
 export const repush = id => request({ url: `${baseUrl}/repush`, method: 'post', params: { id } });
+export const syncKingdee = id =>
+  request({ url: `${baseUrl}/sync-kingdee`, method: 'post', timeout: 30000, params: { id } });
+export const kingdeeWriteOffPrecheck = formalSettlementId =>
+  request({ url: `${baseUrl}/kingdee-writeoff-precheck`, method: 'get', params: { formalSettlementId } });
 
 export const approvalStatusOptions = [
   { label: '草稿', value: 'draft' },
diff --git a/src/api/settlement/settlementImport.js b/src/api/settlement/settlementImport.js
new file mode 100644
index 0000000..e59c23f
--- /dev/null
+++ b/src/api/settlement/settlementImport.js
@@ -0,0 +1,65 @@
+import request from '@/axios';
+
+const baseUrl = '/blade-transport/settlement-import';
+
+export const getOptions = () => request({ url: `${baseUrl}/options`, method: 'get' });
+
+export const getNextCode = () => request({ url: `${baseUrl}/next-code`, method: 'get' });
+
+export const getList = (current, size, params) =>
+  request({
+    url: `${baseUrl}/list`,
+    method: 'get',
+    params: { current, size, ...params },
+  });
+
+export const getDetail = id =>
+  request({ url: `${baseUrl}/detail`, method: 'get', params: { id } });
+
+export const exportTemplate = () =>
+  request({
+    url: `${baseUrl}/export-template`,
+    method: 'get',
+    responseType: 'blob',
+  });
+
+export const parseFile = file => {
+  const data = new FormData();
+  data.append('file', file);
+  return request({
+    url: `${baseUrl}/parse`,
+    method: 'post',
+    data,
+    timeout: 120000,
+  });
+};
+
+export const validate = data =>
+  request({ url: `${baseUrl}/validate`, method: 'post', data, timeout: 120000 });
+
+export const exportFailures = data =>
+  request({
+    url: `${baseUrl}/export-failures`,
+    method: 'post',
+    data,
+    responseType: 'blob',
+    timeout: 120000,
+  });
+
+export const saveDraft = data =>
+  request({ url: `${baseUrl}/draft`, method: 'post', data, timeout: 120000 });
+
+export const confirm = data =>
+  request({ url: `${baseUrl}/confirm`, method: 'post', data, timeout: 120000 });
+
+export const voidBatch = data => request({ url: `${baseUrl}/void`, method: 'post', data });
+
+export const removeDraft = id =>
+  request({ url: `${baseUrl}/remove`, method: 'post', params: { id } });
+
+export const getHistoryWaybills = params =>
+  request({
+    url: `${baseUrl}/history-waybills`,
+    method: 'get',
+    params,
+  });
diff --git a/src/api/system/dept.js b/src/api/system/dept.js
index 5a489e0..c7f22de 100644
--- a/src/api/system/dept.js
+++ b/src/api/system/dept.js
@@ -77,7 +77,8 @@ export const syncOaDepartment = (
   size = 20,
   signal,
   incremental = false,
-  modifiedSince
+  modifiedSince,
+  companyOaId
 ) => {
   return request({
     url: '/blade-system/dept/sync-oa-department',
@@ -87,6 +88,7 @@ export const syncOaDepartment = (
       size,
       incremental: !!incremental,
       modifiedSince: modifiedSince || undefined,
+      companyOaId: companyOaId || undefined,
     },
     timeout: 60000,
     signal,
diff --git a/src/axios.js b/src/axios.js
index 1d23232..a3de4a3 100644
--- a/src/axios.js
+++ b/src/axios.js
@@ -74,12 +74,15 @@ const redirectToLogin = () => {
  * 统一弹出错误提示并返回带标记的 Error。
  * `_notified` 标记用于让业务层（批量导入等）识别「拦截器已经提示过」，
  * 避免同一条错误被弹两次。
+ * meta.suppressErrorMessage=true 时由业务层自行弹框汇总，拦截器不再 toast。
  */
-const notifiedError = message => {
-  ElMessage({
-    message: message,
-    type: 'error',
-  });
+const notifiedError = (message, config) => {
+  if (config?.meta?.suppressErrorMessage !== true) {
+    ElMessage({
+      message: message,
+      type: 'error',
+    });
+  }
   const error = new Error(message);
   error._notified = true;
   return error;
@@ -260,12 +263,12 @@ axios.interceptors.response.use(
 
     // OAuth2 业务错误码提示
     if (status > 2000 && !validatenull(res.data.error_description)) {
-      return Promise.reject(notifiedError(message));
+      return Promise.reject(notifiedError(message, config));
     }
 
     // 其余非 200 响应统一提示
     if (status !== 200) {
-      return Promise.reject(notifiedError(message));
+      return Promise.reject(notifiedError(message, config));
     }
     return res;
   },
@@ -273,7 +276,11 @@ axios.interceptors.response.use(
     NProgress.done();
     // 网络级失败（HTTP 状态 >500、网关错误、超时、断网等 validateStatus 放行之外的响应）
     // 原为静默 reject，接口报错页面无任何感知；统一补错误提示，取消请求与刷新令牌请求除外
-    if (!axios.isCancel(error) && !isRefreshTokenRequest(error?.config)) {
+    if (
+      !axios.isCancel(error) &&
+      !isRefreshTokenRequest(error?.config) &&
+      error?.config?.meta?.suppressErrorMessage !== true
+    ) {
       ElMessage({
         message: error?.response?.data?.msg || '请求失败，请稍后重试',
         type: 'error',
diff --git a/src/option/business/contract-manage.js b/src/option/business/contract-manage.js
index 4bcfdf2..9efc345 100644
--- a/src/option/business/contract-manage.js
+++ b/src/option/business/contract-manage.js
@@ -254,8 +254,8 @@ export const option = createCrudOption([
     searchOrder: 6,
     searchPlaceholder: '请输入',
     order: 185,
-    disabled: true,
-    placeholder: '不填写，则系统自动生成',
+    maxlength: 100,
+    placeholder: '不填写则按部门规则自动生成',
     minWidth: 200,
   },
   {
diff --git a/src/option/business/project-apply.js b/src/option/business/project-apply.js
index b438ffd..08c0eef 100644
--- a/src/option/business/project-apply.js
+++ b/src/option/business/project-apply.js
@@ -99,7 +99,8 @@ export const config = {
       action: 'startChange',
       label: '变更',
       statusProp: 'approvalStatus',
-      status: ['approved'],
+      // 立项通过、变更通过后均可再次发起变更
+      status: ['approved', 'change_approved'],
       permission: 'project_apply_change',
     },
   ],
diff --git a/src/option/payment/paymentApplication.js b/src/option/payment/paymentApplication.js
index 9f3b688..65494a3 100644
--- a/src/option/payment/paymentApplication.js
+++ b/src/option/payment/paymentApplication.js
@@ -52,7 +52,8 @@ export const paymentApplicationOption = ({
   searchShow: true,
   searchIcon: true,
   searchLabelWidth: 88,
-  searchMenuSpan: 24,
+  // 查询/重置紧跟首行 4 个条件（4×5 + 菜单 4 = 24），不再独占下一整行
+  searchMenuSpan: 4,
   searchIndex: 4,
   searchMenuPosition: 'right',
   border: true,
@@ -78,6 +79,7 @@ export const paymentApplicationOption = ({
       prop: 'paymentNo',
       slot: true,
       search: true,
+      searchSpan: 5,
       searchOrder: 9,
       searchPlaceholder: '请输入',
       minWidth: 150,
@@ -88,6 +90,7 @@ export const paymentApplicationOption = ({
       type: 'daterange',
       searchType: 'daterange',
       search: true,
+      searchSpan: 5,
       searchOrder: 8,
       hide: true,
       showColumn: false,
@@ -95,18 +98,24 @@ export const paymentApplicationOption = ({
       editDisplay: false,
       viewDisplay: false,
     },
-    searchOnlyColumn({
-      label: '客户名称',
-      prop: 'payeeNameSearch',
-      searchOrder: 7,
-      searchProp: 'payeeName',
-    }),
-    searchOnlyColumn({
-      label: '项目名称',
-      prop: 'projectNameSearch',
-      searchOrder: 6,
-      searchProp: 'projectName',
-    }),
+    {
+      ...searchOnlyColumn({
+        label: '客户名称',
+        prop: 'payeeNameSearch',
+        searchOrder: 7,
+        searchProp: 'payeeName',
+      }),
+      searchSpan: 5,
+    },
+    {
+      ...searchOnlyColumn({
+        label: '项目名称',
+        prop: 'projectNameSearch',
+        searchOrder: 6,
+        searchProp: 'projectName',
+      }),
+      searchSpan: 5,
+    },
     searchOnlyColumn({
       label: '关联结算单',
       prop: 'settlementNo',
diff --git a/src/option/settlement/formalSettlement.js b/src/option/settlement/formalSettlement.js
new file mode 100644
index 0000000..e9523be
--- /dev/null
+++ b/src/option/settlement/formalSettlement.js
@@ -0,0 +1,173 @@
+/**
+ * 正式结算单列表（avue-crud）配置
+ * ------------------------------------------------------------------
+ * 列表页与其它模块统一使用 avue-crud，头部 4 个按钮（刷新 / 列显隐 / 搜索显隐 /
+ * 显示方式）由 avue-crud 自带，不做二次封装。
+ *
+ * 表格列复用 formalSettlementTable.js 的 formalSettlementTableColumns（与弹窗内
+ * 明细表共用同一份列定义），此处只补充 avue 需要的展示/搜索属性，避免两处维护。
+ *
+ * ⚠️ searchOrder 为降序排序，值越大越靠前。
+ * ⚠️ 仅用于搜索的列必须 hide + showColumn: false，否则会混进「列显隐」抽屉。
+ * ⚠️ column 数组顺序 = 表格列顺序，搜索专用列统一放在数组最前面。
+ */
+
+import {
+  approvalStatusOptions,
+  invoiceStatusOptions,
+  kingdeeSyncStatusOptions,
+  paymentStatusOptions,
+} from './formalSettlementSearch';
+import { formalSettlementTableColumns } from './formalSettlementTable';
+
+const textFormatter = (row, value) =>
+  value === null || value === undefined || value === '' ? '-' : value;
+
+/** 金额统一展示：两位小数 + 币种 */
+const moneyFormatter = (row, value) =>
+  `${Number(value || 0).toFixed(2)} ${row?.currency || 'RMB'}`;
+
+const pickLabel = (options, value) =>
+  options.find(item => item.value === value)?.label || value || '-';
+
+const searchOnlyColumn = ({ label, prop, searchOrder, type = 'input', dicData }) => {
+  const column = {
+    label,
+    prop,
+    search: true,
+    searchOrder,
+    searchSpan: 5,
+    hide: true,
+    showColumn: false,
+    addDisplay: false,
+    editDisplay: false,
+    viewDisplay: false,
+  };
+  if (type === 'select') {
+    column.type = 'select';
+    column.searchPlaceholder = '请选择';
+    column.dicData = dicData || [];
+  } else if (type === 'daterange') {
+    column.type = 'daterange';
+    column.searchType = 'daterange';
+    column.searchPlaceholder = '请选择';
+  } else {
+    column.searchPlaceholder = '请输入';
+  }
+  return column;
+};
+
+/** 表格列的 avue 增量配置：搜索项、插槽、覆盖宽度等 */
+const COLUMN_EXTRA = {
+  formalSettlementNo: {
+    slot: true,
+    search: true,
+    searchSpan: 5,
+    searchOrder: 12,
+    searchPlaceholder: '请输入',
+  },
+  payerName: { search: true, searchSpan: 5, searchOrder: 7, searchPlaceholder: '请输入' },
+  payeeName: { search: true, searchSpan: 5, searchOrder: 6, searchPlaceholder: '请输入' },
+  projectName: { search: true, searchSpan: 5, searchOrder: 11, searchPlaceholder: '请输入' },
+  deptName: { search: true, searchslot: true, searchSpan: 5, searchOrder: 10 },
+  contractNo: { search: true, searchSpan: 5, searchOrder: 9, searchPlaceholder: '请输入' },
+  invoiceStatusName: { slot: true },
+  paymentStatusName: { slot: true },
+  approvalStatusName: { slot: true },
+  adjustFlag: {
+    formatter: row => row.adjustStatusName || (row.originFormalSettlementNo ? '调整后单' : '-'),
+  },
+  kingdeeSyncStatus: {
+    slot: true,
+    search: true,
+    type: 'select',
+    dicData: kingdeeSyncStatusOptions,
+    searchSpan: 5,
+    searchOrder: 2,
+    searchPlaceholder: '请选择',
+  },
+  kingdeeLockStatus: { slot: true },
+  createTime: { width: 180 },
+};
+
+const buildTableColumns = () =>
+  formalSettlementTableColumns.map(column => {
+    const extra = { ...(COLUMN_EXTRA[column.prop] || {}) };
+    if (column.money) {
+      extra.formatter = moneyFormatter;
+      extra.align = 'right';
+    }
+    // link / status 标记的列统一走单元格插槽
+    if (column.link || column.status) extra.slot = true;
+    if (!extra.formatter) extra.formatter = textFormatter;
+    return { ...column, ...extra };
+  });
+
+export const formalSettlementOption = () => ({
+  height: 'auto',
+  calcHeight: 32,
+  tip: false,
+  searchBtnText: '查询',
+  emptyBtnText: '重置',
+  searchShow: true,
+  searchIcon: true,
+  searchLabelWidth: 88,
+  // 查询/重置紧跟首行 4 个条件（4×5 + 菜单 4 = 24），不再独占下一整行
+  searchMenuSpan: 4,
+  searchIndex: 4,
+  searchMenuPosition: 'right',
+  border: true,
+  index: true,
+  indexLabel: '序号',
+  indexWidth: 64,
+  indexFixed: 'left',
+  selection: true,
+  selectionWidth: 52,
+  selectionFixed: 'left',
+  addBtn: false,
+  viewBtn: false,
+  delBtn: false,
+  editBtn: false,
+  menuWidth: 320,
+  menuFixed: 'right',
+  column: [
+    // ---------- 仅搜索列 ----------
+    searchOnlyColumn({
+      label: '预付结算单号',
+      prop: 'preSettlementNo',
+      searchOrder: 8,
+    }),
+    searchOnlyColumn({
+      label: '发票状态',
+      prop: 'invoiceStatus',
+      searchOrder: 5,
+      type: 'select',
+      dicData: invoiceStatusOptions,
+    }),
+    searchOnlyColumn({
+      label: '收付款状态',
+      prop: 'paymentStatus',
+      searchOrder: 4,
+      type: 'select',
+      dicData: paymentStatusOptions,
+    }),
+    searchOnlyColumn({
+      label: '审核状态',
+      prop: 'approvalStatus',
+      searchOrder: 3,
+      type: 'select',
+      dicData: approvalStatusOptions,
+    }),
+    searchOnlyColumn({
+      label: '生成日期',
+      prop: 'createDateRange',
+      searchOrder: 1,
+      type: 'daterange',
+    }),
+    // ---------- 表格列（部分兼搜索项） ----------
+    ...buildTableColumns(),
+  ],
+});
+
+export const kingdeeSyncName = value => pickLabel(kingdeeSyncStatusOptions, value);
+export const paymentStatusName = value => pickLabel(paymentStatusOptions, value);
diff --git a/src/option/settlement/formalSettlementForm.js b/src/option/settlement/formalSettlementForm.js
index 4b51186..5afba6b 100644
--- a/src/option/settlement/formalSettlementForm.js
+++ b/src/option/settlement/formalSettlementForm.js
@@ -8,6 +8,8 @@ export const formalSettlementFormFields = [
   { label: '收款方', prop: 'payeeName', readonly: true },
   { label: '结算类型', prop: 'settlementTypeName', readonly: true },
   { label: '结算金额', prop: 'settlementAmount', readonly: true, money: true },
+  { label: '业务模式', prop: 'businessModel', type: 'select', optionsKey: 'businessModelOptions' },
+  { label: '运输方式', prop: 'transportType', type: 'select', optionsKey: 'transportTypeOptions' },
   { label: '汇率日期', prop: 'exchangeRateDate', type: 'date', required: true },
   { label: '结算汇率', prop: 'exchangeRate', type: 'number', required: true },
   { label: '本位币合计', prop: 'localSettlementAmount', readonly: true, money: true },
@@ -25,6 +27,8 @@ export const createFormalSettlementForm = () => ({
   settlementType: '',
   sourcePreSettlementIds: [],
   sourceDetailIds: [],
+  businessModel: '',
+  transportType: '',
   exchangeRateDate: '',
   exchangeRate: 1,
   createUserName: '',
diff --git a/src/option/settlement/formalSettlementSearch.js b/src/option/settlement/formalSettlementSearch.js
index abe3520..cd4d811 100644
--- a/src/option/settlement/formalSettlementSearch.js
+++ b/src/option/settlement/formalSettlementSearch.js
@@ -36,7 +36,7 @@ export const kingdeeSyncStatusOptions = [
 
 export const formalSettlementSearchFields = [
   { label: '结算单号', prop: 'formalSettlementNo', type: 'input' },
-  { label: '预结算单号', prop: 'preSettlementNo', type: 'input' },
+  { label: '预付结算单号', prop: 'preSettlementNo', type: 'input' },
   { label: '项目', prop: 'projectName', type: 'input' },
   { label: '所属组织', prop: 'deptName', type: 'cascader' },
   { label: '合同编号', prop: 'contractNo', type: 'input' },
diff --git a/src/option/settlement/formalSettlementTable.js b/src/option/settlement/formalSettlementTable.js
index 83e9f1f..93393b9 100644
--- a/src/option/settlement/formalSettlementTable.js
+++ b/src/option/settlement/formalSettlementTable.js
@@ -8,6 +8,8 @@ export const formalSettlementTableColumns = [
   { label: '合同编号', prop: 'contractNo', minWidth: 150 },
   { label: '合同名称', prop: 'contractName', minWidth: 170 },
   { label: '原币结算金额', prop: 'settlementAmount', minWidth: 145, money: true },
+  { label: '业务模式', prop: 'businessModelName', minWidth: 120 },
+  { label: '运输方式', prop: 'transportTypeName', minWidth: 120 },
   { label: '本位币结算金额', prop: 'localSettlementAmount', minWidth: 155, money: true },
   { label: '结算汇率', prop: 'exchangeRate', minWidth: 110 },
   { label: '申请付款金额（含预付）', prop: 'appliedPaymentAmount', minWidth: 185, money: true },
@@ -19,6 +21,8 @@ export const formalSettlementTableColumns = [
   { label: '审核状态', prop: 'approvalStatusName', minWidth: 110, status: true },
   { label: '当前节点', prop: 'currentNode', minWidth: 130 },
   { label: '当前处理人', prop: 'currentProcessor', minWidth: 130 },
+  { label: '调整标识', prop: 'adjustFlag', minWidth: 110 },
+  { label: '来源原单号', prop: 'originFormalSettlementNo', minWidth: 170 },
   { label: '金蝶单据号', prop: 'kingdeeBillNo', minWidth: 150 },
   { label: '金蝶单据状态', prop: 'kingdeeSyncStatus', minWidth: 135 },
   { label: '金蝶锁状态', prop: 'kingdeeLockStatus', minWidth: 150 },
@@ -28,15 +32,15 @@ export const formalSettlementTableColumns = [
 ];
 
 export const sourceColumns = [
-  { label: '预结算单号', prop: 'preSettlementNo', minWidth: 160 },
+  { label: '预付结算单号', prop: 'preSettlementNo', minWidth: 160 },
   { label: '结算金额', prop: 'settlementAmount', minWidth: 130, money: true },
   { label: '申请预付金额', prop: 'advanceAppliedAmount', minWidth: 140, money: true },
   { label: '已付款金额', prop: 'advancePaidAmount', minWidth: 130, money: true },
 ];
 
 export const detailColumns = [
-  { label: '单据号', prop: 'documentNo', minWidth: 180 },
-  { label: '运单号', prop: 'waybillNo', minWidth: 160 },
+  { label: '单据号', prop: 'documentNo', minWidth: 180, link: true },
+  { label: '运单号', prop: 'waybillNo', minWidth: 160, link: true },
   { label: '车号', prop: 'vehicleNo', minWidth: 130 },
   { label: '发货地址', prop: 'departureAddress', minWidth: 180 },
   { label: '到货地址', prop: 'arrivalAddress', minWidth: 180 },
@@ -48,11 +52,11 @@ export const detailColumns = [
   { label: '运输总量', prop: 'transportQuantity', minWidth: 120 },
   { label: '里程（KM）', prop: 'mileage', minWidth: 120 },
   { label: '批次号', prop: 'batchNo', minWidth: 120 },
+  { label: '计费方式', prop: 'billingType', minWidth: 130 },
   { label: '运输单价', prop: 'unitPrice', minWidth: 120, money: true },
   { label: '运费', prop: 'freightAmount', minWidth: 120, money: true },
   { label: '调整金额', prop: 'adjustAmount', minWidth: 120, money: true },
   { label: '结算金额（含税）', prop: 'settlementAmountTax', minWidth: 155, money: true },
-  { label: '结算金额（不含税）', prop: 'settlementAmountNoTax', minWidth: 170, money: true },
   { label: '备注', prop: 'remark', minWidth: 180 },
 ];
 
@@ -66,7 +70,7 @@ export const summaryColumns = [
 ];
 
 export const candidateColumns = [
-  { label: '预结算单号', prop: 'preSettlementNo', minWidth: 170 },
+  { label: '预付结算单号', prop: 'preSettlementNo', minWidth: 170 },
   { label: '项目名称', prop: 'projectName', minWidth: 140 },
   { label: '所属组织', prop: 'deptName', minWidth: 140 },
   { label: '合同编号', prop: 'contractNo', minWidth: 150 },
@@ -86,7 +90,7 @@ export const candidateDetailColumns = [
   { label: '合同编号', prop: 'contractNo', minWidth: 150 },
   { label: '合同名称', prop: 'contractName', minWidth: 170 },
   { label: '来源', prop: 'sourceType', minWidth: 110 },
-  { label: '预结算单号', prop: 'preSettlementNo', minWidth: 160 },
+  { label: '预付结算单号', prop: 'preSettlementNo', minWidth: 160 },
   { label: '正式结算单号', prop: 'formalSettlementNo', minWidth: 160 },
   { label: '运单号', prop: 'waybillNo', minWidth: 150 },
   { label: '车号', prop: 'vehicleNo', minWidth: 130 },
@@ -94,6 +98,7 @@ export const candidateDetailColumns = [
   { label: '货物名称', prop: 'cargoName', minWidth: 140 },
   { label: '货物类型', prop: 'cargoType', minWidth: 130 },
   { label: '批次号', prop: 'batchNo', minWidth: 120 },
+  { label: '计费方式', prop: 'billingType', minWidth: 130 },
   { label: '应收应付合计', prop: 'totalAmount', minWidth: 140, money: true },
   { label: '状态', prop: 'settlementStatusName', minWidth: 110 },
 ];
diff --git a/src/option/settlement/preSettlementForm.js b/src/option/settlement/preSettlementForm.js
index cace25d..64754ba 100644
--- a/src/option/settlement/preSettlementForm.js
+++ b/src/option/settlement/preSettlementForm.js
@@ -4,7 +4,7 @@ export const settlementTypeOptions = [
 ];
 
 export const preSettlementFormFields = [
-  { label: '预结算单号', prop: 'preSettlementNo', readonly: true },
+  { label: '预付结算单号', prop: 'preSettlementNo', readonly: true },
   { label: '合同名称', prop: 'contractId', type: 'contract', required: true },
   { label: '合同编号', prop: 'contractNo', readonly: true },
   { label: '项目名称', prop: 'projectName', readonly: true },
@@ -12,6 +12,8 @@ export const preSettlementFormFields = [
   { label: '付款方', prop: 'payerName', readonly: true },
   { label: '结算类型', prop: 'settlementType', readonly: true },
   { label: '结算金额', prop: 'settlementAmount', readonly: true, money: true },
+  { label: '业务模式', prop: 'businessModel', type: 'select', optionsKey: 'businessModelOptions' },
+  { label: '运输方式', prop: 'transportType', type: 'select', optionsKey: 'transportTypeOptions' },
   { label: '汇率日期', prop: 'exchangeRateDate', type: 'date' },
   { label: '结算汇率', prop: 'exchangeRate', type: 'number', class: 'exchange-rate-input' },
   { label: '本位币合计', prop: 'localSettlementAmount', readonly: true, money: true },
@@ -64,6 +66,8 @@ export const emptyPreSettlementForm = () => ({
   settlementType: 'payable',
   currency: 'RMB',
   settlementAmount: 0,
+  businessModel: '',
+  transportType: '',
   localCurrency: 'RMB',
   localSettlementAmount: 0,
   exchangeRateDate: '',
diff --git a/src/option/settlement/preSettlementSearch.js b/src/option/settlement/preSettlementSearch.js
index 1165ae9..c270345 100644
--- a/src/option/settlement/preSettlementSearch.js
+++ b/src/option/settlement/preSettlementSearch.js
@@ -7,7 +7,7 @@ export const approvalStatusOptions = [
 ];
 
 export const preSettlementSearchFields = [
-  { label: '预结算单号', prop: 'preSettlementNo', type: 'input' },
+  { label: '预付结算单号', prop: 'preSettlementNo', type: 'input' },
   { label: '预付单号', prop: 'advanceNo', type: 'input' },
   { label: '项目名称', prop: 'projectName', type: 'input' },
   { label: '所属组织', prop: 'deptName', type: 'cascader' },
diff --git a/src/option/settlement/preSettlementTable.js b/src/option/settlement/preSettlementTable.js
index b383b92..b253079 100644
--- a/src/option/settlement/preSettlementTable.js
+++ b/src/option/settlement/preSettlementTable.js
@@ -1,5 +1,5 @@
 export const preSettlementTableColumns = [
-  { label: '预结算单号', prop: 'preSettlementNo', minWidth: 150, link: true, fixed: 'left' },
+  { label: '预付结算单号', prop: 'preSettlementNo', minWidth: 150, link: true, fixed: 'left' },
   { label: '来源', prop: 'sourceType', minWidth: 100 },
   { label: '付款方', prop: 'payerName', minWidth: 160 },
   { label: '收款方', prop: 'payeeName', minWidth: 160 },
@@ -8,6 +8,8 @@ export const preSettlementTableColumns = [
   { label: '合同编号', prop: 'contractNo', minWidth: 140 },
   { label: '合同名称', prop: 'contractName', minWidth: 160 },
   { label: '原币结算金额', prop: 'settlementAmount', minWidth: 140, money: true, precision: 2 },
+  { label: '业务模式', prop: 'businessModelName', minWidth: 120 },
+  { label: '运输方式', prop: 'transportTypeName', minWidth: 120 },
   { label: '本位币结算金额', prop: 'localSettlementAmount', minWidth: 150, money: true, precision: 2 },
   { label: '结算汇率', prop: 'exchangeRate', minWidth: 110, precision: 2 },
   {
@@ -40,7 +42,7 @@ export const settlementSummaryColumns = [
 
 export const settlementDetailColumns = [
   { label: '单据号', prop: 'documentNo', minWidth: 180, link: true },
-  { label: '运单号', prop: 'waybillNo', minWidth: 160 },
+  { label: '运单号', prop: 'waybillNo', minWidth: 160, link: true },
   { label: '车号', prop: 'vehicleNo', minWidth: 130 },
   { label: '发货地址', prop: 'departureAddress', minWidth: 180 },
   { label: '到货地址', prop: 'arrivalAddress', minWidth: 180 },
@@ -52,6 +54,7 @@ export const settlementDetailColumns = [
   { label: '运输总量', prop: 'transportQuantityText', minWidth: 120 },
   { label: '里程（KM）', prop: 'mileage', minWidth: 120 },
   { label: '批次号', prop: 'batchNo', minWidth: 130 },
+  { label: '计费方式', prop: 'billingType', minWidth: 130 },
   { label: '运输单价', prop: 'unitPrice', minWidth: 120, money: true },
   { label: '运费', prop: 'freightAmount', minWidth: 120, money: true },
   { label: '原金额', prop: 'originalAmount', minWidth: 120, money: true },
@@ -94,5 +97,6 @@ export const candidateDetailColumns = [
   { label: '货物名称', prop: 'cargoName', minWidth: 140 },
   { label: '货物类型', prop: 'cargoType', minWidth: 130 },
   { label: '批次号', prop: 'batchNo', minWidth: 120 },
+  { label: '计费方式', prop: 'billingType', minWidth: 130 },
   { label: '结算金额', prop: 'totalAmount', minWidth: 130, money: true },
 ];
diff --git a/src/option/settlement/receivable-payable-detail.js b/src/option/settlement/receivable-payable-detail.js
index 29123d0..bdf976d 100644
--- a/src/option/settlement/receivable-payable-detail.js
+++ b/src/option/settlement/receivable-payable-detail.js
@@ -20,7 +20,7 @@ export const searchFields = [
   { label: '货物名称', prop: 'cargoName', type: 'input' },
   { label: '合同编号', prop: 'contractNo', type: 'input' },
   { label: '合同名称', prop: 'contractName', type: 'input' },
-  { label: '预结算单号', prop: 'preSettlementNo', type: 'input' },
+  { label: '预付结算单号', prop: 'preSettlementNo', type: 'input' },
   { label: '正式结算单号', prop: 'formalSettlementNo', type: 'input' },
   { label: '批次号', prop: 'batchNo', type: 'input' },
   { label: '车号', prop: 'vehicleNo', type: 'input' },
@@ -35,7 +35,7 @@ export const tableColumns = [
   { label: '合同编号', prop: 'contractNo', minWidth: 140 },
   { label: '合同名称', prop: 'contractName', minWidth: 140 },
   { label: '来源', prop: 'sourceType', minWidth: 110 },
-  { label: '预结算单号', prop: 'preSettlementNo', minWidth: 140, link: true },
+  { label: '预付结算单号', prop: 'preSettlementNo', minWidth: 140, link: true },
   { label: '正式结算单号', prop: 'formalSettlementNo', minWidth: 140, link: true },
   { label: '运单号', prop: 'waybillNo', minWidth: 140, link: true },
   { label: '车号', prop: 'vehicleNo', minWidth: 120 },
diff --git a/src/option/settlement/settlementAdjustmentTable.js b/src/option/settlement/settlementAdjustmentTable.js
index aaaa9fc..4919a1a 100644
--- a/src/option/settlement/settlementAdjustmentTable.js
+++ b/src/option/settlement/settlementAdjustmentTable.js
@@ -1,6 +1,6 @@
 export const settlementAdjustmentTableColumns = [
   { label: '单据号', prop: 'adjustmentNo', minWidth: 160, link: true, fixed: 'left' },
-  { label: '结算单号', prop: 'formalSettlementNo', minWidth: 160 },
+  { label: '结算单号', prop: 'formalSettlementNo', minWidth: 160, link: true },
   { label: '结算单类型', prop: 'settlementTypeName', minWidth: 110 },
   { label: '项目名称', prop: 'projectName', minWidth: 140 },
   { label: '所属组织', prop: 'deptName', minWidth: 140 },
@@ -9,6 +9,8 @@ export const settlementAdjustmentTableColumns = [
   { label: '合同名称', prop: 'contractName', minWidth: 170 },
   { label: '调整金额', prop: 'adjustmentAmount', minWidth: 130, money: true },
   { label: '审核状态', prop: 'approvalStatusName', minWidth: 110, status: true },
+  { label: '金蝶单据状态', prop: 'kingdeeSyncStatus', minWidth: 130, kingdee: true },
+  { label: '金蝶单据号', prop: 'kingdeeBillNo', minWidth: 150 },
   { label: '当前节点', prop: 'currentNode', minWidth: 120 },
   { label: '当前处理人', prop: 'currentProcessor', minWidth: 130 },
   { label: '创建人', prop: 'createUserName', minWidth: 110 },
diff --git a/src/option/settlement/settlementImport.js b/src/option/settlement/settlementImport.js
new file mode 100644
index 0000000..49f4dce
--- /dev/null
+++ b/src/option/settlement/settlementImport.js
@@ -0,0 +1,157 @@
+/**
+ * 导入结算单列表（avue-crud）配置
+ * ------------------------------------------------------------------
+ * 列表页与其它模块统一使用 avue-crud，头部 4 个按钮（刷新 / 列显隐 / 搜索显隐 /
+ * 显示方式）由 avue-crud 自带，不做二次封装。
+ *
+ * ⚠️ searchOrder 为降序排序，值越大越靠前。
+ * ⚠️ 仅用于搜索的列必须 hide + showColumn: false，否则会混进「列显隐」抽屉。
+ */
+
+const IMPORT_STATUS_OPTIONS = [
+  { label: '草稿', value: 'draft' },
+  { label: '已完成', value: 'completed' },
+  { label: '已作废', value: 'voided' },
+];
+
+const SETTLEMENT_TYPE_OPTIONS = [
+  { label: '应收', value: 'receivable' },
+  { label: '应付', value: 'payable' },
+];
+
+const textFormatter = (row, value) =>
+  value === null || value === undefined || value === '' ? '-' : value;
+
+const pickLabel = (options, value) =>
+  options.find(item => item.value === value)?.label || value || '-';
+
+const settlementTypeLabel = value => pickLabel(SETTLEMENT_TYPE_OPTIONS, value);
+
+const billTypeLabel = value => (value === 'pre' ? '预结算单' : value ? '正式结算单' : '-');
+
+export const importStatusLabel = value => pickLabel(IMPORT_STATUS_OPTIONS, value);
+
+export const settlementImportOption = () => ({
+  height: 'auto',
+  calcHeight: 32,
+  tip: false,
+  searchBtnText: '查询',
+  emptyBtnText: '重置',
+  searchShow: true,
+  searchIcon: true,
+  searchLabelWidth: 88,
+  // 查询/重置紧跟首行 4 个条件（4×5 + 菜单 4 = 24），不再独占下一整行
+  searchMenuSpan: 4,
+  searchIndex: 4,
+  searchMenuPosition: 'right',
+  border: true,
+  index: true,
+  indexLabel: '序号',
+  indexWidth: 64,
+  indexFixed: 'left',
+  selection: false,
+  addBtn: false,
+  viewBtn: false,
+  delBtn: false,
+  editBtn: false,
+  menuWidth: 220,
+  menuFixed: 'right',
+  column: [
+    // ---------- 搜索项（前 4 项默认展示，其余折叠；searchOrder 越大越靠前） ----------
+    {
+      label: '状态',
+      prop: 'importStatus',
+      type: 'select',
+      search: true,
+      searchSpan: 5,
+      searchOrder: 6,
+      searchPlaceholder: '请选择',
+      dicData: IMPORT_STATUS_OPTIONS,
+      hide: true,
+      showColumn: false,
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+    },
+    {
+      label: '导入类型',
+      prop: 'settlementType',
+      type: 'select',
+      search: true,
+      searchSpan: 5,
+      searchOrder: 5,
+      searchPlaceholder: '请选择',
+      dicData: SETTLEMENT_TYPE_OPTIONS,
+      hide: true,
+      showColumn: false,
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+    },
+    // ---------- 表格列 ----------
+    {
+      label: '导入批次号',
+      prop: 'batchNo',
+      slot: true,
+      search: true,
+      searchSpan: 5,
+      searchOrder: 7,
+      searchPlaceholder: '请选择',
+      minWidth: 160,
+    },
+    { label: '状态', prop: 'importStatusName', slot: true, width: 100, align: 'center' },
+    {
+      label: '导入类型',
+      prop: 'settlementTypeName',
+      minWidth: 100,
+      align: 'center',
+      formatter: (row, value) => value || settlementTypeLabel(row.settlementType),
+    },
+    {
+      label: '结算单',
+      prop: 'settlementBillTypeName',
+      minWidth: 110,
+      align: 'center',
+      formatter: (row, value) => value || billTypeLabel(row.settlementBillType),
+    },
+    {
+      label: '项目',
+      prop: 'projectName',
+      search: true,
+      searchSpan: 5,
+      searchOrder: 4,
+      searchPlaceholder: '请输入',
+      minWidth: 140,
+      formatter: textFormatter,
+    },
+    {
+      label: '客户',
+      prop: 'customerName',
+      search: true,
+      searchSpan: 5,
+      searchOrder: 3,
+      searchPlaceholder: '请输入',
+      minWidth: 140,
+      formatter: textFormatter,
+    },
+    {
+      label: '承运商',
+      prop: 'carrierName',
+      search: true,
+      searchSpan: 5,
+      searchOrder: 2,
+      searchPlaceholder: '请输入',
+      minWidth: 140,
+      formatter: textFormatter,
+    },
+    {
+      label: '明细行数',
+      prop: 'detailCount',
+      width: 100,
+      align: 'center',
+      formatter: row => row.detailCount ?? row.waybillCount ?? 0,
+    },
+    { label: '创建时间', prop: 'createTime', width: 180, align: 'center', formatter: textFormatter },
+    { label: '创建人', prop: 'createUserName', minWidth: 110, formatter: textFormatter },
+  ],
+});
diff --git a/src/option/settlement/transportReconciliationSearch.js b/src/option/settlement/transportReconciliationSearch.js
index 0f1ca83..9852557 100644
--- a/src/option/settlement/transportReconciliationSearch.js
+++ b/src/option/settlement/transportReconciliationSearch.js
@@ -13,7 +13,7 @@ export const reconciliationStatusOptions = [
 
 export const transportReconciliationSearchFields = [
   { prop: 'reconciliationNo', label: '对账单号', type: 'input' },
-  { prop: 'preSettlementNos', label: '预结算单号', type: 'input' },
+  { prop: 'preSettlementNos', label: '预付结算单号', type: 'input' },
   { prop: 'projectName', label: '项目', type: 'input' },
   { prop: 'deptName', label: '所属组织', type: 'cascader' },
   { prop: 'contractNo', label: '合同编号', type: 'input' },
diff --git a/src/option/system/user.js b/src/option/system/user.js
index 93e3152..cd0a0ee 100644
--- a/src/option/system/user.js
+++ b/src/option/system/user.js
@@ -72,6 +72,7 @@ export const userOption = safe => {
       },
       { label: '岗位', prop: 'postName', overHidden: true, display: false },
       { label: '性别', prop: 'sexName', width: 80, display: false },
+      { label: 'OA登录名', prop: 'oaLoginId', minWidth: 140, overHidden: true, display: false },
       { label: 'OA人员id', prop: 'oaPersonId', minWidth: 120, overHidden: true, display: false },
       { label: '备注', prop: 'remark', minWidth: 160, overHidden: true, display: false },
       {
diff --git a/src/router/page/index.js b/src/router/page/index.js
index e2a8ab1..11c3a57 100644
--- a/src/router/page/index.js
+++ b/src/router/page/index.js
@@ -108,7 +108,7 @@ export default [
   },
   {
     path: '/settlement/pre-settlement/public-view',
-    name: '查看预结算信息',
+    name: '查看预付结算单信息',
     component: () => import('@/views/settlement/pre-settlement-public-view.vue'),
     meta: {
       keepAlive: false,
@@ -119,7 +119,7 @@ export default [
   },
   {
     path: '/settlement/formal-settlement/public-view',
-    name: '查看正式结算信息',
+    name: '查看结算单信息',
     component: () => import('@/views/settlement/formal-settlement-public-view.vue'),
     meta: {
       keepAlive: false,
diff --git a/src/router/views/index.js b/src/router/views/index.js
index 11d72aa..6d11ebd 100644
--- a/src/router/views/index.js
+++ b/src/router/views/index.js
@@ -95,7 +95,7 @@ export default [
     children: [
       {
         path: '',
-        name: '新增编辑预结算',
+        name: '新增编辑预付结算单',
         meta: {
           keepAlive: false,
           activeMenu: '/settlement/pre-settlement',
@@ -110,15 +110,31 @@ export default [
     children: [
       {
         path: '',
-        name: '新增编辑正式结算',
+        name: '新增编辑结算单',
         meta: {
           keepAlive: false,
-          activeMenu: '/settlement/formal-settlement',
+          // 付款/收款结算单共用表单页，具体高亮菜单由页面按 settlementType 回写
+          activeMenu: '/settlement/payment-settlement',
         },
         component: loadView(() => import('@/views/settlement/formal-settlement-form.vue')),
       },
     ],
   },
+  {
+    path: '/settlement/settlement-import/form',
+    component: Layout,
+    children: [
+      {
+        path: '',
+        name: '新增导入结算单',
+        meta: {
+          keepAlive: false,
+          activeMenu: '/settlement/settlement-import',
+        },
+        component: loadView(() => import('@/views/settlement/settlement-import-form.vue')),
+      },
+    ],
+  },
   {
     path: '/settlement/transport-reconciliation/form',
     component: Layout,
diff --git a/src/utils/import-excel.js b/src/utils/import-excel.js
index 4d69c81..b6a9093 100644
--- a/src/utils/import-excel.js
+++ b/src/utils/import-excel.js
@@ -7,7 +7,7 @@ import 'nprogress/nprogress.css';
 const excelPattern = /\.(xls|xlsx)$/;
 
 /** 是否为浏览器 Blob（含跨 realm 的 Blob-like） */
-const isBlobLike = value =>
+export const isBlobLike = value =>
   value != null &&
   typeof value === 'object' &&
   typeof value.size === 'number' &&
@@ -15,14 +15,14 @@ const isBlobLike = value =>
   (typeof value.text === 'function' || typeof value.arrayBuffer === 'function');
 
 /** axios 拦截器已把 JSON Blob 解析成的业务对象 */
-const isBusinessJson = value =>
+export const isBusinessJson = value =>
   value != null &&
   typeof value === 'object' &&
   !isBlobLike(value) &&
   !(value instanceof ArrayBuffer) &&
   ('code' in value || 'success' in value || 'msg' in value);
 
-const isExcelResponse = res => {
+export const isExcelResponse = res => {
   // 已是业务 JSON（导入成功/失败提示）时，绝不能当失败明细 Excel 处理
   if (isBusinessJson(res?.data)) {
     return false;
@@ -54,7 +54,7 @@ const isExcelResponse = res => {
  * 提前解析成普通对象；此处需同时兼容 Blob / 字符串 / 已解析对象，避免再调
  * `blob.text()` 时出现「blob.text is not a function」。
  */
-const parseBlobJson = async data => {
+export const parseBlobJson = async data => {
   if (data == null) {
     return {};
   }
diff --git a/src/utils/mk-approval.js b/src/utils/mk-approval.js
index 60ee800..9e224b2 100644
--- a/src/utils/mk-approval.js
+++ b/src/utils/mk-approval.js
@@ -23,7 +23,7 @@ export const MK_BIZ = {
   },
   'pre-settlement': {
     dictName: '提交预结算审核流',
-    subjectPrefix: '预结算审批',
+    subjectPrefix: '预付结算审批',
     rejected: ['returned'],
     approved: ['approved'],
   },
@@ -61,9 +61,18 @@ export const MK_BIZ = {
 
 const MK_SWITCH_NAME = '开启MK';
 
-async function loadMkTemplateList() {
+/** 进程内缓存，避免每次提交都打字典；登录后同一会话开关一般不变 */
+let mkEnabledCache = null;
+let mkEnabledPromise = null;
+let mkTemplateListCache = null;
+
+async function loadMkTemplateList(force = false) {
+  if (!force && mkTemplateListCache) {
+    return mkTemplateListCache;
+  }
   const res = await getDictionary({ code: 'mk_template' });
-  return res?.data?.data || [];
+  mkTemplateListCache = res?.data?.data || [];
+  return mkTemplateListCache;
 }
 
 /** 业务字典 mk_template：名称「开启MK」且键值为 1 时才请求 MK */
@@ -72,10 +81,37 @@ export function isMkEnabled(list = []) {
   return String(matched?.dictKey ?? '').trim() === '1';
 }
 
-/** 加载业务字典并判断是否开启 MK */
-export async function loadMkEnabled() {
-  const list = await loadMkTemplateList();
-  return isMkEnabled(list);
+/** 清除 MK 开关缓存（字典变更后可调用） */
+export function clearMkEnabledCache() {
+  mkEnabledCache = null;
+  mkEnabledPromise = null;
+  mkTemplateListCache = null;
+}
+
+/**
+ * 加载业务字典并判断是否开启 MK
+ * @param {boolean} [force=false] 是否强制刷新缓存
+ */
+export async function loadMkEnabled(force = false) {
+  if (!force && mkEnabledCache !== null) {
+    return mkEnabledCache;
+  }
+  if (!force && mkEnabledPromise) {
+    return mkEnabledPromise;
+  }
+  mkEnabledPromise = loadMkTemplateList(force)
+    .then(list => {
+      mkEnabledCache = isMkEnabled(list);
+      return mkEnabledCache;
+    })
+    .catch(error => {
+      mkEnabledCache = false;
+      throw error;
+    })
+    .finally(() => {
+      mkEnabledPromise = null;
+    });
+  return mkEnabledPromise;
 }
 
 export async function resolveMkTemplateCode(dictName, list) {
@@ -99,19 +135,22 @@ export function isMkApprovedStatus(bizType, approvalStatus) {
 }
 
 /**
- * 提交 MK 审核流
+ * 提交 MK 审核流。未开启 MK 时直接跳过，不请求流程实例相关接口。
  * @param {Object} options
  * @param {string} options.bizType 业务类型
- * @param {string|number} options.bizId 业务主键（后端据此生成/复用 formInstanceId）
+ * @param {string|number} options.bizId 业务主键
  * @param {string} [options.subjectName] 标题后缀
- * @param {string} [options.approvalStatus] 提交前的审批状态（须在业务 submit 改状态前取值；通过态强制新建实例）
+ * @param {string} [options.approvalStatus] 提交前的审批状态
+ * @param {boolean} [options.mkEnabled] 调用方已知开关时传入，false 时立即跳过
+ * @returns {Promise<boolean>} true=已发起/复用 MK 流程，false=未开启或已跳过
  */
 export async function submitMkApprovalFlow({
   bizType,
   bizId,
   subjectName = '',
   approvalStatus = '',
-}) {
+  mkEnabled,
+} = {}) {
   const conf = MK_BIZ[bizType];
   if (!conf) {
     return Promise.reject(new Error(`不支持的MK业务类型：${bizType}`));
@@ -119,17 +158,29 @@ export async function submitMkApprovalFlow({
   if (bizId == null || bizId === '') {
     return Promise.reject(new Error('业务id不能为空'));
   }
+
+  // 调用方显式关闭，或字典未开启：不请求 hasMkProcessInstance / processSubmit 等 MK 接口
+  if (mkEnabled === false) {
+    return false;
+  }
+  const enabled = mkEnabled === true ? true : await loadMkEnabled();
+  if (!enabled) {
+    return false;
+  }
+
   const list = await loadMkTemplateList();
   if (!isMkEnabled(list)) {
-    return;
+    mkEnabledCache = false;
+    return false;
   }
+
   const bizIdText = String(bizId);
   const forceNewFormInstance = isMkApprovedStatus(bizType, approvalStatus);
   // 审核通过后再提交必须新建流程；其余场景已有有效实例则跳过
   if (!forceNewFormInstance) {
     const existsRes = await hasMkProcessInstance({ bizId: bizIdText });
     if (existsRes?.data?.data) {
-      return;
+      return true;
     }
   }
   if ((conf.rejected || []).includes(approvalStatus)) {
@@ -139,11 +190,12 @@ export async function submitMkApprovalFlow({
   const subject = subjectName
     ? `${conf.subjectPrefix}：${subjectName}`
     : `${conf.subjectPrefix}：${bizIdText}`;
-  return processSubmit({
+  await processSubmit({
     templateCode,
     bizId: bizIdText,
     subject,
     bizType,
     forceNewFormInstance,
   });
+  return true;
 }
diff --git a/src/utils/search-range.js b/src/utils/search-range.js
index e5723cd..34865bb 100644
--- a/src/utils/search-range.js
+++ b/src/utils/search-range.js
@@ -1,3 +1,35 @@
+/**
+ * 合并列表搜索条件：新条件覆盖旧条件，本次显式清空的字段从查询中移除。
+ */
+export const applyIncomingSearch = (current = {}, incoming = {}) => {
+  const merged = { ...current, ...incoming };
+  Object.keys(incoming || {}).forEach(key => {
+    const value = incoming[key];
+    if (
+      value === '' ||
+      value === null ||
+      value === undefined ||
+      (Array.isArray(value) && value.length === 0)
+    ) {
+      delete merged[key];
+    }
+  });
+  return merged;
+};
+
+/**
+ * 启停状态下拉「全部」在数字类型下会被转成 0/-1，不能当作查询条件。
+ * 状态 0 表示草稿等有效值的页面不要调用。
+ */
+export const omitInvalidListStatus = (params = {}) => {
+  const values = { ...params };
+  const status = values.status;
+  if (status === 0 || status === '0' || status === -1 || status === '-1') {
+    delete values.status;
+  }
+  return values;
+};
+
 export const normalizeSearchRangeParams = (params = {}, rangeMap = {}) => {
   const values = { ...params };
 
diff --git a/src/utils/settlement-adjust-rule.js b/src/utils/settlement-adjust-rule.js
new file mode 100644
index 0000000..7d58540
--- /dev/null
+++ b/src/utils/settlement-adjust-rule.js
@@ -0,0 +1,47 @@
+export function isFreightFeeName(name) {
+  const text = String(name || '');
+  return text.includes('运费') || text.includes('运输费');
+}
+
+function parseBillingRules(row = {}) {
+  const rule = row.billingRule || {};
+  const nested = Array.isArray(rule.rules) ? rule.rules : [];
+  if (nested.length) return nested;
+  const raw = row.billingRulesJson ?? row.billingRules;
+  if (Array.isArray(raw)) return raw.filter(item => item && typeof item === 'object');
+  if (typeof raw === 'string' && raw.trim()) {
+    try {
+      const parsed = JSON.parse(raw);
+      return Array.isArray(parsed) ? parsed.filter(item => item && typeof item === 'object') : [];
+    } catch (error) {
+      return [];
+    }
+  }
+  return [];
+}
+
+/** 运输单价对应的运费计费类型。 */
+export function freightBillingType(row = {}) {
+  const rule = row.billingRule || {};
+  const rules = parseBillingRules(row);
+  const freightRule = rules.find(
+    item => isFreightFeeName(item?.feeItem) || isFreightFeeName(item?.feeType)
+  );
+  return freightRule?.billingType || row.billingType || rule.billingType || '';
+}
+
+export function isTierUnitPrice(row) {
+  return freightBillingType(row) === '阶梯单价';
+}
+
+export function isIntervalBilling(row) {
+  const type = freightBillingType(row);
+  return type === '区间单价' || (type.includes('区间') && type.includes('一口价'));
+}
+
+/** 阶梯单价、区间单价、区间一口价的运输单价不开放手工调整。 */
+export function isUnitPriceAdjustable(row) {
+  const type = freightBillingType(row);
+  if (!type) return true;
+  return !isTierUnitPrice(row) && !isIntervalBilling(row);
+}
diff --git a/src/utils/settlement-change-record.js b/src/utils/settlement-change-record.js
new file mode 100644
index 0000000..b59b1dc
--- /dev/null
+++ b/src/utils/settlement-change-record.js
@@ -0,0 +1,6 @@
+/** 审批通过、驳回等审批流转类变更内容，不在结算单变更记录中展示。 */
+export function isApprovalSettlementChange(content) {
+  const text = String(content || '').trim();
+  if (!text) return false;
+  return text.includes('审批通过') || text.includes('审批驳回') || text === '已驳回';
+}
diff --git a/src/utils/settlement-detail-link.js b/src/utils/settlement-detail-link.js
new file mode 100644
index 0000000..d218711
--- /dev/null
+++ b/src/utils/settlement-detail-link.js
@@ -0,0 +1,51 @@
+import { getList as getReceivablePayableDetailList } from '@/api/settlement/receivable-payable-detail';
+import { getList as getWaybillList } from '@/api/business/waybill-manage';
+
+// 结算明细的「单据号」是应收应付明细单据号（应收 YS…/应付 YF…），按结算类型落到对应菜单页
+const SETTLEMENT_DETAIL_PATHS = {
+  receivable: '/settlement/receivable-detail',
+  payable: '/settlement/payable-detail',
+};
+
+const unwrapPage = response => {
+  const body = response?.data || response || {};
+  return body?.data || body;
+};
+
+const firstRecordId = data => (Array.isArray(data) ? data : data?.records || [])[0]?.id || '';
+
+export const settlementDetailPath = settlementType =>
+  SETTLEMENT_DETAIL_PATHS[settlementType] || SETTLEMENT_DETAIL_PATHS.payable;
+
+/**
+ * 结算明细行「单据号」对应的应收应付明细ID：已落库的明细自带 sourceDetailId，未落库的行按单据号回查。
+ */
+export const resolveReceivablePayableDetailId = async (row = {}, settlementType) => {
+  if (row.sourceDetailId) return row.sourceDetailId;
+  if (!row.documentNo) return '';
+  try {
+    const data = unwrapPage(
+      await getReceivablePayableDetailList(1, 1, {
+        documentNo: row.documentNo,
+        settlementType,
+      })
+    );
+    return firstRecordId(data);
+  } catch (error) {
+    return '';
+  }
+};
+
+/**
+ * 结算明细行「运单号」对应的运单ID：总单来源的明细没有 waybillId（运单号列存的是总单号），按运单号回查。
+ */
+export const resolveWaybillId = async (row = {}) => {
+  if (row.waybillId) return row.waybillId;
+  if (!row.waybillNo) return '';
+  try {
+    const data = unwrapPage(await getWaybillList(1, 1, { waybillNo: row.waybillNo }));
+    return firstRecordId(data);
+  } catch (error) {
+    return '';
+  }
+};
diff --git a/src/utils/settlement-menu.js b/src/utils/settlement-menu.js
new file mode 100644
index 0000000..86413c0
--- /dev/null
+++ b/src/utils/settlement-menu.js
@@ -0,0 +1,39 @@
+/** 结算菜单拆分后的展示名与权限前缀 */
+
+export const SETTLEMENT_TYPE_PAYABLE = 'payable';
+export const SETTLEMENT_TYPE_RECEIVABLE = 'receivable';
+
+export function settlementBillLabel(settlementType) {
+  return settlementType === SETTLEMENT_TYPE_RECEIVABLE ? '收款结算单' : '付款结算单';
+}
+
+export function settlementPermissionPrefix(settlementType) {
+  return settlementType === SETTLEMENT_TYPE_RECEIVABLE
+    ? 'receipt_settlement'
+    : 'payment_settlement';
+}
+
+export function settlementListPath(settlementType) {
+  return settlementType === SETTLEMENT_TYPE_RECEIVABLE
+    ? '/settlement/receipt-settlement'
+    : '/settlement/payment-settlement';
+}
+
+/**
+ * 权限判断：优先新菜单码，兼容旧 formal_settlement_*。
+ * @param {Object} ctx 组件实例（需含 permission、isAdmin、validData）
+ * @param {string} settlementType payable|receivable
+ * @param {string} action add|edit|view...
+ */
+export function hasSettlementPermission(ctx, settlementType, action) {
+  if (ctx?.isAdmin) return true;
+  const prefix = settlementPermissionPrefix(settlementType);
+  const codes = [`${prefix}_${action}`, `formal_settlement_${action}`];
+  return codes.some(code => {
+    const value = ctx?.permission?.[code];
+    if (typeof ctx?.validData === 'function') {
+      return ctx.validData(value, false);
+    }
+    return value === true;
+  });
+}
diff --git a/src/utils/settlementStatus.js b/src/utils/settlementStatus.js
new file mode 100644
index 0000000..4fdf2ec
--- /dev/null
+++ b/src/utils/settlementStatus.js
@@ -0,0 +1,23 @@
+/**
+ * 结算单预付记录单据状态名（预结算编辑器与正式结算编辑器共用，避免两页状态名不一致）
+ */
+export function settlementStatusName(status, displayValue) {
+  const labels = {
+    reviewing: '审批中',
+    approved: '审批通过',
+    paid: '已付款',
+    returned: '已驳回',
+    voided: '已作废',
+    draft: '草稿',
+  };
+  const name = labels[status];
+  if (name) return name;
+  return typeof displayValue === 'function' ? displayValue(status) : status || '-';
+}
+
+/**
+ * 统一预付付款记录类型名
+ */
+export function settlementRecordTypeName(recordType) {
+  return { progress_advance: '进度预付', project_advance: '项目预付核销' }[recordType] || '';
+}
diff --git a/src/views/base/airport-master.vue b/src/views/base/airport-master.vue
index 3c94260..9969378 100644
--- a/src/views/base/airport-master.vue
+++ b/src/views/base/airport-master.vue
@@ -150,6 +150,7 @@ import { mapGetters } from 'vuex';
 import { downloadXls } from '@/utils/util';
 import { openImportDialog } from '@/utils/import-excel';
 import { formatUpdateUserName } from '@/utils/audit';
+import { omitInvalidListStatus } from '@/utils/search-range';
 import { getToken, isAdministrator } from '@/utils/auth';
 import { getCoordinateValidationMessage, normalizeCoordinateInput } from '@/utils/coordinate';
 import AddressMapPicker from '@/components/address-map-picker/main.vue';
@@ -1182,7 +1183,7 @@ export default {
     },
     onLoad(page, params = {}) {
       this.loading = true;
-      getList(page.currentPage, page.pageSize, { ...params, ...this.query })
+      getList(page.currentPage, page.pageSize, omitInvalidListStatus({ ...params, ...this.query }))
         .then(res => {
           const data = res.data.data;
           this.page.total = data.total;
diff --git a/src/views/base/currency.vue b/src/views/base/currency.vue
index 0ad39fe..903fae0 100644
--- a/src/views/base/currency.vue
+++ b/src/views/base/currency.vue
@@ -104,6 +104,7 @@ import { mapGetters } from 'vuex';
 import { downloadXls } from '@/utils/util';
 import { openImportDialog } from '@/utils/import-excel';
 import { formatUpdateUserName } from '@/utils/audit';
+import { omitInvalidListStatus } from '@/utils/search-range';
 import { getToken } from '@/utils/auth';
 import NProgress from 'nprogress';
 import 'nprogress/nprogress.css';
@@ -507,7 +508,7 @@ export default {
       this.onLoad(this.page, this.query);
     },
     buildQuery(params = {}) {
-      const values = { ...params, ...this.query };
+      const values = omitInvalidListStatus({ ...params, ...this.query });
       const rangeMap = {
         effectiveDateRange: ['effectiveDateStart', 'effectiveDateEnd'],
         expiryDateRange: ['expiryDateStart', 'expiryDateEnd'],
diff --git a/src/views/base/customer-type.vue b/src/views/base/customer-type.vue
index fb68968..6653a85 100644
--- a/src/views/base/customer-type.vue
+++ b/src/views/base/customer-type.vue
@@ -63,6 +63,7 @@
 
 <script>
 import { getList, getDetail, submit, remove, changeStatus } from '@/api/base/customer-type';
+import { omitInvalidListStatus } from '@/utils/search-range';
 import { mapGetters } from 'vuex';
 
 export default {
@@ -290,7 +291,7 @@ export default {
     },
     onLoad(page, params = {}) {
       this.loading = true;
-      getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+      getList(page.currentPage, page.pageSize, omitInvalidListStatus(Object.assign(params, this.query))).then(res => {
         const data = res.data.data;
         this.page.total = data.total;
         this.data = data.records;
diff --git a/src/views/base/fee-item.vue b/src/views/base/fee-item.vue
index 3693a3d..da2f71b 100644
--- a/src/views/base/fee-item.vue
+++ b/src/views/base/fee-item.vue
@@ -97,6 +97,7 @@ import { exportBlob } from '@/api/common';
 import { getDictionaryAll } from '@/api/system/dictbiz';
 import { getDeptTree } from '@/api/system/dept';
 import { downloadXls } from '@/utils/util';
+import { omitInvalidListStatus } from '@/utils/search-range';
 import { getToken } from '@/utils/auth';
 import { Download } from '@element-plus/icons-vue';
 import { mapGetters } from 'vuex';
@@ -569,7 +570,7 @@ export default {
     },
     onLoad(page, params = {}) {
       this.loading = true;
-      getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+      getList(page.currentPage, page.pageSize, omitInvalidListStatus(Object.assign(params, this.query))).then(res => {
         const data = res.data.data;
         this.page.total = data.total;
         this.data = data.records;
diff --git a/src/views/base/measurement-unit.vue b/src/views/base/measurement-unit.vue
index 4034d01..707eb56 100644
--- a/src/views/base/measurement-unit.vue
+++ b/src/views/base/measurement-unit.vue
@@ -82,6 +82,7 @@
 import { mapGetters } from 'vuex';
 import { changeStatus, getDetail, getList, remove, submit } from '@/api/base/measurement-unit';
 import { createOption } from '@/option/base/measurement-unit';
+import { omitInvalidListStatus } from '@/utils/search-range';
 import { isAdministrator } from '@/utils/auth';
 
 export default {
@@ -218,7 +219,7 @@ export default {
     },
     onLoad(page = this.page, params = this.query) {
       this.loading = true;
-      return getList(page.currentPage, page.pageSize, params)
+      return getList(page.currentPage, page.pageSize, omitInvalidListStatus(params))
         .then(res => {
           const pageData = res.data.data || {};
           this.data = pageData.records || [];
diff --git a/src/views/base/port-terminal.vue b/src/views/base/port-terminal.vue
index 5d4e631..4f73bd6 100644
--- a/src/views/base/port-terminal.vue
+++ b/src/views/base/port-terminal.vue
@@ -270,6 +270,7 @@ import { mapGetters } from 'vuex';
 import { downloadXls } from '@/utils/util';
 import { openImportDialog } from '@/utils/import-excel';
 import { formatUpdateUserName } from '@/utils/audit';
+import { omitInvalidListStatus } from '@/utils/search-range';
 import { getToken, isAdministrator } from '@/utils/auth';
 import { getCoordinateValidationMessage, normalizeCoordinateInput } from '@/utils/coordinate';
 import AddressMapPicker from '@/components/address-map-picker/main.vue';
@@ -1636,7 +1637,7 @@ export default {
     },
     onLoad(page, params = {}) {
       this.loading = true;
-      getList(page.currentPage, page.pageSize, { ...params, ...this.query })
+      getList(page.currentPage, page.pageSize, omitInvalidListStatus({ ...params, ...this.query }))
         .then(res => {
           const data = res.data.data;
           this.page.total = data.total;
diff --git a/src/views/base/railway-station.vue b/src/views/base/railway-station.vue
index 4abfe97..8670593 100644
--- a/src/views/base/railway-station.vue
+++ b/src/views/base/railway-station.vue
@@ -150,6 +150,7 @@ import { mapGetters } from 'vuex';
 import { downloadXls } from '@/utils/util';
 import { openImportDialog } from '@/utils/import-excel';
 import { formatUpdateUserName } from '@/utils/audit';
+import { omitInvalidListStatus } from '@/utils/search-range';
 import { getToken, isAdministrator } from '@/utils/auth';
 import { getCoordinateValidationMessage, normalizeCoordinateInput } from '@/utils/coordinate';
 import AddressMapPicker from '@/components/address-map-picker/main.vue';
@@ -1157,7 +1158,7 @@ export default {
     },
     onLoad(page, params = {}) {
       this.loading = true;
-      getList(page.currentPage, page.pageSize, { ...params, ...this.query })
+      getList(page.currentPage, page.pageSize, omitInvalidListStatus({ ...params, ...this.query }))
         .then(res => {
           const data = res.data.data;
           this.page.total = data.total;
diff --git a/src/views/business/common-route.vue b/src/views/business/common-route.vue
index 99095ac..15b8cba 100644
--- a/src/views/business/common-route.vue
+++ b/src/views/business/common-route.vue
@@ -396,8 +396,11 @@ export default {
       return this.selectionList.map(item => item.id).join(',');
     },
   },
-  created() {
-    this.applyDefaultDeptSearch();
+    created() {
+    // 超管默认查全部组织，不预填组织筛选；普通用户预填当前组织。
+    if (!this.isAdmin) {
+      this.applyDefaultDeptSearch();
+    }
     this.initDeptTree();
   },
   methods: {
@@ -455,10 +458,23 @@ export default {
     normalizeListQuery(params = {}) {
       // 搜索条件优先于缓存的 query，避免默认组织 ID 覆盖用户新选择的组织。
       const query = { ...this.query, ...params };
-      const rawDeptId = query.deptId ?? query.searchDeptId;
+      // 本次搜索显式带了组织字段时，以本次为准（含清空）；否则沿用缓存。
+      const hasDeptInParams =
+        Object.prototype.hasOwnProperty.call(params, 'deptId') ||
+        Object.prototype.hasOwnProperty.call(params, 'searchDeptId');
+      const rawDeptId = hasDeptInParams
+        ? params.deptId ?? params.searchDeptId
+        : query.deptId ?? query.searchDeptId;
       delete query.searchDeptId;
       if (rawDeptId !== undefined && rawDeptId !== null && String(rawDeptId).trim() !== '') {
-        query.deptId = String(rawDeptId).split(',')[0].trim();
+        // 级联可能回传路径数组，统一取末级并保持字符串，避免雪花 ID 精度丢失。
+        const deptValue = Array.isArray(rawDeptId) ? rawDeptId.at(-1) : rawDeptId;
+        query.deptId = String(deptValue ?? '')
+          .split(',')[0]
+          .trim();
+        if (!query.deptId) {
+          delete query.deptId;
+        }
       } else {
         delete query.deptId;
       }
@@ -466,6 +482,23 @@ export default {
       return query;
     },
     applyDefaultDeptSearch() {
+      // 超管默认不限组织，避免预填组织后新增落在其他组织时列表看不见。
+      if (this.isAdmin) {
+        const deptColumn = this.findColumn(this.option.column, 'searchDeptId');
+        if (deptColumn) {
+          deptColumn.searchValue = undefined;
+        }
+        const nextQuery = { ...this.query };
+        delete nextQuery.deptId;
+        delete nextQuery.searchDeptId;
+        this.query = nextQuery;
+        this.$nextTick(() => {
+          if (this.$refs.crud?.searchForm) {
+            this.$refs.crud.searchForm.searchDeptId = undefined;
+          }
+        });
+        return;
+      }
       const deptId = this.defaultDeptId();
       const deptColumn = this.findColumn(this.option.column, 'searchDeptId');
       if (!deptId || !deptColumn) return;
@@ -477,6 +510,11 @@ export default {
         }
       });
     },
+    resolveDeptName(deptId) {
+      if (!deptId) return '';
+      const matched = this.deptOptions.find(item => String(item.value) === String(deptId));
+      return matched ? String(matched.label || '').trim() : '';
+    },
     resetAddressQuery() {
       this.addressQuery = {
         addressName: '',
@@ -933,7 +971,8 @@ export default {
       }
       api.submit(submitRow).then(
         () => {
-          this.onLoad(this.page);
+          this.page.currentPage = 1;
+          this.onLoad(this.page, this.query);
           this.$message({ type: 'success', message: '操作成功!' });
           done();
         },
@@ -951,7 +990,7 @@ export default {
       }
       api.submit(submitRow).then(
         () => {
-          this.onLoad(this.page);
+          this.onLoad(this.page, this.query);
           this.$message({ type: 'success', message: '操作成功!' });
           done();
         },
@@ -1006,7 +1045,13 @@ export default {
     beforeOpen(done, type) {
       this.dialogReadonly = type === 'view';
       if (type === 'add') {
-        this.form = {};
+        const form = {};
+        // 超管若当前按某组织筛选，新增默认归属该组织，避免保存后被筛选条件滤掉。
+        if (this.isAdmin && this.query.deptId) {
+          form.deptId = String(this.query.deptId);
+          form.deptName = this.resolveDeptName(form.deptId);
+        }
+        this.form = form;
         done();
         return;
       }
diff --git a/src/views/business/components/business-crud-page.vue b/src/views/business/components/business-crud-page.vue
index 115eb11..eb23da3 100644
--- a/src/views/business/components/business-crud-page.vue
+++ b/src/views/business/components/business-crud-page.vue
@@ -3774,7 +3774,7 @@
               </el-table-column>
               <el-table-column label="剩余数量" min-width="130" align="center">
                 <template #default="{ row }">
-                  {{ formatDispatchQuantity(dispatchItemRemainingQuantity(row)) }}
+                  {{ formatDispatchQuantity(dispatchItemDisplayRemainingQuantity(row)) }}
                 </template>
               </el-table-column>
               <el-table-column min-width="130" align="center">
@@ -4031,7 +4031,7 @@
               </el-input>
               <div class="business-crud-page__dispatch-quantity-hint">
                 剩余数量：{{
-                  formatDispatchQuantity(dispatchItemHintRemainingQuantity(dispatchItemForm))
+                  formatDispatchQuantity(dispatchItemDisplayRemainingQuantity(dispatchItemForm))
                 }}
                 {{ dispatchItemForm.quantityUnit || '吨' }}
               </div>
@@ -5740,6 +5740,8 @@ export default {
       dispatchItemIndex: -1,
       dispatchItemForm: defaultDispatchRow(),
       dispatchItemCargoRows: [],
+      // 本次数量变更版本号：驱动同表其他行「剩余数量」同步重算
+      dispatchCargoQuantityVersion: 0,
       dispatchItemAttachmentRows: [],
       selectedDispatchItemAttachmentRows: [],
       attachmentRows: [],
@@ -5897,7 +5899,7 @@ export default {
         '固定金额（整单一口价）': ['固定一口价'],
         按数量: ['固定单价', '区间单价', '阶梯单价', '区间阶梯一口价'],
       },
-      settlementTypeOptions: ['月结', '日结', '周结', '半月结', '固定天数周期结算'],
+      settlementTypeOptions: ['月结', '日结', '周结', '固定天数周期结算'],
       billCycleTypeOptions: ['固定截单日', '自然月', '自定义多周期'],
       reconciliationModeOptions: ['明细逐行核对', '按账单汇总核对', '跳过自动核对'],
       packageOptions,
@@ -12776,18 +12778,23 @@ export default {
       row.cargoName = '';
       row.specification = '';
       row.model = '';
+      this.dispatchCargoQuantityVersion += 1;
     },
     handleDispatchConfiguredCargoNameChange(row, value) {
       const option = this.getDispatchConfiguredCargoNameOptions(row).find(
         item => String(item.value) === String(value || '')
       );
       row.cargoName = option?.value || '';
-      if (!option) return;
+      if (!option) {
+        this.dispatchCargoQuantityVersion += 1;
+        return;
+      }
       row.cargoType = option.cargoTypeLabel || row.cargoType || '';
       row.cargoTypeCode = option.cargoTypeCode || row.cargoTypeCode || '';
       row.cargoTypePath = option.cargoTypePath || row.cargoTypePath || [];
       row.specification = option.specification || row.specification || '';
       row.model = option.model || row.model || '';
+      this.dispatchCargoQuantityVersion += 1;
     },
     openDispatchItemDialog(index = -1, row = defaultDispatchRow()) {
       const defaultSummaryItem =
@@ -13119,6 +13126,7 @@ export default {
       const parts = text.split('.');
       row.quantity =
         parts.length > 1 ? `${parts[0]}.${parts.slice(1).join('').slice(0, 3)}` : parts[0];
+      this.dispatchCargoQuantityVersion += 1;
     },
     handleDispatchCargoNumberInput(row, prop, value) {
       this.handleTaskFullFreightNumberInput(row, prop, value);
@@ -13138,12 +13146,14 @@ export default {
       const nextRow = this.normalizeTransportCargoRow({ priceUnit: '元/吨' });
       if (index > -1) this.dispatchItemCargoRows.splice(index + 1, 0, nextRow);
       else this.dispatchItemCargoRows.push(nextRow);
+      this.dispatchCargoQuantityVersion += 1;
     },
     removeDispatchCargoRow(index) {
       this.dispatchItemCargoRows.splice(index, 1);
       if (!this.dispatchItemCargoRows.length) {
         this.dispatchItemCargoRows.push(this.normalizeTransportCargoRow());
       }
+      this.dispatchCargoQuantityVersion += 1;
     },
     dispatchCargoFreightAmount(cargo = {}) {
       const quantity = Number(cargo.quantity || 0);
@@ -13217,11 +13227,52 @@ export default {
         }, 0)
       );
     },
-    /** 精简录入提示：可调度余量扣减当前本次数量后的剩余 */
-    dispatchItemHintRemainingQuantity(row = {}) {
+    /**
+     * 当前编辑表单中，与指定行同货物（有身份）或同单位（无身份）已占用的本次数量合计。
+     * 用于剩余数量展示联动，不参与提交校验（校验仍按整单合计对比计划余量）。
+     */
+    getDispatchFormOccupiedQuantity(row = {}) {
+      const goodsRows =
+        this.dispatchItemForm?.taskEntryMode === 'full'
+          ? this.dispatchItemCargoRows || []
+          : [this.dispatchItemForm || row];
+      const hasCargoIdentity = Boolean(
+        String(row.cargoName || row.goodsName || row.name || '').trim() ||
+          String(
+            row.cargoType || row.secondCargoTypeName || row.goodsType || row.type || ''
+          ).trim()
+      );
+      const unit = this.getDispatchQuantityUnit(row);
+      const cargoKey = this.getDispatchCargoIdentity(row);
+      return goodsRows.reduce((sum, goods) => {
+        if (!goods) return sum;
+        if (hasCargoIdentity) {
+          const goodsHasIdentity = Boolean(
+            String(goods.cargoName || goods.goodsName || goods.name || '').trim() ||
+              String(
+                goods.cargoType || goods.secondCargoTypeName || goods.goodsType || goods.type || ''
+              ).trim()
+          );
+          if (!goodsHasIdentity || this.getDispatchCargoIdentity(goods) !== cargoKey) {
+            return sum;
+          }
+        } else if (this.getDispatchQuantityUnit(goods) !== unit) {
+          return sum;
+        }
+        return sum + this.parseDispatchQuantity(goods.quantity);
+      }, 0);
+    },
+    /** 展示用剩余数量：计划可调度余量扣减本单已填本次数量（含当前行） */
+    dispatchItemDisplayRemainingQuantity(row = {}) {
+      // 依赖版本号，确保一行本次数量变化后其他行剩余数量一并刷新
+      void this.dispatchCargoQuantityVersion;
       const available = this.dispatchItemRemainingQuantity(row);
-      const current = this.parseDispatchQuantity(row.quantity);
-      return Math.max(available - current, 0);
+      const occupied = this.getDispatchFormOccupiedQuantity(row);
+      return Math.max(available - occupied, 0);
+    },
+    /** 精简录入提示：与完整录入剩余数量展示规则一致 */
+    dispatchItemHintRemainingQuantity(row = {}) {
+      return this.dispatchItemDisplayRemainingQuantity(row);
     },
     pruneDispatchPendingRows(rows = []) {
       const planQuantities = new Map();
diff --git a/src/views/business/components/shipping-template-page.vue b/src/views/business/components/shipping-template-page.vue
index 21f0015..5b4df82 100644
--- a/src/views/business/components/shipping-template-page.vue
+++ b/src/views/business/components/shipping-template-page.vue
@@ -388,7 +388,7 @@
                           :disabled="dialogReadonly"
                           @visible-change="visible => visible && loadFeeUnitOptions()"
                           ><el-option
-                            v-for="unit in feeUnitOptions"
+                            v-for="unit in feeUnitSelectOptions"
                             :key="unit.value"
                             :label="unit.label"
                             :value="unit.value" /></el-select
@@ -1124,6 +1124,10 @@ import { getDictionary as getSystemDictionary } from '@/api/system/dict';
 import { getDictionary } from '@/api/system/dictbiz';
 import { packageOptions } from '@/option/business/common';
 import { formatContractOptionLabel } from '@/utils/contract';
+import {
+  mapFeeUnitOptions,
+  resolvePriceUnitByQuantityUnit,
+} from '@/utils/currency';
 import { loadMeasurementUnitOptions } from '@/utils/measurement-unit';
 import { normalizeMapSearchResults, searchAmapPlaceText } from '@/utils/map-search';
 import { downloadFileByUrl, downloadXls } from '@/utils/util';
@@ -1264,6 +1268,10 @@ const PageAvueForm = {
   },
 };
 
+const shippingTemplateListRoute = '/business/shipping-template';
+const shippingTemplateFormRoute = '/business/shipping-template/form';
+const shippingTemplateListRefreshKey = 'shipping-template-list-refresh';
+
 export default {
   name: 'ShippingTemplatePage',
   components: { PageAvueForm, ElImageViewer, OpenFileViewer },
@@ -1280,6 +1288,9 @@ export default {
     return {
       Location,
       OfficeBuilding,
+      // 实例所属路由快照，避免 keep-alive 列表实例被全局 $route 误判成表单页。
+      routePathLocked: this.$route.path,
+      isFormPageInstance: this.$route.path === shippingTemplateFormRoute,
       form: {},
       query: {},
       loading: true,
@@ -1401,13 +1412,18 @@ export default {
     isStandaloneBusinessPage() {
       return (
         this.standaloneFormPage &&
-        ['/business/shipping-template', '/business/shipping-template/form'].includes(
-          this.$route.path
-        )
+        (this.isFormPageInstance ||
+          [shippingTemplateListRoute, shippingTemplateFormRoute].includes(this.routePathLocked) ||
+          [shippingTemplateListRoute, shippingTemplateFormRoute].includes(this.$route.path))
       );
     },
     isStandaloneFormPage() {
-      return this.isStandaloneBusinessPage && ['add', 'edit'].includes(this.$route.query.mode);
+      // 用实例锁定标志，避免列表 keep-alive 实例被全局路由误判成表单页。
+      return (
+        this.standaloneFormPage &&
+        this.isFormPageInstance &&
+        ['add', 'edit'].includes(this.$route.query.mode)
+      );
     },
     formPageTitle() {
       return this.isStandaloneFormPage
@@ -1464,6 +1480,12 @@ export default {
       );
       return this.currencyUnit(option?.label || this.shippingTemplateFreight.currency);
     },
+    feeUnitSelectOptions() {
+      return mapFeeUnitOptions(
+        this.feeUnitOptions,
+        this.shippingTemplateFreight.currency || 'RMB'
+      );
+    },
     roadFreightTotal() {
       const total = this.shippingTemplateFreight.freightItems.reduce(
         (sum, item) => sum + Number(this.freightAmount(item) || 0),
@@ -1530,6 +1552,18 @@ export default {
   },
   watch: {
     $route(to, from) {
+      // 列表实例：从其他页进入列表时刷新（activated 负责标签切回）。
+      if (!this.isFormPageInstance) {
+        const enteringList =
+          (to.path === this.routePathLocked || to.path === shippingTemplateListRoute) &&
+          from?.path &&
+          from.path !== to.path;
+        if (enteringList) {
+          sessionStorage.removeItem(shippingTemplateListRefreshKey);
+          this.$nextTick(() => this.onLoad(this.page, this.query));
+        }
+        return;
+      }
       if (
         this.isStandaloneFormPage &&
         (to.query.mode !== from?.query?.mode ||
@@ -1550,6 +1584,10 @@ export default {
       this.handleTransportTypeChange(value);
       this.syncFreightItems();
     },
+    'form.templateType'() {
+      // 切换到运单模板时立即按货物数量单位生成公路运费明细。
+      this.$nextTick(() => this.syncFreightItems());
+    },
   },
   created() {
     this.loadProjectOptions();
@@ -1559,8 +1597,16 @@ export default {
     this.loadCurrencyOptions();
     if (this.isStandaloneFormPage) this.$nextTick(() => this.initStandaloneFormPage());
   },
+  activated() {
+    if (this.isFormPageInstance) return;
+    sessionStorage.removeItem(shippingTemplateListRefreshKey);
+    this.$nextTick(() => this.onLoad(this.page, this.query));
+  },
   methods: {
     formatContractOptionLabel,
+    markShippingTemplateListNeedRefresh() {
+      sessionStorage.setItem(shippingTemplateListRefreshKey, '1');
+    },
     loadQuantityUnitOptions() {
       if (this.quantityUnitLoading) return this.quantityUnitLoadPromise;
       this.quantityUnitLoading = true;
@@ -1591,12 +1637,8 @@ export default {
         });
       }
       if (this.menuWidth != null) next.menuWidth = this.menuWidth;
-      if (
-        this.standaloneFormPage &&
-        ['/business/shipping-template', '/business/shipping-template/form'].includes(
-          this.$route.path
-        )
-      ) {
+      // 仅表单页实例套用全屏表单弹窗样式，避免列表页误用后表格区域异常。
+      if (this.standaloneFormPage && this.$route.path === shippingTemplateFormRoute) {
         next.dialogAppendToBody = false;
         next.dialogModal = false;
         next.dialogCustomClass = 'shipping-template-form-page-dialog';
@@ -1776,13 +1818,22 @@ export default {
       this.onLoad(this.page, this.query);
     },
     onLoad(page, params = {}) {
+      if (this.isFormPageInstance) return;
       this.loading = true;
+      const currentPage = page?.currentPage || this.page.currentPage || 1;
+      const pageSize = page?.pageSize || this.page.pageSize || 10;
       this.api
-        .getList(page.currentPage, page.pageSize, { ...this.query, ...params })
+        .getList(currentPage, pageSize, { ...this.query, ...params })
         .then(res => {
-          const data = res?.data?.data || {};
-          this.data = extractRecords(res);
-          this.page.total = data.total || this.data.length;
+          const data = res?.data?.data || res?.data || {};
+          const records = extractRecords(res);
+          this.data = records;
+          this.page.total = Number(data.total ?? records.length) || 0;
+        })
+        .catch(error => {
+          window.console.error(error);
+          this.data = [];
+          this.page.total = 0;
         })
         .finally(() => {
           this.loading = false;
@@ -1821,9 +1872,10 @@ export default {
         .submit(submit)
         .then(() => {
           this.$message.success('操作成功');
+          this.markShippingTemplateListNeedRefresh();
           done?.();
           this.closeCrudDialog();
-          this.onLoad(this.page, this.query);
+          if (!this.isFormPageInstance) this.onLoad(this.page, this.query);
         })
         .catch(() => loading?.());
     },
@@ -1837,9 +1889,10 @@ export default {
         .submit(submit)
         .then(() => {
           this.$message.success('操作成功');
+          this.markShippingTemplateListNeedRefresh();
           done?.();
           this.closeCrudDialog();
-          this.onLoad(this.page, this.query);
+          if (!this.isFormPageInstance) this.onLoad(this.page, this.query);
         })
         .catch(() => loading?.());
     },
@@ -1883,6 +1936,8 @@ export default {
         this.attachmentRows = [];
         this.shippingTemplateFreight = defaultFreight();
         this.loadCurrencyOptions();
+        this.loadFeeUnitOptions();
+        this.$nextTick(() => this.syncFreightItems());
         if (typeof this.api.nextCode === 'function')
           this.api
             .nextCode()
@@ -2005,20 +2060,47 @@ export default {
         return false;
       }
       if (this.transportMode === 'road') {
-        const invalid = this.shippingTemplateFreight.freightItems.findIndex(
-          item =>
-            Number(item.unitPrice || 0) < 0 ||
-            !item.priceUnit ||
-            (!this.isFreightAutoCalculable(item) &&
-              (item.freightAmount === '' ||
-                item.freightAmount === null ||
-                item.freightAmount === undefined)) ||
-            Number(item.freightAmount || 0) < 0
-        );
-        if (invalid > -1) {
-          this.$message.warning(`第${invalid + 1}条货物的单价、计价单位或运费无效`);
+        if (!this.shippingTemplateFreight.freightItems.length) {
+          this.$message.warning('请先完善货物数量单位，以便生成运费明细');
           return false;
         }
+        for (const [index, item] of this.shippingTemplateFreight.freightItems.entries()) {
+          const label = `第${index + 1}条运费明细`;
+          if (
+            item.unitPrice === '' ||
+            item.unitPrice === null ||
+            item.unitPrice === undefined
+          ) {
+            this.$message.warning(`请填写${label}的单价`);
+            return false;
+          }
+          if (Number(item.unitPrice) < 0) {
+            this.$message.warning(`${label}的单价不能小于0`);
+            return false;
+          }
+          if (!String(item.priceUnit || '').trim()) {
+            this.$message.warning(`请选择${label}的计价单位`);
+            return false;
+          }
+          if (this.isFreightAutoCalculable(item)) {
+            if (!item.freightAmountManual) {
+              item.freightAmount = this.freightAmount(item);
+            }
+          } else if (
+            item.freightAmount === '' ||
+            item.freightAmount === null ||
+            item.freightAmount === undefined
+          ) {
+            this.$message.warning(
+              `${label}的计价单位与货物数量单位不匹配，无法自动计算运费，请手动填写运费`
+            );
+            return false;
+          }
+          if (Number(item.freightAmount || 0) < 0) {
+            this.$message.warning(`${label}的运费不能小于0`);
+            return false;
+          }
+        }
       } else if (Number(this.shippingTemplateFreight.freightAmount || 0) < 0) {
         this.$message.warning('运费不能小于0');
         return false;
@@ -2033,8 +2115,11 @@ export default {
       return true;
     },
     closeCrudDialog() {
-      if (this.isStandaloneBusinessPage) {
-        this.$router.push({ path: '/business/shipping-template', query: {} });
+      if (this.isStandaloneBusinessPage || this.isFormPageInstance) {
+        // 关闭独立表单页时标记列表需刷新（含直接点关闭未保存的场景）
+        this.markShippingTemplateListNeedRefresh();
+        this.$router.$avueRouter?.closeTag?.();
+        this.$router.push({ path: shippingTemplateListRoute, query: {} });
         return;
       }
       this.$refs.crud?.closeDialog?.();
@@ -2294,7 +2379,16 @@ export default {
     },
     loadFeeUnitOptions() {
       getDictionary({ code: 'unit_fee' }).then(res => {
-        this.feeUnitOptions = this.normalizeDictOptions(res?.data?.data || []);
+        // 计价单位必须保存可读文案（如 元/吨），才能与货物数量单位匹配并自动计算运费。
+        this.feeUnitOptions = (res?.data?.data || []).map(item => {
+          const label = String(item.dictValue || item.label || item.value || '').trim();
+          const key = String(item.dictKey || item.value || '').trim();
+          return {
+            label: label || key,
+            value: label.includes('/') ? label : key || label,
+            remark: item.remark || '',
+          };
+        });
       });
     },
     loadCurrencyOptions() {
@@ -3098,24 +3192,53 @@ export default {
         : [];
       const quantityUnits = [];
       this.transportCargoRows.forEach(row => {
-        const quantityUnit = row.quantityUnit || '';
+        const quantityUnit = String(row.quantityUnit || '').trim();
+        if (!quantityUnit) return;
         if (!quantityUnits.some(unit => unit === quantityUnit)) quantityUnits.push(quantityUnit);
       });
+      const currency = this.shippingTemplateFreight.currency || 'RMB';
       this.shippingTemplateFreight.freightItems = quantityUnits.map((quantityUnit, index) => {
         const matched =
           previousItems.find(item => String(item.quantityUnit || '') === String(quantityUnit)) ||
           previousItems[index] ||
           {};
+        const defaultPriceUnit = resolvePriceUnitByQuantityUnit(quantityUnit, currency);
+        const priceUnit = this.normalizeFreightPriceUnit(
+          matched.priceUnit || defaultPriceUnit || '',
+          quantityUnit,
+          currency
+        );
         return {
           quantityUnit,
           unitPrice: matched.unitPrice || '',
-          priceUnit: matched.priceUnit || '',
+          priceUnit,
           freightAmount: matched.freightAmount ?? '',
           freightAmountManual:
             matched.freightAmountManual === true || matched.manualFreightAmount === true,
         };
       });
     },
+    normalizeFreightPriceUnit(priceUnit, quantityUnit, currency = 'RMB') {
+      const text = this.resolvePriceUnitText(priceUnit);
+      if (text && this.priceUnitMatchesQuantity(text, quantityUnit)) return text;
+      return (
+        resolvePriceUnitByQuantityUnit(quantityUnit, currency) ||
+        text ||
+        String(priceUnit || '').trim()
+      );
+    },
+    resolvePriceUnitText(priceUnit) {
+      const raw = String(priceUnit || '').trim();
+      if (!raw) return '';
+      if (raw.includes('/')) return raw;
+      const options = this.feeUnitSelectOptions.length
+        ? this.feeUnitSelectOptions
+        : this.feeUnitOptions;
+      const matched = options.find(
+        item => String(item.value) === raw || String(item.label) === raw
+      );
+      return matched?.label || raw;
+    },
     quantityUnits() {
       return [
         ...new Set(
@@ -3131,7 +3254,7 @@ export default {
           .replace(/\s+/g, '')
           .replace(/立方米|立方公尺|方/g, '立方');
       const unit = normalizeUnit(quantityUnit).replace(/[·*.]/g, '');
-      const value = String(priceUnit || '')
+      const value = String(this.resolvePriceUnitText(priceUnit) || '')
         .trim()
         .toLowerCase()
         .replace(/\s+/g, '');
@@ -3163,6 +3286,10 @@ export default {
         return this.formatFreightNumber(item.freightAmount);
       }
       if (!this.isFreightAutoCalculable(item)) {
+        // 无法自动计算且未手工填写时返回空，避免把空值显示成 0 造成“已填写”的错觉。
+        if (item.freightAmount === '' || item.freightAmount === null || item.freightAmount === undefined) {
+          return '';
+        }
         return this.formatFreightNumber(item.freightAmount);
       }
       return this.formatFreightNumber(
diff --git a/src/views/business/components/transport-plan-page.vue b/src/views/business/components/transport-plan-page.vue
index 4d12b86..1eccc90 100644
--- a/src/views/business/components/transport-plan-page.vue
+++ b/src/views/business/components/transport-plan-page.vue
@@ -1677,7 +1677,7 @@
                   {{
                     isDispatchPlanQuantityUnlimited(row)
                       ? '-'
-                      : formatDispatchQuantity(dispatchItemRemainingQuantity(row))
+                      : formatDispatchQuantity(dispatchItemDisplayRemainingQuantity(row))
                   }}
                 </template>
               </el-table-column>
@@ -1861,7 +1861,7 @@
                 />
               </el-select>
             </el-form-item>
-            <el-form-item label="司机" :required="dispatchItemForm.carrierType !== '承运商'">
+            <el-form-item label="司机" required>
               <el-autocomplete
                 v-model="dispatchItemForm.driverName"
                 placeholder="请输入"
@@ -1874,7 +1874,7 @@
             </el-form-item>
             <el-form-item
               :label="dispatchItemForm.carrierType === '承运商' ? '手机号' : '司机手机号'"
-              :required="dispatchItemForm.carrierType !== '承运商'"
+              required
             >
               <el-input v-model="dispatchItemForm.driverPhone" placeholder="请输入" />
             </el-form-item>
@@ -1955,7 +1955,7 @@
                 class="transport-plan-page__dispatch-quantity-hint"
               >
                 剩余数量：{{
-                  formatDispatchQuantity(dispatchItemHintRemainingQuantity(dispatchItemForm))
+                  formatDispatchQuantity(dispatchItemDisplayRemainingQuantity(dispatchItemForm))
                 }}
                 {{ dispatchItemForm.quantityUnit || '吨' }}
               </div>
@@ -2096,11 +2096,7 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item
-            v-if="dispatchIsRoadTransport"
-            label="司机"
-            :required="dispatchItemForm.carrierType === '自运'"
-          >
+          <el-form-item v-if="dispatchIsRoadTransport" label="司机" required>
             <el-autocomplete
               v-model="dispatchItemForm.driverName"
               placeholder="请输入"
@@ -2111,11 +2107,7 @@
               @select="item => handleTaskDriverSelect('dispatch', item)"
             />
           </el-form-item>
-          <el-form-item
-            v-if="dispatchIsRoadTransport"
-            label="手机号"
-            :required="dispatchItemForm.carrierType === '自运'"
-          >
+          <el-form-item v-if="dispatchIsRoadTransport" label="手机号" required>
             <el-input v-model="dispatchItemForm.driverPhone" placeholder="请输入" />
           </el-form-item>
           <el-form-item
@@ -2807,8 +2799,11 @@ import 'nprogress/nprogress.css';
 const AMAP_KEY = '653b7cf105ad7fb8ec9b2f5198ade315';
 const AMAP_SECURITY_CODE = '5aab65c632e48ebae0d0e28f5b28e21a';
 let amapLoader;
+const transportPlanListRoute = '/business/transport-plan';
+const transportPlanFormRoute = '/business/transport-plan/form';
+const transportPlanListRefreshKey = 'transport-plan-list-refresh';
 const standaloneTransportPlanFormRoutes = {
-  '/business/transport-plan': '/business/transport-plan/form',
+  [transportPlanListRoute]: transportPlanFormRoute,
 };
 const standaloneTransportPlanFormPaths = [
   ...Object.keys(standaloneTransportPlanFormRoutes),
@@ -3072,6 +3067,10 @@ export default {
       // 必须放 data：Options API 的顺序是 data → computed → watch(immediate) → created，
       // 放 created 的话首个 immediate watcher 会读到空值，把首次加载也挡掉。
       routePathLocked: this.$route.path,
+      // 表单页实例在创建时锁定，避免 keep-alive 列表实例随全局 $route 误切到表单态。
+      isFormPageInstance: Object.values(standaloneTransportPlanFormRoutes).includes(
+        this.$route.path
+      ),
       form: {},
       suppressTransportTypeClear: false,
       query: {},
@@ -3112,10 +3111,11 @@ export default {
       option: (() => {
         const opt = this.cloneOption(this.crudOption, estimateMenuButtonCount(this.config));
         if (this.menuWidth != null) opt.menuWidth = this.menuWidth;
-        if (
-          this.standaloneFormPage &&
-          standaloneTransportPlanFormPaths.includes(this.$route.path)
-        ) {
+        // 仅表单页实例套用全屏表单弹窗样式，避免列表页误用后表格区域异常。
+        const isFormInstance = Object.values(standaloneTransportPlanFormRoutes).includes(
+          this.$route.path
+        );
+        if (this.standaloneFormPage && isFormInstance) {
           opt.dialogAppendToBody = false;
           opt.dialogModal = false;
           opt.dialogCustomClass = 'transport-plan-form-page-dialog';
@@ -3150,6 +3150,8 @@ export default {
       dispatchItemIndex: -1,
       dispatchItemForm: defaultDispatchRow(),
       dispatchItemCargoRows: [],
+      // 本次数量变更版本号：驱动同表其他行「剩余数量」同步重算
+      dispatchCargoQuantityVersion: 0,
       dispatchItemAttachmentRows: [],
       selectedDispatchItemAttachmentRows: [],
       attachmentRows: [],
@@ -3289,6 +3291,12 @@ export default {
     }
     this.loadTaskQuantityUnitOptions();
   },
+  // keep-alive 重新激活列表时强制刷新，避免缓存脏数据；标记位用于兼容旧跳转逻辑。
+  activated() {
+    if (this.isFormPageInstance) return;
+    sessionStorage.removeItem(transportPlanListRefreshKey);
+    this.$nextTick(() => this.onLoad(this.page, this.query));
+  },
   computed: {
     ...mapGetters(['permission', 'userInfo']),
     permissionList() {
@@ -3300,10 +3308,20 @@ export default {
       return this.config.detailSections || [];
     },
     isStandaloneBusinessPage() {
-      return this.standaloneFormPage && standaloneTransportPlanFormPaths.includes(this.$route.path);
+      return (
+        this.standaloneFormPage &&
+        (this.isFormPageInstance ||
+          standaloneTransportPlanFormPaths.includes(this.routePathLocked) ||
+          standaloneTransportPlanFormPaths.includes(this.$route.path))
+      );
     },
     isStandaloneFormPage() {
-      return this.isStandaloneBusinessPage && ['add', 'edit'].includes(this.$route.query.mode);
+      // 用实例锁定标志，避免列表 keep-alive 实例被全局路由误判成表单页。
+      return (
+        this.standaloneFormPage &&
+        this.isFormPageInstance &&
+        ['add', 'edit'].includes(this.$route.query.mode)
+      );
     },
     formPageTitle() {
       if (this.isStandaloneFormPage) {
@@ -3752,6 +3770,18 @@ export default {
   },
   watch: {
     $route(to, from) {
+      // 列表实例：从其他页进入列表时刷新（activated 负责标签切回）。
+      if (!this.isFormPageInstance) {
+        const enteringList =
+          (to.path === this.routePathLocked || to.path === transportPlanListRoute) &&
+          from?.path &&
+          from.path !== to.path;
+        if (enteringList) {
+          sessionStorage.removeItem(transportPlanListRefreshKey);
+          this.$nextTick(() => this.onLoad(this.page, this.query));
+        }
+        return;
+      }
       if (!this.isStandaloneFormPage) return;
       if (
         to.query.mode !== from?.query?.mode ||
@@ -4484,6 +4514,9 @@ export default {
         loading();
       }
     },
+    markTransportPlanListNeedRefresh() {
+      sessionStorage.setItem(transportPlanListRefreshKey, '1');
+    },
     rowSave(row, done, loading) {
       const submitRow = this.normalizeRow(row);
       if (!submitRow) {
@@ -4492,6 +4525,7 @@ export default {
       }
       this.getSaveRequest()(submitRow).then(
         () => {
+          this.markTransportPlanListNeedRefresh();
           this.onLoad(this.page);
           this.$message({ type: 'success', message: '操作成功!' });
           done();
@@ -4511,6 +4545,7 @@ export default {
       }
       this.getSaveRequest()(submitRow).then(
         () => {
+          this.markTransportPlanListNeedRefresh();
           this.onLoad(this.page);
           this.$message({ type: 'success', message: '操作成功!' });
           done();
@@ -4540,7 +4575,7 @@ export default {
         .submit(submitRow)
         .then(() => {
           this.$message.success(action === 'draft' ? '暂存成功' : '创建成功');
-          this.onLoad(this.page, this.query);
+          this.markTransportPlanListNeedRefresh();
           this.closeCrudDialog();
         })
         .finally(() => {
@@ -4548,12 +4583,14 @@ export default {
         });
     },
     closeCrudDialog() {
-      if (this.isStandaloneBusinessPage) {
+      if (this.isStandaloneBusinessPage || this.isFormPageInstance) {
+        // 关闭独立表单页时标记列表需刷新（含直接点关闭未保存的场景）
+        this.markTransportPlanListNeedRefresh();
         this.$router.$avueRouter?.closeTag?.();
         const listPath =
           Object.entries(standaloneTransportPlanFormRoutes).find(
-            ([, formPath]) => formPath === this.$route.path
-          )?.[0] || this.$route.path;
+            ([, formPath]) => formPath === this.$route.path || formPath === this.routePathLocked
+          )?.[0] || transportPlanListRoute;
         this.$router.push({ path: listPath, query: {} });
         return;
       }
@@ -6634,20 +6671,33 @@ export default {
       return query;
     },
     onLoad(page, params = {}) {
+      if (this.isFormPageInstance) return;
       this.loading = true;
+      const currentPage = page?.currentPage || this.page.currentPage || 1;
+      const pageSize = page?.pageSize || this.page.pageSize || 10;
       const query = this.normalizeQueryParams({
         ...params,
         ...this.query,
         allDept: 0,
       });
       this.api
-        .getList(page.currentPage, page.pageSize, query)
+        .getList(currentPage, pageSize, query)
         .then(res => {
-          const result = res.data.data;
-          this.page.total = result.total;
-          this.data = result.records;
+          const result = res?.data?.data || res?.data || {};
+          const records = Array.isArray(result.records)
+            ? result.records
+            : Array.isArray(result)
+              ? result
+              : [];
+          this.page.total = Number(result.total ?? records.length) || 0;
+          this.data = records;
           this.selectionClear();
         })
+        .catch(error => {
+          window.console.error(error);
+          this.data = [];
+          this.page.total = 0;
+        })
         .finally(() => {
           this.loading = false;
         });
@@ -7652,6 +7702,7 @@ export default {
       row.cargoName = '';
       row.specification = '';
       row.model = '';
+      this.dispatchCargoQuantityVersion += 1;
     },
     handleDispatchConfiguredCargoNameChange(row, value) {
       const nextValue = String(value ?? row.cargoName ?? '').trim();
@@ -7660,6 +7711,7 @@ export default {
       );
       if (!option) {
         row.cargoName = nextValue;
+        this.dispatchCargoQuantityVersion += 1;
         return;
       }
       const previousType = String(row.cargoType || '').trim();
@@ -7674,6 +7726,7 @@ export default {
       }
       row.specification = option.specification || row.specification || '';
       row.model = option.model || row.model || '';
+      this.dispatchCargoQuantityVersion += 1;
     },
     openDispatchItemDialog(index = -1, row = defaultDispatchRow()) {
       const defaultSummaryItem =
@@ -8002,6 +8055,7 @@ export default {
       const parts = text.split('.');
       row.quantity =
         parts.length > 1 ? `${parts[0]}.${parts.slice(1).join('').slice(0, 3)}` : parts[0];
+      this.dispatchCargoQuantityVersion += 1;
     },
     handleDispatchCargoNumberInput(row, prop, value) {
       this.handleFreightNumberInput(row, prop, value);
@@ -8021,12 +8075,14 @@ export default {
       const nextRow = this.normalizeTransportCargoRow({ priceUnit: this.defaultPriceUnit });
       if (index > -1) this.dispatchItemCargoRows.splice(index + 1, 0, nextRow);
       else this.dispatchItemCargoRows.push(nextRow);
+      this.dispatchCargoQuantityVersion += 1;
     },
     removeDispatchCargoRow(index) {
       this.dispatchItemCargoRows.splice(index, 1);
       if (!this.dispatchItemCargoRows.length) {
         this.dispatchItemCargoRows.push(this.normalizeTransportCargoRow());
       }
+      this.dispatchCargoQuantityVersion += 1;
     },
     dispatchCargoFreightAmount(cargo = {}) {
       if (cargo.freightAmount !== undefined && cargo.freightAmount !== null) {
@@ -8176,11 +8232,50 @@ export default {
         }, 0)
       );
     },
-    /** 精简录入提示：可调度余量扣减当前本次数量后的剩余 */
-    dispatchItemHintRemainingQuantity(row = {}) {
+    /**
+     * 当前编辑表单中，与指定行同货物（有身份）或同单位（无身份）已占用的本次数量合计。
+     * 用于剩余数量展示联动，不参与提交校验（校验仍按整单合计对比计划余量）。
+     */
+    getDispatchFormOccupiedQuantity(row = {}) {
+      const goodsRows =
+        this.dispatchItemForm?.taskEntryMode === 'full'
+          ? this.dispatchItemCargoRows || []
+          : [this.dispatchItemForm || row];
+      const hasCargoIdentity = Boolean(
+        String(row.cargoName || row.goodsName || row.name || '').trim() ||
+          String(row.cargoType || row.secondCargoTypeName || row.goodsType || row.type || '').trim()
+      );
+      const unit = this.getDispatchQuantityUnit(row);
+      const cargoKey = this.getDispatchCargoIdentity(row);
+      return goodsRows.reduce((sum, goods) => {
+        if (!goods) return sum;
+        if (hasCargoIdentity) {
+          const goodsHasIdentity = Boolean(
+            String(goods.cargoName || goods.goodsName || goods.name || '').trim() ||
+              String(
+                goods.cargoType || goods.secondCargoTypeName || goods.goodsType || goods.type || ''
+              ).trim()
+          );
+          if (!goodsHasIdentity || this.getDispatchCargoIdentity(goods) !== cargoKey) {
+            return sum;
+          }
+        } else if (this.getDispatchQuantityUnit(goods) !== unit) {
+          return sum;
+        }
+        return sum + this.parseDispatchQuantity(goods.quantity);
+      }, 0);
+    },
+    /** 展示用剩余数量：计划可调度余量扣减本单已填本次数量（含当前行） */
+    dispatchItemDisplayRemainingQuantity(row = {}) {
+      // 依赖版本号，确保一行本次数量变化后其他行剩余数量一并刷新
+      void this.dispatchCargoQuantityVersion;
       const available = this.dispatchItemRemainingQuantity(row);
-      const current = this.parseDispatchQuantity(row.quantity);
-      return Math.max(available - current, 0);
+      const occupied = this.getDispatchFormOccupiedQuantity(row);
+      return Math.max(available - occupied, 0);
+    },
+    /** 精简录入提示：与完整录入剩余数量展示规则一致 */
+    dispatchItemHintRemainingQuantity(row = {}) {
+      return this.dispatchItemDisplayRemainingQuantity(row);
     },
     pruneDispatchPendingRows(rows = []) {
       const planQuantities = new Map();
@@ -8278,13 +8373,17 @@ export default {
       const fullEntry = row.taskEntryMode === 'full';
       const roadTransport = this.resolveTransportMode(row.transportType) === 'road';
       if (fullEntry) {
-        if (roadTransport && row.carrierType === '自运') {
+        // 公路运输时司机/手机号一律必填（含承运类型为承运商）
+        if (roadTransport && row.carrierType) {
           requiredFields.push(['driverName', '司机']);
           requiredFields.push(['driverPhone', '手机号']);
         }
-      } else if (row.carrierType && row.carrierType !== '承运商') {
+      } else if (row.carrierType) {
         requiredFields.push(['driverName', '司机']);
-        requiredFields.push(['driverPhone', '司机手机号']);
+        requiredFields.push([
+          'driverPhone',
+          row.carrierType === '承运商' ? '手机号' : '司机手机号',
+        ]);
       }
       const emptyField = requiredFields.find(([prop]) => this.isBillingFieldEmpty(row[prop]));
       if (emptyField) return requiredMessage(emptyField[1]);
diff --git a/src/views/business/components/waybill-import-dialog.vue b/src/views/business/components/waybill-import-dialog.vue
index 3645750..94972e9 100644
--- a/src/views/business/components/waybill-import-dialog.vue
+++ b/src/views/business/components/waybill-import-dialog.vue
@@ -96,22 +96,12 @@
           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.statusName"
@@ -119,6 +109,12 @@
           label="状态"
           width="100"
         />
+        <el-table-column
+          v-if="columnVisible.settlementStatusName"
+          prop="settlementStatusName"
+          label="结算状态"
+          width="110"
+        />
         <el-table-column
           v-if="columnVisible.createUserName"
           prop="createUserName"
@@ -159,7 +155,7 @@
               >编辑</el-link
             >
             <el-link
-              v-if="row.importStatus === 'draft'"
+              v-if="canRemoveBatch(row)"
               type="danger"
               @click="removeBatch(row)"
               >删除</el-link
@@ -641,10 +637,9 @@ const columnOptions = [
   { prop: 'batchNo', label: '运单批次号' },
   { prop: 'projectName', label: '项目名称' },
   { prop: 'carrierName', label: '承运商' },
-  { prop: 'carrierType', label: '承运类型' },
   { prop: 'waybillCount', label: '运单数' },
-  { prop: 'importTypeName', label: '导入方式' },
   { prop: 'statusName', label: '状态' },
+  { prop: 'settlementStatusName', label: '结算状态' },
   { prop: 'createUserName', label: '创建人' },
   { prop: 'createTime', label: '创建时间' },
   { prop: 'updateTime', label: '更新时间' },
@@ -1266,9 +1261,47 @@ const fillEditForm = async row => {
   if (carrierValue) carrierChange(carrierValue);
   await loadBatchRows(snapshot.id);
 };
-const removeBatches = () =>
-  api.removeImportBatches(selected.value.map(item => item.id).join(',')).then(loadBatches);
-const removeBatch = row => api.removeImportBatches(row.id).then(loadBatches);
+/** 与后端一致：仅未结算批次可整批删除 */
+const canRemoveBatch = row => String(row?.settlementStatus || 'unsettled') === 'unsettled';
+const removeBatches = async () => {
+  if (!selected.value.length) {
+    ElMessage.warning('请选择至少一条数据');
+    return;
+  }
+  // 选中含部分结算/已结算时整批拦截，不静默跳过
+  if (selected.value.some(row => !canRemoveBatch(row))) {
+    ElMessage.warning('仅未结算的运单批次可以删除');
+    return;
+  }
+  try {
+    await ElMessageBox.confirm('确认删除选中的运单批次？删除后不可恢复。', '提示', {
+      type: 'warning',
+    });
+  } catch {
+    return;
+  }
+  await api.removeImportBatches(selected.value.map(item => item.id).join(','));
+  ElMessage.success('删除成功');
+  return loadBatches();
+};
+const removeBatch = async row => {
+  if (!canRemoveBatch(row)) {
+    ElMessage.warning('仅未结算的运单批次可以删除');
+    return;
+  }
+  try {
+    await ElMessageBox.confirm(
+      `确认删除运单批次「${row.batchNo || ''}」？删除后不可恢复。`,
+      '提示',
+      { type: 'warning' }
+    );
+  } catch {
+    return;
+  }
+  await api.removeImportBatches(row.id);
+  ElMessage.success('删除成功');
+  return loadBatches();
+};
 const projectChange = async id => {
   const requestId = ++projectRequestId;
   const item = projects.value.find(row => String(row.id) === String(id));
diff --git a/src/views/business/contract-manage-change.vue b/src/views/business/contract-manage-change.vue
index ba20e53..6a5b6bf 100644
--- a/src/views/business/contract-manage-change.vue
+++ b/src/views/business/contract-manage-change.vue
@@ -222,7 +222,12 @@
       />
 
       <section class="change-section">
-        <div class="section-head"><div class="dialog-section-title">计费信息</div><el-button type="primary" plain @click="addPlan">添加</el-button></div>
+        <div class="section-head">
+          <div class="dialog-section-title">计费信息</div>
+          <el-button v-if="feeGenerationMode !== 'manual'" type="primary" plain @click="addPlan"
+            >添加</el-button
+          >
+        </div>
         <el-radio-group v-model="feeGenerationMode"><el-radio label="system">系统生成</el-radio><el-radio label="manual">账单导入生成</el-radio></el-radio-group>
         <el-table :data="plans" border class="change-table"><el-table-column type="index" label="序号" width="70" /><el-table-column prop="planName" label="方案名称" min-width="220" /><el-table-column label="默认方案" min-width="120"><template #default="{ row }">{{ row.defaultPlan ? '是' : '否' }}</template></el-table-column><el-table-column prop="remark" label="备注" min-width="260" /><el-table-column label="操作" width="180"><template #default="{ row, $index }"><el-link type="primary" @click="editPlan(row, $index)">编辑</el-link><el-link type="danger" @click="plans.splice($index, 1)">删除</el-link></template></el-table-column></el-table>
       </section>
@@ -337,7 +342,7 @@
 
 <script>
 import * as api from '@/api/business/contract-manage';
-import { submitMkApprovalFlow } from '@/utils/mk-approval';
+import { loadMkEnabled, submitMkApprovalFlow } from '@/utils/mk-approval';
 import BillingPlanEditor from './components/billing-plan-editor.vue';
 import ContractAttachmentSection, {
   isContractSealMaterialLocation,
@@ -445,7 +450,7 @@ export default {
       },
       preSettlementConfig: {},
       formalSettlementConfig: {},
-      settlementTypeOptions: ['月结', '日结', '周结', '半月结', '固定天数周期结算'],
+      settlementTypeOptions: ['月结', '日结', '周结', '固定天数周期结算'],
       billCycleTypeOptions: ['固定截单日', '自然月', '自定义多周期'],
       billCutoffDayOptions: Array.from({ length: 31 }, (_, index) => ({
         label: `${index + 1}日`,
@@ -754,7 +759,7 @@ export default {
     removeCustomPeriodRow(index) { if (index <= 0) return; const periods = [...(this.settlementRule.customPeriods || [])]; periods.splice(index, 1); this.settlementRule.customPeriods = normalizeCustomPeriods(periods); },
     validateCustomPeriods(periods = [], label) { const rows = normalizeCustomPeriods(periods); if (!rows.length) { this.$message.warning(`${label}：请至少配置一段自定义周期`); return false; } for (let index = 0; index < rows.length; index += 1) { const row = rows[index]; const startDay = Number(row.startDay); const endDay = Number(row.endDay); if (!Number.isFinite(startDay) || startDay < 1 || startDay > 31) { this.$message.warning(`${label}：请选择第${index + 1}行运单区间开始日`); return false; } if (!Number.isFinite(endDay) || endDay < 1 || endDay > 31) { this.$message.warning(`${label}：请选择第${index + 1}行运单区间结束日`); return false; } if (endDay < startDay) { this.$message.warning(`${label}：第${index + 1}行结束日不能早于开始日`); return false; } if (index > 0 && startDay !== Number(rows[index - 1].endDay) + 1) { this.$message.warning(`${label}：自定义多周期区间必须连续，不允许重叠或存在日期缺口`); return false; } } return true; },
     validateSettlementRule(rule, label) { if (Number(rule.autoGenerate) !== 1) return true; if (!rule.billStartDate || !rule.settlementType) { this.$message.warning(`${label}：请完整填写账单起始日和结算类型`); return false; } if (rule.settlementType === '月结' && !rule.billCycleType) { this.$message.warning(`${label}：请选择结算周期`); return false; } if (rule.settlementType === '月结' && rule.billCycleType === '固定截单日' && !rule.billCutoffDay) { this.$message.warning(`${label}：请选择账单截单日`); return false; } if (rule.settlementType === '月结' && rule.billCycleType === '自定义多周期') return this.validateCustomPeriods(rule.customPeriods, label); if (rule.settlementType === '固定天数周期结算' && !rule.cycleDays) { this.$message.warning(`${label}：请选择周期天数`); return false; } return true; },
-    async submit() { await this.$refs.formRef.validate(); const total = this.paymentRatioRows.reduce((sum, row) => sum + Number(row.ratioLimit || 0), 0); if (this.paymentRatioRows.length && Math.abs(total - 100) > 0.0001) { this.$message.warning('付款比例上限合计必须等于100%'); return; } if (this.settlementConfigTab === 'pre') this.preSettlementConfig = { ...this.settlementRule }; else this.formalSettlementConfig = { ...this.settlementRule }; if (!this.validateSettlementRule(this.preSettlementConfig, '预结算配置') || !this.validateSettlementRule(this.formalSettlementConfig, '正式结算配置')) return; const settlementRule = { preSettlementConfig: this.preSettlementConfig, formalSettlementConfig: this.formalSettlementConfig }; await api.submitChange({ ...this.form, settlementCurrency: String(this.form.settlementCurrency || '').trim() || 'RMB', copyCount: normalizeOptionalPositiveInteger(this.form.copyCount), invoiceCycle: normalizeOptionalPositiveInteger(this.form.invoiceCycle), paymentDays: normalizeOptionalPositiveInteger(this.form.paymentDays), contractAmount: normalizeOptionalAmount(this.form.contractAmount), startDate: this.period[0], endDate: this.period[1], feeGenerationMode: this.feeGenerationMode, billingEnabled: this.feeGenerationMode === 'system' ? 1 : 0, billingPlanJson: JSON.stringify(this.plans), settlementRuleJson: JSON.stringify(settlementRule), preSettlementConfigJson: JSON.stringify(this.preSettlementConfig), formalSettlementConfigJson: JSON.stringify(this.formalSettlementConfig), paymentRatioJson: JSON.stringify(this.paymentRatioRows), contractFileJson: JSON.stringify(this.contractFileRows), attachmentsJson: JSON.stringify(this.attachments), changeContent: this.form.changeContent, changeReason: this.form.changeReason, changeAttachmentsJson: JSON.stringify(this.changeMaterials) }); await submitMkApprovalFlow({ bizType: 'contract-manage', bizId: this.form.id, subjectName: this.form.contractName || '', approvalStatus: this.form.approvalStatus || 'change_rejected' }); this.$message.success('变更已提交'); this.$router.back(); },
+    async submit() { await this.$refs.formRef.validate(); const total = this.paymentRatioRows.reduce((sum, row) => sum + Number(row.ratioLimit || 0), 0); if (this.paymentRatioRows.length && Math.abs(total - 100) > 0.0001) { this.$message.warning('付款比例上限合计必须等于100%'); return; } if (this.settlementConfigTab === 'pre') this.preSettlementConfig = { ...this.settlementRule }; else this.formalSettlementConfig = { ...this.settlementRule }; if (!this.validateSettlementRule(this.preSettlementConfig, '预结算配置') || !this.validateSettlementRule(this.formalSettlementConfig, '正式结算配置')) return; const settlementRule = { preSettlementConfig: this.preSettlementConfig, formalSettlementConfig: this.formalSettlementConfig }; await api.submitChange({ ...this.form, settlementCurrency: String(this.form.settlementCurrency || '').trim() || 'RMB', copyCount: normalizeOptionalPositiveInteger(this.form.copyCount), invoiceCycle: normalizeOptionalPositiveInteger(this.form.invoiceCycle), paymentDays: normalizeOptionalPositiveInteger(this.form.paymentDays), contractAmount: normalizeOptionalAmount(this.form.contractAmount), startDate: this.period[0], endDate: this.period[1], feeGenerationMode: this.feeGenerationMode, billingEnabled: this.feeGenerationMode === 'system' ? 1 : 0, billingPlanJson: JSON.stringify(this.plans), settlementRuleJson: JSON.stringify(settlementRule), preSettlementConfigJson: JSON.stringify(this.preSettlementConfig), formalSettlementConfigJson: JSON.stringify(this.formalSettlementConfig), paymentRatioJson: JSON.stringify(this.paymentRatioRows), contractFileJson: JSON.stringify(this.contractFileRows), attachmentsJson: JSON.stringify(this.attachments), changeContent: this.form.changeContent, changeReason: this.form.changeReason, changeAttachmentsJson: JSON.stringify(this.changeMaterials) }); await submitMkApprovalFlow({ bizType: 'contract-manage', bizId: this.form.id, subjectName: this.form.contractName || '', approvalStatus: this.form.approvalStatus || 'change_rejected', mkEnabled: await loadMkEnabled().catch(() => false) }); this.$message.success('变更已提交'); this.$router.back(); },
   },
 };
 </script>
diff --git a/src/views/business/contract-manage.vue b/src/views/business/contract-manage.vue
index 4ce63ba..de25000 100644
--- a/src/views/business/contract-manage.vue
+++ b/src/views/business/contract-manage.vue
@@ -413,17 +413,15 @@
                 />
               </el-select>
             </el-form-item>
-            <el-form-item label="合同编号">
+            <el-form-item label="合同编号" prop="contractNo">
               <el-input
                 v-model="form.contractNo"
-                disabled
+                maxlength="100"
+                clearable
                 :placeholder="
-                  formMode === 'add'
-                    ? form.organizationId
-                      ? '系统按部门规则自动生成'
-                      : '请先选择合同负责部门'
-                    : ''
+                  formMode === 'add' ? '不填写则按部门规则自动生成' : '请输入合同编号'
                 "
+                @input="handleContractNoInput"
               />
             </el-form-item>
             <el-form-item label="合同名称" prop="contractName">
@@ -687,7 +685,12 @@
                 <el-radio label="manual">账单导入生成</el-radio>
               </el-radio-group>
             </div>
-            <el-button type="primary" @click="openBillingPlan()">添加</el-button>
+            <el-button
+              v-if="form.feeGenerationMode !== 'manual'"
+              type="primary"
+              @click="openBillingPlan()"
+              >添加</el-button
+            >
           </div>
           <el-table :data="billingPlanRows" border>
             <el-table-column type="index" label="序号" width="80" align="center" />
@@ -1313,7 +1316,23 @@ export default {
         { label: '已到期', value: 'expired', statKey: 'expired' },
       ],
       form: defaultForm(),
+      contractNoManual: false,
       formRules: {
+        contractNo: [
+          {
+            validator: (rule, value, callback) => {
+              const contractNo = String(value || '').trim();
+              if (this.formMode === 'edit' && !contractNo) {
+                return callback(new Error('请输入合同编号'));
+              }
+              if (contractNo.length > 100) {
+                return callback(new Error('合同编号不能超过100个字符'));
+              }
+              callback();
+            },
+            trigger: 'blur',
+          },
+        ],
         contractName: [{ required: true, message: '请输入合同名称', trigger: 'blur' }],
         contractCategory: [{ required: true, message: '请选择合同类别', trigger: 'change' }],
         signType: [{ required: true, message: '请选择签约类型', trigger: 'change' }],
@@ -1936,6 +1955,7 @@ export default {
       this.api.getDetail(id).then(res => this.applyDetail(res.data?.data || {}));
     },
     resetFormState() {
+      this.contractNoManual = false;
       this.form = {
         ...defaultForm(),
         handlerUserName:
@@ -2011,7 +2031,20 @@ export default {
       this.$router.$avueRouter?.closeTag?.();
       this.$router.push(contractManageListRoute);
     },
+    validateContractNo() {
+      const contractNo = String(this.form.contractNo || '').trim();
+      if (this.formMode === 'edit' && !contractNo) {
+        this.$message.warning('请输入合同编号');
+        return false;
+      }
+      if (contractNo.length > 100) {
+        this.$message.warning('合同编号不能超过100个字符');
+        return false;
+      }
+      return true;
+    },
     validateBase(action) {
+      if (!this.validateContractNo()) return false;
       if (action === 'temporary') {
         const required = [
           ['signType', '签约类型'],
@@ -2097,6 +2130,7 @@ export default {
       const projectName = projectId ? normalizeProjectValue(this.form.projectName) : '';
       return {
         ...this.form,
+        contractNo: String(this.form.contractNo || '').trim(),
         projectId,
         projectName,
         copyCount: normalizeOptionalInteger(this.form.copyCount),
@@ -2145,7 +2179,9 @@ export default {
                 bizType: 'contract-manage',
                 bizId: id,
                 subjectName: saved.contractName || submit.contractName || '',
-                approvalStatus: previousApprovalStatus || saved.approvalStatus || submit.approvalStatus || '',
+                approvalStatus:
+                  previousApprovalStatus || saved.approvalStatus || submit.approvalStatus || '',
+                mkEnabled: this.mkEnabled,
               })
             );
           }
@@ -2184,6 +2220,7 @@ export default {
             bizId: payload.id || this.form.id,
             subjectName: payload.contractName || this.form.contractName || '',
             approvalStatus: this.form.approvalStatus || 'change_rejected',
+            mkEnabled: this.mkEnabled,
           }).then(() => {
             this.$message.success('已重新提交变更审批');
             this.closeForm();
@@ -2507,11 +2544,14 @@ export default {
         this.refreshPreviewContractNo();
       }
     },
+    handleContractNoInput(value) {
+      this.contractNoManual = String(value || '').trim() !== '';
+    },
     refreshPreviewContractNo() {
       if (this.formMode !== 'add') return;
       const organizationId = this.form.organizationId;
       if (!organizationId) {
-        this.form.contractNo = '';
+        if (!this.contractNoManual) this.form.contractNo = '';
         return;
       }
       const requestId = (this.contractNoPreviewRequestId =
@@ -2519,11 +2559,11 @@ export default {
       api
         .nextContractNo(organizationId)
         .then(res => {
-          if (requestId !== this.contractNoPreviewRequestId) return;
+          if (requestId !== this.contractNoPreviewRequestId || this.contractNoManual) return;
           this.form.contractNo = res.data?.data || '';
         })
         .catch(() => {
-          if (requestId !== this.contractNoPreviewRequestId) return;
+          if (requestId !== this.contractNoPreviewRequestId || this.contractNoManual) return;
           this.form.contractNo = '';
         });
     },
@@ -2956,6 +2996,7 @@ export default {
     },
     getContractChangeFieldLabel(field) {
       const labels = {
+        contractNo: '合同编号',
         contractName: '合同名称',
         partyB: '乙方',
         startDate: '开始日期',
@@ -3202,6 +3243,7 @@ export default {
                   bizId: row.id,
                   subjectName: row.contractName || '',
                   approvalStatus: row.approvalStatus || '',
+                  mkEnabled: this.mkEnabled,
                 })
               )
             : request();
@@ -3578,7 +3620,7 @@ export default {
 
   :deep(.el-form-item) {
     align-items: center;
-    margin-bottom: 24px;
+    //margin-bottom: 24px;
   }
 
   :deep(.el-form-item__label) {
diff --git a/src/views/business/master-order.vue b/src/views/business/master-order.vue
index 225ed98..7be51d6 100644
--- a/src/views/business/master-order.vue
+++ b/src/views/business/master-order.vue
@@ -79,7 +79,7 @@
               <p>{{ timeRange(row) }}</p>
               <p>{{ goodsSummary(row) }}</p>
               <p>创建人：{{ row.createUserName || '-' }}</p>
-              <p>创建时间：{{ row.createTime || '-' }}</p>
+              <p>创建时间：{{ formatDate(row.createTime) }}</p>
             </section>
             <section class="route-progress">
               <div class="route-track">
@@ -155,6 +155,7 @@
 
 <script>
 import * as api from '@/api/business/master-order';
+import { splitRegionTokens } from '@/utils/region-address';
 import TableHeaderTools from '@/components/table-header-tools/main.vue';
 import MasterOrderEditor from './components/master-order-editor.vue';
 import MasterOrderDispatch from './components/master-order-dispatch.vue';
@@ -332,6 +333,10 @@ export default {
         ? `${String(row.planStartTime).slice(0, 10)} - ${String(row.planEndTime).slice(0, 10)}`
         : '-';
     },
+    // 创建时间只展示日期。
+    formatDate(value) {
+      return value ? String(value).slice(0, 10) : '-';
+    },
     goodsSummary(row) {
       const item = (row.goods || [])[0] || {};
       if (!item.cargoName && !item.cargoType) return '-';
@@ -391,6 +396,26 @@ export default {
       }`;
       return `${city} ${district}`;
     },
+    // 悬停气泡里的地址：起讫点若只保存了名称或详细地址的一半，气泡就会显示成
+    // “柳南区”“安徽”这类残缺地址，故把两个字段互为补充后展示。
+    completeAddress(name, address) {
+      const rawName = String(name || '').trim();
+      const rawAddress = String(address || '').trim();
+      if (!rawName) return rawAddress;
+      if (!rawAddress) return rawName;
+      // 详细地址已含省市，本身就是完整地址，不再拼接名称，避免重复卡片上已有的站点名。
+      if (/(?:省|自治区|特别行政区|市)/.test(rawAddress)) return rawAddress;
+      const normalizedName = rawName.replace(/\s+/g, '');
+      const normalizedAddress = rawAddress.replace(/\s+/g, '');
+      if (normalizedAddress.includes(normalizedName)) return rawAddress;
+      if (normalizedName.includes(normalizedAddress)) return rawName;
+      // “珠海1号港口”与“珠海港口1号”这类同字异序写法只保留一个。
+      if ([...normalizedName].sort().join('') === [...normalizedAddress].sort().join('')) {
+        return normalizedName.length >= normalizedAddress.length ? rawName : rawAddress;
+      }
+      // 区域在前、详细地址在后。
+      return splitRegionTokens(rawName) ? `${rawName}${rawAddress}` : `${rawAddress}${rawName}`;
+    },
     routeNodeName(value, address, transportType, region = {}) {
       const text = String(value || '').trim();
       if (!text) return '-';
@@ -457,15 +482,12 @@ export default {
         if (this.isStationLikeName(rawAddress) && !this.isStationLikeName(rawName)) {
           return {
             name: rawAddress,
-            address: rawName || regionText || rawAddress,
+            address: this.completeAddress(rawName, rawAddress) || regionText || rawAddress,
           };
         }
         const displayName = rawName || rawAddress || '-';
         const tipAddress =
-          (rawAddress && rawAddress !== displayName ? rawAddress : '') ||
-          regionText ||
-          rawAddress ||
-          displayName;
+          this.completeAddress(rawName, rawAddress) || regionText || rawAddress || displayName;
         return { name: displayName, address: tipAddress };
       }
       return {
@@ -475,7 +497,7 @@ export default {
           siteCode,
           nextTransportType,
         }),
-        address: rawAddress || rawName || regionText || '-',
+        address: this.completeAddress(rawName, rawAddress) || regionText || '-',
       };
     },
     routeNodes(row = {}) {
diff --git a/src/views/business/process-config.vue b/src/views/business/process-config.vue
index 4cf9f31..d676238 100644
--- a/src/views/business/process-config.vue
+++ b/src/views/business/process-config.vue
@@ -416,6 +416,7 @@ import { getList as getProjectList } from '@/api/business/project-apply';
 import { getDeptTree } from '@/api/system/dept';
 import { exportBlob } from '@/api/common';
 import { config, option } from '@/option/business/process-config';
+import { applyIncomingSearch } from '@/utils/search-range';
 import { getToken, isAdministrator } from '@/utils/auth';
 import { downloadXls } from '@/utils/util';
 import { mapGetters } from 'vuex';
@@ -603,7 +604,8 @@ export default {
       });
     },
     normalizeListQuery(params = {}) {
-      const query = { ...params, ...this.query };
+      // 新条件覆盖旧条件，清空的筛选项不再沿用上一次的值。
+      const query = applyIncomingSearch(this.query, params);
       const rawDeptId = query.deptId ?? query.searchDeptId;
       delete query.searchDeptId;
       if (rawDeptId !== undefined && rawDeptId !== null && String(rawDeptId).trim() !== '') {
diff --git a/src/views/business/project-apply.vue b/src/views/business/project-apply.vue
index 2571a9a..b7abfc1 100644
--- a/src/views/business/project-apply.vue
+++ b/src/views/business/project-apply.vue
@@ -256,7 +256,7 @@
               placeholder="请选择"
               filterable
               clearable
-              :disabled="isBasicInfoReadonly"
+              :disabled="dialogReadonly"
             />
           </el-form-item>
           <el-form-item label="平台公司" prop="undertakeDeptId">
@@ -268,7 +268,7 @@
               collapse-tags-tooltip
               clearable
               filterable
-              :disabled="isBasicInfoReadonly"
+              :disabled="dialogReadonly"
               @change="handleUndertakeDeptChange"
             >
               <el-option
@@ -1866,6 +1866,7 @@ export default {
                 bizId: row.id,
                 subjectName: row.projectName || '',
                 approvalStatus: row.approvalStatus || '',
+                mkEnabled: this.mkEnabled,
               }).then(() => request())
             : request();
         // 项目通过会同步等待合规推送，加遮罩防重复点击
@@ -2089,6 +2090,7 @@ export default {
                 bizId: id,
                 subjectName: name,
                 approvalStatus: status,
+                mkEnabled: this.mkEnabled,
               }).then(() => {
                 this.$message.success('提交成功!');
                 this.closeProjectForm();
@@ -2160,6 +2162,7 @@ export default {
               bizId: id,
               subjectName: this.form.projectName || '',
               approvalStatus: this.form.approvalStatus || 'change_rejected',
+              mkEnabled: this.mkEnabled,
             }).then(() => {
               this.$message.success('提交成功!');
               this.closeProjectForm();
@@ -2623,7 +2626,8 @@ export default {
     loadDeptOptions() {
       getDeptTree().then(res => {
         const deptTree = res.data.data || [];
-        const businessDeptTree = ['add', 'edit', 'majorSupplement'].includes(this.dialogType)
+        // 新增/编辑/重大补录/项目变更均可选择业务部门，排除外部组织
+        const businessDeptTree = ['add', 'edit', 'majorSupplement', 'change'].includes(this.dialogType)
           ? this.excludeExternalOrganization(deptTree)
           : deptTree;
         this.deptOptions = this.flattenDept(businessDeptTree);
@@ -2636,8 +2640,9 @@ export default {
         const list = res.data.data || [];
         this.platformCompanyOptions = list.map(item => ({
           label: item.deptName || item.fullName || item.title || item.name,
-          value: item.id,
-        }));
+          // 雪花 ID 必须以字符串绑定，避免 JS Number 精度丢失导致多选提交异常
+          value: item.id == null || item.id === '' ? '' : String(item.id),
+        })).filter(item => item.value);
         this.ensureCurrentPlatformOption();
       });
     },
diff --git a/src/views/business/transport-plan-import.vue b/src/views/business/transport-plan-import.vue
index 4944c48..f49195a 100644
--- a/src/views/business/transport-plan-import.vue
+++ b/src/views/business/transport-plan-import.vue
@@ -602,6 +602,8 @@ export default {
           if (result.code !== 200) throw new Error(result.msg || '导入失败');
           this.$message.success('导入完成');
         }
+        // 与运单/配载一致：通知 keep-alive 列表实例重新拉取
+        sessionStorage.setItem('transport-plan-list-refresh', '1');
         this.$router.push('/business/transport-plan');
       } catch (error) {
         this.$message.error(error.message || '导入失败');
diff --git a/src/views/payment/bill-ledger-form.vue b/src/views/payment/bill-ledger-form.vue
index 2c511d4..ccc8364 100644
--- a/src/views/payment/bill-ledger-form.vue
+++ b/src/views/payment/bill-ledger-form.vue
@@ -44,7 +44,8 @@
                 reserve-keyword
                 :remote-method="searchCustomers"
                 :loading="customerLoading"
-                placeholder="请选择客商基础档案"
+                placeholder="请选择"
+                @change="syncFeeBearer"
               >
                 <el-option
                   v-for="item in customerOptions"
@@ -63,6 +64,7 @@
                 allow-create
                 default-first-option
                 placeholder="请选择或输入"
+                @change="syncFeeBearer"
               >
                 <el-option
                   v-for="item in receiverOptions"
@@ -74,7 +76,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="票面金额" prop="faceAmount">
+            <el-form-item label="票面金额" prop="faceAmount" required>
               <el-input-number
                 v-model="form.faceAmount"
                 :min="0"
@@ -111,17 +113,15 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="可用部门" prop="availableDeptIds">
-              <el-tree-select
-                v-model="form.availableDeptIds"
-                :data="deptTree"
-                :props="deptProps"
-                node-key="id"
-                multiple
-                show-checkbox
+              <el-cascader
+                v-model="availableDeptCascaderValue"
+                :options="businessDeptTreeOptions"
+                :props="deptCascaderProps"
+                placeholder="请选择"
+                filterable
+                clearable
                 collapse-tags
                 collapse-tags-tooltip
-                placeholder="请选择，默认全部"
-                @change="handleDeptChange"
               />
             </el-form-item>
           </el-col>
@@ -140,17 +140,9 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="费用承担方" prop="feeBearerId">
-              <el-select
-                v-model="form.feeBearerId"
-                filterable
-                remote
-                reserve-keyword
-                :remote-method="searchCustomers"
-                :loading="customerLoading"
-                placeholder="请选择客商基础档案"
-              >
+              <el-select v-model="form.feeBearerId" filterable clearable placeholder="请选择">
                 <el-option
-                  v-for="item in customerOptions"
+                  v-for="item in feeBearerOptions"
                   :key="item.id"
                   :label="customerName(item)"
                   :value="item.id"
@@ -245,13 +237,13 @@ const emptyForm = () => ({
   billNo: '',
   issuerId: null,
   receiverName: '',
-  billType: 'issued',
+  billType: '',
   faceAmount: null,
   availableBalance: 0,
   issueDate: '',
   maturityDate: '',
-  availableDeptIds: ['all'],
-  availableDeptNames: '全部',
+  availableDeptIds: [],
+  availableDeptNames: '',
   feeBearerId: null,
   confirmedDiscountRate: null,
   issuingBank: '',
@@ -272,9 +264,17 @@ export default {
       receiverOptions: [],
       customerLoading: false,
       saving: false,
-      deptTree: [],
+      businessDeptTreeOptions: [],
       deptMap: new Map(),
-      deptProps: { label: 'title', value: 'id', children: 'children' },
+      deptCascaderProps: {
+        label: 'label',
+        value: 'value',
+        children: 'children',
+        multiple: true,
+        checkStrictly: true,
+        emitPath: true,
+        expandTrigger: 'click',
+      },
       bankOptions: [
         '中国工商银行',
         '中国农业银行',
@@ -309,7 +309,10 @@ export default {
         issuerId: [{ required: true, message: '请选择出票单位', trigger: 'change' }],
         receiverName: [{ required: true, message: '请选择或输入收票单位', trigger: 'change' }],
         billType: [{ required: true, message: '请选择汇票类型', trigger: 'change' }],
-        faceAmount: [{ validator: this.validateFaceAmount, trigger: 'change' }],
+        faceAmount: [
+          { required: true, message: '请输入票面金额', trigger: 'change' },
+          { validator: this.validateFaceAmount, trigger: 'change' },
+        ],
         issueDate: [{ required: true, message: '请选择出票日期', trigger: 'change' }],
         maturityDate: [{ required: true, validator: this.validateMaturityDate, trigger: 'change' }],
         availableDeptIds: [{ validator: this.validateDepartments, trigger: 'change' }],
@@ -340,6 +343,42 @@ export default {
         (Number(this.form.faceAmount || 0) * Number(this.form.confirmedDiscountRate || 0)) / 100
       );
     },
+    // 可用部门：表单存部门 id，级联多选回显用根到节点的路径
+    availableDeptCascaderValue: {
+      get() {
+        return (this.form.availableDeptIds || [])
+          .filter(id => id !== undefined && id !== null && String(id) !== 'all' && String(id) !== '')
+          .map(id => this.findDeptPath(id, this.businessDeptTreeOptions) || [String(id)]);
+      },
+      set(paths) {
+        const ids = [
+          ...new Set(
+            (paths || [])
+              .map(path => {
+                const nodes = Array.isArray(path) ? path.filter(item => item !== undefined && item !== null && item !== '') : [];
+                return nodes.length ? String(nodes.at(-1)) : '';
+              })
+              .filter(Boolean)
+          ),
+        ];
+        this.form.availableDeptIds = ids;
+        this.form.availableDeptNames = ids
+          .map(id => this.deptMap.get(String(id)))
+          .filter(Boolean)
+          .join('、');
+      },
+    },
+    feeBearerOptions() {
+      const issuer = this.customerOptions.find(item => String(item.id) === String(this.form.issuerId));
+      const receiverName = String(this.form.receiverName || '').trim();
+      const receiver = receiverName
+        ? this.customerOptions.find(item => this.customerName(item) === receiverName)
+        : null;
+      return [issuer, receiver].filter(
+        (item, index, rows) =>
+          item && rows.findIndex(row => row && String(row.id) === String(item.id)) === index
+      );
+    },
   },
   created() {
     this.initialize();
@@ -352,7 +391,6 @@ export default {
     async initialize() {
       await Promise.all([this.loadDepartments(), this.searchCustomers('')]);
       if (!this.recordId) {
-        this.form.issueDate = this.$dayjs().format('YYYY-MM-DD');
         return;
       }
       const data = this.unwrapData(await api.getDetail(this.recordId));
@@ -361,14 +399,20 @@ export default {
         ...data,
         confirmedDiscountRate: this.normalizeDiscountRate(data.confirmedDiscountRate),
         bankDiscountReferenceRate: this.normalizeDiscountRate(data.bankDiscountReferenceRate),
-        availableDeptIds: this.parse(data.availableDeptIdsJson),
+        availableDeptIds: this.parse(data.availableDeptIdsJson)
+          .filter(id => String(id) !== 'all')
+          .map(id => String(id)),
         attachments: this.parse(data.attachmentsJson),
       };
       this.usageRecords = data.usageRecords || [];
       this.receiverOptions = data.receiverName ? [data.receiverName] : [];
       this.ensureCustomerOption(data.issuerId, data.issuerName);
       this.ensureCustomerOption(data.feeBearerId, data.feeBearerName);
-      this.handleDeptChange(this.form.availableDeptIds);
+      this.form.availableDeptNames = (this.form.availableDeptIds || [])
+        .map(id => this.deptMap.get(String(id)))
+        .filter(Boolean)
+        .join('、');
+      this.syncFeeBearer();
     },
     parse(value) {
       if (!value) return [];
@@ -381,22 +425,52 @@ export default {
     },
     async loadDepartments() {
       const response = await getDeptTree(this.userInfo?.tenantId);
-      const rows = this.unwrapData(response) || [];
-      this.deptTree = [{ id: 'all', title: '全部', children: rows }];
-      this.deptMap = new Map([['all', '全部']]);
-      this.flattenDepartments(rows).forEach(item => this.deptMap.set(String(item.id), item.title));
+      const rows = this.excludeExternalOrganization(this.unwrapData(response) || []);
+      this.businessDeptTreeOptions = this.toDeptCascaderOptions(rows);
+      this.deptMap = new Map();
+      this.flattenDepartments(rows).forEach(item =>
+        this.deptMap.set(String(item.id), item.title || item.deptName || item.name)
+      );
+    },
+    excludeExternalOrganization(list = []) {
+      return list.reduce((result, item) => {
+        const deptName = item.title || item.deptName || item.name;
+        if (String(deptName || '').trim() === '外部组织') return result;
+        result.push({
+          ...item,
+          children: item.children?.length
+            ? this.excludeExternalOrganization(item.children)
+            : item.children,
+        });
+        return result;
+      }, []);
+    },
+    toDeptCascaderOptions(list = []) {
+      return list.map(item => ({
+        label: item.title || item.deptName || item.name,
+        value: item.id == null || item.id === '' ? '' : String(item.id),
+        children: item.children?.length ? this.toDeptCascaderOptions(item.children) : undefined,
+      }));
     },
     flattenDepartments(rows) {
       return (rows || []).flatMap(item => [item, ...this.flattenDepartments(item.children || [])]);
     },
-    handleDeptChange(values) {
-      const ids = values || [];
-      this.form.availableDeptNames = ids.some(item => String(item) === 'all')
-        ? '全部'
-        : ids
-            .map(item => this.deptMap.get(String(item)))
-            .filter(Boolean)
-            .join('、');
+    findDeptPath(id, tree = [], parents = []) {
+      const target = Array.isArray(id) ? id.at(-1) : id;
+      if (target === undefined || target === null || target === '') return null;
+      for (const node of tree || []) {
+        const path = [...parents, node.value];
+        if (String(node.value) === String(target)) return path;
+        const matched = this.findDeptPath(target, node.children, path);
+        if (matched) return matched;
+      }
+      return null;
+    },
+    syncFeeBearer() {
+      const allowed = this.feeBearerOptions.map(item => String(item.id));
+      if (this.form.feeBearerId && !allowed.includes(String(this.form.feeBearerId))) {
+        this.form.feeBearerId = null;
+      }
     },
     async searchCustomers(keyword) {
       this.customerLoading = true;
@@ -545,7 +619,7 @@ export default {
 .bill-ledger-form-page__form :deep(.el-select),
 .bill-ledger-form-page__form :deep(.el-input-number),
 .bill-ledger-form-page__form :deep(.el-date-editor),
-.bill-ledger-form-page__form :deep(.el-tree-select) {
+.bill-ledger-form-page__form :deep(.el-cascader) {
   width: 100%;
 }
 .bill-ledger-form-page__form :deep(.el-input-number .el-input__inner) {
diff --git a/src/views/payment/bill-payment-form.vue b/src/views/payment/bill-payment-form.vue
index c8654a9..77297ed 100644
--- a/src/views/payment/bill-payment-form.vue
+++ b/src/views/payment/bill-payment-form.vue
@@ -140,7 +140,7 @@ import * as api from '@/api/payment/billPayment';
 import * as billLedgerApi from '@/api/payment/billLedger';
 import VehicleAttachmentTable from '@/components/vehicle-attachment-table/main.vue';
 import { getMkPublicDetail } from '@/api/mk-process';
-import { submitMkApprovalFlow } from '@/utils/mk-approval';
+import { loadMkEnabled, submitMkApprovalFlow } from '@/utils/mk-approval';
 
 const emptyForm = () => ({
   id: null,
@@ -348,6 +348,7 @@ export default {
           bizId: this.form.id,
           subjectName: this.form.paymentNo || this.form.billNo || '',
           approvalStatus: previousApprovalStatus,
+          mkEnabled: await loadMkEnabled().catch(() => false),
         });
         this.$message.success('提交成功');
         this.goBack();
diff --git a/src/views/payment/bill-payment.vue b/src/views/payment/bill-payment.vue
index d44acbd..defddf9 100644
--- a/src/views/payment/bill-payment.vue
+++ b/src/views/payment/bill-payment.vue
@@ -132,6 +132,7 @@ export default {
         bizId: row.id,
         subjectName: row.paymentNo || row.billNo || '',
         approvalStatus: previousApprovalStatus,
+        mkEnabled: this.mkEnabled,
       });
       this.$message.success('提交成功');
       this.loadTable();
diff --git a/src/views/payment/invoice-application-form.vue b/src/views/payment/invoice-application-form.vue
index 0f47253..d4ed32a 100644
--- a/src/views/payment/invoice-application-form.vue
+++ b/src/views/payment/invoice-application-form.vue
@@ -492,7 +492,7 @@ import { getDictionary } from '@/api/system/dictbiz';
 import { invoiceApplicationDetailColumns } from '@/option/payment/invoiceApplication';
 import VehicleAttachmentTable from '@/components/vehicle-attachment-table/main.vue';
 import { getMkPublicDetail } from '@/api/mk-process';
-import { submitMkApprovalFlow } from '@/utils/mk-approval';
+import { loadMkEnabled, submitMkApprovalFlow } from '@/utils/mk-approval';
 
 let localId = 0;
 const emptyLine = () => ({
@@ -774,7 +774,7 @@ export default {
     },
     validateSettlements(rule, value, callback) {
       if (!this.form.settlements.length) {
-        callback(new Error('请选择正式结算单'));
+        callback(new Error('请选择付款结算单'));
         return;
       }
       callback();
@@ -1208,13 +1208,14 @@ export default {
         bizId: this.form.id,
         subjectName: this.form.applicationNo || '',
         approvalStatus: previousApprovalStatus,
+        mkEnabled: await loadMkEnabled().catch(() => false),
       });
       this.$message.success('提交成功');
       this.goBack();
     },
     async syncReferenceData() {
       if (!this.settlementIds.length) {
-        this.$message.warning('请先选择正式结算单');
+        this.$message.warning('请先选择付款结算单');
         return;
       }
       await Promise.all([this.loadReceiverInformation(), this.loadSettlementDetails(false)]);
diff --git a/src/views/payment/invoice-application.vue b/src/views/payment/invoice-application.vue
index 8cc072b..969c41a 100644
--- a/src/views/payment/invoice-application.vue
+++ b/src/views/payment/invoice-application.vue
@@ -359,7 +359,7 @@ export default {
           item => String(item.formalSettlementNo || '').trim() === normalizedNo
         );
         if (!row?.id) {
-          this.$message.warning('未找到对应的正式结算单');
+          this.$message.warning('未找到对应的付款结算单');
           return;
         }
         this.$router.push({
@@ -384,6 +384,7 @@ export default {
         bizId: row.id,
         subjectName: row.applicationNo || '',
         approvalStatus: previousApprovalStatus,
+        mkEnabled: this.mkEnabled,
       });
       this.$message.success('提交成功');
       this.loadTable();
@@ -504,6 +505,16 @@ export default {
           tip: row.kingdeeLockFailReason || '系统将自动补偿重锁',
         };
       }
+      // 金蝶解锁终态标识：删单解锁的源单已作废，此标签用于区分人工作废与金蝶删单
+      if (row.kingdeeUnlockTime) {
+        const isDelete = row.kingdeeUnlockOperationName === '金蝶删单';
+        return {
+          show: true,
+          type: isDelete ? 'danger' : 'warning',
+          label: row.kingdeeUnlockOperationName || '金蝶解锁',
+          tip: `${row.kingdeeUnlockOperator || '-'} 于 ${this.$dayjs(row.kingdeeUnlockTime).format('YYYY-MM-DD HH:mm:ss')} 解锁`,
+        };
+      }
       return { show: false };
     },
     displayValue(value) {
diff --git a/src/views/payment/invoice-receipt-form.vue b/src/views/payment/invoice-receipt-form.vue
index ac424da..b798e98 100644
--- a/src/views/payment/invoice-receipt-form.vue
+++ b/src/views/payment/invoice-receipt-form.vue
@@ -16,13 +16,22 @@
         <el-row :gutter="32">
           <el-col :span="6">
             <el-form-item label="发票号码" prop="invoiceNo">
-              <el-input v-model="form.invoiceNo" readonly placeholder="请选择金蝶票据池发票">
-                <template v-if="!readonly" #append>
-                  <el-tooltip content="查询金蝶票据池" placement="top">
-                    <el-button :icon="Search" @click="openInvoiceDialog" />
-                  </el-tooltip>
-                </template>
-              </el-input>
+              <el-tooltip
+                :content="form.invoiceNo"
+                :disabled="!form.invoiceNo"
+                placement="top"
+                :show-after="200"
+              >
+                <div class="receipt-form-page__overflow-trigger">
+                  <el-input v-model="form.invoiceNo" readonly placeholder="请选择金蝶票据池发票">
+                    <template v-if="!readonly" #append>
+                      <el-tooltip content="查询金蝶票据池" placement="top">
+                        <el-button :icon="Search" @click="openInvoiceDialog" />
+                      </el-tooltip>
+                    </template>
+                  </el-input>
+                </div>
+              </el-tooltip>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -32,7 +41,16 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="发票类型">
-              <el-input v-model="form.invoiceType" disabled placeholder="从金蝶票据池带出" />
+              <el-tooltip
+                :content="form.invoiceType"
+                :disabled="!form.invoiceType"
+                placement="top"
+                :show-after="200"
+              >
+                <div class="receipt-form-page__overflow-trigger">
+                  <el-input v-model="form.invoiceType" disabled placeholder="从金蝶票据池带出" />
+                </div>
+              </el-tooltip>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -64,23 +82,54 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="受票单位">
-              <el-input v-model="form.receiverName" disabled placeholder="从金蝶票据池带出" />
+              <el-tooltip
+                :content="form.receiverName"
+                :disabled="!form.receiverName"
+                placement="top"
+                :show-after="200"
+              >
+                <div class="receipt-form-page__overflow-trigger">
+                  <el-input v-model="form.receiverName" disabled placeholder="从金蝶票据池带出" />
+                </div>
+              </el-tooltip>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="开票单位">
-              <el-input v-model="form.issuerName" disabled placeholder="从金蝶票据池带出" />
+              <el-tooltip
+                :content="form.issuerName"
+                :disabled="!form.issuerName"
+                placement="top"
+                :show-after="200"
+              >
+                <div class="receipt-form-page__overflow-trigger">
+                  <el-input v-model="form.issuerName" disabled placeholder="从金蝶票据池带出" />
+                </div>
+              </el-tooltip>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="关联结算单" prop="settlementIds">
-              <el-input :model-value="settlementLabel" readonly placeholder="请选择应付正式结算单">
-                <template v-if="!readonly" #append>
-                  <el-tooltip content="选择正式结算单" placement="top">
-                    <el-button :icon="Search" @click="openSettlementDialog" />
-                  </el-tooltip>
-                </template>
-              </el-input>
+              <el-tooltip
+                :content="settlementLabel"
+                :disabled="!settlementLabel"
+                placement="top"
+                :show-after="200"
+              >
+                <div class="receipt-form-page__overflow-trigger">
+                  <el-input
+                    :model-value="settlementLabel"
+                    readonly
+                    placeholder="请选择应付正式结算单"
+                  >
+                    <template v-if="!readonly" #append>
+                      <el-tooltip content="选择付款结算单" placement="top">
+                        <el-button :icon="Search" @click="openSettlementDialog" />
+                      </el-tooltip>
+                    </template>
+                  </el-input>
+                </div>
+              </el-tooltip>
             </el-form-item>
           </el-col>
         </el-row>
@@ -89,7 +138,12 @@
       <section-card title="结算信息">
         <el-table :data="form.settlements" border>
           <el-table-column type="index" label="序号" width="64" align="center" />
-          <el-table-column label="结算单号" min-width="180" align="center">
+          <el-table-column
+            label="结算单号"
+            min-width="180"
+            align="center"
+            show-overflow-tooltip
+          >
             <template #default="{ row }">
               <el-link type="primary" @click="openSettlementDetail(row)">
                 {{ row.formalSettlementNo }}
@@ -173,7 +227,7 @@
         <el-input
           v-model="settlementDialog.keyword"
           clearable
-          placeholder="3结算单号、项目或合同"
+          placeholder="结算单号、项目或合同"
           @keyup.enter="loadSettlementCandidates"
         />
         <el-button type="primary" @click="loadSettlementCandidates">查询</el-button>
@@ -182,16 +236,32 @@
         ref="settlementTable"
         v-loading="settlementDialog.loading"
         :data="settlementDialog.rows"
+        row-key="id"
         border
         @selection-change="settlementDialog.selection = $event"
       >
-        <el-table-column type="selection" width="52" align="center" />
-        <el-table-column prop="formalSettlementNo" label="结算单号" min-width="170" />
-        <el-table-column prop="projectName" label="所属项目" min-width="150" />
-        <el-table-column prop="deptName" label="所属组织" min-width="150" />
-        <el-table-column prop="contractNo" label="合同编号" min-width="150" />
-        <el-table-column prop="payerName" label="付款方" min-width="150" />
-        <el-table-column prop="payeeName" label="收款方" min-width="150" />
+        <el-table-column type="selection" width="52" align="center" reserve-selection />
+        <el-table-column
+          prop="formalSettlementNo"
+          label="结算单号"
+          min-width="170"
+          show-overflow-tooltip
+        />
+        <el-table-column
+          prop="projectName"
+          label="所属项目"
+          min-width="150"
+          show-overflow-tooltip
+        />
+        <el-table-column prop="deptName" label="所属组织" min-width="150" show-overflow-tooltip />
+        <el-table-column
+          prop="contractNo"
+          label="合同编号"
+          min-width="150"
+          show-overflow-tooltip
+        />
+        <el-table-column prop="payerName" label="付款方" min-width="150" show-overflow-tooltip />
+        <el-table-column prop="payeeName" label="收款方" min-width="150" show-overflow-tooltip />
         <el-table-column label="结算总金额" min-width="140" align="right">
           <template #default="{ row }">{{ formatMoney(row.settlementAmount) }}</template>
         </el-table-column>
@@ -206,7 +276,9 @@
       </el-table>
       <template #footer>
         <el-button @click="settlementDialog.visible = false">取消</el-button>
-        <el-button type="primary" @click="confirmSettlements">确定</el-button>
+        <el-button type="primary" @click="confirmSettlements">
+          确定{{ settlementDialog.selection.length ? `（${settlementDialog.selection.length}）` : '' }}
+        </el-button>
       </template>
     </el-dialog>
   </basic-container>
@@ -219,7 +291,7 @@ import * as api from '@/api/payment/invoiceReceipt';
 import KingdeeInvoicePoolDialog from '@/components/kingdee-invoice-pool-dialog/main.vue';
 import VehicleAttachmentTable from '@/components/vehicle-attachment-table/main.vue';
 import { getMkPublicDetail } from '@/api/mk-process';
-import { submitMkApprovalFlow } from '@/utils/mk-approval';
+import { loadMkEnabled, submitMkApprovalFlow } from '@/utils/mk-approval';
 
 const emptyForm = () => ({
   id: null,
@@ -437,7 +509,15 @@ export default {
     },
     async openSettlementDialog() {
       this.settlementDialog.visible = true;
+      this.settlementDialog.selection = [];
       await this.loadSettlementCandidates();
+      await this.$nextTick();
+      const selectedIds = new Set(this.settlementIds.map(id => String(id)));
+      this.settlementDialog.rows.forEach(row => {
+        if (selectedIds.has(String(row.id))) {
+          this.$refs.settlementTable?.toggleRowSelection(row, true);
+        }
+      });
     },
     async loadSettlementCandidates() {
       this.settlementDialog.loading = true;
@@ -468,11 +548,21 @@ export default {
         this.$message.warning('关联结算单必须属于同一项目、组织及收付款方');
         return;
       }
+      const previousAmount = new Map(
+        this.form.settlements.map(item => [
+          String(item.formalSettlementId || item.settlementId),
+          item.allocatedInvoiceAmount,
+        ])
+      );
       this.form.settlements = rows.map(item => ({
         ...item,
         formalSettlementId: item.id,
         settlementId: item.id,
-        allocatedInvoiceAmount: rows.length === 1 ? Number(item.settlementAmount || 0) : 0,
+        allocatedInvoiceAmount: previousAmount.has(String(item.id))
+          ? Number(previousAmount.get(String(item.id)) || 0)
+          : rows.length === 1
+            ? Number(item.settlementAmount || 0)
+            : 0,
       }));
       this.form.projectName = first.projectName;
       this.form.deptName = first.deptName;
@@ -482,9 +572,8 @@ export default {
       await this.loadReferenceInformation();
       this.$refs.formRef?.validateField('settlementIds').catch(() => {});
     },
-    async selectSettlement(row) {
-      this.settlementDialog.selection = [row];
-      await this.confirmSettlements();
+    selectSettlement(row) {
+      this.$refs.settlementTable?.toggleRowSelection(row);
     },
     async loadReferenceInformation() {
       const data = this.unwrapData(await api.getReferenceInformation(this.settlementIds.join(',')));
@@ -571,6 +660,7 @@ export default {
         bizId: this.form.id,
         subjectName: this.form.invoiceNo || '',
         approvalStatus: previousApprovalStatus,
+        mkEnabled: await loadMkEnabled().catch(() => false),
       });
       this.$message.success('提交成功');
       this.goBack();
@@ -616,6 +706,15 @@ export default {
 .receipt-form-page__form :deep(.el-input-number) {
   width: 100%;
 }
+.receipt-form-page__overflow-trigger {
+  display: block;
+  width: 100%;
+  min-width: 0;
+}
+.receipt-form-page__form :deep(.el-tooltip__trigger:not(.el-select__wrapper)) {
+  display: block;
+  width: 100%;
+}
 .receipt-form-page__remark :deep(.el-form-item__content) {
   margin-left: 0 !important;
 }
diff --git a/src/views/payment/invoice-receipt.vue b/src/views/payment/invoice-receipt.vue
index 02b2ad1..8710449 100644
--- a/src/views/payment/invoice-receipt.vue
+++ b/src/views/payment/invoice-receipt.vue
@@ -341,6 +341,7 @@ export default {
         bizId: row.id,
         subjectName: row.invoiceNo || '',
         approvalStatus: previousApprovalStatus,
+        mkEnabled: this.mkEnabled,
       });
       this.$message.success('提交成功');
       this.loadTable();
diff --git a/src/views/payment/payment-application-form.vue b/src/views/payment/payment-application-form.vue
index 16ca9ea..836f9fd 100644
--- a/src/views/payment/payment-application-form.vue
+++ b/src/views/payment/payment-application-form.vue
@@ -36,25 +36,20 @@
           <el-col v-if="isSettlementRelatedType" :span="6"
             ><el-form-item label="结算单号" prop="referenceId">
               <div class="payment-form-page__settlement-nos">
-                <el-select
-                  ref="settlementNoSelectRef"
-                  :model-value="referenceSettlementNos"
-                  multiple
-                  collapse-tags
-                  collapse-tags-tooltip
-                  :max-collapse-tags="1"
-                  :disabled="readonly"
-                  placeholder="请输入"
-                  class="payment-form-page__settlement-select"
-                  @visible-change="handleSettlementSelectVisible"
+                <el-tooltip
+                  :content="referenceLabel"
+                  placement="top"
+                  :disabled="!referenceLabel || referenceSettlementCount < 2"
                 >
-                  <el-option
-                    v-for="item in referenceSettlementLinks"
-                    :key="`${item.id || item.settlementNo}`"
-                    :label="item.settlementNo"
-                    :value="item.settlementNo"
+                  <el-input
+                    :model-value="referenceDisplayText"
+                    readonly
+                    :disabled="readonly"
+                    placeholder="请输入"
+                    class="payment-form-page__settlement-input"
+                    @click="!readonly && openReference()"
                   />
-                </el-select>
+                </el-tooltip>
                 <el-button
                   v-if="!readonly"
                   class="payment-form-page__settlement-select-btn"
@@ -145,7 +140,8 @@
                 :step="0.01"
                 :controls="false"
                 style="width: 100%"
-                value-on-clear="0"
+                :value-on-clear="null"
+                placeholder="请输入申请付款金额"
               /></el-form-item
           ></el-col>
           <el-col :span="6"
@@ -250,11 +246,46 @@
           <el-table-column prop="payableAmount" label="可付款金额" min-width="130">
             <template #default="{ row }">{{ formatMoney(row.payableAmount) }}</template>
           </el-table-column>
-          <el-table-column prop="paymentRatio" label="付款比例（%）" min-width="110">
-            <template #default="{ row }">{{ formatMoney(row.paymentRatio) }}</template>
+          <el-table-column prop="paymentRatio" label="付款比例（%）" min-width="160">
+            <template #default="{ row }">
+              <el-input-number
+                v-if="multipleSettlementRows && !readonly"
+                :model-value="row.paymentRatio"
+                :min="0"
+                :max="rowPaymentRatioMax(row)"
+                :precision="2"
+                :controls="false"
+                :value-on-clear="null"
+                style="width: 100%"
+                @update:model-value="value => handleRowPaymentRatioChange(row, value)"
+              />
+              <span v-else :class="{ 'payment-form-page__ratio-exceeded': row.ratioExceeded }">
+                {{ formatMoney(row.paymentRatio) }}
+              </span>
+            </template>
           </el-table-column>
-          <el-table-column prop="appliedAmount" label="付款金额" min-width="130">
-            <template #default="{ row }">{{ formatMoney(row.appliedAmount) }}</template>
+          <el-table-column prop="appliedAmount" label="付款金额" min-width="160">
+            <template #default="{ row }">
+              <el-input-number
+                v-if="multipleSettlementRows && !readonly"
+                :model-value="row.appliedAmount"
+                :min="0"
+                :max="Number(row.payableAmount || 0)"
+                :precision="2"
+                :controls="false"
+                :value-on-clear="null"
+                style="width: 100%"
+                @update:model-value="value => handleRowAppliedAmountChange(row, value)"
+              />
+              <span v-else>{{ formatMoney(row.appliedAmount) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="ratioRemark" label="备注" min-width="220" show-overflow-tooltip>
+            <template #default="{ row }">
+              <span :class="{ 'payment-form-page__ratio-exceeded': row.ratioExceeded }">
+                {{ row.ratioRemark || '-' }}
+              </span>
+            </template>
           </el-table-column>
         </el-table>
       </section-card>
@@ -419,7 +450,7 @@
         <el-button v-if="!readonly" type="primary" plain @click="syncPaymentRecords"
           >同步</el-button
         >
-        <el-button v-if="!readonly && canSave" type="primary" plain @click="saveDraft()"
+        <el-button v-if="!readonly && canSave" type="primary" plain @click="handleSave"
           >保存</el-button
         >
         <el-button
@@ -493,7 +524,7 @@
           </el-form>
         </el-card>
         <el-tabs v-model="referenceTab" @tab-change="handleReferenceTabChange">
-          <el-tab-pane v-if="canSelectFormalSettlement" label="正式结算单" name="formal">
+          <el-tab-pane v-if="canSelectFormalSettlement" label="付款结算单" name="formal">
             <el-table
               v-loading="formalPage.loading"
               :data="formalRows"
@@ -501,12 +532,19 @@
               @selection-change="formalSelection = $event"
             >
               <el-table-column type="selection" width="50" />
-              <el-table-column prop="formalSettlementNo" label="结算单号" />
-              <el-table-column prop="projectName" label="所属项目" />
-              <el-table-column prop="contractName" label="合同名称" />
-              <el-table-column prop="settlementAmount" label="结算金额">
+              <el-table-column prop="formalSettlementNo" label="结算单号" min-width="150" />
+              <el-table-column prop="projectName" label="所属项目" min-width="140" />
+              <el-table-column prop="contractName" label="合同名称" min-width="160" />
+              <el-table-column prop="settlementAmount" label="结算金额" min-width="130">
                 <template #default="{ row }">{{ formatMoney(row.settlementAmount) }}</template>
               </el-table-column>
+              <el-table-column prop="payableAmount" label="可付款金额" min-width="130">
+                <template #default="{ row }">{{
+                  row.payableAmount === undefined || row.payableAmount === null
+                    ? '-'
+                    : formatMoney(row.payableAmount)
+                }}</template>
+              </el-table-column>
               <el-table-column label="操作" width="100">
                 <template #default="{ row }">
                   <el-link type="primary" @click.stop="selectFormal(row)">选择</el-link>
@@ -525,7 +563,7 @@
               />
             </div>
           </el-tab-pane>
-          <el-tab-pane v-if="canSelectPreSettlement" label="预结算单" name="pre">
+          <el-tab-pane v-if="canSelectPreSettlement" label="预付结算单" name="pre">
             <el-table
               v-loading="prePage.loading"
               :data="preRows"
@@ -533,12 +571,19 @@
               @selection-change="preSelection = $event"
             >
               <el-table-column type="selection" width="50" />
-              <el-table-column prop="preSettlementNo" label="结算单号" />
-              <el-table-column prop="projectName" label="所属项目" />
-              <el-table-column prop="contractName" label="合同名称" />
-              <el-table-column prop="settlementAmount" label="结算金额">
+              <el-table-column prop="preSettlementNo" label="结算单号" min-width="150" />
+              <el-table-column prop="projectName" label="所属项目" min-width="140" />
+              <el-table-column prop="contractName" label="合同名称" min-width="160" />
+              <el-table-column prop="settlementAmount" label="结算金额" min-width="130">
                 <template #default="{ row }">{{ formatMoney(row.settlementAmount) }}</template>
               </el-table-column>
+              <el-table-column prop="payableAmount" label="可付款金额" min-width="130">
+                <template #default="{ row }">{{
+                  row.payableAmount === undefined || row.payableAmount === null
+                    ? '-'
+                    : formatMoney(row.payableAmount)
+                }}</template>
+              </el-table-column>
               <el-table-column label="操作" width="100">
                 <template #default="{ row }">
                   <el-link type="primary" @click.stop="selectPre(row)">选择</el-link>
@@ -572,22 +617,27 @@
       </template>
     </el-dialog>
     <el-dialog v-model="billDialogVisible" title="选择汇票" width="80%" append-to-body>
-      <div class="payment-form-page__reference-search">
-        <el-form :model="billQuery" label-position="right" label-width="160px" @submit.prevent>
-          <div class="payment-form-page__reference-search-fields">
-            <el-form-item label="汇票筛选">
-              <el-input
-                v-model="billQuery.keyword"
-                clearable
-                placeholder="请输入汇票号、出票单位或收票单位"
-                @keyup.enter="handleBillSearch"
-              />
-            </el-form-item>
-          </div>
-          <div class="payment-form-page__reference-search-actions">
-            <el-button type="primary" @click="handleBillSearch">搜索</el-button>
-            <el-button @click="resetBillSearch">清空</el-button>
-          </div>
+      <div class="payment-form-page__reference-search payment-form-page__bill-search">
+        <el-form
+          :model="billQuery"
+          inline
+          label-position="right"
+          label-width="88px"
+          @submit.prevent
+        >
+          <el-form-item label="汇票筛选">
+            <el-input
+              v-model="billQuery.keyword"
+              clearable
+              style="width: 320px"
+              placeholder="请输入汇票号、出票单位或收票单位"
+              @keyup.enter="handleBillSearch"
+            />
+          </el-form-item>
+          <el-form-item class="payment-form-page__bill-search-actions">
+            <el-button type="primary" @click="handleBillSearch">查询</el-button>
+            <el-button @click="resetBillSearch">重置</el-button>
+          </el-form-item>
         </el-form>
       </div>
       <el-table v-loading="billPage.loading" :data="billRows" border>
@@ -662,7 +712,7 @@
 </template>
 
 <script>
-import { ElImageViewer } from 'element-plus';
+import { ElImageViewer, ElMessage } from 'element-plus';
 import { OpenFileViewer } from '@open-file-viewer/vue';
 import { fallbackPlugin, imagePlugin, officePlugin, textPlugin } from '@open-file-viewer/core';
 import '@open-file-viewer/core/style.css';
@@ -684,7 +734,7 @@ import {
 import { readSettlementTransfer, removeSettlementTransfer } from '@/utils/settlement-transfer';
 import { formatContractOptionLabel } from '@/utils/contract';
 import { downloadFileByUrl } from '@/utils/util';
-import { submitMkApprovalFlow } from '@/utils/mk-approval';
+import { loadMkEnabled, submitMkApprovalFlow } from '@/utils/mk-approval';
 import {
   downloadKingdeeInvoiceFile,
   isKingdeePathAttachment,
@@ -699,6 +749,9 @@ const attachmentViewerPlugins = [
   fallbackPlugin(),
 ];
 
+const paymentApplicationListRoute = '/payment/payment-application';
+const paymentApplicationListRefreshKey = 'payment-application-list-refresh';
+
 const ATTACHMENT_MATERIALS = {
   weighingSlip: { key: 'weighingSlip', label: '磅单', keywords: ['磅单'] },
   entrustOrder: { key: 'entrustOrder', label: '委托单', keywords: ['委托单'] },
@@ -805,6 +858,8 @@ export default {
       billOptions: [],
       billLoading: false,
       billDialogVisible: false,
+      settlementPayerName: '',
+      settlementPayeeName: '',
       billQuery: {
         keyword: '',
       },
@@ -822,6 +877,8 @@ export default {
       contractSignatureFileAvailable: false,
       contractPaymentRatioLimit: null,
       contractPaymentRatioExceeded: false,
+      /** 合同付款比例设置（按第1笔、第2笔…顺序） */
+      contractPaymentRatioRows: [],
       payeeCustomerLevel: '',
       // 收款方 C101-1 风险查询留档：risky=高风险/黑名单，tip=后端拼装提示文案
       payeeRisky: false,
@@ -829,6 +886,8 @@ export default {
       payeeRiskLevel: '',
       payeeBlackStatus: '',
       attachmentRuleLoading: false,
+      // 最近一次从结算单同步过来的附件 URL，切换结算单时用于整批替换
+      linkedSettlementAttachmentUrls: [],
       attachmentImagePreviewVisible: false,
       attachmentImagePreviewUrls: [],
       attachmentImagePreviewIndex: 0,
@@ -873,7 +932,7 @@ export default {
         billLedgerId: [{ validator: this.validateBillLedger, trigger: 'change' }],
         settlementAmount: [{ validator: this.validateSettlementAmount, trigger: 'change' }],
         appliedAmount: [
-          { required: true, validator: this.validateAppliedAmount, trigger: 'change' },
+          { required: true, validator: this.validateAppliedAmount, trigger: ['change', 'blur'] },
         ],
       },
     };
@@ -918,8 +977,8 @@ export default {
     referenceDialogTitle() {
       if (this.form.paymentType === 'project_advance') return '选择项目合同';
       if (this.canSelectPreSettlement && this.canSelectFormalSettlement) return '选择结算单';
-      if (this.canSelectPreSettlement) return '选择预结算单';
-      if (this.canSelectFormalSettlement) return '选择正式结算单';
+      if (this.canSelectPreSettlement) return '选择预付结算单';
+      if (this.canSelectFormalSettlement) return '选择付款结算单';
       return '选择结算单';
     },
     billPayment() {
@@ -963,12 +1022,37 @@ export default {
     referenceSettlementNos() {
       return this.referenceSettlementLinks.map(item => item.settlementNo).filter(Boolean);
     },
+    referenceSettlementCount() {
+      return this.referenceSettlementNos.length;
+    },
+    multipleSettlementRows() {
+      return this.referenceRows.length > 1;
+    },
+    // 结算单号展示：单张显示单号；多张仅提示数量，明细在下方「结算信息」表，悬停可看全部单号
+    referenceDisplayText() {
+      if (this.referenceSettlementCount > 1) return `已选 ${this.referenceSettlementCount} 张结算单`;
+      return this.referenceLabel;
+    },
     settlementRows() {
+      if (this.referenceRows.length > 1) {
+        // 多结算单：行内比例/金额独立维护，不回落到表头比例（表头与结算信息不关联）
+        return this.referenceRows.map(item => {
+          const paymentRatio =
+            item.paymentRatio === undefined || item.paymentRatio === null || item.paymentRatio === ''
+              ? 0
+              : Number(item.paymentRatio);
+          const appliedAmount = Number(item.appliedAmount || 0);
+          return {
+            ...item,
+            paymentRatio,
+            appliedAmount,
+            ...this.buildSettlementRatioHint({ ...item, paymentRatio }),
+          };
+        });
+      }
       if (this.referenceRows.length) {
-        return this.referenceRows.map(item => ({
-          ...item,
-          paymentRatio: this.form.paymentRatio,
-          appliedAmount:
+        return this.referenceRows.map(item => {
+          const appliedAmount =
             item.fixedAppliedAmount === true
               ? Number(item.appliedAmount || 0)
               : Number(
@@ -976,8 +1060,14 @@ export default {
                     (Number(item.settlementAmount || 0) * Number(this.form.paymentRatio || 0)) /
                     100
                   ).toFixed(2)
-                ),
-        }));
+                );
+          return {
+            ...item,
+            paymentRatio: this.form.paymentRatio,
+            appliedAmount,
+            ...this.buildSettlementRatioHint(item),
+          };
+        });
       }
       if (!this.referenceLabel) return [];
       return [
@@ -987,6 +1077,8 @@ export default {
           payableAmount: this.form.payableAmount,
           paymentRatio: this.form.paymentRatio,
           appliedAmount: this.form.appliedAmount,
+          paymentSequence: 1,
+          ...this.buildSettlementRatioHint({ paymentSequence: 1 }),
         },
       ];
     },
@@ -1032,6 +1124,7 @@ export default {
     },
     'form.paymentRatio'(value) {
       this.checkContractPaymentRatio(value);
+      // 上方比例仅用于反算申请付款金额，不联动结算信息列表
       if (this.amountSyncing || !this.paymentAmountBase) return;
       this.amountSyncing = true;
       this.form.appliedAmount = Number(
@@ -1042,6 +1135,7 @@ export default {
       });
     },
     'form.appliedAmount'(value) {
+      // 上方申请付款金额反算比例，不联动结算信息列表
       if (this.amountSyncing || !this.paymentAmountBase) return;
       this.amountSyncing = true;
       this.form.paymentRatio = Number(
@@ -1059,6 +1153,7 @@ export default {
       ) {
         return;
       }
+      // 结算金额变化时按上方比例重算申请付款金额，仍不联动结算信息明细
       this.amountSyncing = true;
       this.form.appliedAmount = Number(
         ((this.paymentAmountBase * Number(this.form.paymentRatio || 0)) / 100).toFixed(2)
@@ -1087,7 +1182,7 @@ export default {
         !this.form.preSettlementId &&
         !this.form.preSettlementIds?.length
       ) {
-        callback(new Error('请选择预结算单'));
+        callback(new Error('请选择预付结算单'));
         return;
       }
       if (
@@ -1118,14 +1213,18 @@ export default {
       callback();
     },
     validateAppliedAmount(rule, value, callback) {
+      if (value === null || value === undefined || value === '') {
+        callback(new Error('请填写申请付款金额'));
+        return;
+      }
       const amount = Number(value);
       const payableAmount = Number(this.form.payableAmount || 0);
-      if (value === null || value === undefined || value === '' || !Number.isFinite(amount)) {
+      if (!Number.isFinite(amount)) {
         callback(new Error('请填写申请付款金额'));
         return;
       }
       if (amount <= 0) {
-        callback(new Error('申请付款金额必须大于0'));
+        callback(new Error('申请付款金额必须大于0，不能为0元'));
         return;
       }
       if (
@@ -1148,10 +1247,27 @@ export default {
         return;
       }
       const selected = this.billOptions.find(item => String(item.id) === String(value));
+      if (!selected) {
+        callback();
+        return;
+      }
       if (
-        selected &&
-        Number(this.form.appliedAmount || 0) > Number(selected.availableBalance || 0)
+        selected.billType &&
+        selected.billType !== 'received' &&
+        !this.billMatchesSettlementParties(selected)
       ) {
+        callback(new Error('汇票付款仅可选择收票类型，或出票单位与收票单位均为当前结算收付款方的汇票'));
+        return;
+      }
+      if (selected.maturityDate) {
+        const maturity = this.$dayjs(selected.maturityDate).startOf('day');
+        const today = this.$dayjs().startOf('day');
+        if (maturity.isValid() && maturity.isBefore(today)) {
+          callback(new Error('所选汇票已到期，不可选择'));
+          return;
+        }
+      }
+      if (Number(this.form.appliedAmount || 0) > Number(selected.availableBalance || 0)) {
         callback(new Error('申请付款金额不能超过汇票可用余额'));
         return;
       }
@@ -1249,7 +1365,8 @@ export default {
         ];
       }
       const referenceRow = this.createReferenceRow(data);
-      this.referenceRows = referenceRow.settlementNo ? [referenceRow] : [];
+      this.referenceRows = this.restoreReferenceRows(data, referenceRow);
+      if (this.referenceRows.length > 1) this.syncHeaderPaymentFromRows();
       this.paymentRecords = data.paymentRecords || [];
     },
     async initialize() {
@@ -1272,13 +1389,16 @@ export default {
           invoices: data.invoices || [],
         };
         const referenceRow = this.createReferenceRow(data);
-        this.referenceRows = referenceRow.settlementNo ? [referenceRow] : [];
+        this.referenceRows = this.restoreReferenceRows(data, referenceRow);
+        this.clearFormalReferenceWhenPreOnly();
         this.paymentRecords = data.paymentRecords || [];
         if (this.form.paymentType === 'project_advance') {
           await this.loadProjectOptions();
           await this.loadContractOptions(this.form.projectId);
         }
         await this.fillBillTypeFromContract(this.form.contractId);
+        await this.refreshSettlementPaymentSequences();
+        if (this.referenceRows.length > 1) this.syncHeaderPaymentFromRows();
         await this.loadAttachmentRuleData(await this.loadCurrentSettlementDetails());
         if (this.billPayment) await this.loadBillOptions('', data.billLedgerId);
       } else {
@@ -1306,6 +1426,7 @@ export default {
         this.form.billType = '';
         this.contractPartyBName = '';
         this.receiptAccountOptions = [];
+        this.resetContractPaymentRatioLimit();
         return;
       }
       try {
@@ -1317,11 +1438,13 @@ export default {
           this.form.payerName = partyA;
         }
         this.contractPartyBName = String(data?.partyB || data?.payeeName || '').trim();
+        this.applyContractPaymentRatioLimit(data || {});
         await this.loadReceiptAccountOptions(autoSelectDefault);
       } catch (error) {
         this.form.billType = '';
         this.contractPartyBName = '';
         this.receiptAccountOptions = [];
+        this.resetContractPaymentRatioLimit();
       }
     },
     async loadPaymentMethodOptions() {
@@ -1416,16 +1539,34 @@ export default {
       if (!rows.length) return;
       const contractIds = new Set(rows.map(item => String(item.contractId || '')));
       if (contractIds.size !== 1 || contractIds.has('')) {
-        this.$message.warning('所选正式结算单合同信息不一致，请返回后重新选择');
+        this.$message.warning('所选付款结算单合同信息不一致，请返回后重新选择');
         return;
       }
       const first = rows[0];
-      const referenceRows = rows.map(item => ({
-        ...this.createReferenceRow(item),
-        settlementNo: item.formalSettlementNo || item.settlementNo || '',
-        appliedAmount: Number(item.appliedAmount || 0),
-        fixedAppliedAmount: true,
-      }));
+      const amountResponses = await Promise.all(
+        rows.map(item => {
+          const referenceId = item.settlementId || item.id;
+          if (!this.isValidReferenceId(referenceId)) return Promise.resolve(null);
+          return api
+            .getReferenceAmount('settlement_payment', referenceId, this.form.id)
+            .catch(() => null);
+        })
+      );
+      const referenceRows = rows.map((item, index) => {
+        const amount = this.unwrapData(amountResponses[index]) || {};
+        return {
+          ...this.createReferenceRow({
+            ...item,
+            settlementAmount: amount.settlementAmount ?? item.settlementAmount,
+            payableAmount: amount.payableAmount ?? item.payableAmount,
+            paymentSequence: amount.paymentSequence,
+          }),
+          settlementNo: item.formalSettlementNo || item.settlementNo || '',
+          appliedAmount: Number(item.appliedAmount || 0),
+          fixedAppliedAmount: true,
+        };
+      });
+      this.seedMultipleRowPayments(referenceRows);
       const settlementAmount = referenceRows.reduce(
         (total, item) => total + Number(item.settlementAmount || 0),
         0
@@ -1434,13 +1575,27 @@ export default {
         (total, item) => total + Number(item.payableAmount || 0),
         0
       );
-      const appliedAmount = referenceRows.reduce(
+      const multiple = referenceRows.length > 1;
+      // 多结算单：表头比例/申请金额独立；单结算单：沿用行金额或按比例计算
+      const paymentRatio = Number(this.form.paymentRatio || 0);
+      const rowsAppliedTotal = referenceRows.reduce(
         (total, item) => total + Number(item.appliedAmount || 0),
         0
       );
-      const paymentRatio = settlementAmount
-        ? Number(((appliedAmount / settlementAmount) * 100).toFixed(2))
-        : 0;
+      const headerAppliedAmount = multiple
+        ? Number(((settlementAmount * paymentRatio) / 100).toFixed(2))
+        : Number(
+            (
+              rowsAppliedTotal > 0
+                ? rowsAppliedTotal
+                : (payableAmount * paymentRatio) / 100
+            ).toFixed(2)
+          );
+      const headerPaymentRatio = multiple
+        ? paymentRatio
+        : settlementAmount
+          ? Number(((headerAppliedAmount / settlementAmount) * 100).toFixed(2))
+          : paymentRatio;
       const settlementIds = rows.map(item => item.settlementId || item.id).filter(Boolean);
       this.amountSyncing = true;
       this.referenceRows = referenceRows;
@@ -1467,12 +1622,13 @@ export default {
         settlementAmount: Number(settlementAmount.toFixed(2)),
         payableAmount: Number(payableAmount.toFixed(2)),
         billType: '',
-        paymentRatio,
-        appliedAmount: Number(appliedAmount.toFixed(2)),
+        paymentRatio: headerPaymentRatio,
+        appliedAmount: headerAppliedAmount,
         invoices: rows.flatMap(item =>
           this.createInvoiceRows(item.invoices || [], item.formalSettlementNo || item.settlementNo)
         ),
       });
+      this.rememberSettlementParties(first.payerName, first.payeeName);
       this.paymentRecords = rows.flatMap(item =>
         (item.paymentRecords || item.paymentApplications || []).map(record => ({
           ...record,
@@ -1490,21 +1646,146 @@ export default {
         this.$refs.formRef?.clearValidate();
       });
     },
+    clearFormalReferenceWhenPreOnly() {
+      const progressAdvance = this.form.paymentType === 'progress_advance';
+      const onlyPre =
+        progressAdvance ||
+        (this.referenceRows.length > 0 &&
+          this.referenceRows.every(item => item.referenceType === 'pre'));
+      if (!onlyPre) return;
+      if (!this.form.preSettlementId) {
+        const preId =
+          this.referenceRows.find(item => item.referenceType === 'pre')?.id ||
+          (progressAdvance ? this.form.settlementId : null);
+        if (preId) {
+          this.form.preSettlementId = preId;
+          this.form.preSettlementIds = [preId];
+        }
+      }
+      this.form.settlementId = null;
+      this.form.settlementIds = [];
+      this.form.settlementNo = '';
+    },
+    restoreReferenceRows(data, fallbackRow) {
+      const relations = Array.isArray(data?.settlements) ? data.settlements : [];
+      const rows = relations
+        .map(item => {
+          const isPre = Boolean(item.preSettlementId || item.preSettlementNo);
+          const settlementNo = item.preSettlementNo || item.formalSettlementNo || '';
+          if (!settlementNo) return null;
+          return {
+            id: isPre ? item.preSettlementId || item.formalSettlementId : item.formalSettlementId,
+            settlementNo,
+            referenceType: isPre ? 'pre' : 'formal',
+            settlementAmount: Number(Number(item.settlementAmount || 0).toFixed(2)),
+            payableAmount: Number(Number(item.payableAmount ?? item.settlementAmount ?? 0).toFixed(2)),
+            appliedAmount: Number(Number(item.appliedAmount || 0).toFixed(2)),
+            paymentRatio: Number(item.settlementAmount || 0)
+              ? Number(
+                  (
+                    (Number(item.appliedAmount || 0) / Number(item.settlementAmount || 0)) *
+                    100
+                  ).toFixed(2)
+                )
+              : null,
+            fixedAppliedAmount: this.readonly,
+          };
+        })
+        .filter(Boolean);
+      if (rows.length > 1) {
+        this.form.preSettlementIds = rows.filter(item => item.referenceType === 'pre').map(item => item.id);
+        this.form.settlementIds = rows.filter(item => item.referenceType === 'formal').map(item => item.id);
+        if (this.form.preSettlementIds.length) this.form.preSettlementId = this.form.preSettlementIds[0];
+        if (this.form.settlementIds.length) this.form.settlementId = this.form.settlementIds[0];
+        return rows;
+      }
+      return fallbackRow?.settlementNo ? [fallbackRow] : [];
+    },
     createReferenceRow(row) {
       const settlementAmount = Number(row.settlementAmount || 0);
-      const appliedAmount = Number(row.advanceAppliedAmount || row.appliedPaymentAmount || 0);
-      const isPre = Boolean(row.preSettlementNo || row.preSettlementId || row.referenceType === 'pre');
+      const isPre = Boolean(
+        row.preSettlementNo ||
+          row.preSettlementId ||
+          row.referenceType === 'pre' ||
+          row.paymentType === 'progress_advance'
+      );
+      const paymentSequence = Number(row.paymentSequence);
+      // 可付款金额必须来自 referenceAmount 接口（已扣减占用中的付款申请）；缺失时置 0，避免误用未扣减结算金额
+      const payableAmount =
+        row.payableAmount === undefined || row.payableAmount === null
+          ? 0
+          : Number(row.payableAmount || 0);
       return {
-        id: row.preSettlementId || row.settlementId || row.id,
+        id:
+          row.preSettlementId ||
+          (isPre ? row.settlementId : null) ||
+          row.settlementId ||
+          (row.paymentNo ? null : row.id),
         settlementNo: row.preSettlementNo || row.formalSettlementNo || row.settlementNo || '',
         referenceType: isPre ? 'pre' : 'formal',
-        settlementAmount,
-        payableAmount:
-          row.payableAmount === undefined || row.payableAmount === null
-            ? Math.max(0, settlementAmount - appliedAmount)
-            : Number(row.payableAmount || 0),
+        settlementAmount: Number(Number(settlementAmount || 0).toFixed(2)),
+        payableAmount: Number(Math.max(0, payableAmount).toFixed(2)),
+        paymentSequence: Number.isFinite(paymentSequence) && paymentSequence > 0 ? paymentSequence : 1,
       };
     },
+    /**
+     * 按合同付款比例配置，判断当前付款次序是否超上限。
+     * @param {Object} row 结算信息行（含 paymentSequence）
+     */
+    buildSettlementRatioHint(row = {}) {
+      const sequence = Number(row.paymentSequence || 1);
+      const rawRatio =
+        row.paymentRatio !== undefined && row.paymentRatio !== null && row.paymentRatio !== ''
+          ? row.paymentRatio
+          : this.form.paymentRatio;
+      const paymentRatio = Number(rawRatio);
+      const ratioConfig = this.contractPaymentRatioRows[sequence - 1];
+      const ratioLimitValue = ratioConfig?.ratioLimit;
+      const ratioLimit = Number(ratioLimitValue);
+      const hasLimit =
+        ratioLimitValue !== null &&
+        ratioLimitValue !== undefined &&
+        String(ratioLimitValue).trim() !== '' &&
+        Number.isFinite(ratioLimit);
+      const hasPaymentRatio =
+        rawRatio !== null &&
+        rawRatio !== undefined &&
+        String(rawRatio).trim() !== '' &&
+        Number.isFinite(paymentRatio);
+      const ratioExceeded = hasLimit && hasPaymentRatio && paymentRatio > ratioLimit;
+      return {
+        paymentSequence: Number.isFinite(sequence) && sequence > 0 ? sequence : 1,
+        contractRatioLimit: hasLimit ? ratioLimit : null,
+        ratioExceeded,
+        ratioRemark: ratioExceeded
+          ? `合同约定第${sequence}笔付款比例上限为${Number(ratioLimit).toFixed(2)}%`
+          : '',
+      };
+    },
+    /** 为结算信息行回填付款次序（第几次付款） */
+    async refreshSettlementPaymentSequences() {
+      if (!this.isSettlementRelatedType || !this.referenceRows.length) {
+        return;
+      }
+      const paymentType =
+        this.form.paymentType === 'settlement_payment' ? 'settlement_payment' : 'progress_advance';
+      const amountResponses = await Promise.all(
+        this.referenceRows.map(item => {
+          if (!this.isValidReferenceId(item.id)) {
+            return Promise.resolve(null);
+          }
+          return api.getReferenceAmount(paymentType, item.id, this.form.id).catch(() => null);
+        })
+      );
+      this.referenceRows = this.referenceRows.map((item, index) => {
+        const amount = this.unwrapData(amountResponses[index]) || {};
+        const paymentSequence = Number(amount.paymentSequence || item.paymentSequence || 1);
+        return {
+          ...item,
+          paymentSequence: Number.isFinite(paymentSequence) && paymentSequence > 0 ? paymentSequence : 1,
+        };
+      });
+    },
     createInvoiceRows(invoices = [], settlementNo = '') {
       return (invoices || []).map(invoice => ({
         settlementNo,
@@ -1555,14 +1836,42 @@ export default {
       if (!rows.length) return;
       const contractIds = new Set(rows.map(item => String(item.contractId || '')));
       if (contractIds.size > 1 || contractIds.has('')) {
-        this.$message.warning('所选预结算单合同信息不一致，请返回后重新选择');
+        this.$message.warning('所选预付结算单合同信息不一致，请返回后重新选择');
         return;
       }
       const first = rows[0];
       this.form.invoices = [];
-      this.referenceRows = rows.map(item =>
-        this.createReferenceRow({ ...item, referenceType: 'pre' })
-      );
+      const paymentType =
+        this.form.paymentType === 'settlement_payment' ? 'settlement_payment' : 'progress_advance';
+      try {
+        const amountResponses = await Promise.all(
+          rows.map(item => {
+            const referenceId = item.preSettlementId || item.id;
+            if (!this.isValidReferenceId(referenceId)) {
+              return Promise.reject(new Error('结算单无效'));
+            }
+            return api.getReferenceAmount(paymentType, referenceId, this.form.id);
+          })
+        );
+        this.referenceRows = rows.map((item, index) => {
+          const amount = this.unwrapData(amountResponses[index]) || {};
+          const settlementAmount = Number(amount.settlementAmount ?? item.settlementAmount ?? 0);
+          if (amount.payableAmount === undefined || amount.payableAmount === null) {
+            throw new Error('可付款金额获取失败，请重试');
+          }
+          return this.createReferenceRow({
+            ...item,
+            referenceType: 'pre',
+            settlementAmount,
+            payableAmount: Number(amount.payableAmount || 0),
+            paymentSequence: amount.paymentSequence,
+          });
+        });
+      } catch (error) {
+        this.$message.error(error?.message || '可付款金额获取失败，请重试');
+        return;
+      }
+      this.seedMultipleRowPayments(this.referenceRows);
       const settlementAmount = this.referenceRows.reduce(
         (total, item) => total + Number(item.settlementAmount || 0),
         0
@@ -1571,10 +1880,22 @@ export default {
         (total, item) => total + Number(item.payableAmount || 0),
         0
       );
+      const multiple = this.referenceRows.length > 1;
       const paymentRatio = Number(this.form.paymentRatio || 0);
-      // 尾款付款场景下选择预结算单时保留尾款付款类型，不强制改为进度预付
-      const paymentType =
-        this.form.paymentType === 'settlement_payment' ? 'settlement_payment' : 'progress_advance';
+      const rowsAppliedTotal = this.referenceRows.reduce(
+        (total, item) => total + Number(item.appliedAmount || 0),
+        0
+      );
+      // 多结算单：表头申请金额只由上方比例计算；单结算单仍按可付款金额×比例
+      const headerAppliedAmount = multiple
+        ? Number(((settlementAmount * paymentRatio) / 100).toFixed(2))
+        : Number(((payableAmount * paymentRatio) / 100).toFixed(2));
+      const headerPaymentRatio = multiple
+        ? paymentRatio
+        : settlementAmount && rowsAppliedTotal > 0
+          ? Number(((rowsAppliedTotal / settlementAmount) * 100).toFixed(2))
+          : paymentRatio;
+      // 尾款付款场景下选择预付结算单时保留尾款付款类型，不强制改为进度预付
       this.amountSyncing = true;
       Object.assign(this.form, {
         paymentType,
@@ -1599,8 +1920,10 @@ export default {
         settlementAmount: Number(settlementAmount.toFixed(2)),
         payableAmount: Number(payableAmount.toFixed(2)),
         billType: '',
-        appliedAmount: Number(((settlementAmount * paymentRatio) / 100).toFixed(2)),
+        paymentRatio: headerPaymentRatio,
+        appliedAmount: headerAppliedAmount,
       });
+      this.rememberSettlementParties(first.payerName, first.payeeName);
       this.paymentRecords = [];
       this.clearReceiptAccount();
       await this.fillBillTypeFromContract(first.contractId, true);
@@ -1796,12 +2119,31 @@ export default {
     },
     resolveAttachmentMaterial(file, materials = Object.values(ATTACHMENT_MATERIALS)) {
       if (!this.attachmentFileUrl(file)) return null;
-      const typeMatched = (materials || []).find(
-        material => file.attachmentType === MATERIAL_TYPE_MAP[material.key]
-      );
+      const typeText = String(file.attachmentType || file.type || '')
+        .trim()
+        .toLocaleLowerCase();
+      const typeMatched = (materials || []).find(material => {
+        if (file.attachmentType === MATERIAL_TYPE_MAP[material.key]) return true;
+        if (!typeText) return false;
+        const label = String(material.label || '').toLocaleLowerCase();
+        return (
+          typeText === label ||
+          material.keywords.some(keyword => {
+            const normalizedKeyword = String(keyword).toLocaleLowerCase();
+            return normalizedKeyword && typeText.includes(normalizedKeyword);
+          })
+        );
+      });
       return typeMatched || this.matchAttachmentMaterialByFileName(file, materials);
     },
-    mergeAutomaticAttachments(files, materials, sourceName, defaultMaterial = null) {
+    mergeAutomaticAttachments(
+      files,
+      materials,
+      sourceName,
+      defaultMaterial = null,
+      sourceKey = '',
+      keepUnmatched = false
+    ) {
       const existingUrls = new Set(
         (this.form.attachments || []).map(file => this.attachmentFileUrl(file)).filter(Boolean)
       );
@@ -1810,38 +2152,108 @@ export default {
           file,
           material: this.resolveAttachmentMaterial(file, materials) || defaultMaterial,
         }))
-        .filter(item => item.material && !existingUrls.has(this.attachmentFileUrl(item.file)))
+        .filter(item => {
+          const url = this.attachmentFileUrl(item.file);
+          return Boolean(url) && !existingUrls.has(url) && (item.material || keepUnmatched);
+        })
         .map(({ file, material }) => {
-          existingUrls.add(this.attachmentFileUrl(file));
+          const url = this.attachmentFileUrl(file);
+          existingUrls.add(url);
           return {
             ...file,
             originalName: this.attachmentFileName(file),
             name: this.attachmentFileName(file),
-            url: this.attachmentFileUrl(file),
-            link: file.link || this.attachmentFileUrl(file),
-            attachmentType: MATERIAL_TYPE_MAP[material.key],
+            url,
+            link: file.link || url,
+            attachmentType: material ? MATERIAL_TYPE_MAP[material.key] : 'other',
             description: file.description || `自动取自${sourceName}`,
             sourceImported: true,
+            sourceKey: sourceKey || undefined,
           };
         });
       if (imported.length) this.form.attachments = [...this.form.attachments, ...imported];
+      return imported;
+    },
+    /** 移除指定来源的自动关联附件（切换结算单/合同时整批替换） */
+    removeAutomaticAttachments(sourceKey, sourceName = '') {
+      const previousUrls = new Set(
+        sourceKey === 'settlement' ? this.linkedSettlementAttachmentUrls || [] : []
+      );
+      this.form.attachments = (this.form.attachments || []).filter(file => {
+        const url = this.attachmentFileUrl(file);
+        if (sourceKey && file.sourceKey === sourceKey) return false;
+        if (
+          sourceName &&
+          file.sourceImported &&
+          String(file.description || '').includes(`自动取自${sourceName}`)
+        ) {
+          return false;
+        }
+        if (previousUrls.size && url && previousUrls.has(url)) return false;
+        return true;
+      });
+      if (sourceKey === 'settlement') {
+        this.linkedSettlementAttachmentUrls = [];
+      }
+    },
+    /** 按当前结算单附件整批同步：先清旧关联，再写入新结算单上传的附件 */
+    syncSettlementAttachments(settlementRows = []) {
+      const settlementMaterials = Object.values(ATTACHMENT_MATERIALS);
+      const settlementFiles = (settlementRows || []).flatMap(row => this.parse(row.attachmentsJson));
+      const nextUrlSet = new Set(
+        settlementFiles.map(file => this.attachmentFileUrl(file)).filter(Boolean)
+      );
+      // 编辑回显时草稿里已有结算单附件但无 sourceKey：用 URL 交集补齐待替换清单
+      if (!(this.linkedSettlementAttachmentUrls || []).length && nextUrlSet.size) {
+        this.linkedSettlementAttachmentUrls = (this.form.attachments || [])
+          .map(file => this.attachmentFileUrl(file))
+          .filter(url => url && nextUrlSet.has(url));
+      }
+      this.removeAutomaticAttachments('settlement', '结算单');
+      const imported = this.mergeAutomaticAttachments(
+        settlementFiles,
+        settlementMaterials,
+        '结算单',
+        null,
+        'settlement',
+        true
+      );
+      this.linkedSettlementAttachmentUrls = imported
+        .map(file => this.attachmentFileUrl(file))
+        .filter(Boolean);
     },
     async loadCurrentSettlementDetails() {
+      const preIds = [
+        ...(this.form.preSettlementIds || []),
+        this.form.preSettlementId,
+        ...(this.referenceRows || [])
+          .filter(item => item.referenceType === 'pre')
+          .map(item => item.id),
+      ]
+        .map(id => String(id ?? '').trim())
+        .filter(id => this.isValidReferenceId(id));
+      const formalIds = [
+        ...(this.form.settlementIds || []),
+        this.form.settlementId,
+        ...(this.referenceRows || [])
+          .filter(item => item.referenceType !== 'pre')
+          .map(item => item.id),
+      ]
+        .map(id => String(id ?? '').trim())
+        .filter(id => this.isValidReferenceId(id));
+      const uniquePreIds = [...new Set(preIds)];
+      const uniqueFormalIds = [...new Set(formalIds)];
       if (
-        this.form.paymentType === 'progress_advance' &&
-        this.isValidReferenceId(this.form.preSettlementId)
+        (this.form.paymentType === 'progress_advance' ||
+          this.form.paymentType === 'settlement_payment') &&
+        uniquePreIds.length
       ) {
-        const response = await preApi.getDetail(this.form.preSettlementId);
-        const detail = this.unwrapData(response);
-        return detail?.id ? [detail] : [];
+        const responses = await Promise.all(uniquePreIds.map(id => preApi.getDetail(id)));
+        return responses.map(response => this.unwrapData(response)).filter(item => item?.id);
       }
-      if (
-        this.form.paymentType === 'settlement_payment' &&
-        this.isValidReferenceId(this.form.settlementId)
-      ) {
-        const response = await formalApi.getDetail(this.form.settlementId);
-        const detail = this.unwrapData(response);
-        return detail?.id ? [detail] : [];
+      if (this.form.paymentType === 'settlement_payment' && uniqueFormalIds.length) {
+        const responses = await Promise.all(uniqueFormalIds.map(id => formalApi.getDetail(id)));
+        return responses.map(response => this.unwrapData(response)).filter(item => item?.id);
       }
       return [];
     },
@@ -1851,32 +2263,29 @@ export default {
       this.contractSignatureFileAvailable = false;
       this.resetContractPaymentRatioLimit();
       try {
-        const settlementMaterials = [
-          ATTACHMENT_MATERIALS.weighingSlip,
-          ATTACHMENT_MATERIALS.entrustOrder,
-          ATTACHMENT_MATERIALS.settlement,
-        ];
-        const settlementFiles = (settlementRows || []).flatMap(row =>
-          this.parse(row.attachmentsJson)
-        );
-        this.mergeAutomaticAttachments(settlementFiles, settlementMaterials, '结算单');
+        // 切换结算单时，附件区同步替换为当前结算单已上传附件
+        this.syncSettlementAttachments(settlementRows);
         if (!this.form.contractId) {
           this.firstContractPayment = false;
+          this.removeAutomaticAttachments('contract', '合同');
           return;
         }
         const contractResponse = await getContractDetail(this.form.contractId);
         const contract = this.unwrapData(contractResponse) || {};
+        // 结算信息需用合同全部付款比例配置判断第几笔是否超限
+        this.applyContractPaymentRatioLimit(contract);
         if (this.form.paymentType === 'project_advance') {
-          this.applyContractPaymentRatioLimit(contract);
           const contractFiles = this.parse(contract.contractFileJson);
           this.contractSignatureFileAvailable = contractFiles.some(file =>
             Boolean(this.attachmentFileUrl(file))
           );
+          this.removeAutomaticAttachments('contract', '合同');
           this.mergeAutomaticAttachments(
             contractFiles,
             [ATTACHMENT_MATERIALS.contract],
             '合同',
-            ATTACHMENT_MATERIALS.contract
+            ATTACHMENT_MATERIALS.contract,
+            'contract'
           );
           return;
         }
@@ -1890,12 +2299,14 @@ export default {
             String(item.id || '') !== String(this.form.id || '') &&
             item.approvalStatus !== 'voided'
         );
+        this.removeAutomaticAttachments('contract', '合同');
         if (this.firstContractPayment) {
           this.mergeAutomaticAttachments(
             this.parse(contract.contractFileJson),
             [ATTACHMENT_MATERIALS.contract],
             '合同',
-            ATTACHMENT_MATERIALS.contract
+            ATTACHMENT_MATERIALS.contract,
+            'contract'
           );
         }
       } catch (error) {
@@ -1907,9 +2318,12 @@ export default {
     resetContractPaymentRatioLimit() {
       this.contractPaymentRatioLimit = null;
       this.contractPaymentRatioExceeded = false;
+      this.contractPaymentRatioRows = [];
     },
     applyContractPaymentRatioLimit(contract = {}) {
-      const [firstRatio] = this.parse(contract.paymentRatioJson);
+      const ratioRows = this.parse(contract.paymentRatioJson).filter(item => item && typeof item === 'object');
+      this.contractPaymentRatioRows = ratioRows;
+      const [firstRatio] = ratioRows;
       const ratioLimitValue = firstRatio?.ratioLimit;
       const ratioLimit = Number(ratioLimitValue);
       this.contractPaymentRatioLimit =
@@ -2226,7 +2640,13 @@ export default {
       try {
         this.billOptions =
           this.unwrapData(
-            await billLedgerApi.getAvailableOptions(keyword, this.form.deptId, selectedId)
+            await billLedgerApi.getAvailableOptions(
+              keyword,
+              this.form.deptId,
+              selectedId,
+              this.settlementPayerName,
+              this.settlementPayeeName
+            )
           ) || [];
       } finally {
         this.billLoading = false;
@@ -2248,7 +2668,9 @@ export default {
           this.billPage.size,
           String(this.billQuery.keyword || '').trim() || undefined,
           this.form.deptId,
-          this.form.billLedgerId
+          this.form.billLedgerId,
+          this.settlementPayerName,
+          this.settlementPayeeName
         );
         const data = this.unwrapData(response) || {};
         this.billRows = data.records || [];
@@ -2269,7 +2691,37 @@ export default {
       this.billPage.current = 1;
       this.loadBillPage();
     },
+    rememberSettlementParties(payerName, payeeName) {
+      this.settlementPayerName = String(payerName || '').trim();
+      this.settlementPayeeName = String(payeeName || '').trim();
+    },
+    billMatchesSettlementParties(row) {
+      const issuer = String(row?.issuerName || '').trim();
+      const receiver = String(row?.receiverName || '').trim();
+      const payer = this.settlementPayerName;
+      const payee = this.settlementPayeeName;
+      if (!issuer || !receiver || !payer || !payee) return false;
+      return (
+        (issuer === payer && receiver === payee) || (issuer === payee && receiver === payer)
+      );
+    },
     selectBill(row) {
+      if (
+        row?.billType &&
+        row.billType !== 'received' &&
+        !this.billMatchesSettlementParties(row)
+      ) {
+        ElMessage.warning('汇票付款仅可选择收票类型，或出票单位与收票单位均为当前结算收付款方的汇票');
+        return;
+      }
+      if (row?.maturityDate) {
+        const maturity = this.$dayjs(row.maturityDate).startOf('day');
+        const today = this.$dayjs().startOf('day');
+        if (maturity.isValid() && maturity.isBefore(today)) {
+          ElMessage.warning('所选汇票已到期，不可选择');
+          return;
+        }
+      }
       this.form.billLedgerId = row.id;
       this.form.billNo = row.billNo || '';
       this.billOptions = [row];
@@ -2287,6 +2739,33 @@ export default {
         contractName: String(contractName || '').trim() || undefined,
       };
     },
+    async fillReferencePayableAmounts(rows, paymentType) {
+      if (!rows?.length) return rows || [];
+      const amountResponses = await Promise.all(
+        rows.map(row => {
+          const referenceId = row.id;
+          if (!this.isValidReferenceId(referenceId)) {
+            return Promise.resolve(null);
+          }
+          return api
+            .getReferenceAmount(paymentType, referenceId, this.form.id)
+            .catch(() => null);
+        })
+      );
+      return rows.map((row, index) => {
+        const amount = this.unwrapData(amountResponses[index]) || {};
+        const settlementAmount = Number(amount.settlementAmount ?? row.settlementAmount ?? 0);
+        const payableAmount =
+          amount.payableAmount === undefined || amount.payableAmount === null
+            ? null
+            : Number(amount.payableAmount || 0);
+        return {
+          ...row,
+          settlementAmount,
+          payableAmount,
+        };
+      });
+    },
     async loadFormalReferences() {
       this.formalPage.loading = true;
       try {
@@ -2296,7 +2775,8 @@ export default {
           this.referenceParams('formal')
         );
         const data = this.unwrapData(response) || {};
-        this.formalRows = data.records || [];
+        const records = data.records || [];
+        this.formalRows = await this.fillReferencePayableAmounts(records, 'settlement_payment');
         this.formalPage.total = Number(data.total || 0);
       } finally {
         this.formalPage.loading = false;
@@ -2311,7 +2791,10 @@ export default {
           this.referenceParams('pre')
         );
         const data = this.unwrapData(response) || {};
-        this.preRows = data.records || [];
+        const records = data.records || [];
+        const paymentType =
+          this.form.paymentType === 'settlement_payment' ? 'settlement_payment' : 'progress_advance';
+        this.preRows = await this.fillReferencePayableAmounts(records, paymentType);
         this.prePage.total = Number(data.total || 0);
       } finally {
         this.prePage.loading = false;
@@ -2326,13 +2809,6 @@ export default {
       }
       return Promise.all(loaders);
     },
-    handleSettlementSelectVisible(visible) {
-      // 结算单号仅做展示，通过「选择」按钮维护，避免下拉改值
-      if (!visible) return;
-      this.$nextTick(() => {
-        this.$refs.settlementNoSelectRef?.blur?.();
-      });
-    },
     handleReferenceSearch() {
       this.formalPage.current = 1;
       this.prePage.current = 1;
@@ -2411,7 +2887,7 @@ export default {
         }
       }
       if (!id) {
-        this.$message.warning(isPre ? '未找到对应的预结算单' : '未找到对应的正式结算单');
+        this.$message.warning(isPre ? '未找到对应的预付结算单' : '未找到对应的付款结算单');
         return;
       }
       this.$router.push({
@@ -2419,7 +2895,7 @@ export default {
         query: {
           mode: 'view',
           id,
-          name: isPre ? '查看预结算' : '查看正式结算',
+          name: isPre ? '查看预付结算单' : '查看付款结算单',
         },
       });
     },
@@ -2461,7 +2937,14 @@ export default {
       const amount = this.unwrapData(amountResponse) || {};
       const settlementAmount = Number(amount.settlementAmount ?? row.settlementAmount ?? 0);
       const payableAmount = Number(amount.payableAmount ?? 0);
-      this.referenceRows = [this.createReferenceRow({ ...row, settlementAmount, payableAmount })];
+      this.referenceRows = [
+        this.createReferenceRow({
+          ...row,
+          settlementAmount,
+          payableAmount,
+          paymentSequence: amount.paymentSequence,
+        }),
+      ];
       this.clearReceiptAccount();
       Object.assign(this.form, {
         paymentType: 'settlement_payment',
@@ -2484,6 +2967,7 @@ export default {
         payerName: row.payerName,
         payeeName: '',
       });
+      this.rememberSettlementParties(row.payerName, row.payeeName);
       this.referenceVisible = false;
       this.refreshReferenceValidation();
       const detail = this.unwrapData(detailResponse);
@@ -2506,14 +2990,17 @@ export default {
       const rows = this.formalSelection || [];
       if (!rows.length) return;
       if (new Set(rows.map(item => String(item.contractId || ''))).size !== 1) {
-        this.$message.warning('所选正式结算单必须属于同一合同');
+        this.$message.warning('所选付款结算单必须属于同一合同');
         return;
       }
       const validRows = rows.filter(row => this.isValidReferenceId(row.id));
       const details = await Promise.all(validRows.map(row => formalApi.getDetail(row.id)));
-      await this.applyTransferredFormalSettlements(
-        details.map((response, index) => ({ ...validRows[index], ...this.unwrapData(response) }))
-      );
+      const detailRows = details.map((response, index) => ({
+        ...validRows[index],
+        ...this.unwrapData(response),
+      }));
+      await this.applyTransferredFormalSettlements(detailRows);
+      await this.loadAttachmentRuleData(detailRows);
       this.referenceVisible = false;
     },
     async selectPre(row) {
@@ -2531,7 +3018,13 @@ export default {
       const settlementAmount = Number(amount.settlementAmount ?? row.settlementAmount ?? 0);
       const payableAmount = Number(amount.payableAmount ?? 0);
       this.referenceRows = [
-        this.createReferenceRow({ ...row, settlementAmount, payableAmount, referenceType: 'pre' }),
+        this.createReferenceRow({
+          ...row,
+          settlementAmount,
+          payableAmount,
+          referenceType: 'pre',
+          paymentSequence: amount.paymentSequence,
+        }),
       ];
       this.form.invoices = [];
       this.paymentRecords = [];
@@ -2557,6 +3050,7 @@ export default {
         payerName: row.payerName,
         payeeName: '',
       });
+      this.rememberSettlementParties(row.payerName, row.payeeName);
       this.referenceVisible = false;
       this.refreshReferenceValidation();
       const detail = this.unwrapData(detailResponse);
@@ -2570,14 +3064,17 @@ export default {
       const rows = this.preSelection || [];
       if (!rows.length) return;
       if (new Set(rows.map(item => String(item.contractId || ''))).size !== 1) {
-        this.$message.warning('所选预结算单必须属于同一合同');
+        this.$message.warning('所选预付结算单必须属于同一合同');
         return;
       }
       const validRows = rows.filter(row => this.isValidReferenceId(row.id));
       const details = await Promise.all(validRows.map(row => preApi.getDetail(row.id)));
-      await this.applyTransferredPreSettlements(
-        details.map((response, index) => ({ ...validRows[index], ...this.unwrapData(response) }))
-      );
+      const detailRows = details.map((response, index) => ({
+        ...validRows[index],
+        ...this.unwrapData(response),
+      }));
+      await this.applyTransferredPreSettlements(detailRows);
+      await this.loadAttachmentRuleData(detailRows);
       this.referenceVisible = false;
     },
     normalizeAttachments(files) {
@@ -2632,7 +3129,113 @@ export default {
         );
       });
     },
+    rowPaymentRatioMax(row) {
+      const settlementAmount = Number(row.settlementAmount || 0);
+      const payableAmount = Number(row.payableAmount || 0);
+      if (settlementAmount <= 0) return 100;
+      return Number(Math.min(100, (payableAmount / settlementAmount) * 100).toFixed(2));
+    },
+    /**
+     * 多结算单行金额规范化：仅在行内反算比例，不使用表头比例灌入（表头与结算信息不关联）。
+     */
+    seedMultipleRowPayments(rows = []) {
+      if (rows.length <= 1) return;
+      rows.forEach(item => {
+        const settlementAmount = Number(item.settlementAmount || 0);
+        const payableAmount = Number(item.payableAmount || 0);
+        let applied = Number(item.appliedAmount || 0);
+        if (!Number.isFinite(applied) || applied < 0) applied = 0;
+        if (applied > payableAmount) applied = Number(payableAmount.toFixed(2));
+        item.appliedAmount = Number(applied.toFixed(2));
+        item.paymentRatio = settlementAmount
+          ? Number(((item.appliedAmount / settlementAmount) * 100).toFixed(2))
+          : 0;
+      });
+    },
+    findReferenceRow(row) {
+      return this.referenceRows.find(
+        item =>
+          item.id === row.id &&
+          item.referenceType === row.referenceType &&
+          item.settlementNo === row.settlementNo
+      );
+    },
+    /** 结算信息付款金额合计 */
+    settlementRowsAppliedTotal(rows = this.referenceRows) {
+      return (rows || []).reduce((total, item) => total + Number(item.appliedAmount || 0), 0);
+    },
+    /** 结算信息合计不得超过上方申请付款金额 */
+    ensureSettlementAppliedWithinHeader(showWarning = true) {
+      if (!this.multipleSettlementRows) return true;
+      const headerApplied = Number(this.form.appliedAmount || 0);
+      const rowsTotal = Number(this.settlementRowsAppliedTotal().toFixed(2));
+      if (rowsTotal - headerApplied > 1e-8) {
+        if (showWarning) {
+          this.$message.warning(
+            `结算信息付款金额合计(${rowsTotal.toFixed(2)})不能大于申请付款金额(${headerApplied.toFixed(2)})`
+          );
+        }
+        return false;
+      }
+      return true;
+    },
+    handleRowPaymentRatioChange(row, value) {
+      const target = this.findReferenceRow(row);
+      if (!target) return;
+      const settlementAmount = Number(target.settlementAmount || 0);
+      const payableAmount = Number(target.payableAmount || 0);
+      const ratio = value === null || value === undefined || value === '' ? 0 : Number(value);
+      let applied = Number(((settlementAmount * ratio) / 100).toFixed(2));
+      if (applied > payableAmount) applied = Number(payableAmount.toFixed(2));
+      target.appliedAmount = applied;
+      target.paymentRatio = settlementAmount
+        ? Number(((applied / settlementAmount) * 100).toFixed(2))
+        : Number(ratio.toFixed(2));
+      // 仅刷新结算金额/可付款金额合计，不回写表头申请金额与比例
+      this.syncHeaderSettlementTotalsFromRows();
+      this.ensureSettlementAppliedWithinHeader(true);
+    },
+    handleRowAppliedAmountChange(row, value) {
+      const target = this.findReferenceRow(row);
+      if (!target) return;
+      const settlementAmount = Number(target.settlementAmount || 0);
+      const payableAmount = Number(target.payableAmount || 0);
+      let applied = value === null || value === undefined || value === '' ? 0 : Number(value);
+      if (!Number.isFinite(applied) || applied < 0) applied = 0;
+      if (applied > payableAmount) applied = payableAmount;
+      target.appliedAmount = Number(applied.toFixed(2));
+      target.paymentRatio = settlementAmount
+        ? Number(((target.appliedAmount / settlementAmount) * 100).toFixed(2))
+        : 0;
+      this.syncHeaderSettlementTotalsFromRows();
+      this.ensureSettlementAppliedWithinHeader(true);
+    },
+    /** 多结算单时仅同步结算金额/可付款金额合计，申请付款金额与比例由上方独立维护 */
+    syncHeaderSettlementTotalsFromRows() {
+      if (this.referenceRows.length <= 1) return;
+      const settlementAmount = this.referenceRows.reduce(
+        (total, item) => total + Number(item.settlementAmount || 0),
+        0
+      );
+      const payableAmount = this.referenceRows.reduce(
+        (total, item) => total + Number(item.payableAmount || 0),
+        0
+      );
+      this.amountSyncing = true;
+      this.form.settlementAmount = Number(settlementAmount.toFixed(2));
+      this.form.payableAmount = Number(payableAmount.toFixed(2));
+      this.$nextTick(() => {
+        this.amountSyncing = false;
+        this.$refs.formRef?.validateField?.(['settlementAmount', 'appliedAmount']);
+      });
+    },
+    /** @deprecated 兼容旧调用名，行为见 syncHeaderSettlementTotalsFromRows */
+    syncHeaderPaymentFromRows() {
+      this.syncHeaderSettlementTotalsFromRows();
+    },
     payload() {
+      // 驳回重提前再清一次：避免历史误存的正式结算单 ID 盖过预结算引用
+      this.clearFormalReferenceWhenPreOnly();
       const {
         id,
         paymentType,
@@ -2665,13 +3268,38 @@ export default {
         remark,
         invoices,
       } = this.form;
+      const usePreSettlementOnly =
+        paymentType === 'progress_advance' ||
+        (this.referenceRows.length > 0 &&
+          this.referenceRows.every(item => item.referenceType === 'pre'));
+      // 进度预付 / 仅预结算引用：强制不传正式结算单 ID，并兜底恢复预结算单 ID
+      const resolvedPreSettlementId =
+        preSettlementId ||
+        preSettlementIds?.[0] ||
+        (usePreSettlementOnly ? settlementId : null) ||
+        null;
+      const resolvedPreSettlementIds =
+        preSettlementIds?.length > 0
+          ? preSettlementIds
+          : resolvedPreSettlementId
+            ? [resolvedPreSettlementId]
+            : [];
+      const preSettlementNo = usePreSettlementOnly
+        ? this.form.preSettlementNo ||
+          (this.referenceRows || [])
+            .filter(item => item.referenceType === 'pre')
+            .map(item => item.settlementNo)
+            .filter(Boolean)
+            .join('、')
+        : this.form.preSettlementNo;
       return {
         id,
         paymentType,
-        settlementId,
-        settlementIds,
-        preSettlementId,
-        preSettlementIds,
+        settlementId: usePreSettlementOnly ? null : settlementId,
+        settlementIds: usePreSettlementOnly ? [] : settlementIds,
+        preSettlementId: usePreSettlementOnly ? resolvedPreSettlementId : preSettlementId,
+        preSettlementIds: usePreSettlementOnly ? resolvedPreSettlementIds : preSettlementIds,
+        preSettlementNo,
         projectId,
         projectName,
         deptId,
@@ -2686,6 +3314,12 @@ export default {
         billType,
         paymentRatio,
         appliedAmount,
+        settlementLines: (this.referenceRows || []).map(item => ({
+          formalSettlementId: item.referenceType === 'formal' ? item.id : null,
+          preSettlementId: item.referenceType === 'pre' ? item.id : null,
+          paymentRatio: item.paymentRatio,
+          appliedAmount: item.appliedAmount,
+        })),
         paymentMethod,
         billLedgerId,
         billNo,
@@ -2720,30 +3354,78 @@ export default {
               })),
       };
     },
+    /** 顶部「保存」：保存成功后关闭表单页并回到列表 */
+    async handleSave() {
+      await this.saveDraft({ showSuccess: true, closePage: true });
+    },
+    clearMessages() {
+      ElMessage.closeAll();
+      this.$message?.closeAll?.();
+    },
     async saveDraft(options = {}) {
-      const showSuccess = options.showSuccess !== false;
+      // 仅显式 showSuccess:true 时提示；提交前静默保存默认不弹「保存成功」
+      const showSuccess = options.showSuccess === true;
+      const closePage = options.closePage === true;
       await this.$refs.formRef.validate();
+      const appliedAmount = Number(this.form.appliedAmount);
+      if (
+        this.form.appliedAmount === null ||
+        this.form.appliedAmount === undefined ||
+        this.form.appliedAmount === '' ||
+        !Number.isFinite(appliedAmount) ||
+        appliedAmount <= 0
+      ) {
+        this.clearMessages();
+        ElMessage.warning('申请付款金额必填且必须大于0');
+        return false;
+      }
+      if (this.multipleSettlementRows) {
+        const invalidRow = this.referenceRows.find(
+          item => Number(item.appliedAmount || 0) > Number(item.payableAmount || 0)
+        );
+        if (invalidRow) {
+          this.clearMessages();
+          ElMessage.warning(`${invalidRow.settlementNo || '结算单'}付款金额不能超过可付款金额`);
+          return false;
+        }
+        const rowsTotal = Number(this.settlementRowsAppliedTotal().toFixed(2));
+        if (rowsTotal - appliedAmount > 1e-8) {
+          this.clearMessages();
+          ElMessage.warning(
+            `结算信息付款金额合计(${rowsTotal.toFixed(2)})不能大于申请付款金额(${appliedAmount.toFixed(2)})`
+          );
+          return false;
+        }
+      }
       if (this.form.paymentType === 'project_advance' && !this.form.projectId) {
-        this.$message.warning('请选择所属项目');
+        this.clearMessages();
+        ElMessage.warning('请选择所属项目');
         return false;
       }
       try {
         this.validateInvoices();
         this.validatePaymentRecords();
       } catch (error) {
-        this.$message.warning(error.message);
+        this.clearMessages();
+        ElMessage.warning(error.message);
         return false;
       }
       const data = this.unwrapData(await api.save(this.payload()));
       this.form.id = data;
       if (showSuccess) {
-        this.$message.success('保存成功');
+        this.clearMessages();
+        ElMessage.success('保存成功');
+      }
+      if (closePage) {
+        sessionStorage.setItem(paymentApplicationListRefreshKey, '1');
+        this.goBack();
       }
       return true;
     },
     async submitForm() {
-      // 提交前静默保存，避免同时弹出「保存成功」与材料缺失 toast
-      const saved = await this.saveDraft({ showSuccess: false });
+      // 提交前静默保存；不校验/提示附件未上传；全程只保留一条「提交成功」
+      this.clearMessages();
+      const saved = await this.saveDraft({ showSuccess: false, closePage: false });
       if (!saved) return;
       // 高风险/黑名单收款方必须上传特批附件（与后端提交强校验同口径）
       if (
@@ -2761,14 +3443,18 @@ export default {
         bizId: this.form.id,
         subjectName: this.form.paymentNo || '',
         approvalStatus: previousApprovalStatus,
+        mkEnabled: await loadMkEnabled().catch(() => false),
       });
-      this.$message.success('提交成功');
+      this.clearMessages();
+      ElMessage.success('提交成功');
+      // 通知列表页（keep-alive）重新拉取列表
+      sessionStorage.setItem(paymentApplicationListRefreshKey, '1');
       this.goBack();
     },
     goBack() {
       removeSettlementTransfer(this.$route.query.transferToken);
       this.$router.$avueRouter?.closeTag?.();
-      this.$router.push('/payment/payment-application');
+      this.$router.push(paymentApplicationListRoute);
     },
     formatMoney(value) {
       const amount = Number(value);
@@ -2809,15 +3495,15 @@ export default {
   width: 100%;
   min-height: 32px;
 }
-.payment-form-page__settlement-select {
+.payment-form-page__settlement-input {
   flex: 1;
   min-width: 0;
 }
-.payment-form-page__settlement-select :deep(.el-select__wrapper) {
-  width: 100%;
+.payment-form-page__settlement-input :deep(.el-input__inner) {
+  cursor: pointer;
 }
-.payment-form-page__settlement-select :deep(.el-tag__close) {
-  display: none;
+.payment-form-page__settlement-input.is-disabled :deep(.el-input__inner) {
+  cursor: not-allowed;
 }
 .payment-form-page__settlement-select-btn {
   flex-shrink: 0;
@@ -2844,6 +3530,19 @@ export default {
   display: flex;
   justify-content: flex-end;
 }
+.payment-form-page__bill-search :deep(.el-form--inline) {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  gap: 0 8px;
+}
+.payment-form-page__bill-search :deep(.el-form-item) {
+  margin-right: 0;
+  margin-bottom: 8px;
+}
+.payment-form-page__bill-search-actions {
+  margin-left: 0;
+}
 .payment-form-page__reference-pagination {
   margin-top: 12px;
 }
@@ -2878,6 +3577,9 @@ export default {
   font-size: 13px;
   font-weight: 400;
 }
+.payment-form-page__ratio-exceeded {
+  color: var(--el-color-danger);
+}
 .payment-form-page__attachment-checklist {
   display: flex;
   flex-wrap: wrap;
diff --git a/src/views/payment/payment-application.vue b/src/views/payment/payment-application.vue
index 90b6915..baf454c 100644
--- a/src/views/payment/payment-application.vue
+++ b/src/views/payment/payment-application.vue
@@ -152,6 +152,9 @@ import organizationSearch from '@/mixins/organization-search';
 import { getMKApprovalUrl } from '@/api/system/business-process';
 import { loadMkEnabled, submitMkApprovalFlow } from '@/utils/mk-approval';
 
+const paymentApplicationListRoute = '/payment/payment-application';
+const paymentApplicationListRefreshKey = 'payment-application-list-refresh';
+
 export default {
   name: 'PaymentApplication',
   mixins: [organizationSearch],
@@ -160,6 +163,7 @@ export default {
       rows: [],
       selection: [],
       loading: false,
+      approveLoading: false,
       syncLoading: false,
       resultSyncing: false,
       query: {},
@@ -193,7 +197,28 @@ export default {
         this.mkEnabled = false;
       });
   },
+  activated() {
+    this.consumeListRefreshFlag();
+  },
+  watch: {
+    $route(to, from) {
+      if (
+        to.path === paymentApplicationListRoute &&
+        from?.path?.includes('/payment-application/form')
+      ) {
+        this.consumeListRefreshFlag();
+      }
+    },
+  },
   methods: {
+    /** 表单提交成功后带标记返回时，重新拉取列表 */
+    consumeListRefreshFlag() {
+      if (!sessionStorage.getItem(paymentApplicationListRefreshKey)) {
+        return;
+      }
+      sessionStorage.removeItem(paymentApplicationListRefreshKey);
+      this.onLoad(this.page);
+    },
     hasPermission(code) {
       return this.permission?.[code] !== false;
     },
@@ -296,19 +321,28 @@ export default {
         bizId: row.id,
         subjectName: row.paymentNo || '',
         approvalStatus: previousApprovalStatus,
+        mkEnabled: this.mkEnabled,
       });
+      this.$message.closeAll?.();
       this.$message.success('提交成功');
       this.refreshChange();
     },
     async handleApprove(row) {
-      const res = await api.approve({ id: row.id });
-      // data=false 表示审批已通过但自动同步金蝶失败，msg 带具体原因
-      if (res.data.data === false) {
-        this.$message.warning(res.data.msg);
-      } else {
-        this.$message.success(res.data.msg || '审批通过');
+      // 防止重复点击：请求进行中忽略后续点击
+      if (this.approveLoading) return;
+      this.approveLoading = true;
+      try {
+        const res = await api.approve({ id: row.id });
+        // data=false 表示审批已通过但自动同步金蝶失败，msg 带具体原因
+        if (res.data.data === false) {
+          this.$message.warning(res.data.msg);
+        } else {
+          this.$message.success(res.data.msg || '审批通过');
+        }
+        this.refreshChange();
+      } finally {
+        this.approveLoading = false;
       }
-      this.refreshChange();
     },
     handleMkAudit(row) {
       if (!row?.id) {
@@ -441,6 +475,16 @@ export default {
           tip: row.kingdeeLockFailReason || '系统将自动补偿重锁',
         };
       }
+      // 金蝶解锁终态标识：后端按 unlocked 锁记录回填（付款申请不作废，仅此标识可区分金蝶删单与推送失败）
+      if (row.kingdeeUnlockTime) {
+        const isDelete = row.kingdeeUnlockOperationName === '金蝶删单';
+        return {
+          show: true,
+          type: isDelete ? 'danger' : 'warning',
+          label: row.kingdeeUnlockOperationName || '金蝶解锁',
+          tip: `${row.kingdeeUnlockOperator || '-'} 于 ${this.$dayjs(row.kingdeeUnlockTime).format('YYYY-MM-DD HH:mm:ss')} 解锁`,
+        };
+      }
       return { show: false };
     },
     displayValue(value) {
diff --git a/src/views/payment/receipt-flow-batch-form.vue b/src/views/payment/receipt-flow-batch-form.vue
index b7f0bd8..547a956 100644
--- a/src/views/payment/receipt-flow-batch-form.vue
+++ b/src/views/payment/receipt-flow-batch-form.vue
@@ -46,6 +46,9 @@
           <el-table-column label="金蝶未认领金额" min-width="140" align="right">
             <template #default="{ row }">{{ formatMoney(row.unclaimedAmount) }}</template>
           </el-table-column>
+          <el-table-column label="剩余可认领金额" min-width="140" align="right">
+            <template #default="{ row }">{{ formatMoney(flowRemaining(row)) }}</template>
+          </el-table-column>
           <el-table-column prop="summary" label="摘要" min-width="180" show-overflow-tooltip />
         </el-table>
         <el-row :gutter="32" class="receipt-claim-batch-form-page__claim-info">
@@ -298,10 +301,24 @@ export default {
         0
       );
     },
+    flowRemaining(flow) {
+      const unclaimed = Number(flow.unclaimedAmount || 0);
+      const receipt = Number(flow.receiptAmount || 0);
+      const ceiling = unclaimed > 0 && receipt > 0 ? Math.min(unclaimed, receipt) : unclaimed || receipt;
+      return Math.max(ceiling - Number(flow.claimedAmount || 0), 0);
+    },
     maxAllocation(row) {
       const current = Number(row.settlement.allocations?.[row.flow.id] || 0);
       const otherTotal = this.settlementAllocatedTotal(row.settlement) - current;
-      return Math.max(this.settlementRemaining(row.settlement) - otherTotal, 0);
+      // 流水维度：该流水其余分摊已占用部分同样挤占剩余可认领金额
+      const flowOtherTotal = this.flowAllocatedTotal(row.flow.id) - current;
+      return Math.max(
+        Math.min(
+          this.settlementRemaining(row.settlement) - otherTotal,
+          this.flowRemaining(row.flow) - flowOtherTotal
+        ),
+        0
+      );
     },
     handleAllocationChange(settlement) {
       const total = this.settlementAllocatedTotal(settlement);
diff --git a/src/views/payment/receipt-flow-form.vue b/src/views/payment/receipt-flow-form.vue
index 2171f28..8497954 100644
--- a/src/views/payment/receipt-flow-form.vue
+++ b/src/views/payment/receipt-flow-form.vue
@@ -252,10 +252,11 @@ export default {
       );
     },
     claimableAmount() {
-      return Math.max(
-        Number(this.form.unclaimedAmount || 0) - Number(this.form.claimedAmount || 0),
-        0
-      );
+      const unclaimed = Number(this.form.unclaimedAmount || 0);
+      const receipt = Number(this.form.receiptAmount || 0);
+      const ceiling =
+        unclaimed > 0 && receipt > 0 ? Math.min(unclaimed, receipt) : unclaimed || receipt;
+      return Math.max(ceiling - Number(this.form.claimedAmount || 0), 0);
     },
   },
   created() {
@@ -274,14 +275,21 @@ export default {
       }
       const data = this.unwrapData(await api.getDetail(this.flowId));
       const userInfo = this.$store.getters.userInfo || {};
+      // 部分认领继续认领：预填本流水历史关联且仍有剩余可认领金额的结算单
+      const relatedSettlements = (data?.relatedSettlements || []).map(item => ({
+        ...item,
+        formalSettlementId: item.id,
+        settlementId: item.id,
+        allocatedReceiptAmount: 0,
+      }));
       this.form = {
         ...emptyForm(),
         ...data,
         claimerName: userInfo.realName || userInfo.userName || data.claimerName || '',
         claimerDeptName: userInfo.deptName || userInfo.dept_name || data.claimerDeptName || '',
         claimDate: this.$dayjs().format('YYYY-MM-DD'),
-        settlementIds: [],
-        settlements: [],
+        settlementIds: relatedSettlements.map(item => item.formalSettlementId),
+        settlements: relatedSettlements,
         attachments: [],
       };
     },
@@ -347,7 +355,7 @@ export default {
         return;
       }
       if (this.allocatedTotal > this.claimableAmount + 0.001) {
-        this.$message.warning('累计认领金额不能超过公告未认领金额（剩余可认领金额）');
+        this.$message.warning('累计认领金额不能超过剩余可认领金额');
         return;
       }
       for (const row of this.form.settlements)
diff --git a/src/views/settlement/components/formal-settlement-editor.vue b/src/views/settlement/components/formal-settlement-editor.vue
index 5da1c16..b572070 100644
--- a/src/views/settlement/components/formal-settlement-editor.vue
+++ b/src/views/settlement/components/formal-settlement-editor.vue
@@ -14,7 +14,7 @@
           label-width="auto"
         >
           <el-row :gutter="24">
-            <el-col v-for="field in fields" :key="field.prop" :span="6">
+            <el-col v-for="field in visibleFields" :key="field.prop" :span="6">
               <el-form-item :label="field.label" :prop="field.prop">
                 <el-date-picker
                   v-if="field.type === 'date' && editable"
@@ -53,7 +53,7 @@
                   <el-option
                     v-for="item in contracts"
                     :key="item.id"
-                    :label="formatContractOptionLabel(item)"
+                    :label="item.contractName || ''"
                     :value="item.id"
                   />
                 </el-select>
@@ -64,7 +64,30 @@
                   :precision="2"
                   :controls="false"
                 />
+                <el-select
+                  v-else-if="field.type === 'select' && editable"
+                  v-model="form[field.prop]"
+                  filterable
+                  clearable
+                  placeholder="请选择"
+                >
+                  <el-option
+                    v-for="item in formSelectOptions(field)"
+                    :key="item.dictKey"
+                    :label="item.dictValue"
+                    :value="item.dictKey"
+                  />
+                </el-select>
+                <span
+                  v-else-if="field.prop === 'formalSettlementNo'"
+                  :class="{ 'form-readonly--code': form.formalSettlementNo }"
+                >
+                  {{ form.formalSettlementNo || (form.id ? '-' : '系统自动生成') }}
+                </span>
                 <span v-else-if="field.money">{{ formatMoney(form[field.prop]) }}</span>
+                <span v-else-if="field.type === 'select'">{{
+                  formSelectLabel(field, form[field.prop])
+                }}</span>
                 <span v-else-if="field.type === 'contract'">{{
                   displayValue(form.contractName)
                 }}</span>
@@ -171,6 +194,22 @@
             </template>
           </el-table-column>
         </el-table>
+        <el-descriptions
+          v-if="form.settlementType === 'payable'"
+          :column="3"
+          border
+          class="formal-editor__settle-summary"
+        >
+          <el-descriptions-item label="结算合计（原金额）">
+            {{ formatMoney(form.settlementAmount) }}
+          </el-descriptions-item>
+          <el-descriptions-item label="已付金额（含预付、核销）">
+            {{ formatMoney(settlePaidTotal) }}
+          </el-descriptions-item>
+          <el-descriptions-item label="剩余未付金额">
+            {{ formatMoney(settleRemainTotal) }}
+          </el-descriptions-item>
+        </el-descriptions>
       </section-card>
 
       <section-card title="结算明细">
@@ -246,24 +285,36 @@
             :index="detailIndexMethod"
           />
           <el-table-column
-            v-for="column in detailTableColumns"
-            :key="column.prop"
-            v-bind="column"
+            v-for="item in detailDisplayColumns"
+            :key="item.key"
+            :label="item.kind === 'fee' ? item.name : item.column.label"
+            :prop="item.kind === 'fee' ? undefined : item.column.prop"
+            :min-width="item.kind === 'fee' ? 130 : item.column.minWidth"
             align="center"
             show-overflow-tooltip
           >
             <template #default="{ row }">
-              <span v-if="column.money">{{ formatMoney(row[column.prop]) }}</span>
-              <span v-else-if="column.prop === 'transportQuantity'">
-                {{ formatDetailTransportQuantity(row[column.prop]) }}
+              <span v-if="item.kind === 'fee'">
+                {{ formatMoney(parseFeeItems(row.feeItemsJson || row.feeItems)[item.name]) }}
               </span>
-              <span v-else-if="column.prop === 'mileage'">
-                {{ formatDetailMileage(row[column.prop]) }}
+              <el-link
+                v-else-if="item.column.link && row[item.column.prop] && !publicMode"
+                type="primary"
+                @click.stop="handleDetailLink(row, item.column)"
+              >
+                {{ row[item.column.prop] }}
+              </el-link>
+              <span v-else-if="item.column.money">{{ formatMoney(row[item.column.prop]) }}</span>
+              <span v-else-if="item.column.prop === 'transportQuantity'">
+                {{ formatDetailTransportQuantity(row[item.column.prop]) }}
               </span>
-              <span v-else-if="column.prop === 'transportType'">
-                {{ transportTypeName(row[column.prop]) }}
+              <span v-else-if="item.column.prop === 'mileage'">
+                {{ formatDetailMileage(row[item.column.prop]) }}
               </span>
-              <span v-else>{{ displayValue(row[column.prop]) }}</span>
+              <span v-else-if="item.column.prop === 'transportType'">
+                {{ transportTypeName(row[item.column.prop]) }}
+              </span>
+              <span v-else>{{ displayValue(row[item.column.prop]) }}</span>
             </template>
           </el-table-column>
           <el-table-column v-if="editable" label="操作" width="150" fixed="right" align="center">
@@ -378,28 +429,19 @@
         </div>
       </section-card>
 
+      <project-advance-write-off
+        ref="projectAdvanceWriteOffRef"
+        v-model="projectAdvanceWriteOffs"
+        :editable="editable"
+        :contract-id="form.contractId"
+        :settlement-amount="form.settlementAmount"
+        settlement-type="formal"
+        :settlement-id="form.id"
+      />
+
       <section-card title="发票信息">
         <div class="formal-editor__invoice-claim">
-          <el-form inline label-position="right" label-width="auto" @submit.prevent>
-            <el-form-item label="发票号码">
-              <el-input
-                v-model="invoiceClaimNo"
-                clearable
-                maxlength="32"
-                placeholder="请输入发票号码"
-                @keyup.enter="openInvoiceClaimDialog"
-              />
-            </el-form-item>
-            <el-form-item>
-              <el-button
-                type="primary"
-                :loading="invoiceClaimLoading"
-                @click="openInvoiceClaimDialog"
-              >
-                认领查询
-              </el-button>
-            </el-form-item>
-          </el-form>
+          <el-button type="primary" @click="openInvoiceClaimDialog">认领查询</el-button>
         </div>
         <el-table :data="invoices" border>
           <el-table-column type="index" label="序号" width="64" align="center" />
@@ -500,7 +542,6 @@
         title="查询可认领发票"
         confirm-text="确认认领"
         multiple
-        :initial-invoice-no="String(invoiceClaimNo || '').trim()"
         :query-api="invoicePoolQueryApi"
         @confirm="handleInvoiceClaimConfirm"
       />
@@ -549,28 +590,27 @@
             <template #default="{ row }">{{ displayValue(row.claimStatusName) }}</template>
           </el-table-column>
         </el-table>
-        <el-table v-else :data="paymentApplications" border>
+        <el-table v-else :data="paymentRecords" border>
           <el-table-column type="index" label="序号" width="64" align="center" />
-          <el-table-column prop="paymentTypeName" label="付款类型" min-width="120" align="center">
-            <template #default="{ row }">{{ displayValue(row.paymentTypeName) }}</template>
+          <el-table-column label="付款类型" min-width="120" align="center">
+            <template #default="{ row }">{{ displayValue(row.typeName) }}</template>
           </el-table-column>
           <el-table-column label="付款方式" min-width="140" align="center">
-            <template #default="{ row }">{{ paymentMethodName(row.paymentMethod) }}</template>
+            <template #default="{ row }">{{ row.recordType ? '-' : paymentMethodName(row.paymentMethod) }}</template>
           </el-table-column>
           <el-table-column prop="paymentNo" label="单据号" min-width="160" align="center" />
-          <el-table-column prop="appliedAmount" label="申请付款金额" min-width="145" align="center">
+          <el-table-column prop="appliedAmount" label="申请/核销金额" min-width="145" align="center">
             <template #default="{ row }">{{ formatMoney(row.appliedAmount) }}</template>
           </el-table-column>
           <el-table-column prop="paidAmount" label="已付款金额" min-width="130" align="center">
             <template #default="{ row }">{{ formatMoney(row.paidAmount) }}</template>
           </el-table-column>
-          <el-table-column
-            prop="approvalStatusName"
-            label="单据状态"
-            min-width="120"
-            align="center"
-          >
-            <template #default="{ row }">{{ displayValue(row.approvalStatusName) }}</template>
+          <el-table-column label="单据状态" min-width="120" align="center">
+            <template #default="{ row }">
+              {{ row.recordType
+                ? settlementStatusName(row.billStatus)
+                : displayValue(row.approvalStatusName) }}
+            </template>
           </el-table-column>
           <el-table-column prop="kingdeeBillNo" label="金蝶单据号" min-width="150" align="center">
             <template #default="{ row }">{{ displayValue(row.kingdeeBillNo) }}</template>
@@ -611,6 +651,22 @@
           <el-table-column prop="createTime" label="创建时间" min-width="170" align="center">
             <template #default="{ row }">{{ displayValue(row.createTime) }}</template>
           </el-table-column>
+          <el-table-column
+            v-if="hasPermission('settlement_adjustment_repush')"
+            label="操作"
+            width="120"
+            align="center"
+          >
+            <template #default="{ row }">
+              <el-link
+                v-if="row.approvalStatus === 'approved' && row.kingdeeSyncStatus === 'synced'"
+                type="danger"
+                @click="handleAdjustmentRepush(row)"
+                >重新推送</el-link
+              >
+              <span v-else>-</span>
+            </template>
+          </el-table-column>
         </el-table>
       </section-card>
 
@@ -638,9 +694,19 @@
           <el-table-column prop="changeTime" label="变更时间" min-width="170" align="center">
             <template #default="{ row }">{{ displayValue(row.changeTime) }}</template>
           </el-table-column>
+          <el-table-column label="操作" width="100" align="center" fixed="right">
+            <template #default="{ row }">
+              <el-link type="primary" @click="openChangeRecordDetail(row)">详情</el-link>
+            </template>
+          </el-table-column>
         </el-table>
       </section-card>
     </div>
+
+    <change-record-detail-dialog
+      v-model="changeRecordDetailVisible"
+      :rows="changeRecordDetailRows"
+    />
     <template v-if="!pageMode" #footer>
       <el-button v-if="editable" @click="handleSyncPlaceholder">同步</el-button>
       <el-button @click="visible = false">取消</el-button>
@@ -674,7 +740,7 @@
       </el-button>
     </div>
 
-    <el-dialog v-model="candidate.visible" title="选择预结算单" width="88%" append-to-body>
+    <el-dialog v-model="candidate.visible" title="选择预付结算单" width="88%" append-to-body>
       <el-card>
         <el-form
           :model="candidate.query"
@@ -683,7 +749,7 @@
           label-width="88px"
           class="formal-editor__candidate-search"
         >
-          <el-form-item label="预结算单号"
+          <el-form-item label="预付结算单号"
           ><el-input v-model="candidate.query.preSettlementNo" clearable
           /></el-form-item>
           <el-form-item label="合同编号"
@@ -808,20 +874,6 @@
         <el-table-column type="index" label="序号" width="64" fixed="left" align="center" />
         <el-table-column prop="cargoName" label="货物名称" min-width="140" align="center" />
         <el-table-column prop="cargoType" label="货物类型" min-width="130" align="center" />
-        <el-table-column label="计费规则" min-width="190" align="center">
-          <template #default="{ row }">
-            <div class="formal-editor__billing-rule-cell">
-              <span>{{ displayValue(billingRuleName(row)) }}</span>
-              <el-icon
-                class="formal-editor__billing-rule-icon"
-                title="查看计费规则详情"
-                @click="openBillingRuleInfo(row)"
-              >
-                <InfoFilled />
-              </el-icon>
-            </div>
-          </template>
-        </el-table-column>
         <el-table-column label="运输总量" min-width="150" align="center">
           <template #default="{ row }">
             <el-input-number
@@ -846,11 +898,14 @@
         </el-table-column>
         <el-table-column label="运输单价" min-width="140" align="center">
           <template #default="{ row }">
+            <span v-if="isTierUnitPrice(row)">-</span>
             <el-input-number
+              v-else
               v-model="row.unitPrice"
               :min="0"
               :precision="2"
               :controls="false"
+              :disabled="!isUnitPriceAdjustable(row)"
               @change="recalculateAdjustRow(row, 'unitPrice')"
             />
           </template>
@@ -859,11 +914,29 @@
           v-for="feeItem in adjustFeeItemNames"
           :key="feeItem"
           :label="feeItem"
-          min-width="140"
+          min-width="160"
           align="center"
         >
           <template #default="{ row }">
+            <div v-if="isFreightFeeItem(feeItem)" class="formal-editor__billing-rule-cell">
+              <el-input-number
+                v-model="row.feeItems[feeItem]"
+                :min="0"
+                :precision="2"
+                :controls="false"
+                @change="recalculateAdjustRow(row, feeItem)"
+              />
+              <el-icon
+                v-if="hasBillingRule(row)"
+                class="formal-editor__billing-rule-icon"
+                title="查看计费规则详情"
+                @click="openBillingRuleInfo(row)"
+              >
+                <InfoFilled />
+              </el-icon>
+            </div>
             <el-input-number
+              v-else
               v-model="row.feeItems[feeItem]"
               :min="0"
               :precision="2"
@@ -877,11 +950,6 @@
             <el-input-number v-model="row.settlementAmountTax" :precision="2" :controls="false" />
           </template>
         </el-table-column>
-        <el-table-column label="备注" min-width="200" align="center">
-          <template #default="{ row }">
-            <el-input v-model="row.remark" maxlength="200" />
-          </template>
-        </el-table-column>
       </el-table>
       <el-form
         :model="adjust"
@@ -889,8 +957,15 @@
         label-width="auto"
         class="formal-editor__adjust-reason"
       >
-        <el-form-item label="调整原因" required>
-          <el-input v-model="adjust.reason" maxlength="200" show-word-limit />
+        <el-form-item label="备注">
+          <el-input
+            v-model="adjust.reason"
+            type="textarea"
+            :rows="2"
+            maxlength="200"
+            show-word-limit
+            placeholder="请输入"
+          />
         </el-form-item>
       </el-form>
       <template #footer>
@@ -911,51 +986,45 @@
       <template v-if="billingRuleDialog.rule">
         <div class="dialog-section-title">计费规则</div>
         <el-descriptions :column="2" border class="formal-editor__billing-rule-detail">
-          <el-descriptions-item label="规则名称">{{
-            displayValue(billingRuleDialog.rule.name)
-          }}</el-descriptions-item>
-          <el-descriptions-item label="费用类型">{{
-            displayValue(billingRuleDialog.rule.feeType)
-          }}</el-descriptions-item>
-          <el-descriptions-item label="费用项">{{
-            displayValue(billingRuleDialog.rule.feeItem)
-          }}</el-descriptions-item>
-          <el-descriptions-item label="计费要素">{{
-            displayValue(billingRuleDialog.rule.billingElement)
-          }}</el-descriptions-item>
-          <el-descriptions-item label="计费类型">{{
-            displayValue(billingRuleDialog.rule.billingType)
-          }}</el-descriptions-item>
-          <el-descriptions-item label="计费单位">{{
-            displayValue(billingRuleDialog.rule.billingUnit)
-          }}</el-descriptions-item>
-          <el-descriptions-item label="单价">{{
-            displayValue(billingRuleDialog.rule.unitPrice)
-          }}</el-descriptions-item>
-          <el-descriptions-item label="最低计费量">{{
-            displayValue(billingRuleDialog.rule.minimumBillingWeight)
-          }}</el-descriptions-item>
-          <el-descriptions-item label="计费区间">{{
-            billingRuleRanges(billingRuleDialog.rule)
-          }}</el-descriptions-item>
-          <el-descriptions-item label="备注" :span="2">{{
-            displayValue(billingRuleDialog.rule.remark)
-          }}</el-descriptions-item>
+          <el-descriptions-item label="费用项">
+            {{ displayValue(billingRuleDialog.rule.feeItem) }}
+          </el-descriptions-item>
+          <el-descriptions-item label="计费要素">
+            {{ displayValue(billingRuleDialog.rule.billingElement) }}
+          </el-descriptions-item>
+          <el-descriptions-item label="计费类型">
+            {{ displayValue(billingRuleDialog.rule.billingType) }}
+          </el-descriptions-item>
+          <el-descriptions-item label="计费单位">
+            {{ displayValue(billingRuleDialog.rule.billingUnit) }}
+          </el-descriptions-item>
+          <el-descriptions-item label="单价">
+            {{ displayValue(billingRuleDialog.rule.unitPrice) }}
+          </el-descriptions-item>
+          <el-descriptions-item label="最低计费量">
+            {{ displayValue(billingRuleDialog.rule.minimumBillingWeight) }}
+          </el-descriptions-item>
+          <el-descriptions-item label="计费区间">
+            {{ billingRuleRanges(billingRuleDialog.rule) }}
+          </el-descriptions-item>
+          <el-descriptions-item label="备注" :span="2">
+            {{ displayValue(billingRuleDialog.rule.remark) }}
+          </el-descriptions-item>
         </el-descriptions>
         <div class="dialog-section-title formal-editor__billing-rule-match-title">匹配条件</div>
         <el-descriptions :column="2" border class="formal-editor__billing-rule-detail">
-          <el-descriptions-item label="起运地">{{
-            displayValue(billingRuleDialog.rule.matchCondition.origin)
-          }}</el-descriptions-item>
-          <el-descriptions-item label="目的地">{{
-            displayValue(billingRuleDialog.rule.matchCondition.destination)
-          }}</el-descriptions-item>
-          <el-descriptions-item label="运输方式">{{
-            displayValue(billingRuleDialog.rule.matchCondition.transportMode)
-          }}</el-descriptions-item>
-          <el-descriptions-item label="货物类型">{{
-            displayValue(billingRuleDialog.rule.matchCondition.cargoType)
-          }}</el-descriptions-item>
+          <el-descriptions-item label="起运地">
+            {{ displayValue(billingRuleDialog.rule.matchCondition.origin) }}
+          </el-descriptions-item>
+          <el-descriptions-item label="目的地">
+            {{ displayValue(billingRuleDialog.rule.matchCondition.destination) }}
+          </el-descriptions-item>
+          <el-descriptions-item label="货物名称">
+            {{ displayValue(billingRuleDialog.rule.matchCondition.cargoName) }}
+          </el-descriptions-item>
+          <el-descriptions-item label="货物类型">
+            {{ displayValue(billingRuleDialog.rule.matchCondition.cargoType) }}
+          </el-descriptions-item>
         </el-descriptions>
       </template>
       <el-empty v-else description="暂无计费规则详情" />
@@ -967,6 +1036,7 @@
 </template>
 
 <script>
+import { InfoFilled } from '@element-plus/icons-vue';
 import { getMkPublicDetail } from '@/api/mk-process';
 import {
   adjustDetail,
@@ -987,6 +1057,11 @@ import {
   getDetailFees as getPreSettlementDetailFees,
 } from '@/api/settlement/preSettlement';
 import { calculateAdjustedFee, getFeeDetail } from '@/api/settlement/receivable-payable-detail';
+import {
+  resolveReceivablePayableDetailId,
+  resolveWaybillId,
+  settlementDetailPath,
+} from '@/utils/settlement-detail-link';
 import { getBfiExchangeRate } from '@/api/base/currency';
 import {
   createFormalSettlementForm,
@@ -1001,9 +1076,14 @@ import {
 } from '@/option/settlement/formalSettlementTable';
 import { getDictionary } from '@/api/system/dictbiz';
 import { h } from 'vue';
-import { InfoFilled } from '@element-plus/icons-vue';
 import { mapGetters } from 'vuex';
-import { formatContractOptionLabel } from '@/utils/contract';
+import { isTierUnitPrice, isUnitPriceAdjustable } from '@/utils/settlement-adjust-rule';
+import { isApprovalSettlementChange } from '@/utils/settlement-change-record';
+import { normalizeCurrencyCode } from '@/utils/currency';
+import {
+  settlementRecordTypeName,
+  settlementStatusName,
+} from '@/utils/settlementStatus';
 import { downloadFileByUrl } from '@/utils/util';
 import {
   downloadKingdeeInvoiceFile,
@@ -1011,12 +1091,23 @@ import {
   viewKingdeeInvoiceFile,
 } from '@/utils/kingdee-attachment';
 import KingdeeInvoicePoolDialog from '@/components/kingdee-invoice-pool-dialog/main.vue';
+import ChangeRecordDetailDialog from '@/components/change-record-detail-dialog/main.vue';
+import ProjectAdvanceWriteOff from './project-advance-write-off.vue';
 import * as XLSX from 'xlsx';
 import { isAdministrator } from '@/utils/auth';
+import * as settlementAdjustmentApi from '@/api/settlement/settlementAdjustment';
+
+// 结算币种为本位币（人民币）时汇率恒为1，汇率日期、结算汇率与按汇率换算的本位币合计都不展示
+const LOCAL_CURRENCY_HIDDEN_FIELDS = ['exchangeRateDate', 'exchangeRate', 'localSettlementAmount'];
 
 export default {
   name: 'FormalSettlementEditor',
-  components: { InfoFilled, KingdeeInvoicePoolDialog },
+  components: {
+    InfoFilled,
+    KingdeeInvoicePoolDialog,
+    ChangeRecordDetailDialog,
+    ProjectAdvanceWriteOff,
+  },
   props: {
     modelValue: Boolean,
     recordId: [String, Number],
@@ -1042,16 +1133,18 @@ export default {
       details: [],
       summaryFees: [],
       paymentApplications: [],
+      advancePayments: [],
       receiptClaims: [],
       adjustments: [],
       changeRecords: [],
+      changeRecordDetailVisible: false,
+      changeRecordDetailRows: [],
+      projectAdvanceWriteOffs: [],
       attachments: [],
       selectedAttachmentRows: [],
       invoices: [],
       // 开票申请经金蝶回写的发票结果（只读展示，含板式文件/数电PDF下载地址）
       issuedInvoices: [],
-      invoiceClaimNo: '',
-      invoiceClaimLoading: false,
       // 金蝶侧发票附件查看/下载进行中（行组级 loading 守卫）
       kingdeeAttachmentBusy: false,
       invoiceClaimDialog: {
@@ -1083,6 +1176,7 @@ export default {
       projects: [],
       feeOptions: [],
       feeCategoryOptions: [],
+      businessModelOptions: [],
       transportTypeOptions: [],
       fields: formalSettlementFormFields,
       sourceTableColumns: sourceColumns,
@@ -1181,11 +1275,73 @@ export default {
       return isAdministrator(this.userInfo);
     },
     title() {
-      return this.readonly ? '查看正式结算单' : this.recordId ? '编辑正式结算单' : '新增正式结算单';
+      const billLabel =
+        this.form.settlementType === 'receivable' ? '收款结算单' : '付款结算单';
+      return this.readonly
+        ? `查看${billLabel}`
+        : this.recordId
+        ? `编辑${billLabel}`
+        : `新增${billLabel}`;
+    },
+    detailFeeItemNames() {
+      const names = new Set();
+      this.details.forEach(row => {
+        Object.keys(this.parseFeeItems(row.feeItemsJson || row.feeItems)).forEach(name =>
+          names.add(name)
+        );
+      });
+      return Array.from(names);
+    },
+    detailDisplayColumns() {
+      const columns = this.detailTableColumns;
+      const unitPriceIndex = columns.findIndex(column => column.prop === 'unitPrice');
+      const beforeColumns = unitPriceIndex < 0 ? columns : columns.slice(0, unitPriceIndex + 1);
+      const afterColumns = unitPriceIndex < 0 ? [] : columns.slice(unitPriceIndex + 1);
+      return [
+        ...beforeColumns.map(column => ({ kind: 'field', key: column.prop, column })),
+        ...this.detailFeeItemNames.map(name => ({ kind: 'fee', key: `fee-${name}`, name })),
+        ...afterColumns.map(column => ({ kind: 'field', key: column.prop, column })),
+      ];
+    },
+    // 币种为空按人民币处理，与后端预结算/正式结算对空币种的默认取值一致
+    isLocalCurrencySettlement() {
+      return normalizeCurrencyCode(this.form.currency) === 'RMB';
+    },
+    visibleFields() {
+      if (!this.isLocalCurrencySettlement) return this.fields;
+      return this.fields.filter(field => !LOCAL_CURRENCY_HIDDEN_FIELDS.includes(field.prop));
     },
     summaryTotal() {
       return this.summaryFees.reduce((total, row) => total + Number(row.settlementAmount || 0), 0);
     },
+    // 已付金额（含预付、核销）：编辑态取来源预结算预付快照 + 当前核销行实时合计（草稿态无尾款申请）；只读态用落库值
+    settlePaidTotal() {
+      if (!this.editable) return Number(this.form.paidAmount || 0);
+      const advancePaid = this.sources.reduce(
+        (sum, item) => sum + Number(item.advancePaidAmount || 0),
+        0
+      );
+      const writeOff = this.projectAdvanceWriteOffs.reduce(
+        (sum, row) => sum + Number(row.writeOffAmount || 0),
+        0
+      );
+      return advancePaid + writeOff;
+    },
+    settleRemainTotal() {
+      return Math.max(Number(this.form.settlementAmount || 0) - Number(this.settlePaidTotal || 0), 0);
+    },
+    // 付款记录合并表：预付付款记录（进度预付/项目预付核销）+ 尾款付款申请
+    paymentRecords() {
+      const advances = (this.advancePayments || []).map(row => ({
+        ...row,
+        typeName: settlementRecordTypeName(row.recordType),
+      }));
+      const tails = (this.paymentApplications || []).map(row => ({
+        ...row,
+        typeName: row.paymentTypeName,
+      }));
+      return [...advances, ...tails];
+    },
     filteredDetails() {
       return this.details.filter(row =>
         Object.entries(this.appliedDetailQuery).every(([field, keyword]) => {
@@ -1245,9 +1401,31 @@ export default {
     },
   },
   methods: {
-    formatContractOptionLabel,
+    isTierUnitPrice,
+    isUnitPriceAdjustable,
     hasPermission(code) {
-      return this.isAdmin || this.validData(this.permission?.[code], false);
+      if (this.isAdmin) return true;
+      const action = String(code || '').replace(
+        /^(payment_settlement_|receipt_settlement_|formal_settlement_)/,
+        ''
+      );
+      const prefix =
+        this.form.settlementType === 'receivable' ? 'receipt_settlement' : 'payment_settlement';
+      return (
+        this.validData(this.permission?.[`${prefix}_${action}`], false) ||
+        this.validData(this.permission?.[`formal_settlement_${action}`], false)
+      );
+    },
+    async handleAdjustmentRepush(row) {
+      await this.$confirm(
+        '请确认金蝶旧应付/应收单已由财务手工冲销，继续将生成全新财务应付/应收单。',
+        '高危操作确认',
+        { type: 'warning', confirmButtonText: '确认重新推送' }
+      );
+      const res = await settlementAdjustmentApi.repush(row.id);
+      this.$message.success(`已生成新金蝶单据：${res.data?.data || res.data || '-'}`);
+      await this.loadFormalDetail(this.recordId);
+      this.$emit('success');
     },
     async loadFormalDetail(id) {
       const response = this.publicMode
@@ -1270,11 +1448,21 @@ export default {
       this.detailFeeSnapshots = {};
       this.pendingAdjustments = {};
       this.paymentApplications = data.paymentApplications || [];
+      this.advancePayments = data.advancePayments || [];
       if (this.readonly && this.form.settlementType === 'receivable' && !this.publicMode) {
         this.receiptClaims = this.unwrapData(await getReceiptClaims(id)) || [];
       }
       this.adjustments = data.adjustments || [];
-      this.changeRecords = data.changeRecords || [];
+      this.changeRecords = (data.changeRecords || []).filter(
+        row => !isApprovalSettlementChange(row.changeContent)
+      );
+      this.projectAdvanceWriteOffs = (data.projectAdvanceWriteOffs || []).map(row => ({
+        ...row,
+        writeOffAmount: Number(row.writeOffAmount || 0),
+        projectAdvanceAmount: Number(row.projectAdvanceAmount || 0),
+        availableWriteOffAmount: Number(row.availableWriteOffAmount || 0),
+        createTime: row.paymentCreateTime || row.createTime,
+      }));
       this.attachments = this.parseAttachments(data.attachmentsJson);
       this.selectedAttachmentRows = [];
       this.invoices = data.invoices || [];
@@ -1305,11 +1493,14 @@ export default {
       this.receiptClaims = [];
       this.adjustments = [];
       this.changeRecords = [];
+      this.changeRecordDetailVisible = false;
+      this.changeRecordDetailRows = [];
+      this.projectAdvanceWriteOffs = [];
+      this.advancePayments = [];
       this.attachments = [];
       this.selectedAttachmentRows = [];
       this.invoices = [];
       this.issuedInvoices = [];
-      this.invoiceClaimNo = '';
       this.invoiceClaimDialog.visible = false;
       this.invoiceClaimDialog.selected = [];
       this.attachmentUploadFiles = [];
@@ -1326,6 +1517,7 @@ export default {
           this.loadFeeOptions(),
           this.loadFeeCategoryOptions(),
           this.loadAttachmentTypeOptions(),
+          this.loadBusinessModelOptions(),
           this.loadTransportTypeOptions(),
         ]);
       }
@@ -1453,6 +1645,19 @@ export default {
         this.sources.map(item => getPreSettlementDetail(item.preSettlementId))
       );
       const settlements = responses.map(response => this.unwrapData(response) || {});
+      // 预结算转正式：带出来源预结算已保存的项目预付核销行（后端保存时转移源行）
+      const writeOffRows = settlements.flatMap(settlement => settlement.projectAdvanceWriteOffs || []);
+      const existingWriteOffIds = new Set(
+        this.projectAdvanceWriteOffs.map(row => String(row.paymentApplicationId))
+      );
+      writeOffRows.forEach(row => {
+        if (existingWriteOffIds.has(String(row.paymentApplicationId))) return;
+        existingWriteOffIds.add(String(row.paymentApplicationId));
+        this.projectAdvanceWriteOffs.push({
+          ...row,
+          writeOffAmount: Number(row.writeOffAmount || 0),
+        });
+      });
       this.details = settlements.flatMap(settlement =>
         (settlement.details || []).map(detail => ({
           ...detail,
@@ -1623,7 +1828,7 @@ export default {
       this.candidate.page.current = 1;
       this.loadCandidates();
     },
-    confirmCandidates() {
+    async confirmCandidates() {
       const merged = [...this.sources, ...this.candidate.selected];
       const map = new Map(
         merged.map(item => [
@@ -1631,6 +1836,7 @@ export default {
           { ...item, preSettlementId: item.preSettlementId || item.id },
         ])
       );
+      const previousIds = new Set(this.sources.map(item => String(item.preSettlementId || item.id)));
       this.sources = [...map.values()];
       this.form.sourcePreSettlementIds = this.sources.map(item => item.preSettlementId);
       if (this.sources.length) {
@@ -1647,6 +1853,26 @@ export default {
       this.form.localSettlementAmount =
         this.form.settlementAmount * Number(this.form.exchangeRate || 1);
       this.candidate.visible = false;
+      // 预结算转正式：带出来源预结算已保存的项目预付核销行（后端保存时转移源行，额度单份占用）
+      const newIds = this.sources
+        .map(item => item.preSettlementId)
+        .filter(id => !previousIds.has(String(id)));
+      if (!newIds.length) return;
+      const responses = await Promise.all(newIds.map(id => getPreSettlementDetail(id)));
+      const rows = responses.flatMap(response =>
+        this.unwrapData(response)?.projectAdvanceWriteOffs || []
+      );
+      const existing = new Set(
+        this.projectAdvanceWriteOffs.map(row => String(row.paymentApplicationId))
+      );
+      rows.forEach(row => {
+        if (existing.has(String(row.paymentApplicationId))) return;
+        existing.add(String(row.paymentApplicationId));
+        this.projectAdvanceWriteOffs.push({
+          ...row,
+          writeOffAmount: Number(row.writeOffAmount || 0),
+        });
+      });
     },
     removeSource(index) {
       this.sources.splice(index, 1);
@@ -2031,6 +2257,27 @@ export default {
       this.appliedDetailQuery = { ...this.detailQuery };
       this.detailPage.current = 1;
     },
+    // 结算明细的「单据号」跳到该应收应付单据在应收明细/应付明细页的详情，「运单号」跳到运单详情
+    async handleDetailLink(row, column) {
+      if (column.prop === 'documentNo') {
+        const settlementType = row.settlementType || this.form.settlementType || 'payable';
+        const detailId = await resolveReceivablePayableDetailId(row, settlementType);
+        if (!detailId) return this.$message.info('当前记录未找到对应的应收/应付明细');
+        await this.$router.push({ path: settlementDetailPath(settlementType), query: { detailId } });
+        this.closeDetailDialog();
+        return;
+      }
+      if (column.prop === 'waybillNo') {
+        const waybillId = await resolveWaybillId(row);
+        if (!waybillId) return this.$message.info('当前记录未找到对应的运单详情');
+        await this.$router.push({ path: '/business/waybill-manage/detail', query: { id: waybillId } });
+        this.closeDetailDialog();
+      }
+    },
+    closeDetailDialog() {
+      if (this.pageMode) return;
+      this.visible = false;
+    },
     resetDetailQuery(apply = true) {
       this.detailQuery = { documentNo: '', waybillNo: '', batchNo: '', cargoName: '' };
       if (apply) this.handleDetailQuery();
@@ -2062,8 +2309,19 @@ export default {
         )}.xlsx`
       );
     },
-    billingRuleName(row) {
-      return this.normalizeBillingRule(row).name;
+    hasBillingRule(row) {
+      const rule = this.normalizeBillingRule(row);
+      return Boolean(
+        rule.feeItem ||
+          rule.billingElement ||
+          rule.billingType ||
+          rule.unitPrice ||
+          rule.rules?.length ||
+          rule.matchCondition?.origin ||
+          rule.matchCondition?.destination ||
+          rule.matchCondition?.cargoName ||
+          rule.matchCondition?.cargoType
+      );
     },
     openBillingRuleInfo(row) {
       this.billingRuleDialog.rule = this.normalizeBillingRule(row);
@@ -2089,26 +2347,8 @@ export default {
       const matchCondition = this.parseObject(
         source.matchCondition ?? source.billingMatchCondition ?? rule.matchCondition
       );
-      const ruleNames = matchedRules
-        .map(item => item.ruleName || item.name || item.billingRuleName || item.feeItem)
-        .filter(Boolean);
       return {
         ...rule,
-        name:
-          source.billingRuleName ||
-          source.feeRuleName ||
-          source.ruleName ||
-          source.billingPlanRuleName ||
-          source.billingPlanName ||
-          rule.name ||
-          rule.ruleName ||
-          rule.billingRuleName ||
-          rule.planName ||
-          rule.billingPlanName ||
-          ruleNames.join('、') ||
-          rule.feeItem ||
-          '',
-        feeType: source.billingFeeType || source.feeType || rule.feeType,
         feeItem: source.billingFeeItem || source.feeItem || rule.feeItem,
         billingElement:
           source.billingElement ||
@@ -2126,7 +2366,11 @@ export default {
           ...matchCondition,
           origin: matchCondition.origin || matchCondition.originName,
           destination: matchCondition.destination || matchCondition.destinationName,
-          transportMode: matchCondition.transportMode || matchCondition.transportType,
+          cargoName:
+            matchCondition.cargoName ||
+            matchCondition.cargoNameLabel ||
+            source.cargoName ||
+            rule.cargoName,
           cargoType: matchCondition.cargoType || matchCondition.cargoTypeName,
         },
       };
@@ -2157,11 +2401,16 @@ export default {
       row.settlementAmountTax = Number(
         (hasFreightItem ? feeItemTotal : Number(row.freightAmount || 0) + feeItemTotal).toFixed(2)
       );
-      if (changedField && this.adjust.sourceDetailId && (row.sourceFeeId || row.id)) {
-        this.scheduleSourceAdjustCalculation(row);
+      if (
+        ['transportQuantity', 'mileage', 'unitPrice'].includes(changedField) &&
+        this.adjust.sourceDetailId &&
+        (row.sourceFeeId || row.id) &&
+        (changedField !== 'unitPrice' || isUnitPriceAdjustable(row))
+      ) {
+        this.scheduleSourceAdjustCalculation(row, changedField);
       }
     },
-    scheduleSourceAdjustCalculation(row) {
+    scheduleSourceAdjustCalculation(row, changedField) {
       if (row.adjustCalculateTimer) clearTimeout(row.adjustCalculateTimer);
       row.adjustCalculateVersion = Number(row.adjustCalculateVersion || 0) + 1;
       row.calculating = true;
@@ -2174,6 +2423,8 @@ export default {
             feeId: row.sourceFeeId || row.id,
             transportQuantity: Number(row.transportQuantity || 0),
             mileage: Number(row.mileage || 0),
+            unitPrice: row.unitPrice === null || row.unitPrice === '' ? null : Number(row.unitPrice),
+            changedField,
             freightAmount: Number(row.freightAmount || 0),
             feeItems: Object.fromEntries(
               Object.entries(row.feeItems || {}).map(([name, amount]) => [name, Number(amount || 0)])
@@ -2185,10 +2436,14 @@ export default {
           row.feeItems = Object.fromEntries(
             Object.entries(data.feeItems || {}).map(([name, amount]) => [name, Number(amount || 0)])
           );
+          if (!isTierUnitPrice(row) && data.unitPrice !== undefined && data.unitPrice !== null) {
+            row.unitPrice = Number(data.unitPrice);
+          }
           row.adjustAmount = Number(data.adjustAmount || 0);
           row.settlementAmountTax = Number(data.afterAmount || 0);
         } catch (error) {
           row.calculateError = error.message || '费用试算失败';
+          this.$message.warning(row.calculateError);
         } finally {
           if (version === row.adjustCalculateVersion) row.calculating = false;
         }
@@ -2204,7 +2459,11 @@ export default {
         detailId: row.formalSettlementId ? row.id : null,
         sourceDetailId: row.sourceDetailId || null,
         feeKey,
-        reason: pending?.reason || '',
+        // 底部备注回显结算明细备注；暂存过的调整优先取暂存备注
+        reason:
+          pending?.reason !== undefined && pending?.reason !== null
+            ? pending.reason
+            : row.remark || '',
         rows: [],
         targetRow: row.formalSettlementId ? null : row,
       };
@@ -2227,7 +2486,6 @@ export default {
       }
     },
     async saveAdjustment() {
-      if (!this.adjust.reason.trim()) return this.$message.warning('请输入调整原因');
       if (this.adjust.rows.some(row => row.calculating)) {
         return this.$message.warning('费用正在重新计算，请稍候');
       }
@@ -2256,6 +2514,14 @@ export default {
             .reduce((total, item) => total + Number(item.settlementAmountTax || 0), 0)
             .toFixed(2)
         );
+        const settlementAmountNoTax = Number(
+          this.adjust.rows
+            .reduce((total, item) => total + Number(item.settlementAmountNoTax || 0), 0)
+            .toFixed(2)
+        );
+        const hasSettlementAmountNoTax = this.adjust.rows.some(
+          item => item.settlementAmountNoTax !== undefined && item.settlementAmountNoTax !== null
+        );
         const feeItems = this.adjust.rows.reduce((result, item) => {
           Object.entries(item.feeItems || {}).forEach(([name, amount]) => {
             result[name] = Number((Number(result[name] || 0) + Number(amount || 0)).toFixed(2));
@@ -2269,24 +2535,37 @@ export default {
           originalAmount,
           adjustAmount: Number((settlementAmount - originalAmount).toFixed(2)),
           settlementAmountTax: settlementAmount,
+          settlementAmountNoTax: hasSettlementAmountNoTax
+            ? settlementAmountNoTax
+            : target.settlementAmountNoTax,
           feeItemsJson: JSON.stringify(feeItems),
-          freightAmount: this.adjust.rows.reduce(
-            (total, item) => total + Number(item.freightAmount || 0),
-            0
+          freightAmount: Number(
+            this.adjust.rows
+              .reduce((total, item) => total + Number(item.freightAmount || 0), 0)
+              .toFixed(2)
           ),
-          transportQuantity: this.adjust.rows.reduce(
-            (total, item) => total + Number(item.transportQuantity || 0),
-            0
+          transportQuantity: Number(
+            this.adjust.rows
+              .reduce((total, item) => total + Number(item.transportQuantity || 0), 0)
+              .toFixed(2)
+          ),
+          mileage: Number(
+            this.adjust.rows
+              .reduce((total, item) => total + Number(item.mileage || 0), 0)
+              .toFixed(2)
           ),
-          mileage: this.adjust.rows.reduce((total, item) => total + Number(item.mileage || 0), 0),
           unitPrice: edited.unitPrice,
-          remark: edited.remark,
+          // 底部备注写入结算明细备注
+          remark: this.adjust.reason || '',
           pendingDetailAdjustment: true,
         });
         if (this.adjust.feeKey) {
+          const clonedRows = this.cloneAdjustRows(this.adjust.rows);
+          // 暂存后同步费用快照，避免再次打开调整弹窗或汇总时仍用调整前数据。
+          this.detailFeeSnapshots[this.adjust.feeKey] = clonedRows;
           this.pendingAdjustments[this.adjust.feeKey] = {
             reason: this.adjust.reason,
-            rows: this.cloneAdjustRows(this.adjust.rows),
+            rows: clonedRows,
           };
         }
         await this.refreshSummaryFees();
@@ -2308,7 +2587,6 @@ export default {
             feeItems: row.feeItems,
             settlementAmountTax: row.settlementAmountTax,
             settlementAmountNoTax: row.settlementAmountNoTax,
-            remark: row.remark,
           })),
         });
         this.$message.success('调整保存成功');
@@ -2332,6 +2610,17 @@ export default {
       }));
       await this.confirmInvoiceClaims();
     },
+    // 发票认领默认金额以当前结算金额为准：优先表单结算金额，其次结算合计，再次明细含税合计。
+    resolveInvoiceClaimSettlementAmount() {
+      const formAmount = Number(this.form.settlementAmount || 0);
+      if (formAmount > 0) return formAmount;
+      const summaryAmount = Number(this.summaryTotal || 0);
+      if (summaryAmount > 0) return summaryAmount;
+      return this.details.reduce(
+        (total, row) => total + Number(row.settlementAmountTax || row.settlementAmount || 0),
+        0
+      );
+    },
     async confirmInvoiceClaims() {
       if (!this.invoiceClaimDialog.selected.length) {
         this.$message.warning('请至少选择一条发票');
@@ -2340,26 +2629,33 @@ export default {
       this.invoiceClaimDialog.confirming = true;
       try {
         const existingNumbers = new Set(this.invoices.map(item => String(item.invoiceNo)));
+        const settlementAmount = this.resolveInvoiceClaimSettlementAmount();
+        if (settlementAmount > 0 && Number(this.form.settlementAmount || 0) <= 0) {
+          this.form.settlementAmount = Number(settlementAmount).toFixed(2);
+        }
         let remaining = Math.max(
-          Number(this.form.settlementAmount || 0) -
+          settlementAmount -
             this.invoices.reduce((total, item) => total + Number(item.matchedAmount || 0), 0),
           0
         );
         const invoices = this.invoiceClaimDialog.selected
           .filter(row => !existingNumbers.has(String(row.invoiceNo)))
           .map(row => {
-            const sourceAmount = Number(row.matchedAmount || 0);
+            // 票池 matchedAmount 默认等于整张发票金额；可匹配口径优先取 availableInvoiceAmount
+            const sourceAmount = Number(
+              row.availableInvoiceAmount || row.matchedAmount || row.invoiceAmount || 0
+            );
+            // 可匹配金额大于剩余结算金额时，默认匹配金额取剩余结算金额（单张发票常见场景）
             const matchedAmount =
-              Number(this.form.settlementAmount || 0) > 0
-                ? Math.min(sourceAmount, remaining)
-                : sourceAmount;
-            if (Number(this.form.settlementAmount || 0) > 0) {
+              settlementAmount > 0 ? Math.min(sourceAmount, remaining) : sourceAmount;
+            if (settlementAmount > 0) {
               remaining = Math.max(0, remaining - matchedAmount);
             }
             return {
               ...row,
               invoiceType: row.invoiceTypeName || row.invoiceType || '',
-              matchedAmount,
+              availableInvoiceAmount: sourceAmount,
+              matchedAmount: Number(matchedAmount.toFixed(2)),
             };
           })
           .filter(row => row.matchedAmount > 0);
@@ -2417,7 +2713,7 @@ export default {
         }
         matchedTotal += matchedAmount;
       }
-      if (matchedTotal > Number(this.form.settlementAmount || 0)) {
+      if (matchedTotal > this.resolveInvoiceClaimSettlementAmount()) {
         this.$message.warning('发票匹配结算单金额合计不能超过结算金额');
         return false;
       }
@@ -2520,12 +2816,14 @@ export default {
             sourceDetailId: row.sourcePreSettlementId ? undefined : row.sourceDetailId || row.id,
             adjustAmount: Number(row.adjustAmount || 0),
           })),
+        businessModel: this.form.businessModel || undefined,
+        transportType: this.form.transportType || undefined,
         exchangeRateDate: this.form.exchangeRateDate,
         exchangeRate: this.form.exchangeRate,
         summaryFees: this.summaryFees
           .filter(
             row =>
-              row.manualFlag === 1 ||
+              Number(row.manualFlag) === 1 ||
               row.id ||
               Number(row.adjustAmount || 0) !== 0 ||
               String(row.remark || '').trim()
@@ -2536,7 +2834,7 @@ export default {
             feeItem: row.feeItem,
             adjustAmount: Number(row.adjustAmount || 0),
             remark: row.remark,
-            manualFlag: row.manualFlag || 0,
+            manualFlag: Number(row.manualFlag) === 1 ? 1 : 0,
           })),
         attachmentsJson: this.stringifyAttachments(this.attachments),
         invoices: this.invoices.map(row => ({
@@ -2549,6 +2847,7 @@ export default {
           matchedAmount: Number(row.matchedAmount || 0),
           attachmentJson: row.attachmentJson || '',
         })),
+        projectAdvanceWriteOffs: this.$refs.projectAdvanceWriteOffRef?.toSavePayload?.() || [],
         remark: this.form.remark,
       };
     },
@@ -2557,6 +2856,9 @@ export default {
     },
     async handleDraftSave() {
       // 保存草稿：不做表单校验，直接落草稿并返回列表刷新
+      if (this.$refs.projectAdvanceWriteOffRef?.validateBeforeSave?.() === false) {
+        return;
+      }
       this.draftSaving = true;
       try {
         await save({
@@ -2584,6 +2886,9 @@ export default {
         return this.$message.warning('请完善手工费用的费用类型和费用项');
       }
       if (!this.validateInvoices()) return;
+      if (this.$refs.projectAdvanceWriteOffRef?.validateBeforeSave?.() === false) {
+        return;
+      }
       // 附件类型仅做提示，不阻断正式结算单新增/保存提交。
       // this.validateAttachments();
       this.saving = true;
@@ -2603,6 +2908,55 @@ export default {
       const lineNo = row?.lineNo;
       return lineNo === -1 || String(lineNo) === '-1' ? '' : this.displayValue(lineNo);
     },
+    parseChangeRecordData(value) {
+      if (!value) return {};
+      if (typeof value === 'object') return value;
+      try {
+        const parsed = JSON.parse(value);
+        return parsed && typeof parsed === 'object' && !Array.isArray(parsed) ? parsed : {};
+      } catch (error) {
+        return {};
+      }
+    },
+    formatChangeRecordValue(value) {
+      if (value === undefined || value === null || value === '') return '空';
+      if (Array.isArray(value)) {
+        if (!value.length) return '空';
+        return value
+          .map(item => {
+            if (!item || typeof item !== 'object') return String(item);
+            return Object.entries(item)
+              .map(([key, itemValue]) => `${key}：${this.formatChangeRecordValue(itemValue)}`)
+              .join('，');
+          })
+          .join('\n');
+      }
+      if (typeof value === 'object') return JSON.stringify(value);
+      return String(value);
+    },
+    buildChangeRecordDetailRows(row = {}) {
+      const before = this.parseChangeRecordData(row.beforeData);
+      const after = this.parseChangeRecordData(row.afterData);
+      const fields = [...new Set([...Object.keys(before), ...Object.keys(after)])];
+      const rows = fields
+        .filter(field => JSON.stringify(before[field]) !== JSON.stringify(after[field]))
+        .map(field => ({
+          field,
+          before: this.formatChangeRecordValue(before[field]),
+          after: this.formatChangeRecordValue(after[field]),
+        }));
+      if (row.changeContent) {
+        rows.unshift({ field: '变更内容', before: '空', after: row.changeContent });
+      }
+      if (row.changeReason) {
+        rows.push({ field: '变更原因', before: '空', after: row.changeReason });
+      }
+      return rows;
+    },
+    openChangeRecordDetail(row) {
+      this.changeRecordDetailRows = this.buildChangeRecordDetailRows(row);
+      this.changeRecordDetailVisible = true;
+    },
     paymentMethodName(value) {
       const labels = {
         bank_transfer: '银行转账',
@@ -2611,6 +2965,9 @@ export default {
       };
       return this.displayValue(labels[value] || value);
     },
+    settlementStatusName(status) {
+      return settlementStatusName(status, this.displayValue);
+    },
     unwrapData(response) {
       const body = response?.data || response || {};
       return body?.data || body;
@@ -2629,9 +2986,36 @@ export default {
     formatDetailMileage(value) {
       return this.readonly && Number(value) === -1 ? '-' : this.displayValue(value);
     },
+    async loadBusinessModelOptions() {
+      const { data } = await getDictionary({ code: 'business_model' });
+      const records = Array.isArray(data?.data) ? data.data : data?.data?.records || [];
+      this.businessModelOptions = records.map(item => ({
+        dictKey: item.dictKey ?? item.value,
+        dictValue: item.dictValue ?? item.label ?? item.name,
+      }));
+    },
     async loadTransportTypeOptions() {
       const { data } = await getDictionary({ code: 'transport_type' });
-      this.transportTypeOptions = data?.data || [];
+      const records = Array.isArray(data?.data) ? data.data : data?.data?.records || [];
+      this.transportTypeOptions = records.map(item => ({
+        dictKey: item.dictKey ?? item.value,
+        dictValue: item.dictValue ?? item.label ?? item.name,
+      }));
+    },
+    formSelectOptions(field) {
+      const key = field?.optionsKey;
+      const options = key ? this[key] : [];
+      return Array.isArray(options) ? options : [];
+    },
+    formSelectLabel(field, value) {
+      if (value === undefined || value === null || value === '') return '-';
+      const normalized = String(value).trim();
+      const option = this.formSelectOptions(field).find(
+        item =>
+          String(item.dictKey ?? '').trim() === normalized ||
+          String(item.dictValue ?? '').trim() === normalized
+      );
+      return option?.dictValue || normalized;
     },
     transportTypeName(value) {
       if (value === undefined || value === null || value === '') return '';
@@ -2864,6 +3248,9 @@ export default {
 </script>
 
 <style scoped lang="scss">
+.form-readonly--code {
+  color: var(--el-color-primary);
+}
 .formal-editor--page {
   padding-bottom: 72px;
 }
@@ -2953,20 +3340,6 @@ export default {
 .formal-editor__billing-rule-match-title {
   margin-top: 20px;
 }
-.dialog-section-title {
-  display: flex;
-  align-items: center;
-  min-height: 22px;
-  font-size: 16px;
-  font-weight: 600;
-}
-.dialog-section-title::before {
-  width: 4px;
-  height: 18px;
-  margin-right: 8px;
-  background: #409eff;
-  content: '';
-}
 .formal-editor__attachment-missing {
   margin-left: 12px;
   color: var(--el-color-danger);
@@ -2978,21 +3351,9 @@ export default {
 }
 .formal-editor__invoice-claim {
   display: flex;
-  flex-direction: column;
-  align-items: flex-end;
-  gap: 8px;
+  justify-content: flex-end;
   margin-bottom: 12px;
 }
-.formal-editor__invoice-claim-hint {
-  color: var(--el-color-danger);
-  font-size: 13px;
-}
-.formal-editor__invoice-claim :deep(.el-form-item) {
-  margin-bottom: 0;
-}
-.formal-editor__invoice-claim :deep(.el-input) {
-  width: 360px;
-}
 .formal-editor__issued-invoices {
   margin-top: 16px;
 }
@@ -3004,6 +3365,9 @@ export default {
 .formal-editor__negative-amount {
   color: var(--el-color-danger);
 }
+.formal-editor__settle-summary {
+  margin-top: 8px;
+}
 .formal-editor :deep(.formal-editor__negative-amount .el-input__inner) {
   color: var(--el-color-danger);
 }
diff --git a/src/views/settlement/components/formal-settlement-table-panel.vue b/src/views/settlement/components/formal-settlement-table-panel.vue
index 8d0d028..7654dfd 100644
--- a/src/views/settlement/components/formal-settlement-table-panel.vue
+++ b/src/views/settlement/components/formal-settlement-table-panel.vue
@@ -1,219 +1,140 @@
 <template>
-  <div class="fs-table-panel">
-    <div class="fs-table-panel__toolbar">
-      <div>
-        <el-button
-          v-if="hasPermission('formal_settlement_add')"
-          type="primary"
-          @click="$emit('create')"
-          >新增</el-button
-        >
-        <el-button
-          v-if="hasPermission('formal_settlement_payment')"
-          type="primary"
-          plain
-          :disabled="!selection.length"
-          @click="$emit('payment')"
-          >付款申请</el-button
-        >
-        <el-button
-          v-if="hasPermission('formal_settlement_sync')"
-          type="primary"
-          plain
-          :disabled="selection.length !== 1"
-          :loading="syncLoading"
-          @click="$emit('sync')"
-          >同步金蝶</el-button
-        >
-        <el-button
-          v-if="hasPermission('formal_settlement_print')"
-          type="primary"
-          plain
-          @click="emitSingle('print')"
-          >打印结算单</el-button
-        >
-        <el-button
-          v-if="hasPermission('formal_settlement_export')"
-          type="primary"
-          plain
-          @click="$emit('export')"
-          >导出</el-button
-        >
-      </div>
-      <settlement-table-tools
-        :columns="columnSettingOptions"
-        v-model:visible-column-keys="visibleColumnKeys"
-        v-model:table-size="tableSize"
-        :search-visible="searchVisible"
-        @update:search-visible="$emit('update:searchVisible', $event)"
-        @refresh="$emit('refresh')"
-      />
-    </div>
-    <el-table
-      ref="tableRef"
-      v-loading="loading"
-      :data="rows"
-      :size="tableSize"
-      border
-      highlight-current-row
-      @current-change="handleCurrentChange"
-      @selection-change="handleSelectionChange"
-    >
-      <el-table-column type="index" label="序号" width="64" fixed="left" align="center" />
-      <el-table-column type="selection" width="52" fixed="left" align="center" />
-      <el-table-column
-        v-for="column in visibleColumns"
-        :key="column.prop"
-        v-bind="column"
-        align="center"
-        show-overflow-tooltip
+  <avue-crud
+    ref="crud"
+    :option="option"
+    :table-loading="loading"
+    :data="rows"
+    v-model:page="crudPage"
+    @search-change="(params, done) => $emit('search-change', params, done)"
+    @search-reset="$emit('search-reset')"
+    @selection-change="handleSelectionChange"
+    @refresh-change="$emit('refresh')"
+    @on-load="page => $emit('load', page)"
+  >
+    <template #menu-left>
+      <el-button v-if="hasPermission('add')" type="primary" @click="$emit('create')"
+        >新增</el-button
       >
-        <template #default="{ row }">
-          <el-link
-            v-if="column.link && row[column.prop]"
-            type="primary"
-            @click="emitAction('view', row)"
-            >{{ row[column.prop] }}</el-link
-          >
-          <el-tag
-            v-else-if="column.status"
-            :type="statusType(row.approvalStatus)"
-            class="status-text"
-            >{{ displayValue(row[column.prop]) }}</el-tag
-          >
-          <span v-else-if="column.money">{{ formatMoney(row[column.prop], row.currency) }}</span>
-          <span
-            v-else-if="column.prop === 'invoiceStatusName'"
-            :class="['fs-table-panel__invoice-status', `is-${row.invoiceStatus || 'unreceived'}`]"
-          >{{ invoiceName(row.invoiceStatus, row.settlementType) }}</span>
-          <span v-else-if="column.prop === 'paymentStatusName'">{{
-            paymentName(row.paymentStatus)
-          }}</span>
-          <span v-else-if="column.prop === 'kingdeeSyncStatus'">{{
-            kingdeeSyncName(row.kingdeeSyncStatus)
-          }}</span>
-          <template v-else-if="column.prop === 'kingdeeLockStatus'">
-            <el-tooltip v-if="lockTag(row).show" :content="lockTag(row).tip" placement="top">
-              <el-tag :type="lockTag(row).type" class="status-text">{{ lockTag(row).label }}</el-tag>
-            </el-tooltip>
-            <span v-else>-</span>
-          </template>
-          <span v-else>{{ displayValue(row[column.prop]) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" width="320" fixed="right" align="center">
-        <template #default="{ row }"
-          ><div class="fs-table-panel__links">
-            <el-link
-              v-for="action in rowActions(row)"
-              :key="action.type"
-              :type="action.danger ? 'danger' : 'primary'"
-              @click="emitAction(action.type, row)"
-              >{{ action.label }}</el-link
-            >
-          </div></template
-        >
-      </el-table-column>
-    </el-table>
-    <div class="fs-table-panel__pagination">
-      <el-pagination
-        :current-page="page.current"
-        :page-size="page.size"
-        :total="page.total"
-        :page-sizes="[10, 20, 50, 100]"
-        layout="total, sizes, prev, pager, next, jumper"
-        @current-change="current => $emit('page-change', { current, size: page.size })"
-        @size-change="size => $emit('page-change', { current: 1, size })"
-      />
-    </div>
-  </div>
+      <el-button
+        v-if="showPaymentAction && hasPermission('payment')"
+        type="primary"
+        plain
+        :disabled="!selection.length"
+        @click="$emit('payment')"
+        >付款申请</el-button
+      >
+      <el-button
+        v-if="hasPermission('sync')"
+        type="primary"
+        plain
+        :disabled="!selection.length"
+        :loading="syncLoading"
+        @click="$emit('sync')"
+        >同步金蝶</el-button
+      >
+      <el-button v-if="hasPermission('print')" type="primary" plain @click="emitSingle('print')"
+        >打印结算单</el-button
+      >
+      <el-button v-if="hasPermission('export')" type="primary" plain @click="$emit('export')"
+        >导出</el-button
+      >
+    </template>
+
+    <template #formalSettlementNo="{ row }">
+      <el-link type="primary" @click="emitAction('view', row)">{{
+        row.formalSettlementNo || '-'
+      }}</el-link>
+    </template>
+
+    <template #invoiceStatusName="{ row }">
+      <span :class="['fs-invoice-status', `is-${row.invoiceStatus || 'unreceived'}`]">{{
+        invoiceName(row.invoiceStatus, row.settlementType)
+      }}</span>
+    </template>
+
+    <template #paymentStatusName="{ row }">{{ paymentName(row.paymentStatus) }}</template>
+
+    <template #approvalStatusName="{ row }">
+      <el-tag :type="statusType(row.approvalStatus)" class="status-text">{{
+        row.approvalStatusName || '-'
+      }}</el-tag>
+    </template>
+
+    <template #kingdeeSyncStatus="{ row }">{{ kingdeeSyncName(row.kingdeeSyncStatus) }}</template>
+
+    <template #kingdeeLockStatus="{ row }">
+      <el-tooltip v-if="lockTag(row).show" :content="lockTag(row).tip" placement="top">
+        <el-tag :type="lockTag(row).type" class="status-text">{{ lockTag(row).label }}</el-tag>
+      </el-tooltip>
+      <span v-else>-</span>
+    </template>
+
+    <template #menu="{ row }">
+      <el-link
+        v-for="action in rowActions(row)"
+        :key="action.type"
+        :type="action.danger ? 'danger' : 'primary'"
+        @click="emitAction(action.type, row)"
+        >{{ action.label }}</el-link
+      >
+    </template>
+  </avue-crud>
 </template>
 
 <script>
-import {
-  invoiceStatusName,
-  kingdeeSyncStatusOptions,
-  paymentStatusOptions,
-} from '@/option/settlement/formalSettlementSearch';
-import SettlementTableTools from './settlement-table-tools.vue';
+import { invoiceStatusName } from '@/option/settlement/formalSettlementSearch';
+import { kingdeeSyncName, paymentStatusName } from '@/option/settlement/formalSettlement';
 
 export default {
   name: 'FormalSettlementTablePanel',
-  components: { SettlementTableTools },
   props: {
+    option: { type: Object, required: true },
     rows: { type: Array, default: () => [] },
-    columns: { type: Array, default: () => [] },
     loading: { type: Boolean, default: false },
     syncLoading: { type: Boolean, default: false },
     page: { type: Object, required: true },
     hasPermission: { type: Function, required: true },
     mkEnabled: { type: Boolean, default: false },
-    searchVisible: { type: Boolean, default: true },
+    /** 是否展示付款申请按钮（仅付款结算单） */
+    showPaymentAction: { type: Boolean, default: true },
+    billLabel: { type: String, default: '结算单' },
   },
   emits: [
     'create',
     'payment',
     'sync',
-    'print',
     'export',
     'refresh',
-    'page-change',
+    'load',
     'action',
     'update:selection',
-    'update:searchVisible',
+    'search-change',
+    'search-reset',
   ],
   data() {
     return {
       selection: [],
-      tableSize: 'default',
-      visibleColumnKeys: [],
-      knownColumnProps: [],
     };
   },
   computed: {
-    columnSettingOptions() {
-      return this.columns.map(column => ({
-        prop: column.prop,
-        label: column.label,
-      }));
-    },
-    visibleColumns() {
-      if (!this.visibleColumnKeys.length) return this.columns;
-      return this.columns.filter(column => this.visibleColumnKeys.includes(column.prop));
+    // 分页对象由父级持有，avue 内部翻页时同步回写同一个对象
+    crudPage: {
+      get() {
+        return this.page;
+      },
+      set(value) {
+        Object.assign(this.page, value || {});
+      },
     },
   },
   watch: {
-    columns: {
-      immediate: true,
-      handler(columns) {
-        const props = columns.map(column => column.prop);
-        if (!this.visibleColumnKeys.length) {
-          this.visibleColumnKeys = props;
-          this.knownColumnProps = props;
-          return;
-        }
-        const visible = new Set(this.visibleColumnKeys);
-        const known = new Set(this.knownColumnProps || []);
-        props.forEach(prop => {
-          if (!known.has(prop)) visible.add(prop);
-        });
-        this.knownColumnProps = props;
-        this.visibleColumnKeys = props.filter(prop => visible.has(prop));
-      },
-    },
     rows() {
       this.selection = [];
-      this.$refs.tableRef?.clearSelection();
+      this.$refs.crud?.toggleSelection?.();
       this.$emit('update:selection', this.selection);
     },
   },
   methods: {
-    handleCurrentChange(row) {
-      if (!row && this.selection.length === 1) {
-        this.selection = [];
-        this.$emit('update:selection', this.selection);
-      }
-    },
     handleSelectionChange(selection) {
       this.selection = selection;
       this.$emit('update:selection', selection);
@@ -223,7 +144,7 @@ export default {
     },
     emitSingle(type) {
       if (this.selection.length !== 1) {
-        this.$message.warning(`${type === 'print' ? '打印' : '操作'}需选择一条正式结算单`);
+        this.$message.warning(`${type === 'print' ? '打印' : '操作'}需选择一条${this.billLabel}`);
         return;
       }
       this.$emit('action', { type, row: this.selection[0] });
@@ -233,27 +154,26 @@ export default {
     },
     rowActions(row) {
       const actions = [];
-      if (this.hasPermission('formal_settlement_view'))
-        actions.push({ type: 'view', label: '查看' });
-      if (this.hasPermission('formal_settlement_edit') && this.isEditable(row))
+      if (this.hasPermission('view')) actions.push({ type: 'view', label: '查看' });
+      if (this.hasPermission('edit') && this.isEditable(row))
         actions.push({ type: 'edit', label: '编辑' });
-      if (this.hasPermission('formal_settlement_delete') && row.approvalStatus === 'draft')
+      if (this.hasPermission('delete') && row.approvalStatus === 'draft')
         actions.push({ type: 'delete', label: '删除', danger: true });
-      if (this.hasPermission('formal_settlement_submit') && this.isEditable(row))
+      if (this.hasPermission('submit') && this.isEditable(row))
         actions.push({ type: 'submit', label: '提交' });
       if (
         this.mkEnabled &&
-        this.hasPermission('formal_settlement_approve') &&
+        this.hasPermission('approve') &&
         ['reviewing', 'approved'].includes(row.approvalStatus)
       ) {
         actions.push({ type: 'mkAudit', label: '流程' });
       }
-      if (!this.mkEnabled && this.hasPermission('formal_settlement_approve') && row.approvalStatus === 'reviewing') {
+      if (!this.mkEnabled && this.hasPermission('approve') && row.approvalStatus === 'reviewing') {
         actions.push({ type: 'approve', label: '通过' });
         actions.push({ type: 'return', label: '驳回', danger: true });
       }
       if (
-        this.hasPermission('formal_settlement_void') &&
+        this.hasPermission('void') &&
         row.approvalStatus === 'approved' &&
         row.kingdeeSyncStatus !== 'synced'
       )
@@ -270,14 +190,19 @@ export default {
       return invoiceStatusName(value, settlementType);
     },
     paymentName(value) {
-      return paymentStatusOptions.find(item => item.value === value)?.label || value || '-';
+      return paymentStatusName(value);
     },
     kingdeeSyncName(value) {
-      return kingdeeSyncStatusOptions.find(item => item.value === value)?.label || value || '-';
+      return kingdeeSyncName(value);
     },
     lockTag(row) {
       if (row.kingdeeLockStatus === 'locked') {
-        return { show: true, type: 'danger', label: '金蝶锁定中', tip: '该单据已被金蝶锁定，不可编辑/作废' };
+        return {
+          show: true,
+          type: 'danger',
+          label: '金蝶锁定中',
+          tip: '该单据已被金蝶锁定，不可编辑/作废',
+        };
       }
       if (row.kingdeeLockStatus === 'failed') {
         if ((row.kingdeeTryCount || 0) >= 5) {
@@ -295,32 +220,24 @@ export default {
           tip: row.kingdeeLockFailReason || '系统将自动补偿重锁',
         };
       }
+      // 金蝶解锁终态标识：删单解锁的源单已作废，此标签用于区分人工作废与金蝶删单
+      if (row.kingdeeUnlockTime) {
+        const isDelete = row.kingdeeUnlockOperationName === '金蝶删单';
+        return {
+          show: true,
+          type: isDelete ? 'danger' : 'warning',
+          label: row.kingdeeUnlockOperationName || '金蝶解锁',
+          tip: `${row.kingdeeUnlockOperator || '-'} 于 ${this.$dayjs(row.kingdeeUnlockTime).format('YYYY-MM-DD HH:mm:ss')} 解锁`,
+        };
+      }
       return { show: false };
     },
-    displayValue(value) {
-      return value === null || value === undefined || value === '' ? '-' : value;
-    },
-    formatMoney(value, currency = 'RMB') {
-      return `${Number(value || 0).toFixed(2)} ${currency || 'RMB'}`;
-    },
   },
 };
 </script>
 
 <style scoped lang="scss">
-.fs-table-panel__toolbar {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 12px 0;
-}
-.fs-table-panel__links {
-  display: flex;
-  flex-wrap: wrap;
-  justify-content: center;
-  gap: 8px;
-}
-.fs-table-panel__invoice-status {
+.fs-invoice-status {
   &.is-unreceived {
     color: #f56c6c;
   }
@@ -328,12 +245,7 @@ export default {
     color: #e6a23c;
   }
   &.is-completed {
-    color: #67c23a;
+    color: #67c23c;
   }
 }
-.fs-table-panel__pagination {
-  display: flex;
-  justify-content: flex-end;
-  margin-top: 12px;
-}
 </style>
diff --git a/src/views/settlement/components/pre-settlement-editor.vue b/src/views/settlement/components/pre-settlement-editor.vue
index 7a63786..84317bb 100644
--- a/src/views/settlement/components/pre-settlement-editor.vue
+++ b/src/views/settlement/components/pre-settlement-editor.vue
@@ -16,11 +16,11 @@
           class="pre-settlement-editor__form"
         >
           <el-row :gutter="24">
-            <el-col v-for="field in formFields" :key="field.prop" :span="field.span || 6">
+            <el-col v-for="field in visibleFormFields" :key="field.prop" :span="field.span || 6">
               <el-form-item :label="field.label" :prop="field.prop">
                 <el-input
                   v-if="field.type === 'contract'"
-                  :model-value="formatContractOptionLabel(form)"
+                  :model-value="form.contractName"
                   readonly
                   :disabled="!editable || details.length > 0"
                   placeholder="请选择合同"
@@ -40,7 +40,7 @@
                   type="date"
                   value-format="YYYY-MM-DD"
                   format="YYYY-MM-DD"
-                  :disabled="!editable || form.currency === 'RMB'"
+                  :disabled="!editable"
                   placeholder="请选择"
                   @change="handleExchangeRateDateChange"
                 />
@@ -50,9 +50,26 @@
                   :min="0"
                   :precision="2"
                   :controls="false"
-                  :disabled="!editable || form.currency === 'RMB'"
+                  :disabled="!editable"
                   @change="recalculateLocalAmount"
                 />
+                <el-select
+                  v-else-if="field.type === 'select' && editable"
+                  v-model="form[field.prop]"
+                  filterable
+                  clearable
+                  placeholder="请选择"
+                >
+                  <el-option
+                    v-for="item in formSelectOptions(field)"
+                    :key="item.dictKey"
+                    :label="item.dictValue"
+                    :value="item.dictKey"
+                  />
+                </el-select>
+                <span v-else-if="field.type === 'select'" class="form-readonly">
+                  {{ formSelectLabel(field, form[field.prop]) }}
+                </span>
                 <el-input
                   v-else-if="field.type === 'textarea'"
                   v-model="form[field.prop]"
@@ -66,7 +83,11 @@
                 <span v-else-if="field.prop === 'settlementType'" class="form-readonly">
                   {{ settlementTypeName }}
                 </span>
-                <span v-else-if="field.prop === 'preSettlementNo'" class="form-readonly">
+                <span
+                  v-else-if="field.prop === 'preSettlementNo'"
+                  class="form-readonly"
+                  :class="{ 'form-readonly--code': form.preSettlementNo }"
+                >
                   {{ form.preSettlementNo || (!form.id ? '系统自动生成' : '-') }}
                 </span>
                 <span v-else-if="field.prop === 'createTime'" class="form-readonly">
@@ -243,60 +264,68 @@
               :index="detailIndexMethod"
             />
             <el-table-column
-              v-for="column in visibleDetailColumns"
-              :key="column.prop"
-              :label="column.label"
-              :prop="column.prop"
-              :min-width="column.minWidth"
+              v-for="item in detailDisplayColumns"
+              :key="item.key"
+              :label="item.kind === 'fee' ? item.name : item.column.label"
+              :prop="item.kind === 'fee' ? undefined : item.column.prop"
+              :min-width="item.kind === 'fee' ? 150 : item.column.minWidth"
               align="center"
               show-overflow-tooltip
             >
+              <template #header>
+                <span class="pre-settlement-editor__billing-rule-cell">
+                  <span>{{ item.kind === 'fee' ? item.name : item.column.label }}</span>
+                  <el-icon
+                    v-if="showDetailColumnRuleIcon(item)"
+                    class="pre-settlement-editor__billing-rule-icon"
+                    title="查看计费规则详情"
+                    @click.stop="openDetailColumnRule(item)"
+                  >
+                    <InfoFilled />
+                  </el-icon>
+                </span>
+              </template>
               <template #default="{ row }">
+                <span v-if="item.kind === 'fee'">
+                  {{
+                    formatMoney(
+                      parseFeeItems(row.feeItemsJson)[item.name],
+                      row.currency || form.currency
+                    )
+                  }}
+                </span>
                 <el-link
-                  v-if="column.link && row[column.prop]"
+                  v-else-if="item.column.link && row[item.column.prop] && !publicMode"
                   type="primary"
-                  @click="openAdjustDialog(row, true)"
+                  @click.stop="handleDetailLink(row, item.column)"
                 >
-                  {{ row[column.prop] }}
+                  {{ row[item.column.prop] }}
                 </el-link>
-                <span v-else-if="column.money && column.prop === 'unitPrice'">
+                <span v-else-if="item.column.money && item.column.prop === 'unitPrice'">
                   {{ formatUnitPrice(row) }}
                 </span>
-                <span v-else-if="column.money">
-                  {{ formatMoney(row[column.prop], row.currency || form.currency) }}
+                <span v-else-if="item.column.prop === 'freightAmount'">
+                  {{ formatMoney(row[item.column.prop], row.currency || form.currency) }}
                 </span>
-                <span v-else-if="column.prop === 'transportQuantityText'">
+                <span v-else-if="item.column.money">
+                  {{ formatMoney(row[item.column.prop], row.currency || form.currency) }}
+                </span>
+                <span v-else-if="item.column.prop === 'transportQuantityText'">
                   {{ formatQuantity(row) }}
                 </span>
-                <span v-else-if="pageMode && column.prop === 'mileage'">
-                  {{ formatDetailMileage(row[column.prop]) }}
+                <span v-else-if="item.column.prop === 'mileage'">
+                  {{ formatDetailMileage(row[item.column.prop]) }}
                 </span>
-                <span v-else-if="column.prop === 'transportType'">
-                  {{ transportTypeName(row[column.prop]) }}
+                <span v-else-if="item.column.prop === 'transportType'">
+                  {{ transportTypeName(row[item.column.prop]) }}
                 </span>
-                <span v-else-if="column.prop === 'cargoName'">
+                <span v-else-if="item.column.prop === 'cargoName'">
                   {{ formatCargoNames(row) }}
                 </span>
-                <span v-else-if="column.prop === 'cargoType'">
+                <span v-else-if="item.column.prop === 'cargoType'">
                   {{ formatCargoTypes(row) }}
                 </span>
-                <span v-else>{{ displayValue(row[column.prop]) }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column
-              v-for="feeItem in detailFeeItemNames"
-              :key="`fee-${feeItem}`"
-              :label="feeItem"
-              min-width="130"
-              align="center"
-            >
-              <template #default="{ row }">
-                {{
-                  formatMoney(
-                    parseFeeItems(row.feeItemsJson)[feeItem],
-                    row.currency || form.currency
-                  )
-                }}
+                <span v-else>{{ displayValue(row[item.column.prop]) }}</span>
               </template>
             </el-table-column>
             <el-table-column label="操作" :width="editable ? 150 : 90" fixed="right" align="center">
@@ -421,6 +450,16 @@
         </div>
       </section-card>
 
+      <project-advance-write-off
+        ref="projectAdvanceWriteOffRef"
+        v-model="projectAdvanceWriteOffs"
+        :editable="editable"
+        :contract-id="form.contractId"
+        :settlement-amount="form.settlementAmount"
+        settlement-type="pre"
+        :settlement-id="form.id"
+      />
+
       <section-card v-if="form.id && readonly" title="预付信息">
         <el-table :data="advances" border>
           <el-table-column type="index" label="序号" width="64" align="center" />
@@ -453,7 +492,7 @@
       </section-card>
 
       <section-card v-if="form.id && readonly" title="变更记录">
-        <el-table :data="adjustChangeRecords" border>
+        <el-table :data="changeRecords" border>
           <el-table-column type="index" label="序号" width="64" align="center" />
           <el-table-column
             v-for="column in changeTableColumns"
@@ -469,6 +508,11 @@
               <span v-else>{{ displayValue(row[column.prop]) }}</span>
             </template>
           </el-table-column>
+          <el-table-column label="操作" width="100" align="center" fixed="right">
+            <template #default="{ row }">
+              <el-link type="primary" @click="openAdjustChangeRecord(row)">详情</el-link>
+            </template>
+          </el-table-column>
         </el-table>
       </section-card>
     </div>
@@ -747,20 +791,6 @@
       <el-table-column type="index" label="序号" width="64" fixed="left" align="center" />
       <el-table-column prop="cargoName" label="货物名称" min-width="140" align="center" />
       <el-table-column prop="cargoType" label="货物类型" min-width="130" align="center" />
-      <el-table-column label="计费规则" min-width="190" align="center">
-        <template #default="{ row }">
-          <div class="pre-settlement-editor__billing-rule-cell">
-            <span>{{ displayValue(billingRuleName(row)) }}</span>
-            <el-icon
-              class="pre-settlement-editor__billing-rule-icon"
-              title="查看计费规则详情"
-              @click="openBillingRuleInfo(row)"
-            >
-              <InfoFilled />
-            </el-icon>
-          </div>
-        </template>
-      </el-table-column>
       <el-table-column label="运输总量" min-width="150" align="center">
         <template #default="{ row }">
           <span v-if="adjustDialog.readonly">{{ formatQuantity(row) }}</span>
@@ -776,24 +806,27 @@
       </el-table-column>
       <el-table-column label="里程（KM）" min-width="140" align="center">
         <template #default="{ row }">
+          <span v-if="adjustDialog.readonly">{{ formatDetailMileage(row.mileage) }}</span>
           <el-input-number
+            v-else
             v-model="row.mileage"
             :min="0"
             :precision="2"
             :controls="false"
-            :disabled="adjustDialog.readonly"
             @change="recalculateAdjustRow(row, 'mileage')"
           />
         </template>
       </el-table-column>
       <el-table-column label="运输单价" min-width="140" align="center">
         <template #default="{ row }">
+          <span v-if="isTierUnitPrice(row)">-</span>
           <el-input-number
+            v-else
             v-model="row.unitPrice"
             :min="0"
             :precision="2"
             :controls="false"
-            :disabled="adjustDialog.readonly"
+            :disabled="adjustDialog.readonly || !isUnitPriceAdjustable(row)"
             @change="recalculateAdjustRow(row, 'unitPrice')"
           />
         </template>
@@ -802,9 +835,22 @@
         v-for="feeItem in adjustFeeItemNames"
         :key="feeItem"
         :label="feeItem"
-        min-width="140"
+        min-width="160"
         align="center"
       >
+        <template #header>
+          <span class="pre-settlement-editor__billing-rule-cell">
+            <span>{{ feeItem }}</span>
+            <el-icon
+              v-if="showAdjustFeeRuleIcon(feeItem)"
+              class="pre-settlement-editor__billing-rule-icon"
+              title="查看计费规则详情"
+              @click.stop="openAdjustFeeRule(feeItem)"
+            >
+              <InfoFilled />
+            </el-icon>
+          </span>
+        </template>
         <template #default="{ row }">
           <el-input-number
             v-model="row.feeItems[feeItem]"
@@ -826,11 +872,6 @@
           />
         </template>
       </el-table-column>
-      <el-table-column label="备注" min-width="200" align="center">
-        <template #default="{ row }">
-          <el-input v-model="row.remark" maxlength="200" :disabled="adjustDialog.readonly" />
-        </template>
-      </el-table-column>
     </el-table>
     <el-form
       v-if="!adjustDialog.readonly"
@@ -839,7 +880,7 @@
       label-width="auto"
       class="pre-settlement-editor__adjust-reason"
     >
-      <el-form-item label="调整原因">
+      <el-form-item label="备注">
         <el-input
           v-model="adjustDialog.reason"
           type="textarea"
@@ -878,12 +919,6 @@
     <template v-if="billingRuleDialog.rule">
       <div class="dialog-section-title">计费规则</div>
       <el-descriptions :column="2" border class="pre-settlement-editor__billing-rule-detail">
-        <el-descriptions-item label="规则名称">
-          {{ displayValue(billingRuleDialog.rule.name) }}
-        </el-descriptions-item>
-        <el-descriptions-item label="费用类型">
-          {{ displayValue(billingRuleDialog.rule.feeType) }}
-        </el-descriptions-item>
         <el-descriptions-item label="费用项">
           {{ displayValue(billingRuleDialog.rule.feeItem) }}
         </el-descriptions-item>
@@ -919,8 +954,8 @@
         <el-descriptions-item label="目的地">
           {{ displayValue(billingRuleDialog.rule.matchCondition.destination) }}
         </el-descriptions-item>
-        <el-descriptions-item label="运输方式">
-          {{ displayValue(billingRuleDialog.rule.matchCondition.transportMode) }}
+        <el-descriptions-item label="货物名称">
+          {{ displayValue(billingRuleDialog.rule.matchCondition.cargoName) }}
         </el-descriptions-item>
         <el-descriptions-item label="货物类型">
           {{ displayValue(billingRuleDialog.rule.matchCondition.cargoType) }}
@@ -939,19 +974,27 @@ import { h } from 'vue';
 import { mapGetters } from 'vuex';
 import { InfoFilled } from '@element-plus/icons-vue';
 import ChangeRecordDetailDialog from '@/components/change-record-detail-dialog/main.vue';
+import ProjectAdvanceWriteOff from './project-advance-write-off.vue';
 import { getMkPublicDetail } from '@/api/mk-process';
 import {
   adjustDetail,
   getCandidateDetails,
   getContractList,
+  getContractOptions,
   getDetail,
   getDetailFees,
   getFeeOptions,
+  getNextNo,
   removeDetail,
   save,
   submit,
 } from '@/api/settlement/preSettlement';
 import { calculateAdjustedFee, getFeeDetail } from '@/api/settlement/receivable-payable-detail';
+import {
+  resolveReceivablePayableDetailId,
+  resolveWaybillId,
+  settlementDetailPath,
+} from '@/utils/settlement-detail-link';
 import { getBfiExchangeRate } from '@/api/base/currency';
 import { getDictionary } from '@/api/system/dictbiz';
 import {
@@ -973,15 +1016,21 @@ import {
   settlementDetailColumns,
   settlementSummaryColumns,
 } from '@/option/settlement/preSettlementTable';
-import { formatContractOptionLabel } from '@/utils/contract';
+import { isTierUnitPrice, isUnitPriceAdjustable } from '@/utils/settlement-adjust-rule';
+import { isApprovalSettlementChange } from '@/utils/settlement-change-record';
+import { normalizeCurrencyCode } from '@/utils/currency';
+import { settlementStatusName } from '@/utils/settlementStatus';
 import { downloadFileByUrl } from '@/utils/util';
-import { submitMkApprovalFlow } from '@/utils/mk-approval';
+import { loadMkEnabled, submitMkApprovalFlow } from '@/utils/mk-approval';
 import * as XLSX from 'xlsx';
 import { isAdministrator } from '@/utils/auth';
 
+// 结算币种为本位币（人民币）时汇率恒为1，汇率日期、结算汇率与按汇率换算的本位币合计都不展示
+const LOCAL_CURRENCY_HIDDEN_FIELDS = ['exchangeRateDate', 'exchangeRate', 'localSettlementAmount'];
+
 export default {
   name: 'PreSettlementEditor',
-  components: { InfoFilled, ChangeRecordDetailDialog },
+  components: { InfoFilled, ChangeRecordDetailDialog, ProjectAdvanceWriteOff },
   props: {
     modelValue: {
       type: Boolean,
@@ -1063,6 +1112,7 @@ export default {
       },
       feeOptions: [],
       feeCategoryOptions: [],
+      businessModelOptions: [],
       transportTypeOptions: [],
       summaryFees: [],
       details: [],
@@ -1084,6 +1134,7 @@ export default {
         size: 10,
       },
       advances: [],
+      projectAdvanceWriteOffs: [],
       changeRecords: [],
       attachments: [],
       attachmentTypeOptions: [],
@@ -1111,6 +1162,8 @@ export default {
         readonly: false,
         detailId: '',
         sourceDetailId: '',
+        // 未保存明细（id 仍等于来源应收应付明细）时先暂存，保存预结算单后再生效
+        draftMode: false,
         detailLineNo: '',
         reason: '',
       },
@@ -1182,12 +1235,20 @@ export default {
       return this.editable && this.hasPermission('pre_settlement_adjust');
     },
     dialogTitle() {
-      if (this.readonly) return '查看预结算单';
-      return this.form.id ? '编辑预结算单' : '新增预结算单';
+      if (this.readonly) return '查看预付结算单';
+      return this.form.id ? '编辑预付结算单' : '新增预付结算单';
     },
     settlementTypeName() {
       return this.form.settlementType === 'receivable' ? '应收' : '应付';
     },
+    // 币种为空按人民币处理，与后端 normalizeRate 的取默认值一致
+    isLocalCurrencySettlement() {
+      return normalizeCurrencyCode(this.form.currency) === 'RMB';
+    },
+    visibleFormFields() {
+      if (!this.isLocalCurrencySettlement) return this.formFields;
+      return this.formFields.filter(field => !LOCAL_CURRENCY_HIDDEN_FIELDS.includes(field.prop));
+    },
     contractDialogCategory() {
       return '承运商合同';
     },
@@ -1209,6 +1270,23 @@ export default {
       });
       return Array.from(names);
     },
+    // 费用项里已有运输费/运费时，不再单独展示运费列，避免和应收应付费用项重复。
+    showStandaloneFreightColumn() {
+      return !this.detailFeeItemNames.some(name => this.isFreightFeeItem(name));
+    },
+    detailDisplayColumns() {
+      const columns = this.visibleDetailColumns.filter(
+        column => this.showStandaloneFreightColumn || column.prop !== 'freightAmount'
+      );
+      const unitPriceIndex = columns.findIndex(column => column.prop === 'unitPrice');
+      const beforeColumns = unitPriceIndex < 0 ? columns : columns.slice(0, unitPriceIndex + 1);
+      const afterColumns = unitPriceIndex < 0 ? [] : columns.slice(unitPriceIndex + 1);
+      return [
+        ...beforeColumns.map(column => ({ kind: 'field', key: column.prop, column })),
+        ...this.detailFeeItemNames.map(name => ({ kind: 'fee', key: `fee-${name}`, name })),
+        ...afterColumns.map(column => ({ kind: 'field', key: column.prop, column })),
+      ];
+    },
     // 按 preSettlementDetailId 分组的明细数据（用于拼接货物名称和类型）
     groupedDetails() {
       const groups = {};
@@ -1246,13 +1324,6 @@ export default {
       });
       return Array.from(names);
     },
-    adjustChangeRecords() {
-      return this.changeRecords.filter(
-        row =>
-          row.changeType === '结算明细项' &&
-          String(row.lineNo ?? '') === String(this.adjustDialog.detailLineNo ?? '')
-      );
-    },
   },
   watch: {
     modelValue: {
@@ -1277,15 +1348,22 @@ export default {
     },
   },
   methods: {
-    formatContractOptionLabel,
+    isTierUnitPrice,
+    isUnitPriceAdjustable,
     hasPermission(code) {
       return this.isAdmin || this.validData(this.permission?.[code], false);
     },
     async initialize() {
       this.resetEditor();
+      // 新增页在保存前没有创建人/创建日期，先按当前登录用户与当前时间展示将要落库的值
+      if (!this.recordId) {
+        this.form.createUserName = this.userInfo?.realName || this.userInfo?.userName || '';
+        this.form.createTime = this.$dayjs().format('YYYY-MM-DD HH:mm:ss');
+      }
       if (!this.publicMode) {
         await this.loadFeeOptions();
         await this.loadFeeCategoryOptions();
+        await this.loadBusinessModelOptions();
         await this.loadTransportTypeOptions();
         await this.loadAttachmentTypeOptions();
       }
@@ -1293,15 +1371,36 @@ export default {
       else if (this.initialData) {
         await this.applyInitialData();
         this.form.exchangeRateDate = this.$dayjs().format('YYYY-MM-DD');
+        await this.refreshPreSettlementNo();
         await this.fetchBfiExchangeRate();
+      } else if (!this.publicMode) {
+        await this.refreshPreSettlementNo();
       }
     },
+    async refreshPreSettlementNo() {
+      if (this.form.id) return;
+      const response = await getNextNo();
+      this.form.preSettlementNo = response.data?.data || '';
+    },
     async applyInitialData() {
       const rows = Array.isArray(this.initialData?.rows) ? this.initialData.rows : [];
       if (!rows.length) return;
       const first = rows[0];
       const settlementType = this.initialData.settlementType || first.settlementType || 'payable';
       const contractId = first.contractId || '';
+      let contractPartyA = first.payerName || '';
+      let contractPartyB = first.payeeName || '';
+      if (contractId && (!contractPartyA || !contractPartyB)) {
+        try {
+          const { data } = await getContractOptions(first.contractNo || '');
+          const matched = (data?.data || []).find(item => String(item.id) === String(contractId));
+          contractPartyA = contractPartyA || matched?.partyA || '';
+          contractPartyB = contractPartyB || matched?.partyB || '';
+        } catch (error) {
+          contractPartyA = '';
+          contractPartyB = '';
+        }
+      }
       if (!this.contractOptions.some(item => String(item.id) === String(contractId))) {
         this.contractOptions.push({
           id: contractId,
@@ -1312,8 +1411,8 @@ export default {
           deptId: first.deptId,
           deptName: first.deptName,
           settlementType,
-          partyA: first.payerName,
-          partyB: first.payeeName,
+          partyA: contractPartyA,
+          partyB: contractPartyB,
         });
       }
       this.handleContractChange(contractId);
@@ -1325,8 +1424,8 @@ export default {
         projectName: first.projectName || this.form.projectName,
         deptId: first.deptId || this.form.deptId,
         deptName: first.deptName || this.form.deptName,
-        payerName: first.payerName || this.form.payerName,
-        payeeName: first.payeeName || this.form.payeeName,
+        payerName: this.form.payerName || contractPartyA,
+        payeeName: this.form.payeeName || contractPartyB,
         settlementType,
         currency: first.currency || 'RMB',
         localCurrency: first.localCurrency || 'RMB',
@@ -1396,6 +1495,7 @@ export default {
       this.appliedDetailQuery = { ...this.detailQuery };
       this.detailPage = { current: 1, size: 10 };
       this.advances = [];
+      this.projectAdvanceWriteOffs = [];
       this.changeRecords = [];
       this.attachments = [];
       this.selectedAttachmentRows = [];
@@ -1405,6 +1505,7 @@ export default {
       this.detailFeeCache = {};
       this.adjustDialog.detailId = '';
       this.adjustDialog.sourceDetailId = '';
+      this.adjustDialog.draftMode = false;
       this.adjustDialog.detailLineNo = '';
       this.adjustChangeRecordVisible = false;
       this.adjustChangeRecord = null;
@@ -1435,7 +1536,16 @@ export default {
           createUserName: row.createUserName || detail.createUserName,
           createTime: row.createTime || detail.createTime,
         }));
-        this.changeRecords = detail.changeRecords || [];
+        this.projectAdvanceWriteOffs = (detail.projectAdvanceWriteOffs || []).map(row => ({
+          ...row,
+          writeOffAmount: Number(row.writeOffAmount || 0),
+          projectAdvanceAmount: Number(row.projectAdvanceAmount || 0),
+          availableWriteOffAmount: Number(row.availableWriteOffAmount || 0),
+          createTime: row.paymentCreateTime || row.createTime,
+        }));
+        this.changeRecords = (detail.changeRecords || []).filter(
+          row => !isApprovalSettlementChange(row.changeContent)
+        );
         this.attachments = this.parseAttachments(detail.attachmentsJson);
         this.sortAttachments();
         this.selectedAttachmentRows = [];
@@ -1558,6 +1668,14 @@ export default {
       const { data } = await getDictionary({ code: 'fee_category' });
       this.feeCategoryOptions = data?.data || [];
     },
+    async loadBusinessModelOptions() {
+      const { data } = await getDictionary({ code: 'business_model' });
+      const records = Array.isArray(data?.data) ? data.data : data?.data?.records || [];
+      this.businessModelOptions = records.map(item => ({
+        dictKey: item.dictKey ?? item.value,
+        dictValue: item.dictValue ?? item.label ?? item.name,
+      }));
+    },
     async loadTransportTypeOptions() {
       const { data } = await getDictionary({ code: 'transport_type' });
       const records = Array.isArray(data?.data) ? data.data : data?.data?.records || [];
@@ -1566,6 +1684,21 @@ export default {
         dictValue: item.dictValue ?? item.label ?? item.name,
       }));
     },
+    formSelectOptions(field) {
+      const key = field?.optionsKey;
+      const options = key ? this[key] : [];
+      return Array.isArray(options) ? options : [];
+    },
+    formSelectLabel(field, value) {
+      if (value === undefined || value === null || value === '') return '-';
+      const normalized = String(value).trim();
+      const option = this.formSelectOptions(field).find(
+        item =>
+          String(item.dictKey ?? '').trim() === normalized ||
+          String(item.dictValue ?? '').trim() === normalized
+      );
+      return option?.dictValue || normalized;
+    },
     handleContractChange(id) {
       const contract = this.contractOptions.find(item => String(item.id) === String(id));
       if (!contract) {
@@ -1579,6 +1712,7 @@ export default {
         this.form.payerName = '';
         this.form.payeeName = '';
         this.summaryFees = [];
+        this.projectAdvanceWriteOffs = [];
         return;
       }
       this.form.contractId = contract.id;
@@ -1589,10 +1723,12 @@ export default {
       this.form.deptId = contract.deptId;
       this.form.deptName = contract.deptName;
       this.form.settlementType = contract.settlementType || 'payable';
-      this.form.payerName = contract.partyA;
-      this.form.payeeName = contract.partyB;
+      // 部分候选合同只带 id/名称，缺甲方乙方；此时保留已带出的收付方，不要清成 undefined
+      if (contract.partyA) this.form.payerName = contract.partyA;
+      if (contract.partyB) this.form.payeeName = contract.partyB;
       this.form.currency = contract.settlementCurrency || 'RMB';
       this.summaryFees = [];
+      this.projectAdvanceWriteOffs = [];
       if (this.form.currency !== 'RMB') {
         this.form.exchangeRateDate = this.$dayjs().format('YYYY-MM-DD');
         this.fetchBfiExchangeRate();
@@ -1613,6 +1749,9 @@ export default {
         this.$message.warning(`请完善结算合计第${invalidManualFeeIndex + 1}行的费用类型和费用项`);
         return;
       }
+      if (this.$refs.projectAdvanceWriteOffRef?.validateBeforeSave?.() === false) {
+        return;
+      }
       const stateKey = shouldSubmit ? 'submitting' : 'saving';
       this[stateKey] = true;
       try {
@@ -1623,13 +1762,14 @@ export default {
         if (shouldSubmit) {
           const previousApprovalStatus = this.form.approvalStatus || '';
           await submit({ id: this.form.id });
-          await submitMkApprovalFlow({
+          const mkStarted = await submitMkApprovalFlow({
             bizType: 'pre-settlement',
             bizId: this.form.id,
             subjectName: this.form.preSettlementNo || this.form.contractName || '',
             approvalStatus: previousApprovalStatus,
+            mkEnabled: await loadMkEnabled().catch(() => false),
           });
-          this.$message.success('审批流程已发起');
+          this.$message.success(mkStarted ? '审批流程已发起' : '提交成功');
           this.visible = false;
           this.$emit('success', this.form.id);
           return;
@@ -1645,6 +1785,8 @@ export default {
       return {
         id: this.form.id || undefined,
         contractId: this.form.contractId,
+        businessModel: this.form.businessModel || undefined,
+        transportType: this.form.transportType || undefined,
         exchangeRateDate: this.form.exchangeRateDate || undefined,
         exchangeRate: this.form.exchangeRate,
         attachmentsJson: JSON.stringify(this.attachments || []),
@@ -1659,6 +1801,7 @@ export default {
           remark: row.remark,
           manualFlag: row.manualFlag || 0,
         })),
+        projectAdvanceWriteOffs: this.$refs.projectAdvanceWriteOffRef?.toSavePayload?.() || [],
       };
     },
     addSummaryFee() {
@@ -1715,7 +1858,7 @@ export default {
       return option?.dictValue || value;
     },
     formatDetailMileage(value) {
-      if (value === undefined || value === null || value === '' || Number(value) === -1) return '';
+      if (value === undefined || value === null || value === '' || Number(value) === -1) return '-';
       return value;
     },
     removeSummaryFee(index) {
@@ -1784,7 +1927,25 @@ export default {
       });
 
       const manualFees = this.summaryFees.filter(row => Number(row.manualFlag) === 1);
-      this.summaryFees = [...summaryMap.values(), ...manualFees];
+      const nextFeeMap = new Map();
+      summaryMap.forEach((row, key) => nextFeeMap.set(`0\u0000${key}`, row));
+      manualFees.forEach(row => {
+        const key = `1\u0000${row.feeType}\u0000${row.feeItem}`;
+        nextFeeMap.set(key, row);
+      });
+      // 按编辑前顺序回填，新增费用项追加到末尾，避免手工费用被统一挤到最后。
+      const orderedFees = [];
+      const previousKeys = this.summaryFees.map(
+        row => `${Number(row.manualFlag) === 1 ? 1 : 0}\u0000${row.feeType}\u0000${row.feeItem}`
+      );
+      previousKeys.forEach(key => {
+        const row = nextFeeMap.get(key);
+        if (!row) return;
+        orderedFees.push(row);
+        nextFeeMap.delete(key);
+      });
+      nextFeeMap.forEach(row => orderedFees.push(row));
+      this.summaryFees = orderedFees;
       this.recalculateLocalAmount();
     },
     // 每条明细对应的费用行：[调整前基准行, 调整后当前行]，缺少来源费用快照时退化为明细自身的汇总行。
@@ -1972,7 +2133,7 @@ export default {
       }
     },
     async removeDetailRow(row) {
-      await this.$confirm('确认将该明细踢出预结算单？', '提示', { type: 'warning' });
+      await this.$confirm('确认将该明细踢出预付结算单？', '提示', { type: 'warning' });
       if (!this.form.id || !row.id || row.id === row.sourceDetailId) {
         this.details = this.details.filter(item => item !== row);
         this.buildSummaryFeesFromDetails();
@@ -1987,6 +2148,21 @@ export default {
       this.appliedDetailQuery = { ...this.detailQuery };
       this.detailPage.current = 1;
     },
+    // 结算明细的「单据号」跳到该应收应付单据在应收明细/应付明细页的详情，「运单号」跳到运单详情
+    async handleDetailLink(row, column) {
+      if (column.prop === 'documentNo') {
+        const settlementType = row.settlementType || this.form.settlementType || 'payable';
+        const detailId = await resolveReceivablePayableDetailId(row, settlementType);
+        if (!detailId) return this.$message.info('当前记录未找到对应的应收/应付明细');
+        this.$router.push({ path: settlementDetailPath(settlementType), query: { detailId } });
+        return;
+      }
+      if (column.prop === 'waybillNo') {
+        const waybillId = await resolveWaybillId(row);
+        if (!waybillId) return this.$message.info('当前记录未找到对应的运单详情');
+        this.$router.push({ path: '/business/waybill-manage/detail', query: { id: waybillId } });
+      }
+    },
     resetDetailQuery() {
       this.detailQuery = {
         documentNo: '',
@@ -2121,18 +2297,26 @@ export default {
     },
     async openAdjustDialog(row, readonly) {
       const detailRow = row;
+      const sourceDetailId = detailRow.sourceDetailId || '';
+      // 未保存明细 id 仍等于来源应收应付明细 id，调整结果先暂存
+      const draftMode =
+        !this.form.id ||
+        !detailRow.id ||
+        String(detailRow.id) === String(detailRow.sourceDetailId);
       this.adjustDialog.visible = true;
       this.adjustDialog.loading = true;
       this.adjustDialog.readonly = readonly;
+      this.adjustDialog.draftMode = draftMode;
       this.adjustDialog.detailId = detailRow.id;
       this.adjustDialog.detailLineNo = detailRow.lineNo;
-      this.adjustDialog.sourceDetailId =
-        detailRow.id && String(detailRow.id) === String(detailRow.sourceDetailId)
-          ? detailRow.sourceDetailId
-          : '';
-      const sourceDetailId = String(this.adjustDialog.sourceDetailId || '');
-      const pending = sourceDetailId ? this.pendingAdjustments[sourceDetailId] : null;
-      this.adjustDialog.reason = pending?.reason || '';
+      this.adjustDialog.sourceDetailId = sourceDetailId;
+      const pendingKey = String(sourceDetailId || '');
+      const pending = pendingKey ? this.pendingAdjustments[pendingKey] : null;
+      // 底部备注回显结算明细备注；暂存过的调整优先取暂存备注
+      this.adjustDialog.reason =
+        pending?.reason !== undefined && pending?.reason !== null
+          ? pending.reason
+          : detailRow.remark || '';
       try {
         // 已暂存的调整结果优先回显，避免重新打开时又回到调整前的数据。
         if (pending?.rows?.length) {
@@ -2144,11 +2328,12 @@ export default {
           this.adjustRows = cachedFees.map(item => this.normalizeAdjustRow(item));
           return;
         }
-        if (sourceDetailId) {
-          if (!this.sourceFeeSnapshots[sourceDetailId]) {
-            this.sourceFeeSnapshots[sourceDetailId] = await this.loadSourceFeeRows(sourceDetailId);
+        if (draftMode && sourceDetailId) {
+          if (!this.sourceFeeSnapshots[String(sourceDetailId)]) {
+            this.sourceFeeSnapshots[String(sourceDetailId)] =
+              await this.loadSourceFeeRows(sourceDetailId);
           }
-          this.adjustRows = this.cloneAdjustRows(this.sourceFeeSnapshots[sourceDetailId]);
+          this.adjustRows = this.cloneAdjustRows(this.sourceFeeSnapshots[String(sourceDetailId)]);
           return;
         }
         const cachedFees = this.detailFeeCache[detailRow.id];
@@ -2175,6 +2360,17 @@ export default {
     },
     formatAdjustChangeValue(value) {
       if (value === undefined || value === null || value === '') return '空';
+      if (Array.isArray(value)) {
+        if (!value.length) return '空';
+        return value
+          .map(item => {
+            if (!item || typeof item !== 'object') return String(item);
+            return Object.entries(item)
+              .map(([key, itemValue]) => `${key}：${this.formatAdjustChangeValue(itemValue)}`)
+              .join('，');
+          })
+          .join('\n');
+      }
       if (typeof value === 'object') return JSON.stringify(value);
       return String(value);
     },
@@ -2199,14 +2395,100 @@ export default {
       this.adjustChangeRecordDetailRows = this.buildAdjustChangeRecordRows(row);
       this.adjustChangeRecordVisible = true;
     },
-    billingRuleName(row) {
-      return this.normalizeBillingRule(row).name;
+    hasBillingRule(row) {
+      const rule = this.normalizeBillingRule(row);
+      return Boolean(
+        rule.feeItem ||
+          rule.billingElement ||
+          rule.billingType ||
+          rule.unitPrice ||
+          rule.rules?.length ||
+          rule.matchCondition?.origin ||
+          rule.matchCondition?.destination ||
+          rule.matchCondition?.cargoName ||
+          rule.matchCondition?.cargoType
+      );
     },
-    openBillingRuleInfo(row) {
-      this.billingRuleDialog.rule = this.normalizeBillingRule(row);
+    detailFeeRows(row = {}) {
+      return this.detailFeeCache[row.id] || this.detailFeeCache[row.preSettlementDetailId] || [];
+    },
+    hasDetailBillingRule(row) {
+      if (this.hasBillingRule(row)) return true;
+      return this.detailFeeRows(row).some(fee => this.hasBillingRule(fee));
+    },
+    openDetailBillingRule(row, feeName = '') {
+      const fees = this.detailFeeRows(row);
+      const matched = fees.find(fee =>
+        this.collectBillingRules(fee).some(rule =>
+          this.feeNamesMatch(this.ruleFeeName(rule), feeName)
+        )
+      );
+      const source = matched || fees.find(fee => this.hasBillingRule(fee)) || row;
+      this.openBillingRuleInfo(source, feeName);
+    },
+    openBillingRuleInfo(row, feeName = '') {
+      this.billingRuleDialog.rule = this.normalizeBillingRule(row, feeName);
       this.billingRuleDialog.visible = true;
     },
-    normalizeBillingRule(row) {
+    ruleFeeName(rule = {}) {
+      return String(rule.feeItem || rule.feeItemName || rule.name || '').trim();
+    },
+    isHandlingFeeItem(name) {
+      return String(name || '').includes('装卸');
+    },
+    feeNamesMatch(left, right) {
+      const source = String(left || '').trim();
+      const target = String(right || '').trim();
+      if (!source || !target) return false;
+      if (source === target) return true;
+      if (this.isFreightFeeItem(source) && this.isFreightFeeItem(target)) return true;
+      return this.isHandlingFeeItem(source) && this.isHandlingFeeItem(target);
+    },
+    detailColumnFeeName(item = {}) {
+      if (item.kind === 'fee') return item.name || '';
+      if (item.column?.prop === 'freightAmount') return '运输费';
+      return '';
+    },
+    showDetailColumnRuleIcon(item) {
+      const feeName = this.detailColumnFeeName(item);
+      if (!feeName) return false;
+      return this.details.some(row => this.rowHasNamedBillingRule(row, feeName));
+    },
+    openDetailColumnRule(item) {
+      const feeName = this.detailColumnFeeName(item);
+      const row =
+        this.details.find(detail => this.rowHasNamedBillingRule(detail, feeName)) ||
+        this.details[0];
+      if (row) this.openDetailBillingRule(row, feeName);
+    },
+    showAdjustFeeRuleIcon(feeName) {
+      return (this.adjustRows || []).some(row => this.sourceHasNamedBillingRule(row, feeName));
+    },
+    openAdjustFeeRule(feeName) {
+      const row =
+        (this.adjustRows || []).find(item => this.sourceHasNamedBillingRule(item, feeName)) ||
+        this.adjustRows[0];
+      if (row) this.openBillingRuleInfo(row, feeName);
+    },
+    rowHasNamedBillingRule(row, feeName) {
+      return [row, ...this.detailFeeRows(row)].some(source =>
+        this.sourceHasNamedBillingRule(source, feeName)
+      );
+    },
+    sourceHasNamedBillingRule(source = {}, feeName) {
+      const rules = [
+        ...this.collectBillingRules(source),
+        ...(Array.isArray(source.billingRule?.rules) ? source.billingRule.rules : []),
+      ];
+      if (rules.some(rule => this.feeNamesMatch(this.ruleFeeName(rule), feeName))) return true;
+      if (!this.hasBillingRule(source)) return false;
+      const named = String(
+        source.billingFeeItem || source.feeItem || this.ruleFeeName(source.billingRule) || ''
+      ).trim();
+      if (!named) return true;
+      return this.feeNamesMatch(named, feeName);
+    },
+    collectBillingRules(row = {}) {
       const source = row || {};
       const nested = [
         source.billingRule,
@@ -2219,53 +2501,73 @@ export default {
         source.rule,
       ].find(value => value !== undefined && value !== null && value !== '');
       const parsedNested = this.parseJsonValue(nested);
-      const matchedRules = Array.isArray(parsedNested)
+      return Array.isArray(parsedNested)
         ? parsedNested.filter(item => item && typeof item === 'object')
         : [];
-      let rule = this.parseObject(matchedRules[0] || parsedNested || nested);
-      if (!Object.keys(rule).length && typeof nested === 'string') rule = { name: nested };
+    },
+    normalizeBillingRule(row, feeName = '') {
+      const source = row || {};
+      const nested = [
+        source.billingRule,
+        source.billingRuleInfo,
+        source.billingRuleJson,
+        source.billingRulesJson,
+        source.billingRules,
+        source.billingPlanRule,
+        source.feeRule,
+        source.rule,
+      ].find(value => value !== undefined && value !== null && value !== '');
+      const parsedNested = this.parseJsonValue(nested);
+      const parsedRules = this.collectBillingRules(source);
+      const requestedFeeName = String(feeName || '').trim();
+      const matchedRules = requestedFeeName
+        ? parsedRules.filter(item => this.feeNamesMatch(this.ruleFeeName(item), requestedFeeName))
+        : parsedRules;
+      const sharedRule =
+        parsedRules.length === 1 && !this.ruleFeeName(parsedRules[0]) ? parsedRules[0] : null;
+      const ruleSource =
+        matchedRules[0] || sharedRule || (!requestedFeeName ? parsedNested || nested : null);
+      let rule = this.parseObject(ruleSource);
+      if (!Object.keys(rule).length && typeof nested === 'string' && !requestedFeeName) {
+        rule = { name: nested };
+      }
       const matchCondition = this.parseObject(
-        source.matchCondition ?? source.billingMatchCondition ?? rule.matchCondition
+        requestedFeeName
+          ? (rule.matchCondition ?? source.matchCondition ?? source.billingMatchCondition)
+          : (source.matchCondition ?? source.billingMatchCondition ?? rule.matchCondition)
       );
-      const ruleNames = matchedRules
-        .map(item => item.ruleName || item.name || item.billingRuleName || item.feeItem)
-        .filter(Boolean);
-      const name =
-        source.billingRuleName ||
-        source.feeRuleName ||
-        source.ruleName ||
-        source.billingPlanRuleName ||
-        source.billingPlanName ||
-        rule.name ||
-        rule.ruleName ||
-        rule.billingRuleName ||
-        rule.planName ||
-        rule.billingPlanName ||
-        ruleNames.join('、') ||
-        rule.feeItem ||
-        '';
       return {
         ...rule,
-        name,
-        feeType: source.billingFeeType || source.feeType || rule.feeType,
-        feeItem: source.billingFeeItem || source.feeItem || rule.feeItem,
-        billingElement:
-          source.billingElement ||
-          source.billingFactor ||
-          rule.billingElement ||
-          rule.billingFactor,
-        billingType: source.billingType || rule.billingType,
-        billingUnit: source.billingUnit || source.priceUnit || rule.billingUnit || rule.priceUnit,
-        unitPrice: source.billingUnitPrice ?? source.unitPrice ?? rule.unitPrice,
-        minimumBillingWeight:
-          source.minimumBillingWeight ?? rule.minimumBillingWeight ?? rule.lowerLimit,
-        remark: source.billingRuleRemark || source.ruleRemark || rule.remark,
+        feeItem: requestedFeeName || source.billingFeeItem || source.feeItem || rule.feeItem,
+        billingElement: requestedFeeName
+          ? rule.billingElement || rule.billingFactor || ''
+          : source.billingElement ||
+            source.billingFactor ||
+            rule.billingElement ||
+            rule.billingFactor,
+        billingType: requestedFeeName ? rule.billingType || '' : source.billingType || rule.billingType,
+        billingUnit: requestedFeeName
+          ? rule.billingUnit || rule.priceUnit || ''
+          : source.billingUnit || source.priceUnit || rule.billingUnit || rule.priceUnit,
+        unitPrice: requestedFeeName
+          ? (rule.unitPrice ?? '')
+          : (source.billingUnitPrice ?? source.unitPrice ?? rule.unitPrice),
+        minimumBillingWeight: requestedFeeName
+          ? (rule.minimumBillingWeight ?? rule.lowerLimit ?? '')
+          : (source.minimumBillingWeight ?? rule.minimumBillingWeight ?? rule.lowerLimit),
+        remark: requestedFeeName
+          ? rule.remark || ''
+          : source.billingRuleRemark || source.ruleRemark || rule.remark,
         rules: matchedRules,
         matchCondition: {
           ...matchCondition,
           origin: matchCondition.origin || matchCondition.originName,
           destination: matchCondition.destination || matchCondition.destinationName,
-          transportMode: matchCondition.transportMode || matchCondition.transportType,
+          cargoName:
+            matchCondition.cargoName ||
+            matchCondition.cargoNameLabel ||
+            source.cargoName ||
+            rule.cargoName,
           cargoType: matchCondition.cargoType || matchCondition.cargoTypeName,
         },
       };
@@ -2300,11 +2602,16 @@ export default {
       row.settlementAmountTax = Number(
         (hasFreightItem ? feeItemTotal : Number(row.freightAmount || 0) + feeItemTotal).toFixed(2)
       );
-      if (changedField && this.adjustDialog.sourceDetailId && row.id) {
-        this.scheduleSourceAdjustCalculation(row);
+      if (
+        ['transportQuantity', 'mileage', 'unitPrice'].includes(changedField) &&
+        this.adjustDialog.sourceDetailId &&
+        (row.sourceFeeId || row.id) &&
+        (changedField !== 'unitPrice' || isUnitPriceAdjustable(row))
+      ) {
+        this.scheduleSourceAdjustCalculation(row, changedField);
       }
     },
-    scheduleSourceAdjustCalculation(row) {
+    scheduleSourceAdjustCalculation(row, changedField) {
       if (row.adjustCalculateTimer) clearTimeout(row.adjustCalculateTimer);
       row.adjustCalculateVersion += 1;
       row.calculating = true;
@@ -2314,9 +2621,12 @@ export default {
         try {
           const response = await calculateAdjustedFee({
             detailId: this.adjustDialog.sourceDetailId,
-            feeId: row.id,
+            // 已保存预结算费用行需用源应收应付费用ID试算
+            feeId: row.sourceFeeId || row.id,
             transportQuantity: Number(row.transportQuantity || 0),
             mileage: Number(row.mileage || 0),
+            unitPrice: row.unitPrice === null || row.unitPrice === '' ? null : Number(row.unitPrice),
+            changedField,
             freightAmount: Number(row.freightAmount || 0),
             feeItems: Object.fromEntries(
               Object.entries(row.feeItems || {}).map(([name, amount]) => [
@@ -2331,10 +2641,14 @@ export default {
           row.feeItems = Object.fromEntries(
             Object.entries(data.feeItems || {}).map(([name, amount]) => [name, Number(amount || 0)])
           );
+          if (!isTierUnitPrice(row) && data.unitPrice !== undefined && data.unitPrice !== null) {
+            row.unitPrice = Number(data.unitPrice);
+          }
           row.adjustAmount = Number(data.adjustAmount || 0);
           row.settlementAmountTax = Number(data.afterAmount || 0);
         } catch (error) {
           row.calculateError = error.message || '费用试算失败';
+          this.$message.warning(row.calculateError);
         } finally {
           if (version === row.adjustCalculateVersion) row.calculating = false;
         }
@@ -2350,14 +2664,18 @@ export default {
       }
       this.adjustDialog.saving = true;
       try {
-        if (this.adjustDialog.sourceDetailId) {
+        if (this.adjustDialog.draftMode && this.adjustDialog.sourceDetailId) {
           this.pendingAdjustments[this.adjustDialog.sourceDetailId] = {
             reason: this.adjustDialog.reason,
             rows: this.adjustRows.map(row => ({ ...row, feeItems: { ...row.feeItems } })),
           };
-          this.applyLocalAdjustment(this.adjustDialog.sourceDetailId, this.adjustRows);
+          this.applyLocalAdjustment(
+            this.adjustDialog.sourceDetailId,
+            this.adjustRows,
+            this.adjustDialog.reason
+          );
           this.adjustDialog.visible = false;
-          this.$message.success('结算明细调整已暂存，保存预结算单后生效');
+          this.$message.success('结算明细调整已暂存，保存预付结算单后生效');
           return;
         }
         await adjustDetail({
@@ -2372,7 +2690,6 @@ export default {
             feeItems: row.feeItems,
             settlementAmountTax: row.settlementAmountTax,
             settlementAmountNoTax: row.settlementAmountNoTax,
-            remark: row.remark,
           })),
         });
         this.adjustDialog.visible = false;
@@ -2383,12 +2700,12 @@ export default {
         this.adjustDialog.saving = false;
       }
     },
-    applyLocalAdjustment(sourceDetailId, rows) {
+    applyLocalAdjustment(sourceDetailId, rows, detailRemark) {
       const detail = this.details.find(
         item => String(item.sourceDetailId || item.id) === String(sourceDetailId)
       );
       if (!detail) return;
-      // 原金额以进入预结算单时的费用快照为基准，调整金额 = 结算金额 - 原金额。
+      // 原金额以进入预付结算单时的费用快照为基准，调整金额 = 结算金额 - 原金额。
       const baseRows = this.sourceFeeSnapshots[String(sourceDetailId)] || [];
       const originalAmount = baseRows.length
         ? baseRows.reduce((sum, row) => sum + Number(row.settlementAmountTax || 0), 0)
@@ -2397,20 +2714,48 @@ export default {
         (sum, row) => sum + Number(row.settlementAmountTax || 0),
         0
       );
+      const settlementAmountNoTax = rows.reduce(
+        (sum, row) => sum + Number(row.settlementAmountNoTax || 0),
+        0
+      );
+      const hasSettlementAmountNoTax = rows.some(
+        row => row.settlementAmountNoTax !== undefined && row.settlementAmountNoTax !== null
+      );
       const freightAmount = rows.reduce((sum, row) => sum + Number(row.freightAmount || 0), 0);
+      const transportQuantity = rows.reduce(
+        (sum, row) => sum + Number(row.transportQuantity || 0),
+        0
+      );
+      const mileage = rows.reduce((sum, row) => sum + Number(row.mileage || 0), 0);
       const feeItems = {};
       rows.forEach(row =>
         Object.entries(row.feeItems || {}).forEach(([name, amount]) => {
           feeItems[name] = Number((Number(feeItems[name] || 0) + Number(amount || 0)).toFixed(2));
         })
       );
+      const firstRow = rows[0] || {};
       Object.assign(detail, {
+        transportQuantity: Number(transportQuantity.toFixed(2)),
+        mileage: Number(mileage.toFixed(2)),
+        unitPrice: Number(firstRow.unitPrice || 0),
         originalAmount: Number(originalAmount.toFixed(2)),
         adjustAmount: Number((settlementAmountTax - originalAmount).toFixed(2)),
         settlementAmountTax: Number(settlementAmountTax.toFixed(2)),
+        settlementAmountNoTax: hasSettlementAmountNoTax
+          ? Number(settlementAmountNoTax.toFixed(2))
+          : detail.settlementAmountNoTax,
         freightAmount: Number(freightAmount.toFixed(2)),
         feeItemsJson: JSON.stringify(feeItems),
+        // 底部备注写入结算明细备注
+        remark: detailRemark ?? '',
       });
+      // 暂存调整后同步费用缓存，保证货物名称/类型拼接与列表展示一致。
+      if (detail.id) {
+        this.detailFeeCache[detail.id] = rows.map(row => ({
+          ...row,
+          feeItems: { ...row.feeItems },
+        }));
+      }
       this.buildSummaryFeesFromDetails();
     },
     async persistPendingAdjustments() {
@@ -2438,11 +2783,14 @@ export default {
             feeItems: pendingRow.feeItems,
             settlementAmountTax: pendingRow.settlementAmountTax,
             settlementAmountNoTax: pendingRow.settlementAmountNoTax,
-            remark: pendingRow.remark,
           };
         });
         if (rows.length) {
-          await adjustDetail({ detailId: detail.id, changeReason: pending.reason, rows });
+          await adjustDetail({
+            detailId: detail.id,
+            changeReason: pending.reason,
+            rows,
+          });
         }
       }
       this.pendingAdjustments = {};
@@ -2492,9 +2840,12 @@ export default {
           运输总量: this.formatQuantity(row),
           '里程（KM）': row.mileage,
           批次号: row.batchNo,
+          计费方式: row.billingType,
           运输单价: this.formatMoney(row.unitPrice, row.currency || this.form.currency),
-          运费: this.formatMoney(row.freightAmount, row.currency || this.form.currency),
         };
+        if (this.showStandaloneFreightColumn) {
+          result['运费'] = this.formatMoney(row.freightAmount, row.currency || this.form.currency);
+        }
         dynamicFeeItems.forEach(name => {
           result[name] = this.formatMoney(feeItems[name], row.currency || this.form.currency);
         });
@@ -2514,7 +2865,7 @@ export default {
       XLSX.utils.book_append_sheet(workbook, sheet, '结算明细');
       XLSX.writeFile(
         workbook,
-        `${this.form.preSettlementNo || '预结算单'}结算明细${this.$dayjs().format(
+        `${this.form.preSettlementNo || '预付结算单'}结算明细${this.$dayjs().format(
           'YYYY-MM-DD HH-mm-ss'
         )}.xlsx`
       );
@@ -2781,15 +3132,7 @@ export default {
       return value === undefined || value === null || value === '' ? '-' : value;
     },
     advanceStatusName(status) {
-      return (
-        {
-          reviewing: '审批中',
-          approved: '审批通过',
-          paid: '已付款',
-          returned: '已驳回',
-          voided: '已作废',
-        }[status] || this.displayValue(status)
-      );
+      return settlementStatusName(status, this.displayValue);
     },
     advanceCreateUserName(row) {
       return this.displayValue(
@@ -2992,6 +3335,10 @@ export default {
     line-height: 32px;
     color: #303133;
   }
+
+  .form-readonly--code {
+    color: var(--el-color-primary);
+  }
 }
 
 .dialog-section-title {
diff --git a/src/views/settlement/components/project-advance-write-off.vue b/src/views/settlement/components/project-advance-write-off.vue
new file mode 100644
index 0000000..a273121
--- /dev/null
+++ b/src/views/settlement/components/project-advance-write-off.vue
@@ -0,0 +1,300 @@
+<template>
+  <section-card title="项目预付核销">
+    <template v-if="editable" #extra>
+      <el-button type="primary" :disabled="!contractId" @click="openSelectDialog">选择</el-button>
+    </template>
+    <el-table :data="rows" border>
+      <el-table-column type="index" label="序号" width="64" align="center" />
+      <el-table-column
+        prop="paymentNo"
+        label="预付单号"
+        min-width="160"
+        align="center"
+        show-overflow-tooltip
+      />
+      <el-table-column label="项目预付金额" min-width="140" align="center">
+        <template #default="{ row }">{{ formatMoney(row.projectAdvanceAmount) }}</template>
+      </el-table-column>
+      <el-table-column label="可核销金额" min-width="140" align="center">
+        <template #default="{ row }">{{ formatMoney(row.availableWriteOffAmount) }}</template>
+      </el-table-column>
+      <el-table-column label="本次核销金额" min-width="160" align="center">
+        <template #default="{ row }">
+          <el-input-number
+            v-if="editable"
+            v-model="row.writeOffAmount"
+            :min="0"
+            :precision="2"
+            :controls="false"
+            class="project-advance-write-off__amount"
+            @change="handleAmountChange(row)"
+          />
+          <span v-else>{{ formatMoney(row.writeOffAmount) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="kingdeeBillNo"
+        label="金蝶预付单号"
+        min-width="160"
+        align="center"
+        show-overflow-tooltip
+      >
+        <template #default="{ row }">{{ row.kingdeeBillNo || '-' }}</template>
+      </el-table-column>
+      <el-table-column
+        prop="createUserName"
+        label="创建人"
+        min-width="120"
+        align="center"
+        show-overflow-tooltip
+      >
+        <template #default="{ row }">{{ row.createUserName || '-' }}</template>
+      </el-table-column>
+      <el-table-column prop="createTime" label="创建时间" min-width="170" align="center">
+        <template #default="{ row }">{{ formatDateTime(row.createTime || row.paymentCreateTime) }}</template>
+      </el-table-column>
+      <el-table-column v-if="editable" label="操作" width="90" align="center" fixed="right">
+        <template #default="{ $index }">
+          <el-link type="danger" @click="removeRow($index)">删除</el-link>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <el-dialog
+      v-model="dialog.visible"
+      title="选择项目预付单"
+      width="960px"
+      append-to-body
+      destroy-on-close
+      class="dialog-form-title"
+      @closed="handleDialogClosed"
+    >
+      <el-table
+        v-loading="dialog.loading"
+        :data="dialog.rows"
+        border
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column type="selection" width="55" align="center" :selectable="rowSelectable" />
+        <el-table-column type="index" label="序号" width="64" align="center" />
+        <el-table-column
+          prop="paymentNo"
+          label="预付单号"
+          min-width="160"
+          align="center"
+          show-overflow-tooltip
+        />
+        <el-table-column label="项目预付金额" min-width="140" align="center">
+          <template #default="{ row }">{{ formatMoney(row.projectAdvanceAmount) }}</template>
+        </el-table-column>
+        <el-table-column label="可核销金额" min-width="140" align="center">
+          <template #default="{ row }">{{ formatMoney(row.availableWriteOffAmount) }}</template>
+        </el-table-column>
+        <el-table-column
+          prop="kingdeeBillNo"
+          label="金蝶预付单号"
+          min-width="160"
+          align="center"
+          show-overflow-tooltip
+        >
+          <template #default="{ row }">{{ row.kingdeeBillNo || '-' }}</template>
+        </el-table-column>
+        <el-table-column
+          prop="createUserName"
+          label="创建人"
+          min-width="120"
+          align="center"
+          show-overflow-tooltip
+        >
+          <template #default="{ row }">{{ row.createUserName || '-' }}</template>
+        </el-table-column>
+        <el-table-column prop="createTime" label="创建时间" min-width="170" align="center">
+          <template #default="{ row }">{{ formatDateTime(row.createTime) }}</template>
+        </el-table-column>
+      </el-table>
+      <template #footer>
+        <el-button @click="dialog.visible = false">取消</el-button>
+        <el-button type="primary" :disabled="!dialog.selection.length" @click="confirmSelect">
+          确定
+        </el-button>
+      </template>
+    </el-dialog>
+  </section-card>
+</template>
+
+<script>
+import { getProjectAdvanceWriteOffOptions } from '@/api/payment/paymentApplication';
+
+export default {
+  name: 'ProjectAdvanceWriteOff',
+  props: {
+    modelValue: {
+      type: Array,
+      default: () => [],
+    },
+    editable: {
+      type: Boolean,
+      default: true,
+    },
+    contractId: {
+      type: [String, Number],
+      default: '',
+    },
+    settlementAmount: {
+      type: [String, Number],
+      default: 0,
+    },
+    settlementType: {
+      type: String,
+      required: true,
+    },
+    settlementId: {
+      type: [String, Number],
+      default: '',
+    },
+  },
+  emits: ['update:modelValue'],
+  data() {
+    return {
+      dialog: {
+        visible: false,
+        loading: false,
+        rows: [],
+        selection: [],
+      },
+    };
+  },
+  computed: {
+    rows: {
+      get() {
+        return Array.isArray(this.modelValue) ? this.modelValue : [];
+      },
+      set(value) {
+        this.$emit('update:modelValue', value);
+      },
+    },
+  },
+  methods: {
+    formatMoney(value) {
+      const amount = Number(value);
+      return Number.isFinite(amount) ? amount.toFixed(2) : '0.00';
+    },
+    formatDateTime(value) {
+      if (!value) return '-';
+      return this.$dayjs(value).format('YYYY-MM-DD HH:mm:ss');
+    },
+    money(value) {
+      const amount = Number(value);
+      return Number.isFinite(amount) ? Number(amount.toFixed(2)) : 0;
+    },
+    openSelectDialog() {
+      if (!this.contractId) {
+        this.$message.warning('请先选择合同');
+        return;
+      }
+      this.dialog.visible = true;
+      this.loadOptions();
+    },
+    async loadOptions() {
+      this.dialog.loading = true;
+      try {
+        const res = await getProjectAdvanceWriteOffOptions({
+          contractId: this.contractId,
+          excludeSettlementType: this.settlementType,
+          excludeSettlementId: this.settlementId || undefined,
+        });
+        this.dialog.rows = res?.data?.data || [];
+      } finally {
+        this.dialog.loading = false;
+      }
+    },
+    rowSelectable(row) {
+      const selectedIds = new Set(this.rows.map(item => String(item.paymentApplicationId)));
+      return !selectedIds.has(String(row.paymentApplicationId));
+    },
+    handleSelectionChange(list) {
+      this.dialog.selection = list || [];
+    },
+    confirmSelect() {
+      const nextRows = [...this.rows];
+      const existed = new Set(nextRows.map(item => String(item.paymentApplicationId)));
+      this.dialog.selection.forEach(item => {
+        const id = String(item.paymentApplicationId);
+        if (existed.has(id)) return;
+        nextRows.push({
+          paymentApplicationId: item.paymentApplicationId,
+          paymentNo: item.paymentNo,
+          projectAdvanceAmount: this.money(item.projectAdvanceAmount),
+          availableWriteOffAmount: this.money(item.availableWriteOffAmount),
+          writeOffAmount: this.money(item.availableWriteOffAmount),
+          kingdeeBillNo: item.kingdeeBillNo || '',
+          createUserName: item.createUserName || '',
+          createTime: item.createTime,
+          paymentCreateTime: item.createTime,
+        });
+      });
+      this.rows = nextRows;
+      this.dialog.visible = false;
+      this.validateTotal();
+    },
+    handleDialogClosed() {
+      this.dialog.rows = [];
+      this.dialog.selection = [];
+    },
+    handleAmountChange(row) {
+      const available = this.money(row.availableWriteOffAmount);
+      let amount = this.money(row.writeOffAmount);
+      if (amount < 0) amount = 0;
+      if (amount > available) {
+        amount = available;
+        this.$message.warning('本次核销金额不能超过可核销金额');
+      }
+      row.writeOffAmount = amount;
+      this.validateTotal();
+    },
+    validateTotal() {
+      const total = this.rows.reduce((sum, row) => sum + this.money(row.writeOffAmount), 0);
+      const settlementAmount = this.money(this.settlementAmount);
+      if (settlementAmount > 0 && total > settlementAmount) {
+        this.$message.warning('项目预付核销合计不能超过结算单金额');
+        return false;
+      }
+      return true;
+    },
+    validateBeforeSave() {
+      for (const row of this.rows) {
+        const amount = this.money(row.writeOffAmount);
+        if (amount <= 0) {
+          this.$message.warning(`预付单${row.paymentNo || ''}本次核销金额必须大于0`);
+          return false;
+        }
+        if (amount > this.money(row.availableWriteOffAmount)) {
+          this.$message.warning(`预付单${row.paymentNo || ''}本次核销金额不能超过可核销金额`);
+          return false;
+        }
+      }
+      return this.validateTotal();
+    },
+    removeRow(index) {
+      const nextRows = [...this.rows];
+      nextRows.splice(index, 1);
+      this.rows = nextRows;
+    },
+    toSavePayload() {
+      return this.rows.map(row => ({
+        paymentApplicationId: row.paymentApplicationId,
+        writeOffAmount: this.money(row.writeOffAmount),
+      }));
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.project-advance-write-off__amount {
+  width: 100%;
+}
+:deep(.project-advance-write-off__amount .el-input__inner) {
+  text-align: right;
+}
+</style>
diff --git a/src/views/settlement/components/settlement-adjustment-editor.vue b/src/views/settlement/components/settlement-adjustment-editor.vue
index 0c646d3..0ee9530 100644
--- a/src/views/settlement/components/settlement-adjustment-editor.vue
+++ b/src/views/settlement/components/settlement-adjustment-editor.vue
@@ -414,6 +414,8 @@ export default {
       });
       this.details = [];
       this.recalculate();
+      // 金蝶冲销预检：软提示，不阻断建单（金蝶不可用时静默降级）
+      this.precheckWriteOff(formalSettlementId);
       this.loading = true;
       try {
         const { data } = await api.getFormalDetails(formalSettlementId);
@@ -431,6 +433,19 @@ export default {
         this.loading = false;
       }
     },
+    async precheckWriteOff(formalSettlementId) {
+      try {
+        const { data } = await api.kingdeeWriteOffPrecheck(formalSettlementId);
+        if (String(this.form.formalSettlementId) !== String(formalSettlementId)) return;
+        const result = data?.data || data || {};
+        if (!result.message) return;
+        if (result.syncStatus === 'synced' && result.writtenOff === false)
+          this.$message.warning(result.message);
+        else this.$message.info(result.message);
+      } catch (error) {
+        // 预检软提示：金蝶查询失败静默降级，不阻断建单
+      }
+    },
     addFeeRow() {
       this.details.push({
         formalSettlementDetailId: null,
diff --git a/src/views/settlement/components/settlement-import-page.vue b/src/views/settlement/components/settlement-import-page.vue
new file mode 100644
index 0000000..6a45c08
--- /dev/null
+++ b/src/views/settlement/components/settlement-import-page.vue
@@ -0,0 +1,1585 @@
+<template>
+  <div class="settlement-import-create" :class="{ 'is-readonly': readonly }">
+    <section class="settlement-import-create__form-panel">
+      <el-form
+        ref="formRef"
+        :model="form"
+        :rules="rules"
+        label-position="right"
+        label-width="auto"
+        class="settlement-import-create__form"
+      >
+        <el-row :gutter="20">
+          <el-col :span="8">
+            <el-form-item label="项目" prop="projectId">
+              <el-select
+                v-model="form.projectId"
+                filterable
+                clearable
+                :disabled="readonly"
+                placeholder="请选择项目"
+                @change="onProjectChange"
+              >
+                <el-option
+                  v-for="item in projects"
+                  :key="item.id"
+                  :label="item.projectName"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="结算类型" prop="settlementType">
+              <el-select
+                v-model="form.settlementType"
+                :disabled="readonly"
+                clearable
+                placeholder="请选择结算类型"
+                style="width: 100%"
+                @change="onSettlementTypeChange"
+              >
+                <el-option label="应收" value="receivable" />
+                <el-option label="应付" value="payable" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="结算单" prop="settlementBillType">
+              <el-select
+                v-model="form.settlementBillType"
+                :disabled="readonly || form.settlementType !== 'payable'"
+                placeholder="请选择结算单"
+                style="width: 100%"
+              >
+                <el-option label="正式结算单" value="formal" />
+                <el-option
+                  v-if="form.settlementType === 'payable'"
+                  label="预付结算单"
+                  value="pre"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="客户合同" prop="customerContractId">
+              <el-select
+                v-model="form.customerContractId"
+                filterable
+                clearable
+                :disabled="readonly || !form.projectId"
+                style="width: 100%"
+                :placeholder="form.projectId ? '请选择客户合同' : '请先选择项目'"
+                @change="onCustomerContractChange"
+              >
+                <el-option
+                  v-for="item in filteredCustomerContracts"
+                  :key="item.id"
+                  :label="formatContractLabel(item)"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="客户">
+              <el-input v-model="form.customerName" disabled placeholder="选择客户合同后自动填充" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="承运商合同" prop="carrierContractId">
+              <el-select
+                v-model="form.carrierContractId"
+                filterable
+                clearable
+                :disabled="readonly || !form.projectId"
+                style="width: 100%"
+                :placeholder="form.projectId ? '请选择承运商合同' : '请先选择项目'"
+                @change="onCarrierContractChange"
+              >
+                <el-option
+                  v-for="item in filteredCarrierContracts"
+                  :key="item.id"
+                  :label="formatContractLabel(item)"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="承运商">
+              <el-input v-model="form.carrierName" disabled placeholder="选择承运商合同后自动填充" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item prop="waybillMode" class="settlement-import-create__waybill-mode">
+              <template #label>
+                <span>运单类型</span>
+                <el-tooltip placement="top">
+                  <template #content>
+                    <div>
+                      新运单：提交时同步生成运单、应收/应付明细、预/正式结算单；费用项目与金额按导入单据
+                    </div>
+                    <div>
+                      历史运单：按 项目+车号+运输完成日期+客户+承运商+起运地+目的地+货物名称
+                      匹配尚未生成应收/应付的运单（命中 1 条自动绑定，多条可点「选择」弹窗挑选）；提交时生成应收/应付明细与预/正式结算单，费用按导入单据，不新建运单
+                    </div>
+                  </template>
+                  <el-icon class="settlement-import-create__label-tip"><QuestionFilled /></el-icon>
+                </el-tooltip>
+              </template>
+              <el-radio-group v-model="form.waybillMode" :disabled="readonly">
+                <el-radio value="new">新运单</el-radio>
+                <el-radio value="history">历史运单</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item v-if="!readonly" label="结算单上传" prop="file">
+              <div class="settlement-import-create__upload">
+                <el-upload
+                  ref="uploadRef"
+                  action="#"
+                  accept=".xls,.xlsx"
+                  :auto-upload="false"
+                  :limit="1"
+                  :disabled="!formReady"
+                  :file-list="files"
+                  :on-change="onFileChange"
+                  :on-exceed="onFileExceed"
+                  :on-remove="onFileRemove"
+                >
+                  <el-button type="primary" :disabled="!formReady">上传 Excel</el-button>
+                </el-upload>
+                <el-link type="primary" :underline="false" @click="downloadTemplate">
+                  下载模板
+                </el-link>
+                <span class="settlement-import-create__upload-tip">仅支持 .xls / .xlsx</span>
+              </div>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="备注">
+              <el-input
+                v-model="form.remark"
+                type="textarea"
+                :rows="2"
+                maxlength="200"
+                show-word-limit
+                :disabled="readonly"
+                placeholder="请输入备注"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </section>
+
+    <section v-if="rows.length" class="settlement-import-create__detail-panel">
+      <div class="settlement-import-create__detail-head">
+        <div class="dialog-section-title">导入数据明细</div>
+        <el-button
+          v-if="!readonly"
+          type="danger"
+          plain
+          :disabled="!rowSelection.length"
+          @click="removeSelectedRows"
+        >
+          批量删除
+        </el-button>
+      </div>
+      <el-tabs v-model="previewTab">
+        <el-tab-pane :label="`运单数（${rows.length}）`" name="all" />
+        <el-tab-pane :label="`疑似重复（${duplicateRows.length}）`" name="duplicate" />
+      </el-tabs>
+      <el-table
+        :data="previewRows"
+        border
+        max-height="480"
+        class="settlement-import-create__table"
+        :row-class-name="({ row }) => (row._duplicate ? 'is-duplicate-row' : '')"
+        @selection-change="rowSelection = $event"
+      >
+        <el-table-column v-if="!readonly" type="selection" width="48" fixed="left" />
+        <el-table-column type="index" label="序号" width="64" fixed="left" align="center" />
+        <el-table-column
+          v-for="column in detailColumns"
+          :key="column.prop"
+          :prop="column.prop"
+          :label="column.label"
+          :min-width="column.minWidth || 120"
+          :show-overflow-tooltip="readonly || !column.editor || column.readonly"
+        >
+          <template #default="{ row }">
+            <template v-if="!readonly && column.editor && !column.readonly">
+              <el-date-picker
+                v-if="column.editor === 'date'"
+                :key="`${row._key}-${column.prop}`"
+                v-model="row[column.prop]"
+                type="date"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
+                placeholder="请选择"
+              />
+              <el-select
+                v-else-if="column.editor === 'select' && column.prop === 'transportType'"
+                :key="`${row._key}-${column.prop}`"
+                v-model="row[column.prop]"
+                clearable
+                filterable
+                placeholder="请选择运输方式"
+                style="width: 100%"
+              >
+                <el-option
+                  v-for="item in transportTypeOptions"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                />
+              </el-select>
+              <div
+                v-else-if="column.editor === 'waybillSelect'"
+                class="settlement-import-create__waybill-select"
+              >
+                <el-input v-model="row.waybillNo" clearable placeholder="运单号" />
+                <el-link type="primary" :underline="false" @click="openHistoryWaybillDialog(row)">
+                  选择
+                </el-link>
+              </div>
+              <el-cascader
+                v-else-if="column.editor === 'cargoType'"
+                :key="`${row._key}-${column.prop}`"
+                :model-value="resolveCargoTypePath(row)"
+                :options="cargoTypeSelectOptions(row)"
+                :props="cargoTypeCascaderProps"
+                clearable
+                filterable
+                placeholder="请选择货物类型"
+                style="width: 100%"
+                @change="value => handleCargoTypeChange(row, value)"
+              />
+              <el-input
+                v-else-if="column.editor === 'number' || column.editor === 'optionalNumber'"
+                :key="`${row._key}-${column.prop}`"
+                :model-value="resolveCellValue(row, column)"
+                inputmode="decimal"
+                :placeholder="`请输入${column.label}`"
+                @input="value => updateNumberCell(row, column, value)"
+              />
+              <el-input
+                v-else
+                :key="`${row._key}-${column.prop}`"
+                v-model="row[column.prop]"
+                :placeholder="`请输入${column.label}`"
+                @update:model-value="value => syncEditedText(row, column, value)"
+              />
+            </template>
+            <template v-else-if="column.editor === 'waybillSelect' && !readonly">
+              <div class="settlement-import-create__waybill-select">
+                <span>{{ row.waybillNo || '-' }}</span>
+                <el-link type="primary" :underline="false" @click="openHistoryWaybillDialog(row)">
+                  选择
+                </el-link>
+              </div>
+            </template>
+            <span v-else>{{ formatCell(row, column) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column v-if="!readonly" label="操作" width="120" fixed="right">
+          <template #default="{ row }">
+            <div class="settlement-import-create__row-actions">
+              <el-link v-if="row._duplicate" type="primary" @click="confirmDuplicateRow(row)">
+                确认
+              </el-link>
+              <el-link type="danger" @click="deleteRow(row)">删除</el-link>
+            </div>
+          </template>
+        </el-table-column>
+      </el-table>
+    </section>
+
+    <div v-if="!readonly" class="settlement-import-create__footer">
+      <el-button @click="goBack">取消</el-button>
+      <el-button :loading="draftLoading" @click="saveDraft">保存草稿</el-button>
+      <el-button type="primary" :loading="confirmLoading" @click="confirmImport">
+        确认导入
+      </el-button>
+    </div>
+
+    <el-dialog
+      v-model="historyWaybillVisible"
+      title="选择历史运单"
+      width="960px"
+      append-to-body
+      destroy-on-close
+    >
+      <div class="settlement-import-create__history-tip">
+        仅展示相同项目、客户合同、承运商合同下，尚未生成当前结算类型应收/应付明细的运单
+      </div>
+      <el-table
+        v-loading="historyWaybillLoading"
+        :data="historyWaybillRows"
+        border
+        max-height="420"
+        highlight-current-row
+        @row-dblclick="selectHistoryWaybill"
+        @current-change="row => (historyWaybillCurrent = row)"
+      >
+        <el-table-column prop="waybillNo" label="运单号" min-width="140" />
+        <el-table-column prop="vehicleNo" label="车号" min-width="120" />
+        <el-table-column prop="departureAddress" label="起运地" min-width="140" show-overflow-tooltip />
+        <el-table-column prop="arrivalAddress" label="目的地" min-width="140" show-overflow-tooltip />
+        <el-table-column prop="cargoName" label="货物名称" min-width="120" show-overflow-tooltip />
+        <el-table-column prop="actualEndDate" label="完成日期" min-width="120" />
+        <el-table-column prop="quantity" label="数量" width="90" />
+        <el-table-column prop="quantityUnit" label="数量单位" width="90" />
+        <el-table-column prop="mileage" label="里程" width="90" />
+      </el-table>
+      <template #footer>
+        <el-button @click="historyWaybillVisible = false">取消</el-button>
+        <el-button type="primary" @click="confirmHistoryWaybill">确定</el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup>
+import { computed, getCurrentInstance, onMounted, reactive, ref } from 'vue';
+import { useRoute, useRouter } from 'vue-router';
+import { ElMessage, ElMessageBox } from 'element-plus';
+import { QuestionFilled } from '@element-plus/icons-vue';
+import dayjs from 'dayjs';
+import * as api from '@/api/settlement/settlementImport';
+import { getList as getCargoTypeList } from '@/api/base/cargo-type';
+import { getList as getContractList } from '@/api/business/contract-manage';
+import { getDictionary } from '@/api/system/dictbiz';
+import { formatContractOptionLabel } from '@/utils/contract';
+import { downloadXls } from '@/utils/util';
+
+const route = useRoute();
+const router = useRouter();
+const instance = getCurrentInstance();
+const settlementImportListRefreshKey = 'settlement-import-list-refresh';
+
+const formRef = ref();
+const uploadRef = ref();
+const files = ref([]);
+const rows = ref([]);
+const parseLoading = ref(false);
+const rowSelection = ref([]);
+const previewTab = ref('all');
+const feeItemNames = ref([]);
+const parsedHeaders = ref([]);
+const projects = ref([]);
+const customerContracts = ref([]);
+const carrierContracts = ref([]);
+const draftLoading = ref(false);
+const confirmLoading = ref(false);
+const readonly = ref(false);
+const transportTypeOptions = ref([]);
+const cargoTypeOptions = ref([]);
+const cargoTypeFlatOptions = ref([]);
+const cargoTypeCascaderProps = {
+  label: 'cargoName',
+  value: 'id',
+  children: 'children',
+  emitPath: true,
+};
+const historyWaybillVisible = ref(false);
+const historyWaybillLoading = ref(false);
+const historyWaybillRows = ref([]);
+const historyWaybillCurrent = ref(null);
+const historyWaybillTargetRow = ref(null);
+
+const createDefaultForm = () => ({
+  id: undefined,
+  batchNo: '',
+  projectId: '',
+  projectName: '',
+  settlementType: '',
+  settlementBillType: 'formal',
+  customerContractId: '',
+  customerContractName: '',
+  customerName: '',
+  carrierContractId: '',
+  carrierContractName: '',
+  carrierName: '',
+  waybillMode: 'new',
+  remark: '',
+  file: null,
+});
+
+const form = reactive(createDefaultForm());
+
+const validateFile = (rule, value, callback) => {
+  if (rows.value.length || form.file) {
+    callback();
+    return;
+  }
+  callback(new Error('请上传结算单 Excel'));
+};
+
+const rules = {
+  projectId: [{ required: true, message: '请选择项目', trigger: 'change' }],
+  settlementType: [{ required: true, message: '请选择结算类型', trigger: 'change' }],
+  settlementBillType: [{ required: true, message: '请选择结算单', trigger: 'change' }],
+  customerContractId: [{ required: true, message: '请选择客户合同', trigger: 'change' }],
+  carrierContractId: [{ required: true, message: '请选择承运商合同', trigger: 'change' }],
+  waybillMode: [{ required: true, message: '请选择运单类型', trigger: 'change' }],
+  file: [{ required: true, validator: validateFile, trigger: 'change' }],
+};
+
+const formReady = computed(
+  () =>
+    Boolean(form.projectId) &&
+    Boolean(form.settlementType) &&
+    Boolean(form.settlementBillType) &&
+    Boolean(form.customerContractId) &&
+    Boolean(form.carrierContractId)
+);
+
+const filteredCustomerContracts = computed(() => customerContracts.value);
+
+const filteredCarrierContracts = computed(() => carrierContracts.value);
+
+const extractRecords = response => {
+  const data = response?.data || response;
+  if (Array.isArray(data)) return data;
+  if (Array.isArray(data?.records)) return data.records;
+  if (Array.isArray(data?.data)) return data.data;
+  if (Array.isArray(data?.data?.records)) return data.data.records;
+  return [];
+};
+
+const isSelectableContract = item => {
+  const approvalStatus = String(item?.approvalStatus || '').trim();
+  const contractStage = String(item?.contractStage || '').trim();
+  return (
+    ['approved', 'change_approved'].includes(approvalStatus) && contractStage !== 'terminated'
+  );
+};
+
+/** 按项目加载客户合同、承运商合同（与运单导入一致，保证项目绑定可选） */
+const loadContractsByProject = async (projectId, projectName = '') => {
+  if (!projectId) {
+    customerContracts.value = [];
+    carrierContracts.value = [];
+    return;
+  }
+  const [customerRes, carrierRes] = await Promise.all([
+    getContractList(1, 9999, {
+      projectId,
+      projectName: projectName || form.projectName || undefined,
+      contractCategory: '客户合同',
+    }),
+    getContractList(1, 9999, {
+      projectId,
+      projectName: projectName || form.projectName || undefined,
+      contractCategory: '承运商合同',
+    }),
+  ]);
+  const matchProject = item => String(item.projectId ?? '') === String(projectId);
+  customerContracts.value = extractRecords(customerRes)
+    .filter(item => String(item.contractCategory || '').trim() === '客户合同')
+    .filter(matchProject)
+    .filter(isSelectableContract)
+    .map(normalizeContract)
+    .filter(Boolean);
+  carrierContracts.value = extractRecords(carrierRes)
+    .filter(item => String(item.contractCategory || '').trim() === '承运商合同')
+    .filter(matchProject)
+    .filter(isSelectableContract)
+    .map(normalizeContract)
+    .filter(Boolean);
+};
+
+const columnsBeforeFee = [
+  { prop: 'originalNo', label: '原始单号', editor: 'input', minWidth: 130 },
+  { prop: 'loadingIdentifier', label: '配载标识号', editor: 'input', minWidth: 140 },
+  {
+    prop: 'vehicleNo',
+    label: '车牌号/航班号/船号/班列号',
+    editor: 'input',
+    minWidth: 190,
+  },
+  { prop: 'transportType', label: '运输方式', editor: 'select', minWidth: 140 },
+  { prop: 'driverName', label: '司机/船长姓名', editor: 'input', minWidth: 130 },
+  { prop: 'driverPhone', label: '司机/船长手机号', editor: 'input', minWidth: 150 },
+  { prop: 'departureAddress', label: '发货地址', editor: 'input', minWidth: 160 },
+  { prop: 'departureContact', label: '发货联系人', editor: 'input', minWidth: 120 },
+  { prop: 'departurePhone', label: '发货联系人电话', editor: 'input', minWidth: 140 },
+  { prop: 'arrivalAddress', label: '到货地址', editor: 'input', minWidth: 160 },
+  { prop: 'arrivalContact', label: '收货联系人', editor: 'input', minWidth: 120 },
+  { prop: 'arrivalPhone', label: '收货联系人电话', editor: 'input', minWidth: 140 },
+  { prop: 'cargoName', label: '货物名称', editor: 'input', minWidth: 140 },
+  { prop: 'cargoType', label: '货物类型', editor: 'cargoType', minWidth: 200 },
+  { prop: 'packageType', label: '包装', editor: 'input', minWidth: 100 },
+  { prop: 'quantity', label: '数量', editor: 'number', minWidth: 100 },
+  { prop: 'quantityUnit', label: '数量单位', editor: 'input', minWidth: 110 },
+  { prop: 'specification', label: '规格', editor: 'input', minWidth: 110 },
+  { prop: 'model', label: '型号', editor: 'input', minWidth: 110 },
+  { prop: 'mileage', label: '里程(km)', editor: 'optionalNumber', minWidth: 110 },
+  { prop: 'unitPrice', label: '运输单价', editor: 'optionalNumber', minWidth: 110 },
+  { prop: 'transportFee', label: '运输费', editor: 'number', minWidth: 110 },
+];
+const columnsAfterFee = [
+  { prop: 'actualStartDate', label: '实际发货时间', editor: 'date', minWidth: 150 },
+  { prop: 'actualEndDate', label: '实际完成时间', editor: 'date', minWidth: 150 },
+  { prop: 'planStartDate', label: '预计发货时间', editor: 'date', minWidth: 150 },
+  { prop: 'planEndDate', label: '预计完成时间', editor: 'date', minWidth: 150 },
+  { prop: 'remark', label: '备注', editor: 'input', minWidth: 160 },
+  { prop: 'waybillIdentifier', label: '同一运单标识号', editor: 'input', minWidth: 150 },
+];
+
+const headerColumnMap = {};
+[...columnsBeforeFee, ...columnsAfterFee].forEach(column => {
+  headerColumnMap[column.label] = column;
+  headerColumnMap[`*${column.label}`] = column;
+});
+headerColumnMap['结算金额'] = {
+  prop: 'settlementAmount',
+  label: '结算金额',
+  editor: 'number',
+  minWidth: 120,
+};
+headerColumnMap['里程'] = headerColumnMap['里程(km)'];
+headerColumnMap['单价'] = headerColumnMap['运输单价'];
+headerColumnMap['运输类型'] = headerColumnMap['运输方式'];
+headerColumnMap['*运输类型'] = headerColumnMap['运输方式'];
+
+const VEHICLE_ALIAS_KEYS = [
+  '*车牌号/航班号/船号/班列号',
+  '车牌号/航班号/船号/班列号',
+  '*车牌号/船班号/船次号/班次号',
+  '车牌号/船班号/船次号/班次号',
+  '车号',
+];
+
+const readFilledText = value => {
+  const text = String(value ?? '').trim();
+  return text;
+};
+
+const applyVehicleNo = (row, value) => {
+  const vehicleNo = readFilledText(value);
+  row.vehicleNo = vehicleNo;
+  VEHICLE_ALIAS_KEYS.forEach(key => {
+    row[key] = vehicleNo;
+  });
+};
+
+const syncEditedText = (row, column, value) => {
+  if (column.prop !== 'vehicleNo') return;
+  applyVehicleNo(row, value);
+};
+
+const feeColumn = name => ({
+  prop: name,
+  label: name,
+  editor: 'number',
+  minWidth: 110,
+  isFeeItem: true,
+});
+
+const columnFromHeader = header => {
+  const name = String(header || '').trim();
+  if (!name || name === '序号') return null;
+  if (feeItemNames.value.includes(name)) return feeColumn(name);
+  const mapped = headerColumnMap[name];
+  if (mapped) return { ...mapped, label: mapped.label || name.replace(/^\*/, '') };
+  return {
+    prop: name,
+    label: name.replace(/^\*/, ''),
+    editor: 'input',
+    minWidth: 140,
+  };
+};
+
+const dedupeColumns = columns => {
+  const seen = new Set();
+  return columns.filter(column => {
+    if (!column?.prop || seen.has(column.prop)) return false;
+    seen.add(column.prop);
+    return true;
+  });
+};
+
+const settlementAmountColumn = {
+  prop: 'settlementAmount',
+  label: '结算金额',
+  editor: 'number',
+  minWidth: 120,
+};
+
+/** 模板已去掉结算金额；明细仍展示，并插在费用项之后、日期列之前 */
+const ensureSettlementAmountColumn = columns => {
+  if (columns.some(column => column.prop === 'settlementAmount')) {
+    return columns;
+  }
+  const result = [...columns];
+  let insertAt = result.findIndex(column =>
+    ['actualStartDate', 'actualEndDate', 'planStartDate', 'planEndDate', 'remark', 'waybillIdentifier'].includes(
+      column.prop
+    )
+  );
+  if (insertAt < 0) {
+    const lastFeeIndex = [...result].map((column, index) => (column.isFeeItem ? index : -1)).filter(index => index >= 0).pop();
+    const transportFeeIndex = result.findIndex(column => column.prop === 'transportFee');
+    insertAt =
+      lastFeeIndex !== undefined
+        ? lastFeeIndex + 1
+        : transportFeeIndex >= 0
+          ? transportFeeIndex + 1
+          : result.length;
+  }
+  result.splice(insertAt, 0, { ...settlementAmountColumn });
+  return result;
+};
+
+const detailColumns = computed(() => {
+  const historyColumns =
+    form.waybillMode === 'history'
+      ? [
+          {
+            prop: 'waybillNo',
+            label: '运单号',
+            editor: 'waybillSelect',
+            minWidth: 180,
+          },
+        ]
+      : [];
+  const fallback = [
+    ...columnsBeforeFee,
+    ...feeItemNames.value.map(name => feeColumn(name)),
+    { ...settlementAmountColumn },
+    ...columnsAfterFee,
+  ];
+  const uploaded = parsedHeaders.value.map(columnFromHeader).filter(Boolean);
+  const columns = ensureSettlementAmountColumn(
+    dedupeColumns(uploaded.length ? uploaded : fallback)
+  );
+  return [...historyColumns, ...columns];
+});
+
+const duplicateRows = computed(() => rows.value.filter(row => row._duplicate));
+const previewRows = computed(() =>
+  previewTab.value === 'duplicate' ? duplicateRows.value : rows.value
+);
+
+const unwrapData = response => {
+  const body = response?.data || response || {};
+  return body?.data !== undefined ? body.data : body;
+};
+
+const normalizeOptionItem = (item, nameKeys = ['name', 'label']) => {
+  if (item == null) return null;
+  if (typeof item === 'string' || typeof item === 'number') {
+    return { id: item, name: String(item) };
+  }
+  const id = item.id ?? item.value ?? item.key;
+  let name = '';
+  for (const key of nameKeys) {
+    if (item[key] != null && String(item[key]).trim()) {
+      name = String(item[key]).trim();
+      break;
+    }
+  }
+  return { ...item, id, name: name || String(id ?? '') };
+};
+
+const normalizeProject = item => {
+  const normalized = normalizeOptionItem(item, ['projectName', 'label', 'name']);
+  if (!normalized) return null;
+  return {
+    ...normalized,
+    id: normalized.id,
+    projectName: normalized.projectName || normalized.name || normalized.label || '',
+  };
+};
+
+const normalizeContract = item => {
+  const normalized = normalizeOptionItem(item, ['contractName', 'label', 'name']);
+  if (!normalized) return null;
+  return {
+    ...normalized,
+    id: normalized.id,
+    contractName: normalized.contractName || normalized.name || '',
+    contractNo: normalized.contractNo || '',
+    projectId: normalized.projectId,
+    partyA: normalized.partyA || '',
+    partyB: normalized.partyB || '',
+    customerName: normalized.customerName || normalized.partyA || '',
+    carrierName: normalized.carrierName || normalized.partyB || '',
+  };
+};
+
+const formatContractLabel = item => {
+  const label = formatContractOptionLabel(item);
+  return label || item.contractName || item.name || String(item.id || '');
+};
+
+const toNumber = value => {
+  if (value === null || value === undefined || value === '') return 0;
+  const number = Number(value);
+  return Number.isFinite(number) ? number : 0;
+};
+
+const resolveCellValue = (row, column) => {
+  if (column.isFeeItem) {
+    const feeItems = row.feeItems || {};
+    return feeItems[column.prop] ?? row[column.prop] ?? '';
+  }
+  return row[column.prop] ?? '';
+};
+
+const formatCell = (row, column) => {
+  const value = resolveCellValue(row, column);
+  if (
+    column.editor === 'number' ||
+    column.editor === 'optionalNumber' ||
+    column.prop === 'settlementAmount'
+  ) {
+    if (value === '' || value === null || value === undefined) return '';
+    const number = Number(value);
+    return Number.isFinite(number) ? number.toFixed(2) : '';
+  }
+  return value ?? '';
+};
+
+/** 导入解析后自动合计结算金额；编辑运输费/费用项时不再回算 */
+const recalcSettlementAmount = row => {
+  const transportFee = toNumber(row.transportFee ?? row.freight);
+  row.transportFee = transportFee;
+  row.freight = transportFee;
+  if (!row.feeItems || typeof row.feeItems !== 'object') {
+    row.feeItems = {};
+  }
+  let feeSum = 0;
+  feeItemNames.value.forEach(name => {
+    const amount = toNumber(row.feeItems[name] ?? row[name]);
+    row.feeItems[name] = amount;
+    row[name] = amount;
+    feeSum += amount;
+  });
+  const settlementAmount = Number((transportFee + feeSum).toFixed(2));
+  row.settlementAmount = settlementAmount;
+  row.otherFeeTotal = Number(feeSum.toFixed(2));
+  row.freightTotal = settlementAmount;
+  row['运费合计'] = settlementAmount;
+};
+
+const syncOtherFeeTotal = row => {
+  if (!row.feeItems || typeof row.feeItems !== 'object') {
+    row.feeItems = {};
+  }
+  let feeSum = 0;
+  feeItemNames.value.forEach(name => {
+    feeSum += toNumber(row.feeItems[name] ?? row[name]);
+  });
+  row.otherFeeTotal = Number(feeSum.toFixed(2));
+};
+
+const updateNumberCell = (row, column, value) => {
+  const raw = String(value ?? '').trim();
+  if (!raw) {
+    if (column.isFeeItem) {
+      if (!row.feeItems) row.feeItems = {};
+      row.feeItems[column.prop] = '';
+      row[column.prop] = '';
+      syncOtherFeeTotal(row);
+      return;
+    }
+    row[column.prop] = '';
+    if (column.prop === 'transportFee') row.freight = '';
+    if (column.prop === 'unitPrice') row.transportUnitPrice = '';
+    if (column.prop === 'settlementAmount') {
+      row.freightTotal = '';
+      row['运费合计'] = '';
+    }
+    return;
+  }
+  const [integer = '', decimal = ''] = raw.replace(/[^\d.]/g, '').split('.');
+  const normalized =
+    decimal || raw.includes('.') ? `${integer}.${decimal.slice(0, 2)}` : integer;
+  if (column.isFeeItem) {
+    if (!row.feeItems) row.feeItems = {};
+    row.feeItems[column.prop] = normalized;
+    row[column.prop] = normalized;
+    syncOtherFeeTotal(row);
+    return;
+  }
+  row[column.prop] = normalized;
+  if (column.prop === 'transportFee') {
+    row.freight = normalized;
+  }
+  if (column.prop === 'unitPrice') {
+    row.transportUnitPrice = normalized;
+  }
+  if (column.prop === 'settlementAmount') {
+    row.freightTotal = normalized;
+    row['运费合计'] = normalized;
+  }
+};
+
+const importFieldText = value => String(value ?? '').trim();
+
+/** 疑似重复：与历史运单匹配维度一致（项目/客户/承运商为表单级，行内比车号+完成日期+起运地+目的地+货物名称）。 */
+const duplicateSignature = row =>
+  [
+    importFieldText(form.projectId),
+    importFieldText(form.customerContractId),
+    importFieldText(form.carrierContractId),
+    importFieldText(row.vehicleNo),
+    importFieldText(row.actualEndDate).slice(0, 10),
+    importFieldText(row.departureAddress),
+    importFieldText(row.arrivalAddress),
+    importFieldText(row.cargoName),
+  ].join('\u0001');
+
+const refreshDuplicateFlags = (list = rows.value) => {
+  const groups = new Map();
+  list.forEach(row => {
+    const signature = duplicateSignature(row);
+    if (row._duplicateConfirmed && row._duplicateSignature !== signature) {
+      row._duplicateConfirmed = false;
+    }
+    row._duplicateSignature = signature;
+    const group = groups.get(signature) || [];
+    group.push(row);
+    groups.set(signature, group);
+  });
+  groups.forEach(group => {
+    const duplicated = group.length > 1;
+    group.forEach(row => {
+      row._duplicate = duplicated && !row._duplicateConfirmed;
+    });
+  });
+};
+
+const confirmDuplicateRow = row => {
+  row._duplicateConfirmed = true;
+  refreshDuplicateFlags();
+  ElMessage.success('已确认，该行将按正常数据导入');
+};
+
+const normalizeParsedRow = (item, index) => {
+  const feeItems =
+    item.feeItems && typeof item.feeItems === 'object' ? { ...item.feeItems } : {};
+  feeItemNames.value.forEach(name => {
+    if (feeItems[name] == null && item[name] != null) {
+      feeItems[name] = item[name];
+    }
+  });
+  const row = {
+    _key: `${Date.now()}-${index}`,
+    ...item,
+    batchNo: item.batchNo || form.batchNo || '',
+    loadingIdentifier: item.loadingIdentifier || item.loadingNo || '',
+    transportFee: item.transportFee ?? item.freight ?? item['*运输费'] ?? item['运输费'] ?? '',
+    unitPrice: item.unitPrice ?? item.transportUnitPrice ?? item['运输单价'] ?? item['单价'] ?? '',
+    mileage: item.mileage ?? item['里程(km)'] ?? item['里程'] ?? '',
+    quantity: item.quantity ?? item['*数量'] ?? item['数量'] ?? '',
+    quantityUnit: item.quantityUnit ?? item['*数量单位'] ?? item['数量单位'] ?? '',
+    model: item.model ?? item['型号'] ?? '',
+    specification: item.specification ?? item['规格'] ?? '',
+    cargoType: item.cargoType ?? item['*货物类型'] ?? item['货物类型'] ?? '',
+    settlementAmount:
+      item.settlementAmount ?? item['结算金额'] ?? '',
+    feeItems,
+  };
+  const vehicleNo =
+    item.vehicleNo !== undefined && item.vehicleNo !== null
+      ? readFilledText(item.vehicleNo)
+      : readFilledText(VEHICLE_ALIAS_KEYS.map(key => item[key]).find(value => readFilledText(value)));
+  applyVehicleNo(row, vehicleNo);
+  row.transportUnitPrice = row.unitPrice;
+  row.freight = row.transportFee;
+  // 模板无结算金额列：导入后按运输费+费用项自动合计
+  recalcSettlementAmount(row);
+  return row;
+};
+
+const stripInternalRowFields = row => {
+  const {
+    _key,
+    _duplicate,
+    _duplicateConfirmed,
+    _duplicateSignature,
+    _editing,
+    _editSnapshot,
+    ...data
+  } = row;
+  const feeItems = { ...(data.feeItems || {}) };
+  feeItemNames.value.forEach(name => {
+    if (feeItems[name] == null && data[name] != null) {
+      feeItems[name] = data[name];
+    }
+  });
+  return {
+    ...data,
+    transportUnitPrice: data.transportUnitPrice ?? data.unitPrice,
+    transportFee: data.transportFee ?? data.freight,
+    unitPrice: data.unitPrice ?? data.transportUnitPrice,
+    freight: data.freight ?? data.transportFee,
+    feeItems,
+    settlementAmount: data.settlementAmount,
+  };
+};
+
+const buildPayload = () => {
+  const { file, ...batch } = form;
+  return {
+    ...batch,
+    settlementBillType: form.settlementType === 'payable' ? form.settlementBillType || 'formal' : 'formal',
+    waybillMode: form.waybillMode === 'history' ? 'history' : 'new',
+    feeItemNames: [...feeItemNames.value],
+    rows: rows.value.map(stripInternalRowFields),
+  };
+};
+
+const onSettlementTypeChange = () => {
+  // 应收固定正式结算单；应付默认可选正式/预结算
+  if (form.settlementType !== 'payable') {
+    form.settlementBillType = 'formal';
+  } else if (!form.settlementBillType) {
+    form.settlementBillType = 'formal';
+  }
+};
+
+const autoSelectSingleContracts = () => {
+  const customers = filteredCustomerContracts.value;
+  if (customers.length === 1 && !form.customerContractId) {
+    form.customerContractId = customers[0].id;
+    onCustomerContractChange(customers[0].id);
+  }
+  const carriers = filteredCarrierContracts.value;
+  if (carriers.length === 1 && !form.carrierContractId) {
+    form.carrierContractId = carriers[0].id;
+    onCarrierContractChange(carriers[0].id);
+  }
+};
+
+const onProjectChange = async id => {
+  const item = projects.value.find(row => String(row.id) === String(id));
+  form.projectName = item?.projectName || '';
+  form.customerContractId = '';
+  form.customerContractName = '';
+  form.customerName = '';
+  form.carrierContractId = '';
+  form.carrierContractName = '';
+  form.carrierName = '';
+  customerContracts.value = [];
+  carrierContracts.value = [];
+  if (!id) return;
+  try {
+    await loadContractsByProject(id, form.projectName);
+    autoSelectSingleContracts();
+  } catch (error) {
+    ElMessage.error(error?.message || '加载项目合同失败');
+  }
+};
+
+const onCustomerContractChange = id => {
+  const item = filteredCustomerContracts.value.find(row => String(row.id) === String(id));
+  form.customerContractName = item?.contractName || '';
+  form.customerName = item?.customerName || item?.partyA || '';
+};
+
+const onCarrierContractChange = id => {
+  const item = filteredCarrierContracts.value.find(row => String(row.id) === String(id));
+  form.carrierContractName = item?.contractName || '';
+  form.carrierName = item?.carrierName || item?.partyB || '';
+};
+
+const downloadTemplate = async () => {
+  try {
+    const response = await api.exportTemplate();
+    downloadXls(response.data, '导入结算单模板.xlsx');
+    ElMessage.success('模板下载成功');
+  } catch (error) {
+    ElMessage.error('模板下载失败');
+  }
+};
+
+const resetUploadState = () => {
+  files.value = [];
+  form.file = null;
+  rows.value = [];
+  feeItemNames.value = [];
+  parsedHeaders.value = [];
+  rowSelection.value = [];
+};
+
+const onFileRemove = () => {
+  resetUploadState();
+};
+
+/** limit=1 时再次选择文件会走 on-exceed，需主动替换并重新解析 */
+const onFileExceed = uploadFiles => {
+  const file = Array.isArray(uploadFiles) ? uploadFiles[0] : uploadFiles;
+  if (!file) return;
+  uploadRef.value?.clearFiles?.();
+  parseSelectedFile(file, file.name);
+};
+
+const onFileChange = (uploadFile, fileList) => {
+  // 移除、失败等状态不触发解析；仅处理新选中的文件
+  if (uploadFile?.status && !['ready', 'success'].includes(uploadFile.status)) {
+    return;
+  }
+  const raw = uploadFile?.raw;
+  if (!raw) return;
+  files.value = (fileList || []).slice(-1);
+  parseSelectedFile(raw, uploadFile?.name || raw.name);
+};
+
+const parseSelectedFile = async (raw, displayName = '') => {
+  if (!formReady.value) {
+    ElMessage.warning('请先完善项目、结算类型、客户合同与承运商合同');
+    resetUploadState();
+    uploadRef.value?.clearFiles?.();
+    return;
+  }
+  const fileName = String(displayName || raw?.name || '').toLowerCase();
+  if (!/\.(xls|xlsx)$/.test(fileName)) {
+    ElMessage.error('请上传 .xls 或 .xlsx 文件');
+    resetUploadState();
+    uploadRef.value?.clearFiles?.();
+    return;
+  }
+  files.value = [
+    {
+      name: displayName || raw.name,
+      raw,
+      uid: Date.now(),
+      status: 'ready',
+    },
+  ];
+  form.file = raw;
+  if (parseLoading.value) return;
+  parseLoading.value = true;
+  try {
+    const response = await api.parseFile(raw);
+    const data = unwrapData(response) || {};
+    feeItemNames.value = Array.isArray(data.feeItemNames) ? data.feeItemNames : [];
+    parsedHeaders.value = Array.isArray(data.headers) ? data.headers : [];
+    const parsedRows = Array.isArray(data.rows) ? data.rows : [];
+    rows.value = parsedRows.map((item, index) => normalizeParsedRow(item, index));
+    refreshDuplicateFlags();
+    formRef.value?.validateField('file');
+    if (Array.isArray(data.warnings) && data.warnings.length) {
+      ElMessage.warning(data.warnings.slice(0, 3).join('；'));
+    } else if (!rows.value.length) {
+      ElMessage.warning('解析成功，但未识别到有效明细行，请检查表头是否包含「*运输费」及数据行');
+    } else {
+      ElMessage.success(`解析成功，共 ${rows.value.length} 行`);
+    }
+  } catch (error) {
+    resetUploadState();
+    uploadRef.value?.clearFiles?.();
+    ElMessage.error(error?.message || '解析失败，请检查文件后重试');
+  } finally {
+    parseLoading.value = false;
+  }
+};
+
+const formatCargoTypeLabel = item =>
+  item?.cargoName || item?.name || item?.typeName || item?.label || '';
+
+const buildCargoTypeTree = cargoTypes => {
+  const flatCargoTypes = [];
+  const collectCargoTypes = list => {
+    (list || []).forEach(item => {
+      flatCargoTypes.push({ ...item, children: undefined });
+      if (item.children?.length) collectCargoTypes(item.children);
+    });
+  };
+  collectCargoTypes(cargoTypes);
+  const nodeMap = new Map();
+  const codeMap = new Map();
+  flatCargoTypes.forEach(item => {
+    const id = item.id ?? item.cargoCode ?? item.code;
+    if (id === undefined || id === null) return;
+    const node = {
+      ...item,
+      id: String(id),
+      cargoName: formatCargoTypeLabel(item),
+      cargoCode: item.cargoCode || item.code || '',
+      parentId: item.parentId === undefined || item.parentId === null ? '' : String(item.parentId),
+      parentCargoCode: item.parentCargoCode || item.parentCode || '',
+      children: [],
+    };
+    nodeMap.set(node.id, node);
+    if (node.cargoCode) codeMap.set(String(node.cargoCode), node);
+  });
+  const rootNodes = [];
+  nodeMap.forEach(node => {
+    const parent =
+      nodeMap.get(node.parentId) ||
+      codeMap.get(String(node.parentCargoCode || '')) ||
+      codeMap.get(String(node.parentId || ''));
+    if (parent && parent !== node && Number(node.typeLevel) !== 1) parent.children.push(node);
+    else rootNodes.push(node);
+  });
+  const normalize = (cargoType, level = 1, parentPath = []) => {
+    if (level > 2) return null;
+    const id = String(cargoType.id);
+    const path = [...parentPath, id];
+    const children =
+      level === 1
+        ? (cargoType.children || []).map(item => normalize(item, level + 1, path)).filter(Boolean)
+        : [];
+    return {
+      ...cargoType,
+      id,
+      cargoName: formatCargoTypeLabel(cargoType),
+      path,
+      leaf: level === 2,
+      children: children.length ? children : undefined,
+    };
+  };
+  return rootNodes.map(item => normalize(item, 1)).filter(Boolean);
+};
+
+const flattenCargoTypeOptions = options => {
+  const result = [];
+  const collect = list =>
+    (list || []).forEach(item => {
+      result.push(item);
+      if (item.children?.length) collect(item.children);
+    });
+  collect(options);
+  return result;
+};
+
+const resolveCargoTypePath = row => {
+  if (Array.isArray(row.cargoTypePath) && row.cargoTypePath.length) return row.cargoTypePath;
+  const current = String(row.cargoType || row.cargoTypeCode || '').trim();
+  if (!current) return [];
+  const matched = cargoTypeFlatOptions.value.find(item =>
+    [item.cargoName, item.name, item.typeName, item.cargoCode, item.code].some(
+      value => String(value || '').trim() === current
+    )
+  );
+  if (matched?.path?.length) return matched.path;
+  return [`custom:${current}`];
+};
+
+const cargoTypeSelectOptions = row => {
+  const path = resolveCargoTypePath(row);
+  const customId = path.find(value => String(value).startsWith('custom:'));
+  if (!customId) return cargoTypeOptions.value;
+  const name = String(customId).slice('custom:'.length);
+  return [{ id: customId, cargoName: name, leaf: true }, ...cargoTypeOptions.value];
+};
+
+const handleCargoTypeChange = (row, value) => {
+  const path = Array.isArray(value) ? value : [];
+  const leafId = path.length ? String(path[path.length - 1]) : '';
+  if (!leafId) {
+    row.cargoTypePath = [];
+    row.cargoType = '';
+    row.cargoTypeCode = '';
+    return;
+  }
+  if (leafId.startsWith('custom:')) {
+    row.cargoTypePath = path;
+    row.cargoType = leafId.slice('custom:'.length);
+    row.cargoTypeCode = '';
+    return;
+  }
+  const cargoType = cargoTypeFlatOptions.value.find(item => String(item.id) === leafId);
+  row.cargoTypePath = cargoType?.path || path;
+  row.cargoType = cargoType?.cargoName || '';
+  row.cargoTypeCode = cargoType?.cargoCode || cargoType?.code || '';
+};
+
+const deleteRow = row => {
+  rows.value = rows.value.filter(item => item !== row);
+  refreshDuplicateFlags();
+};
+
+const removeSelectedRows = () => {
+  const keys = new Set(rowSelection.value.map(row => row._key));
+  rows.value = rows.value.filter(row => !keys.has(row._key));
+  rowSelection.value = [];
+  refreshDuplicateFlags();
+};
+
+const goBack = () => {
+  router.push({ path: '/settlement/settlement-import' });
+};
+
+const leaveAfterConfirm = () => {
+  sessionStorage.setItem(settlementImportListRefreshKey, '1');
+  instance?.proxy?.$router?.$avueRouter?.closeTag?.();
+  router.push({ path: '/settlement/settlement-import' });
+};
+
+const openHistoryWaybillDialog = async row => {
+  if (!form.projectId || !form.customerContractId || !form.carrierContractId) {
+    ElMessage.warning('请先选择项目、客户合同和承运商合同');
+    return;
+  }
+  if (!form.settlementType) {
+    ElMessage.warning('请先选择结算类型');
+    return;
+  }
+  historyWaybillTargetRow.value = row;
+  historyWaybillCurrent.value = null;
+  historyWaybillVisible.value = true;
+  historyWaybillLoading.value = true;
+  try {
+    const response = await api.getHistoryWaybills({
+      projectId: form.projectId,
+      customerContractId: form.customerContractId,
+      carrierContractId: form.carrierContractId,
+      settlementType: form.settlementType,
+    });
+    historyWaybillRows.value = unwrapData(response) || [];
+  } catch (error) {
+    historyWaybillRows.value = [];
+    ElMessage.error(error?.message || '加载历史运单失败');
+  } finally {
+    historyWaybillLoading.value = false;
+  }
+};
+
+const applyHistoryWaybill = waybill => {
+  const target = historyWaybillTargetRow.value;
+  if (!target || !waybill) return;
+  target.waybillNo = waybill.waybillNo || '';
+  target.matchedWaybillId = waybill.id;
+  target.vehicleNo = waybill.vehicleNo || target.vehicleNo;
+  target.departureAddress = waybill.departureAddress || target.departureAddress;
+  target.arrivalAddress = waybill.arrivalAddress || target.arrivalAddress;
+  target.cargoName = waybill.cargoName || target.cargoName;
+  target.cargoType = waybill.cargoType || target.cargoType;
+  target.quantity = waybill.quantity ?? target.quantity;
+  target.quantityUnit = waybill.quantityUnit || target.quantityUnit;
+  target.model = waybill.model || target.model;
+  target.mileage =
+    waybill.mileage === null || waybill.mileage === undefined ? target.mileage : waybill.mileage;
+  target.actualStartDate = waybill.actualStartDate
+    ? dayjs(waybill.actualStartDate).format('YYYY-MM-DD')
+    : target.actualStartDate;
+  target.actualEndDate = waybill.actualEndDate
+    ? dayjs(waybill.actualEndDate).format('YYYY-MM-DD')
+    : target.actualEndDate;
+  target.driverName = waybill.driverName || target.driverName;
+  refreshDuplicateFlags();
+};
+
+const selectHistoryWaybill = row => {
+  applyHistoryWaybill(row);
+  historyWaybillVisible.value = false;
+};
+
+const confirmHistoryWaybill = () => {
+  if (!historyWaybillCurrent.value) {
+    ElMessage.warning('请选择一条运单');
+    return;
+  }
+  applyHistoryWaybill(historyWaybillCurrent.value);
+  historyWaybillVisible.value = false;
+};
+
+const downloadFailureExcel = async failureRows => {
+  const response = await api.exportFailures({
+    feeItemNames: [...feeItemNames.value],
+    rows: failureRows,
+  });
+  const blob = response.data || response;
+  downloadXls(blob, `导入结算单失败明细${dayjs().format('YYYY-MM-DD HH:mm:ss')}.xlsx`);
+};
+
+const collectValidationErrors = async () => {
+  const payload = buildPayload();
+  const response = await api.validate(payload);
+  const result = unwrapData(response) || {};
+  const errorMap = new Map();
+  if (result?.success === false || (Array.isArray(result?.errors) && result.errors.length)) {
+    (result.errors || []).forEach(error => {
+      const index = Number(error.rowIndex);
+      if (Number.isNaN(index) || index < 0 || index >= rows.value.length) return;
+      errorMap.set(index, error.errorMessage || '校验失败');
+    });
+  }
+  return errorMap;
+};
+
+const saveDraft = async () => {
+  await formRef.value?.validateField([
+    'projectId',
+    'settlementType',
+    'settlementBillType',
+    'customerContractId',
+    'carrierContractId',
+  ]);
+  if (!rows.value.length) {
+    ElMessage.warning('请先上传并解析结算单明细');
+    return;
+  }
+  draftLoading.value = true;
+  try {
+    const response = await api.saveDraft(buildPayload());
+    const batch = unwrapData(response) || {};
+    if (batch.id) form.id = batch.id;
+    if (batch.batchNo) form.batchNo = batch.batchNo;
+    ElMessage.success('保存草稿成功');
+    leaveAfterConfirm();
+  } catch (error) {
+    ElMessage.error(error?.message || '保存草稿失败');
+  } finally {
+    draftLoading.value = false;
+  }
+};
+
+const confirmImport = async () => {
+  await formRef.value?.validate();
+  if (!rows.value.length) {
+    ElMessage.warning('请先上传并解析结算单明细');
+    return;
+  }
+  const duplicateCount = rows.value.filter(row => row._duplicate).length;
+  if (duplicateCount) {
+    await ElMessageBox.confirm(
+      `当前导入有${duplicateCount}条疑似重复数据，是否确认导入？`,
+      '提示',
+      { type: 'warning' }
+    );
+  }
+  confirmLoading.value = true;
+  try {
+    const errorMap = await collectValidationErrors();
+    if (errorMap.size) {
+      const failureRows = [...errorMap.entries()]
+        .sort((left, right) => left[0] - right[0])
+        .map(([index, errorMessage]) => ({
+          ...stripInternalRowFields(rows.value[index]),
+          errorMessage,
+        }));
+      await downloadFailureExcel(failureRows);
+      ElMessage.warning('部分数据校验失败，已下载失败明细');
+      return;
+    }
+    const response = await api.confirm(buildPayload());
+    const batch = unwrapData(response) || {};
+    if (batch.batchNo) form.batchNo = batch.batchNo;
+    ElMessage.success('确认导入成功');
+    leaveAfterConfirm();
+  } catch (error) {
+    if (error === 'cancel' || error === 'close') return;
+    ElMessage.error(error?.message || '确认导入失败');
+  } finally {
+    confirmLoading.value = false;
+  }
+};
+
+const loadTransportTypeOptions = async () => {
+  try {
+    // 运输方式取业务字典 transport_type 的字典名称（dictValue），不写死枚举
+    const response = await getDictionary({ code: 'transport_type' });
+    const list = unwrapData(response) || [];
+    transportTypeOptions.value = (Array.isArray(list) ? list : [])
+      .map(item => {
+        const label = String(item.dictValue || item.label || item.name || '').trim();
+        if (!label || String(item.dictKey) === '-1') return null;
+        return { label, value: label };
+      })
+      .filter(Boolean);
+  } catch (error) {
+    transportTypeOptions.value = [];
+  }
+};
+
+const loadCargoTypeOptions = async () => {
+  try {
+    const response = await getCargoTypeList(1, 9999);
+    const body = unwrapData(response) || {};
+    const records = Array.isArray(body) ? body : body.records || body.data || [];
+    cargoTypeOptions.value = buildCargoTypeTree(records);
+    cargoTypeFlatOptions.value = flattenCargoTypeOptions(cargoTypeOptions.value);
+  } catch (error) {
+    cargoTypeOptions.value = [];
+    cargoTypeFlatOptions.value = [];
+  }
+};
+
+const loadOptions = async () => {
+  const response = await api.getOptions();
+  const options = unwrapData(response) || {};
+  projects.value = (options.projects || []).map(normalizeProject).filter(Boolean);
+  await Promise.all([loadTransportTypeOptions(), loadCargoTypeOptions()]);
+};
+
+const loadDetail = async id => {
+  const response = await api.getDetail(id);
+  const detail = unwrapData(response) || {};
+  Object.assign(form, {
+    id: detail.id,
+    batchNo: detail.batchNo || '',
+    projectId: detail.projectId || '',
+    projectName: detail.projectName || '',
+    settlementType: detail.settlementType || '',
+    settlementBillType: detail.settlementBillType || 'formal',
+    customerContractId: detail.customerContractId || '',
+    customerContractName: detail.customerContractName || '',
+    customerName: detail.customerName || '',
+    carrierContractId: detail.carrierContractId || '',
+    carrierContractName: detail.carrierContractName || '',
+    carrierName: detail.carrierName || '',
+    waybillMode: detail.waybillMode || 'new',
+    remark: detail.remark || '',
+    file: null,
+  });
+  if (detail.projectId) {
+    await loadContractsByProject(detail.projectId, detail.projectName || '');
+  }
+  feeItemNames.value = Array.isArray(detail.feeItemNames) ? detail.feeItemNames : [];
+  parsedHeaders.value = [];
+  const detailRows = Array.isArray(detail.rows) ? detail.rows : [];
+  rows.value = detailRows.map((item, index) => normalizeParsedRow(item, index));
+  refreshDuplicateFlags();
+  // 查看模式始终只读；编辑时仅草稿可改，已完成/已作废强制只读
+  readonly.value =
+    route.query.mode === 'view' ||
+    Boolean(detail.importStatus && detail.importStatus !== 'draft');
+};
+
+const initPage = async () => {
+  await loadOptions();
+  const id = route.query.id;
+  if (route.query.mode === 'view') {
+    readonly.value = true;
+  }
+  if (id) {
+    await loadDetail(id);
+    return;
+  }
+  try {
+    const codeResponse = await api.getNextCode();
+    form.batchNo = unwrapData(codeResponse) || '';
+  } catch (error) {
+    form.batchNo = '';
+  }
+};
+
+onMounted(() => {
+  initPage().catch(error => {
+    ElMessage.error(error?.message || '页面初始化失败');
+  });
+});
+</script>
+
+<style scoped lang="scss">
+.settlement-import-create {
+  padding: 16px 24px 24px;
+  background: #fff;
+}
+
+.settlement-import-create__form-panel {
+  margin-bottom: 8px;
+}
+
+.settlement-import-create__form :deep(.el-form-item) {
+  margin-bottom: 16px;
+}
+
+.settlement-import-create__waybill-mode :deep(.el-form-item__label) {
+  display: inline-flex;
+  align-items: center;
+  gap: 4px;
+}
+
+.settlement-import-create__label-tip {
+  color: #909399;
+  cursor: help;
+  font-size: 14px;
+}
+
+.settlement-import-create__upload {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  gap: 12px;
+}
+
+.settlement-import-create__upload-tip {
+  color: #909399;
+  font-size: 12px;
+}
+
+.settlement-import-create__detail-panel {
+  margin-top: 8px;
+}
+
+.settlement-import-create__detail-head {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-bottom: 8px;
+}
+
+.dialog-section-title {
+  position: relative;
+  padding-left: 12px;
+  color: #303133;
+  font-size: 16px;
+  font-weight: 600;
+
+  &::before {
+    position: absolute;
+    top: 2px;
+    left: 0;
+    width: 4px;
+    height: 16px;
+    border-radius: 2px;
+    background: #409eff;
+    content: '';
+  }
+}
+
+.settlement-import-create__table {
+  --el-table-border-color: #eff1f7;
+}
+
+.settlement-import-create__table :deep(.el-table__body tr:nth-child(even) > td.el-table__cell),
+.settlement-import-create__table
+  :deep(.el-table__body tr:nth-child(even) > td.el-table-fixed-column--left),
+.settlement-import-create__table
+  :deep(.el-table__body tr:nth-child(even) > td.el-table-fixed-column--right) {
+  background: #fafafa;
+}
+
+.settlement-import-create__table :deep(.is-duplicate-row > td.el-table__cell) {
+  background: #fef0f0 !important;
+}
+
+.settlement-import-create__row-actions {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 8px;
+}
+
+.settlement-import-create__footer {
+  display: flex;
+  justify-content: flex-end;
+  gap: 8px;
+  margin-top: 16px;
+  padding-top: 16px;
+  border-top: 1px solid #eff1f7;
+}
+
+.settlement-import-create__waybill-select {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+}
+
+.settlement-import-create__history-tip {
+  margin-bottom: 8px;
+  color: #909399;
+  font-size: 13px;
+}
+</style>
diff --git a/src/views/settlement/components/transport-reconciliation-editor.vue b/src/views/settlement/components/transport-reconciliation-editor.vue
index bcee540..1619e92 100644
--- a/src/views/settlement/components/transport-reconciliation-editor.vue
+++ b/src/views/settlement/components/transport-reconciliation-editor.vue
@@ -263,7 +263,7 @@
               <template v-else-if="isExternalRowEditing(row) && isExternalEditableColumn(column.prop)">
                 <el-input-number
                   v-if="column.feeItemName"
-                  v-model="row.feeItems[column.feeItemName]"
+                  v-model="externalEditTarget(row).feeItems[column.feeItemName]"
                   :min="0"
                   :precision="2"
                   :controls="false"
@@ -271,7 +271,7 @@
                 />
                 <el-date-picker
                   v-else-if="isExternalDateColumn(column.prop)"
-                  v-model="row[column.prop]"
+                  v-model="externalEditTarget(row)[column.prop]"
                   type="date"
                   value-format="YYYY-MM-DD"
                   format="YYYY-MM-DD"
@@ -280,7 +280,7 @@
                 />
                 <el-input-number
                   v-else-if="isExternalNumberColumn(column.prop)"
-                  v-model="row[column.prop]"
+                  v-model="externalEditTarget(row)[column.prop]"
                   :min="0"
                   :precision="2"
                   :controls="false"
@@ -288,7 +288,7 @@
                 />
                 <el-select
                   v-else-if="column.prop === 'transportType'"
-                  v-model="row[column.prop]"
+                  v-model="externalEditTarget(row)[column.prop]"
                   size="small"
                   clearable
                   placeholder="请选择"
@@ -300,7 +300,7 @@
                     :value="item.value"
                   />
                 </el-select>
-                <el-input v-else v-model="row[column.prop]" size="small" />
+                <el-input v-else v-model="externalEditTarget(row)[column.prop]" size="small" />
               </template>
               <span v-else-if="column.prop === 'transportType'">
                 {{ transportTypeLabel(row.transportType) }}
@@ -508,7 +508,7 @@
               <span class="completion-dialog__value">{{ displayValue(form.reconciliationNo) }}</span>
             </div>
             <div class="completion-dialog__field">
-              <span class="completion-dialog__label">预结算单号</span>
+              <span class="completion-dialog__label">预付结算单号</span>
               <span class="completion-dialog__value">{{
                 displayValue(form.preSettlementNo || form.formalSettlementNo)
               }}</span>
@@ -630,6 +630,7 @@ import { getDictionary } from '@/api/system/dictbiz';
 import { Search } from '@element-plus/icons-vue';
 import { h } from 'vue';
 import { downloadXls } from '@/utils/util';
+import { isExcelResponse, parseBlobJson } from '@/utils/import-excel';
 import { transportReconciliationFormFields } from '@/option/settlement/transportReconciliationForm';
 import {
   internalColumns,
@@ -676,6 +677,8 @@ export default {
       completionDialog: { visible: false, loading: false },
       completionSummaryRowsData: null,
       externalEditing: {},
+      // 调整中的草稿，输入只改草稿，点「完成」才写回列表
+      externalEditDrafts: {},
       externalEditSnapshots: {},
       matchingStarted: false,
       rules: {
@@ -932,6 +935,7 @@ export default {
       this.internalDetails = [];
       this.externalDetails = [];
       this.externalEditing = {};
+      this.externalEditDrafts = {};
       this.externalEditSnapshots = {};
       this.completionSummaryRowsData = null;
       this.matchingStarted = false;
@@ -1278,10 +1282,13 @@ export default {
         delete snapshot._externalKey;
         delete snapshot.feeItems;
         snapshot.feeItemsJson = row.feeItemsJson || JSON.stringify(row.feeItems || {});
+        snapshot.actualDepartureTime = this.normalizeExternalDateTime(row.actualDepartureTime);
+        snapshot.actualCompletionTime = this.normalizeExternalDateTime(row.actualCompletionTime);
         return snapshot;
       });
     },
     serializeExternalRows() {
+      const duplicateIds = new Set(this.duplicateRows.map(row => String(row.id)));
       return this.externalDetails.map(row => {
         const snapshot = { ...row };
         delete snapshot._sourceRows;
@@ -1290,6 +1297,7 @@ export default {
         snapshot.feeItemsJson = row.feeItemsJson || JSON.stringify(row.feeItems || {});
         snapshot.actualDepartureTime = this.normalizeExternalDateTime(row.actualDepartureTime);
         snapshot.actualCompletionTime = this.normalizeExternalDateTime(row.actualCompletionTime);
+        snapshot.suspectedDuplicate = duplicateIds.has(String(row.id));
         return snapshot;
       });
     },
@@ -1336,6 +1344,11 @@ export default {
       }
     },
     async handleComplete() {
+      const unmatchedInternal = this.internalDetails.filter(item => item.matchResult !== 'matched').length;
+      const unmatchedExternal = this.externalDetails.filter(item => item.matchStatus !== 'matched').length;
+      if (this.duplicateRows.length || unmatchedInternal || unmatchedExternal) {
+        return this.$message.warning('所有内外部账单明细必须一一匹配且不存在疑似重复');
+      }
       if (
         Number(this.form.differenceCount || 0) !== 0 ||
         Number(this.form.differenceQuantity || 0) !== 0 ||
@@ -1494,16 +1507,16 @@ export default {
           this.form.reconciliationMode === 'cargo'
             ? await api.importCargo(this.currentId, file)
             : await api.importVehicle(this.currentId, file);
-        const contentType = response.headers?.['content-type'] || response.data?.type || '';
-        if (contentType.includes('spreadsheetml') || contentType.includes('ms-excel')) {
+        // 成功时 axios 拦截器可能已把 JSON Blob 解析成对象，不能再调 .text()
+        if (isExcelResponse(response)) {
           downloadXls(
             response.data,
             `运输对账导入失败明细${this.$dayjs().format('YYYY-MM-DD HH-mm-ss')}.xlsx`
           );
           this.$message.warning('部分数据导入失败，已下载失败明细');
         } else {
-          const result = JSON.parse(await response.data.text());
-          if (result.code !== 200) throw new Error(result.msg || '导入失败');
+          const result = await parseBlobJson(response.data);
+          if (Number(result.code) !== 200) throw new Error(result.msg || '导入失败');
           this.$message.success('外部账单导入成功');
         }
         this.matchingStarted = false;
@@ -1652,6 +1665,28 @@ export default {
     isExternalRowEditing(row) {
       return Boolean(this.externalEditing[this.externalRowKey(row)]);
     },
+    cloneExternalEditRow(row) {
+      return {
+        ...row,
+        feeItems: { ...(row.feeItems || this.parseFeeItems(row.feeItemsJson)) },
+      };
+    },
+    /** 编辑态绑定草稿，避免输入时实时改写列表导致疑似重复 Tab 刷新 */
+    externalEditTarget(row) {
+      const key = this.externalRowKey(row);
+      return this.externalEditDrafts[key] || row;
+    },
+    clearExternalEditState(key) {
+      const editing = { ...this.externalEditing };
+      const drafts = { ...this.externalEditDrafts };
+      const snapshots = { ...this.externalEditSnapshots };
+      delete editing[key];
+      delete drafts[key];
+      delete snapshots[key];
+      this.externalEditing = editing;
+      this.externalEditDrafts = drafts;
+      this.externalEditSnapshots = snapshots;
+    },
     isExternalEditableColumn(prop) {
       return !['externalLineNo', 'matchStatus'].includes(prop);
     },
@@ -1663,39 +1698,38 @@ export default {
     },
     openExternalAdjust(row) {
       const key = this.externalRowKey(row);
+      const draft = this.cloneExternalEditRow(row);
       this.externalEditSnapshots = {
         ...this.externalEditSnapshots,
-        [key]: { ...row },
+        [key]: this.cloneExternalEditRow(row),
       };
+      this.externalEditDrafts = { ...this.externalEditDrafts, [key]: draft };
       this.externalEditing = { ...this.externalEditing, [key]: true };
     },
     cancelExternalAdjust(row) {
-      const key = this.externalRowKey(row);
-      const snapshot = this.externalEditSnapshots[key];
-      if (snapshot) Object.assign(row, snapshot);
-      const editing = { ...this.externalEditing };
-      const snapshots = { ...this.externalEditSnapshots };
-      delete editing[key];
-      delete snapshots[key];
-      this.externalEditing = editing;
-      this.externalEditSnapshots = snapshots;
+      this.clearExternalEditState(this.externalRowKey(row));
     },
     async finishExternalAdjust(row) {
-      row.feeItemsJson = JSON.stringify(row.feeItems || {});
       const key = this.externalRowKey(row);
-      const editing = { ...this.externalEditing };
-      const snapshots = { ...this.externalEditSnapshots };
-      delete editing[key];
-      delete snapshots[key];
-      this.externalEditing = editing;
-      this.externalEditSnapshots = snapshots;
+      const draft = this.externalEditDrafts[key];
+      if (draft) {
+        const feeItems = { ...(draft.feeItems || {}) };
+        Object.assign(row, draft, { feeItems });
+        row.feeItemsJson = JSON.stringify(feeItems);
+      } else {
+        row.feeItemsJson = JSON.stringify(row.feeItems || {});
+      }
+      this.clearExternalEditState(key);
       this.refreshLocalStats();
-      this.$message.success('调整已暂存');
+      this.$message.success('调整已暂存，匹配或完成对账后生效');
     },
     normalizeExternalDateTime(value) {
       if (!value) return null;
-      const text = String(value);
-      return text.length === 10 ? `${text}T00:00:00` : text;
+      const text = String(value).trim();
+      if (!text) return null;
+      const date = this.$dayjs(text);
+      if (date.isValid()) return date.format('YYYY-MM-DD HH:mm:ss');
+      return text.length === 10 ? `${text} 00:00:00` : text.replace('T', ' ');
     },
     refreshLocalStats() {
       const internalQuantity = this.internalDetails.reduce(
@@ -1731,7 +1765,8 @@ export default {
         differenceQuantity: Math.abs(internalQuantity - externalQuantity),
         differenceAmount: Math.abs(internalAmount - externalAmount),
         matchedCount,
-        unmatchedCount: internalUnmatched + externalUnmatched,
+        // 无法匹配按内部账单条数统计，不叠加外部未匹配数
+        unmatchedCount: internalUnmatched,
         matchStatus:
           this.internalDetails.length > 0 &&
           this.internalDetails.length === this.externalDetails.length &&
diff --git a/src/views/settlement/formal-settlement-form.vue b/src/views/settlement/formal-settlement-form.vue
index 7986b38..0a8f33f 100644
--- a/src/views/settlement/formal-settlement-form.vue
+++ b/src/views/settlement/formal-settlement-form.vue
@@ -16,6 +16,7 @@
 <script>
 import FormalSettlementEditor from './components/formal-settlement-editor.vue';
 import { readSettlementTransfer, removeSettlementTransfer } from '@/utils/settlement-transfer';
+import { settlementBillLabel, settlementListPath } from '@/utils/settlement-menu';
 
 const LIST_REFRESH_KEY = 'formal-settlement-list-refresh';
 
@@ -35,12 +36,25 @@ export default {
     readonly() {
       return this.$route.query.mode === 'view';
     },
+    settlementType() {
+      return this.$route.query.settlementType || this.transferPayload?.settlementType || 'payable';
+    },
+    billLabel() {
+      return settlementBillLabel(this.settlementType);
+    },
     pageTitle() {
-      return this.readonly ? '查看正式结算' : this.recordId ? '编辑正式结算' : '新增正式结算';
+      return this.readonly
+        ? `查看${this.billLabel}`
+        : this.recordId
+        ? `编辑${this.billLabel}`
+        : `新增${this.billLabel}`;
+    },
+    listPath() {
+      return this.$route.query.listPath || settlementListPath(this.settlementType);
     },
     editorInitialData() {
-      const settlementType = this.$route.query.settlementType;
-      if (!this.transferPayload && !settlementType) return null;
+      const settlementType = this.settlementType;
+      if (!this.transferPayload && !this.$route.query.settlementType) return null;
       return {
         ...(this.transferPayload || {}),
         ...(settlementType ? { settlementType } : {}),
@@ -63,7 +77,7 @@ export default {
     goBack() {
       removeSettlementTransfer(this.$route.query.transferToken);
       this.$router.$avueRouter.closeTag();
-      this.$router.push('/settlement/formal-settlement');
+      this.$router.push(this.listPath);
     },
     syncTagTitle() {
       this.$nextTick(() => {
diff --git a/src/views/settlement/formal-settlement.vue b/src/views/settlement/formal-settlement.vue
index b65d98c..742cdb7 100644
--- a/src/views/settlement/formal-settlement.vue
+++ b/src/views/settlement/formal-settlement.vue
@@ -1,110 +1,39 @@
 <template>
   <basic-container class="formal-page">
-    <section v-show="searchVisible" class="formal-page__search">
-      <el-form :model="query" label-position="right" label-width="88px" @submit.prevent>
-        <div class="formal-page__search-grid">
-          <el-form-item v-for="field in visibleSearchFields" :key="field.prop" :label="field.label">
-            <el-date-picker
-              v-if="field.type === 'daterange'"
-              v-model="query[field.prop]"
-              type="daterange"
-              value-format="YYYY-MM-DD"
-              format="YYYY-MM-DD"
-              range-separator="~"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-            />
-            <el-select
-              v-else-if="field.type === 'select'"
-              v-model="query[field.prop]"
-              clearable
-              placeholder="请选择"
-            >
-              <el-option
-                v-for="item in field.options"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-            <el-cascader
-              v-else-if="field.type === 'cascader'"
-              v-model="query[field.prop]"
-              :options="organizationTreeOptions"
-              :props="organizationCascaderProps"
-              clearable
-              filterable
-              style="width: 100%"
-              placeholder="请选择"
-            />
-            <el-input v-else v-model="query[field.prop]" clearable placeholder="请输入" />
-          </el-form-item>
-          <div class="formal-page__search-actions">
-            <el-button type="primary" @click="handleSearch">查询</el-button>
-            <el-button @click="resetSearch">重置</el-button>
-            <el-button text :icon="searchExpanded ? ArrowUp : ArrowDown" @click="toggleSearch">
-              {{ searchExpanded ? '收起' : '展开' }}
-            </el-button>
-          </div>
-        </div>
-      </el-form>
-    </section>
-
-    <section class="formal-page__table-panel">
-      <el-tabs
-        type="border-card"
-        v-model="activeSettlementType"
-        @tab-change="handleSettlementTypeChange"
-      >
-        <el-tab-pane label="应付" name="payable">
-          <formal-settlement-table-panel
-            :key="activeSettlementType"
-            :rows="rows"
-            :columns="columns"
-            :loading="loading"
-            :page="page"
-            :has-permission="hasPermissionFn"
-            :sync-loading="syncLoading"
-            :mk-enabled="mkEnabled"
-            v-model:search-visible="searchVisible"
-            @create="openCreate"
-            @payment="openPaymentDialog"
-            @sync="handleSync"
-            @export="handleExport"
-            @refresh="loadTable"
-            @page-change="onPageChange"
-            @action="onAction"
-            @update:selection="selection = $event"
-          />
-        </el-tab-pane>
-        <el-tab-pane label="应收" name="receivable">
-          <formal-settlement-table-panel
-            :key="activeSettlementType"
-            :rows="rows"
-            :columns="columns"
-            :loading="loading"
-            :page="page"
-            :has-permission="hasPermissionFn"
-            :sync-loading="syncLoading"
-            :mk-enabled="mkEnabled"
-            v-model:search-visible="searchVisible"
-            @create="openCreate"
-            @payment="openPaymentDialog"
-            @sync="handleSync"
-            @export="handleExport"
-            @refresh="loadTable"
-            @page-change="onPageChange"
-            @action="onAction"
-            @update:selection="selection = $event"
-          />
-        </el-tab-pane>
-      </el-tabs>
-    </section>
+    <el-tabs
+      v-if="!lockedSettlementType"
+      type="border-card"
+      v-model="activeSettlementType"
+      @tab-change="handleSettlementTypeChange"
+    >
+      <el-tab-pane label="应付" name="payable">
+        <formal-settlement-table-panel
+          v-if="activeSettlementType === 'payable'"
+          key="payable"
+          v-bind="tablePanelProps"
+          v-on="tablePanelListeners"
+        />
+      </el-tab-pane>
+      <el-tab-pane label="应收" name="receivable">
+        <formal-settlement-table-panel
+          v-if="activeSettlementType === 'receivable'"
+          key="receivable"
+          v-bind="tablePanelProps"
+          v-on="tablePanelListeners"
+        />
+      </el-tab-pane>
+    </el-tabs>
+    <formal-settlement-table-panel
+      v-else
+      key="locked"
+      v-bind="tablePanelProps"
+      v-on="tablePanelListeners"
+    />
     <formal-settlement-editor
       v-model="editor.visible"
       :record-id="editor.id"
       :readonly="editor.readonly"
-      @success="loadTable"
+      @success="onLoad(page)"
     />
     <el-dialog
       v-model="paymentDialog.visible"
@@ -116,7 +45,7 @@
       <section-card title="付款信息">
         <template v-if="paymentDialog.rows.length > 1">
           <div class="formal-payment-dialog__batch-tip">
-            已选择 {{ paymentDialog.rows.length }} 条同合同应付正式结算单，请确认各单申请金额。
+            已选择 {{ paymentDialog.rows.length }} 条同合同付款结算单，请确认各单申请金额。
           </div>
           <el-table :data="paymentDialog.rows" border>
             <el-table-column prop="formalSettlementNo" label="结算单号" min-width="160" />
@@ -173,58 +102,46 @@
 </template>
 
 <script>
-import { ArrowDown, ArrowUp } from '@element-plus/icons-vue';
 import { mapGetters } from 'vuex';
 import { createSettlementTransfer } from '@/utils/settlement-transfer';
+import {
+  hasSettlementPermission,
+  settlementBillLabel,
+  settlementListPath,
+} from '@/utils/settlement-menu';
+import { isAdministrator } from '@/utils/auth';
 import { downloadFile } from '@/utils/util';
 import * as api from '@/api/settlement/formalSettlement';
 import * as paymentApi from '@/api/payment/paymentApplication';
-import {
-  invoiceStatusName,
-  formalSettlementSearchFields,
-  paymentStatusOptions,
-} from '@/option/settlement/formalSettlementSearch';
+import { formalSettlementOption } from '@/option/settlement/formalSettlement';
 import organizationSearch from '@/mixins/organization-search';
-import { formalSettlementTableColumns } from '@/option/settlement/formalSettlementTable';
 import FormalSettlementEditor from './components/formal-settlement-editor.vue';
 import FormalSettlementTablePanel from './components/formal-settlement-table-panel.vue';
 import { submitMkApprovalFlow, loadMkEnabled } from '@/utils/mk-approval';
 import { getMKApprovalUrl } from '@/api/system/business-process';
 
-const emptyQuery = () => ({
-  formalSettlementNo: '',
-  preSettlementNo: '',
-  projectName: '',
-  deptName: [],
-  contractNo: '',
-  payerName: '',
-  payeeName: '',
-  invoiceStatus: '',
-  paymentStatus: '',
-  approvalStatus: '',
-  kingdeeSyncStatus: '',
-  createDateRange: [],
-});
-
 export default {
   name: 'FormalSettlement',
   components: { FormalSettlementEditor, FormalSettlementTablePanel },
   mixins: [organizationSearch],
+  props: {
+    /** 菜单拆分后锁定结算类型：payable=付款结算单，receivable=收款结算单 */
+    lockedSettlementType: {
+      type: String,
+      default: '',
+      validator: value => ['', 'payable', 'receivable'].includes(value),
+    },
+  },
   data() {
     return {
-      ArrowDown,
-      ArrowUp,
-      query: emptyQuery(),
-      searchExpanded: false,
-      searchVisible: true,
+      option: formalSettlementOption(),
+      query: {},
       activeSettlementType: 'payable',
-      searchFields: formalSettlementSearchFields,
-      columns: formalSettlementTableColumns,
       rows: [],
       selection: [],
       loading: false,
       syncLoading: false,
-      page: { current: 1, size: 10, total: 0 },
+      page: { currentPage: 1, pageSize: 10, pageSizes: [10, 20, 50, 100], total: 0 },
       editor: { visible: false, id: null, readonly: false },
       paymentDialog: {
         visible: false,
@@ -237,25 +154,78 @@ export default {
     };
   },
   computed: {
-    ...mapGetters(['permission']),
-    hasPermissionFn() {
-      return code => this.permission?.[code] !== false;
+    ...mapGetters(['permission', 'userInfo']),
+    isAdmin() {
+      return isAdministrator(this.userInfo);
     },
-    visibleSearchFields() {
-      return this.searchExpanded ? this.searchFields : this.searchFields.slice(0, 4);
+    billLabel() {
+      return settlementBillLabel(this.activeSettlementType);
+    },
+    hasPermissionFn() {
+      return actionOrCode => {
+        const action = String(actionOrCode || '').replace(
+          /^(payment_settlement_|receipt_settlement_|formal_settlement_)/,
+          ''
+        );
+        return hasSettlementPermission(this, this.activeSettlementType, action);
+      };
+    },
+    tablePanelProps() {
+      return {
+        option: this.option,
+        rows: this.rows,
+        loading: this.loading,
+        page: this.page,
+        hasPermission: this.hasPermissionFn,
+        syncLoading: this.syncLoading,
+        mkEnabled: this.mkEnabled,
+        showPaymentAction: this.activeSettlementType === 'payable',
+        billLabel: this.billLabel,
+      };
+    },
+    tablePanelListeners() {
+      return {
+        create: this.openCreate,
+        payment: this.openPaymentDialog,
+        sync: this.handleSync,
+        export: this.handleExport,
+        refresh: () => this.onLoad(this.page),
+        load: this.onLoad,
+        action: this.onAction,
+        'search-change': this.searchChange,
+        'search-reset': this.searchReset,
+        'update:selection': selection => {
+          this.selection = selection;
+        },
+      };
     },
     paymentAvailable() {
       return this.paymentRemaining(this.paymentDialog.row);
     },
   },
   watch: {
+    lockedSettlementType: {
+      immediate: true,
+      handler(value) {
+        if (value === 'payable' || value === 'receivable') {
+          this.activeSettlementType = value;
+        }
+      },
+    },
+    activeSettlementType() {
+      // 切换结算类型后由新挂载的 avue-crud 触发 on-load，此处只重置分页，避免重复请求
+      this.page.currentPage = 1;
+    },
     '$route.query.detailNo'(detailNo) {
       if (detailNo) this.openRouteDetail(detailNo);
     },
   },
-  mounted() {
+  created() {
+    // 标签机制按 fullPath 缓存同页多实例：仅当前路由实例应响应 detailNo 跳转，防止缓存旧实例也弹窗
+    this.ownFullPath = this.$route.fullPath;
     this.loadOrganizationOptions();
-    this.loadTable();
+  },
+  mounted() {
     this.openRouteDetail();
     loadMkEnabled()
       .then(enabled => {
@@ -268,18 +238,18 @@ export default {
   activated() {
     if (sessionStorage.getItem('formal-settlement-list-refresh') === '1') {
       sessionStorage.removeItem('formal-settlement-list-refresh');
-      this.loadTable();
+      this.onLoad(this.page);
     }
   },
   methods: {
-    hasPermission(code) {
-      return this.permission?.[code] !== false;
+    hasPermission(actionOrCode) {
+      return this.hasPermissionFn(actionOrCode);
     },
-    async loadTable() {
+    async onLoad(page) {
       this.loading = true;
       try {
         const params = this.buildQueryParams();
-        const response = await api.getList(this.page.current, this.page.size, params);
+        const response = await api.getList(page.currentPage, page.pageSize, params);
         const data = this.unwrapData(response);
         this.rows = data.records || [];
         this.page.total = data.total || 0;
@@ -287,25 +257,24 @@ export default {
         this.loading = false;
       }
     },
-    handleSearch() {
-      this.page.current = 1;
-      this.loadTable();
+    searchChange(params, done) {
+      // 所属组织级联返回 id 路径，转成组织名称传给后端
+      this.normalizeOrganizationSearch(params, 'deptName');
+      const range = params.createDateRange || [];
+      delete params.createDateRange;
+      this.query = {
+        ...params,
+        createStartDate: range[0] || '',
+        createEndDate: range[1] || '',
+      };
+      this.page.currentPage = 1;
+      this.onLoad(this.page);
+      done();
     },
-    resetSearch() {
-      this.query = emptyQuery();
-      this.handleSearch();
-    },
-    toggleSearch() {
-      this.searchExpanded = !this.searchExpanded;
-    },
-    handleSizeChange() {
-      this.page.current = 1;
-      this.loadTable();
-    },
-    onPageChange({ current, size }) {
-      this.page.current = current;
-      this.page.size = size;
-      this.loadTable();
+    searchReset() {
+      this.query = {};
+      this.page.currentPage = 1;
+      this.onLoad(this.page);
     },
     onAction({ type, row }) {
       const handlers = {
@@ -326,15 +295,23 @@ export default {
         path: '/settlement/formal-settlement/form',
         query: {
           mode: 'add',
-          name: '新增正式结算',
+          name: `新增${this.billLabel}`,
           settlementType: this.activeSettlementType,
+          listPath: settlementListPath(this.activeSettlementType),
         },
       });
     },
     openEdit(row) {
+      const settlementType = row.settlementType || this.activeSettlementType;
       this.$router.push({
         path: '/settlement/formal-settlement/form',
-        query: { mode: 'edit', id: row.id, name: '编辑正式结算' },
+        query: {
+          mode: 'edit',
+          id: row.id,
+          name: `编辑${settlementBillLabel(settlementType)}`,
+          settlementType,
+          listPath: settlementListPath(settlementType),
+        },
       });
     },
     openView(row) {
@@ -342,25 +319,27 @@ export default {
     },
     async openRouteDetail(detailNo = this.$route.query.detailNo) {
       const formalSettlementNo = String(detailNo || '').trim();
-      if (!formalSettlementNo) return;
+      if (!formalSettlementNo || this.ownFullPath !== this.$route.fullPath) return;
       const response = await api.getList(1, 10, { formalSettlementNo });
       const data = this.unwrapData(response);
       const row = (data.records || []).find(item => item.formalSettlementNo === formalSettlementNo);
       if (!row) {
-        this.$message.warning('未找到对应的正式结算单');
+        this.$message.warning(`未找到对应的${this.billLabel}`);
         return;
       }
-      this.activeSettlementType = row.settlementType || this.activeSettlementType;
+      if (!this.lockedSettlementType) {
+        this.activeSettlementType = row.settlementType || this.activeSettlementType;
+      }
       this.openView(row);
     },
     async handleDelete(row) {
-      await this.$confirm('确认删除该正式结算草稿？', '提示', { type: 'warning' });
+      await this.$confirm(`确认删除该${this.billLabel}草稿？`, '提示', { type: 'warning' });
       await api.remove(row.id);
       this.$message.success('删除成功');
-      this.loadTable();
+      this.onLoad(this.page);
     },
     async handleSubmit(row) {
-      await this.$confirm('提交后来源预结算将保持锁定，确认提交？', '提示', { type: 'warning' });
+      await this.$confirm('提交后来源预付结算单将保持锁定，确认提交？', '提示', { type: 'warning' });
       const previousApprovalStatus = row.approvalStatus || '';
       await api.submit({ id: row.id });
       await submitMkApprovalFlow({
@@ -368,13 +347,14 @@ export default {
         bizId: row.id,
         subjectName: row.formalSettlementNo || '',
         approvalStatus: previousApprovalStatus,
+        mkEnabled: this.mkEnabled,
       });
       this.$message.success('提交成功');
-      this.loadTable();
+      this.onLoad(this.page);
     },
     handleMkAudit(row) {
       if (!row?.id) {
-        this.$message.warning('正式结算单ID为空，无法打开审核页');
+        this.$message.warning(`${this.billLabel}ID为空，无法打开审核页`);
         return;
       }
       getMKApprovalUrl({ bizId: String(row.id) })
@@ -392,7 +372,7 @@ export default {
     },
     async handleApprove(row) {
       await this.$confirm(
-        '审核通过后正式结算生效，金额只能通过结算调整单处理，确认通过？',
+        `审核通过后${this.billLabel}生效，金额只能通过结算调整单处理，确认通过？`,
         '提示',
         { type: 'warning' }
       );
@@ -403,7 +383,7 @@ export default {
       } else {
         this.$message.success(res.data.msg || '审批通过');
       }
-      this.loadTable();
+      this.onLoad(this.page);
     },
     async handleReturn(row) {
       const { value } = await this.$prompt('请输入驳回原因', '审批驳回', {
@@ -411,58 +391,92 @@ export default {
       });
       await api.returnBill({ id: row.id, reason: value });
       this.$message.success('已驳回');
-      this.loadTable();
+      this.onLoad(this.page);
     },
     async handleVoid(row) {
-      const { value } = await this.$prompt('请输入作废原因', '作废正式结算单', {
+      const { value } = await this.$prompt('请输入作废原因', `作废${this.billLabel}`, {
         inputValidator: value => Boolean(value?.trim()) || '请输入作废原因',
       });
       await api.voidBill({ id: row.id, reason: value });
       this.$message.success('已作废');
-      this.loadTable();
+      this.onLoad(this.page);
     },
     selectedOne(action) {
       if (this.selection.length !== 1) {
-        this.$message.warning(`${action}需选择一条正式结算单`);
+        this.$message.warning(`${action}需选择一条${this.billLabel}`);
         return null;
       }
       return this.selection[0];
     },
     async handleSync() {
       if (this.syncLoading) return;
-      const row = this.selectedOne('同步金蝶');
-      if (!row) return;
-
+      const rows = (this.selection || []).filter(row => row.approvalStatus === 'approved');
+      if (!rows.length) {
+        this.$message.warning(`请选择至少一条审批通过的${this.billLabel}`);
+        return;
+      }
       this.syncLoading = true;
       try {
-        const response = await api.syncKingdee(row.id);
-        const data = this.unwrapData(response);
-        this.$message.success(`同步成功，金蝶单据号：${data}`);
-        await this.loadTable();
-        // 附件联带同步提示：同步成功但附件未全部上传时追加 warning，重推即自动补传
-        const freshRow = (this.rows || []).find(item => String(item.id) === String(row.id));
-        if (freshRow && ['pending', 'partial'].includes(freshRow.attachmentSyncStatus)) {
-          this.$message({
-            type: 'warning',
-            message: '该单附件未全部上传，可重推补传',
-            duration: 8000,
-          });
+        let successCount = 0;
+        let failCount = 0;
+        let lastFailReason = '';
+        for (const row of rows) {
+          try {
+            await api.syncKingdee(row.id, { meta: { suppressErrorMessage: true } });
+            successCount += 1;
+          } catch (error) {
+            failCount += 1;
+            lastFailReason = String(error?.message || error || '未知错误').trim() || '未知错误';
+          }
         }
+        await this.onLoad(this.page);
+        if (rows.length === 1) {
+          if (failCount) {
+            await this.$alert(`同步失败，${lastFailReason}`, '同步结果', {
+              type: 'error',
+              confirmButtonText: '知道了',
+            });
+          } else {
+            let message = '同步成功';
+            const freshRow = (this.rows || []).find(item => String(item.id) === String(rows[0].id));
+            if (freshRow && ['pending', 'partial'].includes(freshRow.attachmentSyncStatus)) {
+              message += '\n该单附件未全部上传，可重推补传';
+            }
+            await this.$alert(message, '同步结果', {
+              type: 'success',
+              confirmButtonText: '知道了',
+            });
+          }
+          return;
+        }
+        let batchMessage = `完成同步${successCount}条，失败${failCount}条`;
+        const idSet = new Set(rows.map(row => String(row.id)));
+        const pendingCount = (this.rows || []).filter(
+          row =>
+            idSet.has(String(row.id)) && ['pending', 'partial'].includes(row.attachmentSyncStatus)
+        ).length;
+        if (pendingCount) {
+          batchMessage += `\n其中${pendingCount}单附件未全部上传，可重推补传`;
+        }
+        await this.$alert(batchMessage, '同步结果', {
+          type: failCount ? 'warning' : 'success',
+          confirmButtonText: '知道了',
+        });
       } finally {
         this.syncLoading = false;
       }
     },
     async openPaymentDialog() {
-      if (!this.selection.length) return this.$message.warning('请至少选择一条正式结算单');
+      if (!this.selection.length) return this.$message.warning(`请至少选择一条${this.billLabel}`);
       const rows = this.selection;
       if (rows.some(row => row.approvalStatus !== 'approved' || row.settlementType !== 'payable'))
-        return this.$message.warning('仅审批通过的应付正式结算单允许发起付款申请');
+        return this.$message.warning('仅审批通过的付款结算单允许发起付款申请');
       const contractIds = new Set(rows.map(row => String(row.contractId || '')));
       if (contractIds.size !== 1 || contractIds.has(''))
-        return this.$message.warning('付款申请必须选择同一个合同的正式结算单');
+        return this.$message.warning('付款申请必须选择同一个合同的付款结算单');
       const paymentRows = rows.map(row => ({ ...row, appliedAmount: this.paymentRemaining(row) }));
       if (paymentRows.some(row => row.appliedAmount <= 0))
-        return this.$message.warning('所选正式结算单均须存在剩余可申请金额');
+        return this.$message.warning('所选付款结算单均须存在剩余可申请金额');
       try {
         const sourceFormalSettlements = await Promise.all(
           paymentRows.map(async row => {
@@ -498,7 +512,7 @@ export default {
           })
         );
         if (sourceFormalSettlements.some(row => row.appliedAmount <= 0)) {
-          this.$message.warning('所选正式结算单均须存在剩余可申请金额');
+          this.$message.warning('所选付款结算单均须存在剩余可申请金额');
           return;
         }
         const transferToken = createSettlementTransfer({
@@ -518,7 +532,7 @@ export default {
       const paymentRows = this.paymentDialog.rows;
       if (paymentRows.length > 1) {
         if (paymentRows.some(row => Number(row.appliedAmount || 0) <= 0))
-          return this.$message.warning('请输入各正式结算单的申请付款金额');
+          return this.$message.warning('请输入各付款结算单的申请付款金额');
         if (paymentRows.some(row => Number(row.appliedAmount) > this.paymentRemaining(row)))
           return this.$message.warning('申请付款金额不能超过剩余可申请金额');
       } else if (Number(this.paymentDialog.form.appliedAmount || 0) <= 0) {
@@ -539,7 +553,7 @@ export default {
         );
         this.paymentDialog.visible = false;
         this.selection = [];
-        this.loadTable();
+        this.onLoad(this.page);
       } finally {
         this.paymentDialog.loading = false;
       }
@@ -554,9 +568,11 @@ export default {
       win.document.write(
         `<!doctype html><html><head><title>${
           row.formalSettlementNo
-        }</title><style>body{font-family:Arial,"Microsoft YaHei",sans-serif;padding:32px;color:#222}h1{text-align:center}.grid{display:grid;grid-template-columns:repeat(3,1fr);gap:16px 28px;margin-top:30px}.item{border-bottom:1px solid #ddd;padding:8px 0}.actions{text-align:center;margin-top:36px}@media print{.actions{display:none}}</style></head><body><h1>正式结算单</h1><div class="grid"><div class="item">结算单号：${this.escapeHtml(
+        }</title><style>body{font-family:Arial,"Microsoft YaHei",sans-serif;padding:32px;color:#222}h1{text-align:center}.grid{display:grid;grid-template-columns:repeat(3,1fr);gap:16px 28px;margin-top:30px}.item{border-bottom:1px solid #ddd;padding:8px 0}.actions{text-align:center;margin-top:36px}@media print{.actions{display:none}}</style></head><body><h1>${this.escapeHtml(
+          settlementBillLabel(row.settlementType || this.activeSettlementType)
+        )}</h1><div class="grid"><div class="item">结算单号：${this.escapeHtml(
           row.formalSettlementNo
-        )}</div><div class="item">预结算单号：${this.escapeHtml(
+        )}</div><div class="item">预付结算单号：${this.escapeHtml(
           row.preSettlementNos
         )}</div><div class="item">项目：${this.escapeHtml(
           row.projectName
@@ -581,18 +597,14 @@ export default {
       const params = this.buildQueryParams();
       if (this.selection.length) params.ids = this.selection.map(item => item.id).join(',');
       const { data } = await api.exportList(params);
-      downloadFile(data, `正式结算单${this.$dayjs().format('YYYY-MM-DD HH-mm-ss')}.xlsx`);
+      downloadFile(
+        data,
+        `${this.billLabel}${this.$dayjs().format('YYYY-MM-DD HH-mm-ss')}.xlsx`
+      );
     },
     buildQueryParams() {
-      // 所属组织级联返回 id 路径，转成组织名称传给后端（用副本，避免污染搜索框回显）
-      const params = this.normalizeOrganizationSearch({ ...this.query }, 'deptName');
-      params.settlementType = this.activeSettlementType;
-      const range = params.createDateRange || [];
-      delete params.createDateRange;
-      if (range.length === 2) {
-        params.createStartDate = range[0];
-        params.createEndDate = range[1];
-      }
+      const params = { ...this.query };
+      params.settlementType = this.lockedSettlementType || this.activeSettlementType;
       return params;
     },
     unwrapData(response) {
@@ -600,8 +612,8 @@ export default {
       return body?.data || body;
     },
     handleSettlementTypeChange() {
-      this.page.current = 1;
-      this.loadTable();
+      // 分页重置与数据加载由 activeSettlementType watcher + 新挂载 crud 的 on-load 完成
+      this.selection = [];
     },
     escapeHtml(value) {
       return String(value || '-').replace(
@@ -609,24 +621,6 @@ export default {
         char => ({ '&': '&amp;', '<': '&lt;', '>': '&gt;', '"': '&quot;', "'": '&#39;' }[char])
       );
     },
-    isEditable(row) {
-      return ['draft', 'returned'].includes(row.approvalStatus);
-    },
-    statusType(status) {
-      return (
-        { approved: 'success', reviewing: 'warning', returned: 'danger', voided: 'info' }[status] ||
-        ''
-      );
-    },
-    invoiceName(value, settlementType) {
-      return invoiceStatusName(value, settlementType);
-    },
-    paymentName(value) {
-      return paymentStatusOptions.find(item => item.value === value)?.label || value || '-';
-    },
-    displayValue(value) {
-      return value === null || value === undefined || value === '' ? '-' : value;
-    },
     formatMoney(value, currency = 'RMB') {
       return `${Number(value || 0).toFixed(2)} ${currency || 'RMB'}`;
     },
@@ -639,62 +633,21 @@ export default {
 </script>
 
 <style scoped lang="scss">
-.formal-page__search {
-  padding: 12px 12px 4px;
-  background: #fff;
-  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.04);
-}
-.formal-page__search-grid {
-  display: grid;
-  grid-template-columns: repeat(4, minmax(0, 1fr));
-  gap: 8px 24px;
-  align-items: start;
-}
-.formal-page__search :deep(.el-form-item) {
-  margin-bottom: 8px;
-}
-.formal-page__search :deep(.el-form-item__label) {
-  white-space: nowrap;
-}
-.formal-page__search :deep(.el-input),
-.formal-page__search :deep(.el-select),
-.formal-page__search :deep(.el-date-editor) {
-  width: 100%;
-}
-.formal-page__search-actions {
-  grid-column: 1 / -1;
-  display: flex;
-  justify-content: flex-end;
-  align-items: center;
-  gap: 8px;
-  margin-bottom: 8px;
-}
-.formal-page__table-panel {
-  margin-top: 8px;
+.formal-page {
+  :deep(.el-table) {
+    --el-table-border-color: #eff1f7;
+  }
+  :deep(.el-table__body tr:nth-child(even) > td.el-table__cell),
+  :deep(.el-table__body tr:nth-child(even) > td.el-table-fixed-column--left),
+  :deep(.el-table__body tr:nth-child(even) > td.el-table-fixed-column--right) {
+    background: #fafafa;
+  }
 }
 .formal-payment-dialog__batch-tip {
   margin-bottom: 12px;
   color: #606266;
 }
-.formal-page :deep(.el-table) {
-  --el-table-border-color: #eff1f7;
-}
-.formal-page :deep(.el-table__body tr:nth-child(even) > td.el-table__cell),
-.formal-page :deep(.el-table__body tr:nth-child(even) > td.el-table-fixed-column--left),
-.formal-page :deep(.el-table__body tr:nth-child(even) > td.el-table-fixed-column--right) {
-  background: #fafafa;
-}
 :deep(.formal-page.basic-container .basic-container__card > .el-card__body) {
   padding: 0;
 }
-@media (max-width: 1200px) {
-  .formal-page__search-grid {
-    grid-template-columns: repeat(2, minmax(0, 1fr));
-  }
-}
-@media (max-width: 760px) {
-  .formal-page__search-grid {
-    grid-template-columns: 1fr;
-  }
-}
 </style>
diff --git a/src/views/settlement/payment-settlement.vue b/src/views/settlement/payment-settlement.vue
new file mode 100644
index 0000000..66ac565
--- /dev/null
+++ b/src/views/settlement/payment-settlement.vue
@@ -0,0 +1,12 @@
+<template>
+  <formal-settlement locked-settlement-type="payable" />
+</template>
+
+<script>
+import FormalSettlement from './formal-settlement.vue';
+
+export default {
+  name: 'PaymentSettlement',
+  components: { FormalSettlement },
+};
+</script>
diff --git a/src/views/settlement/pre-settlement-form.vue b/src/views/settlement/pre-settlement-form.vue
index 9bd3549..18586de 100644
--- a/src/views/settlement/pre-settlement-form.vue
+++ b/src/views/settlement/pre-settlement-form.vue
@@ -1,7 +1,7 @@
 <template>
   <basic-container class="pre-settlement-form-page">
     <div class="pre-settlement-form-page__title">{{ pageTitle }}</div>
-    <!-- 新增来源明细可直接调整：计费试算走独立接口，调整结果先暂存，保存预结算单时再落库。 -->
+    <!-- 新增来源明细可直接调整：计费试算走独立接口，调整结果先暂存，保存预付结算单时再落库。 -->
     <pre-settlement-editor
       v-model="editorVisible"
       page-mode
@@ -31,7 +31,7 @@ export default {
       return this.$route.query.id || '';
     },
     pageTitle() {
-      return this.recordId || this.savedRecordId ? '编辑预结算' : '新增预结算';
+      return this.recordId || this.savedRecordId ? '编辑预付结算单' : '新增预付结算单';
     },
   },
   watch: {
diff --git a/src/views/settlement/pre-settlement-public-view.vue b/src/views/settlement/pre-settlement-public-view.vue
index 1ddec11..1d76372 100644
--- a/src/views/settlement/pre-settlement-public-view.vue
+++ b/src/views/settlement/pre-settlement-public-view.vue
@@ -1,7 +1,7 @@
 <template>
   <mk-public-shell biz-type="pre-settlement" :get-form="getForm">
     <basic-container>
-      <div class="mk-public-form-title">查看预结算</div>
+      <div class="mk-public-form-title">查看预付结算单</div>
       <pre-settlement-editor
         ref="page"
         :model-value="true"
diff --git a/src/views/settlement/pre-settlement.vue b/src/views/settlement/pre-settlement.vue
index 414acc6..dda0871 100644
--- a/src/views/settlement/pre-settlement.vue
+++ b/src/views/settlement/pre-settlement.vue
@@ -446,13 +446,13 @@ export default {
     openCreate() {
       this.$router.push({
         path: '/settlement/pre-settlement/form',
-        query: { mode: 'add', name: '新增预结算' },
+        query: { mode: 'add', name: '新增预付结算单' },
       });
     },
     openEdit(row) {
       this.$router.push({
         path: '/settlement/pre-settlement/form',
-        query: { mode: 'edit', id: row.id, name: '编辑预结算' },
+        query: { mode: 'edit', id: row.id, name: '编辑预付结算单' },
       });
     },
     openView(row) {
@@ -465,7 +465,7 @@ export default {
       const records = data?.data?.records || [];
       const row = records.find(item => item.preSettlementNo === preSettlementNo);
       if (!row) {
-        this.$message.warning('未找到对应的预结算单');
+        this.$message.warning('未找到对应的预付结算单');
         return;
       }
       this.openView(row);
@@ -474,30 +474,30 @@ export default {
       return ['draft', 'returned'].includes(row.approvalStatus);
     },
     async handleDelete(row) {
-      await this.$confirm('确认删除该预结算草稿？', '提示', { type: 'warning' });
+      await this.$confirm('确认删除该预付结算单草稿？', '提示', { type: 'warning' });
       await remove(row.id);
       this.$message.success('删除成功');
       this.loadTable();
     },
     selectedOne(operationName) {
       if (this.selection.length !== 1) {
-        this.$message.warning(`${operationName}需选择一条预结算单`);
+        this.$message.warning(`${operationName}需选择一条预付结算单`);
         return null;
       }
       return this.selection[0];
     },
     handleAdvanceApplication() {
       if (!this.selection.length) {
-        this.$message.warning('请选择需要发起预付申请的预结算单');
+        this.$message.warning('请选择需要发起预付申请的预付结算单');
         return;
       }
       if (this.selection.some(row => !row.contractId)) {
-        this.$message.warning('所选预结算单缺少合同ID，无法发起预付申请');
+        this.$message.warning('所选预付结算单缺少合同ID，无法发起预付申请');
         return;
       }
       const contractIds = new Set(this.selection.map(row => String(row.contractId)));
       if (contractIds.size > 1) {
-        this.$message.warning('预付申请只能选择同一合同下的预结算单');
+        this.$message.warning('预付申请只能选择同一合同下的预付结算单');
         return;
       }
       if (
@@ -508,7 +508,7 @@ export default {
             row.formalSettlementNo
         )
       ) {
-        this.$message.warning('仅审批通过、未转正式结算的应付预结算单可发起预付');
+        this.$message.warning('仅审批通过、未转付款结算的应付预付结算单可发起预付');
         return;
       }
       const sourcePreSettlements = this.selection.map(row => ({
@@ -533,11 +533,11 @@ export default {
     },
     handleFormalSettlement() {
       if (!this.selection.length) {
-        this.$message.warning('请选择需要转正式结算的预结算单');
+        this.$message.warning('请选择需要转付款结算的预付结算单');
         return;
       }
       if (this.selection.some(row => row.approvalStatus !== 'approved')) {
-        this.$message.warning('仅审核通过的预结算单可转正式结算');
+        this.$message.warning('仅审核通过的预付结算单可转付款结算');
         return;
       }
       const hasCompleteProjectIds = this.selection.every(
@@ -549,7 +549,7 @@ export default {
         )
       );
       if (projectKeys.size > 1) {
-        this.$message.warning('尾款结算只能选择同一项目下的预结算单');
+        this.$message.warning('尾款结算只能选择同一项目下的预付结算单');
         return;
       }
       const transferToken = createSettlementTransfer({
@@ -560,14 +560,20 @@ export default {
       });
       this.$router.push({
         path: '/settlement/formal-settlement/form',
-        query: { mode: 'add', name: '新增正式结算', transferToken },
+        query: {
+          mode: 'add',
+          name: '新增付款结算单',
+          settlementType: 'payable',
+          listPath: '/settlement/payment-settlement',
+          transferToken,
+        },
       });
     },
     async openPrintDialog() {
       const row = this.selectedOne('打印结算单');
       if (!row) return;
       if (row.approvalStatus === 'voided') {
-        this.$message.warning('已作废的预结算单不能打印');
+        this.$message.warning('已作废的预付结算单不能打印');
         return;
       }
       this.printDialog.row = row;
@@ -622,8 +628,8 @@ export default {
         )
         .join('');
       return `<!doctype html><html><head><meta charset="utf-8"><title>${this.escapeHtml(
-        detail.preSettlementNo || '预结算单'
-      )}</title><style>body{font-family:Arial,"Microsoft YaHei",sans-serif;color:#222;padding:28px}h1{text-align:center;font-size:24px}.meta{display:grid;grid-template-columns:repeat(3,1fr);gap:14px 24px;margin:24px 0}.meta div{border-bottom:1px solid #ddd;padding:7px 0}table{width:100%;border-collapse:collapse;margin-top:16px}th,td{border:1px solid #bbb;padding:9px;text-align:center;font-size:13px}th{background:#f5f5f5}.actions{text-align:center;margin-top:24px}@media print{.actions{display:none}}</style></head><body><h1>预结算单</h1><div class="meta"><div>预结算单号：${this.escapeHtml(
+        detail.preSettlementNo || '预付结算单'
+      )}</title><style>body{font-family:Arial,"Microsoft YaHei",sans-serif;color:#222;padding:28px}h1{text-align:center;font-size:24px}.meta{display:grid;grid-template-columns:repeat(3,1fr);gap:14px 24px;margin:24px 0}.meta div{border-bottom:1px solid #ddd;padding:7px 0}table{width:100%;border-collapse:collapse;margin-top:16px}th,td{border:1px solid #bbb;padding:9px;text-align:center;font-size:13px}th{background:#f5f5f5}.actions{text-align:center;margin-top:24px}@media print{.actions{display:none}}</style></head><body><h1>预付结算单</h1><div class="meta"><div>预付结算单号：${this.escapeHtml(
         detail.preSettlementNo
       )}</div><div>项目名称：${this.escapeHtml(
         detail.projectName
@@ -651,7 +657,7 @@ export default {
       const params = this.buildQuery();
       if (this.selection.length) params.ids = this.selection.map(item => item.id).join(',');
       const { data } = await exportList(params);
-      downloadFile(data, `预结算单${this.$dayjs().format('YYYY-MM-DD HH-mm-ss')}.xlsx`);
+      downloadFile(data, `预付结算单${this.$dayjs().format('YYYY-MM-DD HH-mm-ss')}.xlsx`);
     },
     async handleSubmit(row) {
       const previousApprovalStatus = row.approvalStatus || '';
@@ -661,13 +667,14 @@ export default {
         bizId: row.id,
         subjectName: row.preSettlementNo || '',
         approvalStatus: previousApprovalStatus,
+        mkEnabled: this.mkEnabled,
       });
       this.$message.success('提交成功');
       this.loadTable();
     },
     handleMkAudit(row) {
       if (!row?.id) {
-        this.$message.warning('预结算单ID为空，无法打开审核页');
+        this.$message.warning('预付结算单ID为空，无法打开审核页');
         return;
       }
       getMKApprovalUrl({ bizId: String(row.id) })
@@ -684,7 +691,7 @@ export default {
         });
     },
     async handleApprove(row) {
-      await this.$confirm('确认审批通过该预结算单？', '提示', { type: 'warning' });
+      await this.$confirm('确认审批通过该预付结算单？', '提示', { type: 'warning' });
       await approve({ id: row.id });
       this.$message.success('审批通过');
       this.loadTable();
@@ -699,7 +706,7 @@ export default {
       this.loadTable();
     },
     async handleVoid(row) {
-      const { value } = await this.$prompt('请输入作废原因', '作废预结算单', {
+      const { value } = await this.$prompt('请输入作废原因', '作废预付结算单', {
         inputType: 'textarea',
         inputValidator: value => Boolean(value?.trim()) || '请输入作废原因',
       });
diff --git a/src/views/settlement/receipt-settlement.vue b/src/views/settlement/receipt-settlement.vue
new file mode 100644
index 0000000..809f1ef
--- /dev/null
+++ b/src/views/settlement/receipt-settlement.vue
@@ -0,0 +1,12 @@
+<template>
+  <formal-settlement locked-settlement-type="receivable" />
+</template>
+
+<script>
+import FormalSettlement from './formal-settlement.vue';
+
+export default {
+  name: 'ReceiptSettlement',
+  components: { FormalSettlement },
+};
+</script>
diff --git a/src/views/settlement/receivable-payable-detail.vue b/src/views/settlement/receivable-payable-detail.vue
index 0257356..75603cd 100644
--- a/src/views/settlement/receivable-payable-detail.vue
+++ b/src/views/settlement/receivable-payable-detail.vue
@@ -54,9 +54,11 @@
       </div>
 
       <el-table
+        ref="mainTableRef"
         v-loading="loading"
         :data="rows"
         :size="tableSize"
+        :height="listTableHeight"
         border
         class="settlement-detail-page__table"
         @selection-change="selectionChange"
@@ -146,7 +148,21 @@
                   show-overflow-tooltip
                 >
                   <template #default="{ row }">
-                    {{ formatFeeDetailCell(row, column.prop) }}
+                    <div
+                      v-if="isChargeFeeColumn(column)"
+                      class="settlement-detail-page__billing-rule-cell"
+                    >
+                      <span>{{ formatFeeDetailCell(row, column.prop) }}</span>
+                      <el-icon
+                        v-if="hasBillingRule(row)"
+                        class="settlement-detail-page__billing-rule-icon"
+                        title="查看计费规则详情"
+                        @click.stop="openBillingRuleInfo(row, chargeFeeName(column))"
+                      >
+                        <InfoFilled />
+                      </el-icon>
+                    </div>
+                    <span v-else>{{ formatFeeDetailCell(row, column.prop) }}</span>
                   </template>
                 </el-table-column>
               </el-table>
@@ -225,7 +241,12 @@
         <div
           class="settlement-detail-page__detail-panel-body settlement-detail-page__adjust-panel-body"
         >
-          <el-table v-loading="adjustDialog.loading" :data="adjustRows" border>
+          <el-table
+            v-loading="adjustDialog.loading"
+            :data="adjustRows"
+            :max-height="adjustTableMaxHeight"
+            border
+          >
             <el-table-column type="index" label="序号" width="64" align="center" />
             <el-table-column label="来源" width="110" align="center">
               <template #default="{ row }">{{ feeSourceLabel(row.dataSource) }}</template>
@@ -360,12 +381,14 @@
                   inputmode="decimal"
                   @input="value => handleAdjustDecimalInput(row, 'transportQuantity', value)"
                 />
+                <span v-else-if="column.prop === 'unitPrice' && isTierUnitPrice(row)">-</span>
                 <el-input
                   v-else-if="column.prop === 'unitPrice'"
                   class="settlement-detail-page__adjust-input"
                   :model-value="row.unitPrice"
+                  :disabled="!isUnitPriceAdjustable(row)"
                   inputmode="decimal"
-                  @input="value => handleAdjustDecimalInput(row, 'unitPrice', value)"
+                  @input="value => handleAdjustDecimalInput(row, 'unitPrice', value, 'unitPrice')"
                 />
                 <el-input
                   v-else-if="column.prop === 'mileage'"
@@ -428,36 +451,52 @@
         :model="updateFeeForm"
         :rules="updateFeeRules"
         label-position="right"
-        label-width="auto"
+        label-width="120px"
         class="settlement-detail-page__dialog-form"
       >
         <el-form-item label="更新范围" prop="contractId">
-          <el-input
-            :model-value="updateContractName"
-            class="settlement-detail-page__generate-select"
-            readonly
-            placeholder="请选择合同"
-          >
-            <template #append>
-              <el-button @click="openUpdateContractDialog">选择</el-button>
-            </template>
-          </el-input>
+          <div class="settlement-detail-page__update-fee-field">
+            <el-tooltip
+              :content="updateContractName"
+              :disabled="!updateContractName"
+              placement="top"
+              :show-after="200"
+            >
+              <div class="settlement-detail-page__update-fee-trigger">
+                <el-input
+                  :model-value="updateContractName"
+                  class="settlement-detail-page__update-fee-control"
+                  readonly
+                  placeholder="请选择合同"
+                >
+                  <template #append>
+                    <el-button @click="openUpdateContractDialog">选择</el-button>
+                  </template>
+                </el-input>
+              </div>
+            </el-tooltip>
+          </div>
         </el-form-item>
         <el-form-item label="合同计费方案" prop="billingPlanId">
-          <el-select
-            v-model="updateFeeForm.billingPlanId"
-            clearable
-            filterable
-            :disabled="!updateFeeForm.contractId"
-            placeholder="请选择"
-          >
-            <el-option
-              v-for="item in billingPlanOptions"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            />
-          </el-select>
+          <div class="settlement-detail-page__update-fee-field">
+            <el-select
+              v-model="updateFeeForm.billingPlanId"
+              class="settlement-detail-page__update-fee-control"
+              clearable
+              filterable
+              :disabled="!updateFeeForm.contractId"
+              :placeholder="updateFeeForm.contractId ? '请选择' : '请先选择合同'"
+              :title="updateBillingPlanName || undefined"
+            >
+              <el-option
+                v-for="item in billingPlanOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+                :title="item.name"
+              />
+            </el-select>
+          </div>
         </el-form-item>
       </el-form>
       <template #footer>
@@ -520,7 +559,7 @@
           :index="transferIndexMethod"
         />
         <el-table-column
-          v-for="column in tableColumns.slice(0, 13)"
+          v-for="column in transferTableColumns"
           :key="column.prop"
           :prop="column.prop"
           :label="column.label"
@@ -934,11 +973,70 @@
         </el-button>
       </template>
     </el-dialog>
+
+    <el-dialog
+      v-model="billingRuleDialog.visible"
+      title="计费规则详情"
+      width="720px"
+      append-to-body
+      destroy-on-close
+    >
+      <template v-if="billingRuleDialog.rule">
+        <div class="dialog-section-title">计费规则</div>
+        <el-descriptions :column="2" border class="settlement-detail-page__billing-rule-detail">
+          <el-descriptions-item label="费用项">
+            {{ displayValue(billingRuleDialog.rule.feeItem) }}
+          </el-descriptions-item>
+          <el-descriptions-item label="计费要素">
+            {{ displayValue(billingRuleDialog.rule.billingElement) }}
+          </el-descriptions-item>
+          <el-descriptions-item label="计费类型">
+            {{ displayValue(billingRuleDialog.rule.billingType) }}
+          </el-descriptions-item>
+          <el-descriptions-item label="计费单位">
+            {{ displayValue(billingRuleDialog.rule.billingUnit) }}
+          </el-descriptions-item>
+          <el-descriptions-item label="单价">
+            {{ displayValue(billingRuleDialog.rule.unitPrice) }}
+          </el-descriptions-item>
+          <el-descriptions-item label="最低计费量">
+            {{ displayValue(billingRuleDialog.rule.minimumBillingWeight) }}
+          </el-descriptions-item>
+          <el-descriptions-item label="计费区间">
+            {{ billingRuleRanges(billingRuleDialog.rule) }}
+          </el-descriptions-item>
+          <el-descriptions-item label="备注" :span="2">
+            {{ displayValue(billingRuleDialog.rule.remark) }}
+          </el-descriptions-item>
+        </el-descriptions>
+        <div class="dialog-section-title settlement-detail-page__billing-rule-match-title">
+          匹配条件
+        </div>
+        <el-descriptions :column="2" border class="settlement-detail-page__billing-rule-detail">
+          <el-descriptions-item label="起运地">
+            {{ displayValue(billingRuleDialog.rule.matchCondition.origin) }}
+          </el-descriptions-item>
+          <el-descriptions-item label="目的地">
+            {{ displayValue(billingRuleDialog.rule.matchCondition.destination) }}
+          </el-descriptions-item>
+          <el-descriptions-item label="货物名称">
+            {{ displayValue(billingRuleDialog.rule.matchCondition.cargoName) }}
+          </el-descriptions-item>
+          <el-descriptions-item label="货物类型">
+            {{ displayValue(billingRuleDialog.rule.matchCondition.cargoType) }}
+          </el-descriptions-item>
+        </el-descriptions>
+      </template>
+      <el-empty v-else description="暂无计费规则详情" />
+      <template #footer>
+        <el-button type="primary" @click="billingRuleDialog.visible = false">关闭</el-button>
+      </template>
+    </el-dialog>
   </basic-container>
 </template>
 
 <script>
-import { ArrowDown, ArrowUp, Close } from '@element-plus/icons-vue';
+import { ArrowDown, ArrowUp, Close, InfoFilled } from '@element-plus/icons-vue';
 import {
   changeRecordColumns,
   feeDetailBaseColumns,
@@ -959,6 +1057,7 @@ import { getList as getCargoTypeList } from '@/api/base/cargo-type';
 import { exportBlob } from '@/api/common';
 import { getDictionary } from '@/api/system/dictbiz';
 import { formatContractOptionLabel } from '@/utils/contract';
+import { isTierUnitPrice, isUnitPriceAdjustable } from '@/utils/settlement-adjust-rule';
 import { downloadXls } from '@/utils/util';
 import { createSettlementTransfer } from '@/utils/settlement-transfer';
 import {
@@ -990,7 +1089,7 @@ const ADJUST_BILLING_TYPE_MAP = {
 };
 
 export default {
-  components: { SettlementTableTools },
+  components: { SettlementTableTools, InfoFilled },
   props: {
     settlementType: {
       type: String,
@@ -1002,6 +1101,7 @@ export default {
       ArrowDown,
       ArrowUp,
       Close,
+      InfoFilled,
       searchFields,
       tableColumns,
       tableFeeItemNames: [],
@@ -1018,6 +1118,10 @@ export default {
       rows: [],
       selection: [],
       page: { current: 1, size: 10, total: 0 },
+      // 底部详情/调整面板打开时压缩主表高度，露出表格滚动条
+      listTableHeight: undefined,
+      savedListTableHeight: null,
+      listTableLayoutToken: 0,
       detailDialog: {
         visible: false,
         title: '费用明细',
@@ -1027,7 +1131,13 @@ export default {
       },
       feeRows: [],
       dynamicFeeColumns: [],
+      billingRuleDialog: {
+        visible: false,
+        rule: null,
+      },
       adjustDialog: { visible: false, loading: false, submitting: false, row: null },
+      // 表头 + 最多 3 行费用 + 横向滚动条，超出后表体上下滚动
+      adjustTableMaxHeight: 40 + 49 * 3 + 16,
       adjustRows: [],
       adjustDynamicFeeColumns: [],
       adjustTextProps: ['specification', 'model', 'billingFactor', 'billingType'],
@@ -1118,6 +1228,14 @@ export default {
       );
       return formatContractOptionLabel(contract);
     },
+    updateBillingPlanName() {
+      const billingPlanId = this.updateFeeForm.billingPlanId;
+      if (!billingPlanId) return '';
+      const plan = this.billingPlanOptions.find(
+        item => String(item.id) === String(billingPlanId)
+      );
+      return plan?.name || '';
+    },
     generateContractCategory() {
       return this.settlementType === 'payable' ? '承运商合同' : '客户合同';
     },
@@ -1139,7 +1257,9 @@ export default {
       return this.searchExpanded ? this.searchFields : this.searchFields.slice(0, 4);
     },
     feeDetailColumns() {
-      const baseColumns = feeDetailBaseColumns.filter(column => column.prop !== 'freightAmount');
+      const baseColumns = feeDetailBaseColumns.filter(
+        column => !['freightAmount', 'billingFactor', 'billingType'].includes(column.prop)
+      );
       const hasAdjustment = this.feeRows.some(row => Number(row.adjustAmount || 0) !== 0);
       const tailColumns = feeDetailTailColumns.map(col =>
         col.prop === 'originalAmountText' && hasAdjustment
@@ -1174,6 +1294,13 @@ export default {
       columns.splice(totalIndex, 0, ...dynamicColumns);
       return columns;
     },
+    // 批量转结算弹窗只展示前 13 列。预结算单号、正式结算单号正是本操作要生成的单号，
+    // 候选行上必为空，故不占列
+    transferTableColumns() {
+      return this.tableColumns
+        .filter(column => !['preSettlementNo', 'formalSettlementNo'].includes(column.prop))
+        .slice(0, 13);
+    },
     columnSettingOptions() {
       return this.displayTableColumns.map(column => ({
         prop: column.prop,
@@ -1203,11 +1330,27 @@ export default {
     transportCargoTypeOptions() {
       return this.cargoTypeOptions.filter(item => item.children?.length);
     },
+    /** 底部单据详情或调整面板是否展开（与 teleport 面板显示条件一致） */
+    isBottomPanelOpen() {
+      return Boolean(this.detailDialog.visible || this.adjustDialog.visible);
+    },
   },
   watch: {
     '$route.fullPath'() {
       this.openRouteDetail();
     },
+    isBottomPanelOpen: {
+      flush: 'post',
+      handler() {
+        this.updateListTableHeight();
+      },
+    },
+    searchVisible() {
+      this.updateListTableHeight();
+    },
+    searchExpanded() {
+      this.updateListTableHeight();
+    },
     displayTableColumns: {
       immediate: true,
       handler(columns) {
@@ -1231,20 +1374,28 @@ export default {
     },
   },
   async mounted() {
+    window.addEventListener('resize', this.updateListTableHeight);
     this.loadTransportTypeOptions();
     this.loadCargoTypeOptions();
     this.loadPriceUnitOptions();
     await this.loadTable();
     await this.openRouteDetail();
+    this.updateListTableHeight();
+  },
+  activated() {
+    this.updateListTableHeight();
   },
   // 标签切走（keep-alive 缓存）或销毁时，收起 teleport/append-to-body 弹层，避免残留盖住其它页面
   deactivated() {
     this.closeInnerDialogs();
   },
   beforeUnmount() {
+    window.removeEventListener('resize', this.updateListTableHeight);
     this.closeInnerDialogs();
   },
   methods: {
+    isTierUnitPrice,
+    isUnitPriceAdjustable,
     closeInnerDialogs() {
       this.closeDetailPanel();
       this.closeAdjustPanel();
@@ -1255,6 +1406,66 @@ export default {
       this.previewDialog.visible = false;
       this.generateContractDialog.visible = false;
     },
+    /** 表格和分页撑满剩余可视区域；单据详情展开时贴住详情面板，关闭后恢复 */
+    updateListTableHeight() {
+      this.listTableLayoutToken = (this.listTableLayoutToken || 0) + 1;
+      const token = this.listTableLayoutToken;
+      this.$nextTick(() => {
+        window.requestAnimationFrame(() => {
+          if (token !== this.listTableLayoutToken) return;
+          this.applyListTableHeight(token);
+          window.requestAnimationFrame(() => {
+            if (token !== this.listTableLayoutToken) return;
+            this.applyListTableHeight(token);
+          });
+        });
+      });
+    },
+    applyListTableHeight(token = this.listTableLayoutToken) {
+      if (token !== this.listTableLayoutToken) return;
+      const tableElement = this.$refs.mainTableRef?.$el;
+      if (!tableElement) return;
+      const pagination = this.$el?.querySelector?.(
+        '.settlement-detail-page__table-panel .settlement-detail-page__pagination'
+      );
+      const paginationHeight = pagination?.offsetHeight || 0;
+      const tableTop = tableElement.getBoundingClientRect().top;
+      const view = this.$el?.closest?.('#avue-view');
+      const viewRect = view?.getBoundingClientRect?.();
+      // 用滚动容器的可视高度，避免表格被压矮后按内容底部把高度锁死
+      let bottomEdge = view
+        ? viewRect.top + view.clientHeight - 12
+        : window.innerHeight;
+      const panelOpen = this.isBottomPanelOpen;
+      if (panelOpen) {
+        if (!this.savedListTableHeight) {
+          this.savedListTableHeight = this.listTableHeight || null;
+        }
+        const panelRect = document
+          .querySelector('.settlement-detail-page__detail-panel')
+          ?.getBoundingClientRect?.();
+        if (panelRect && panelRect.height > 0) {
+          bottomEdge = Math.min(bottomEdge, panelRect.top);
+          this.listTableHeightRetry = 0;
+        } else if ((this.listTableHeightRetry || 0) < 5) {
+          this.listTableHeightRetry = (this.listTableHeightRetry || 0) + 1;
+          window.requestAnimationFrame(() => this.applyListTableHeight(token));
+          return;
+        }
+      } else {
+        this.listTableHeightRetry = 0;
+      }
+      const gap = panelOpen ? 8 : 0;
+      let nextHeight = Math.max(180, Math.floor(bottomEdge - tableTop - paginationHeight - gap));
+      if (!panelOpen && this.savedListTableHeight) {
+        if (nextHeight + 24 < this.savedListTableHeight) {
+          nextHeight = this.savedListTableHeight;
+        }
+        this.savedListTableHeight = null;
+      }
+      this.listTableHeight = nextHeight;
+      this.$nextTick(() => this.$refs.mainTableRef?.doLayout?.());
+    },
     contractCategoryName(value) {
       return (
         this.contractCategoryOptions.find(item => String(item.value) === String(value))?.label ||
@@ -1683,11 +1894,15 @@ export default {
       this.detailDialog.visible = false;
       this.detailDialog.row = null;
       this.changeRecordsDialog.visible = false;
+      this.billingRuleDialog.visible = false;
+      this.billingRuleDialog.rule = null;
+      this.updateListTableHeight();
     },
     closeAdjustPanel() {
       this.clearAdjustCalculations();
       this.adjustDialog.visible = false;
       this.adjustDialog.row = null;
+      this.updateListTableHeight();
     },
     handleTableLink(row, column) {
       if (column.prop === 'waybillNo') {
@@ -1712,11 +1927,12 @@ export default {
       this.$router.push({ path, query: { detailNo } });
     },
     async openRouteDetail(detailId = this.$route.query.detailId) {
-      if (
-        !detailId ||
-        this.settlementType !== 'payable' ||
-        this.$route.path !== '/settlement/payable-detail'
-      ) {
+      // 结算明细点「单据号」会带 detailId 跳到本页；只有当前停在应收/应付明细页时才自动展开详情
+      const routePath =
+        this.settlementType === 'payable'
+          ? '/settlement/payable-detail'
+          : '/settlement/receivable-detail';
+      if (!detailId || this.$route.path !== routePath) {
         return;
       }
       let row = this.rows.find(item => String(item.id) === String(detailId));
@@ -1729,7 +1945,9 @@ export default {
         if (data.records?.[0]) row = this.decorateRow(data.records[0]);
       }
       if (!row) {
-        this.$message.info('当前记录未找到对应的应付明细');
+        this.$message.info(
+          `当前记录未找到对应的${this.settlementType === 'payable' ? '应付' : '应收'}明细`
+        );
         return;
       }
       await this.openDetailDialog(row);
@@ -1849,8 +2067,9 @@ export default {
     },
     handleAdjustDecimalInput(row, prop, value, changedField) {
       row[prop] = this.normalizeAdjustDecimal(value);
-      if (!row.manualFee && row.id && ['transportQuantity', 'mileage'].includes(prop)) {
-        this.scheduleAdjustFeeCalculation(row);
+      if (!row.manualFee && row.id && ['transportQuantity', 'mileage', 'unitPrice'].includes(prop)) {
+        if (prop === 'unitPrice' && !isUnitPriceAdjustable(row)) return;
+        this.scheduleAdjustFeeCalculation(row, prop);
         return;
       }
       this.recalculateAdjustRow(row, changedField);
@@ -1877,23 +2096,25 @@ export default {
       );
       row.adjustAmount = Number((row.afterAmount - Number(row.originalAmount || 0)).toFixed(2));
     },
-    scheduleAdjustFeeCalculation(row) {
+    scheduleAdjustFeeCalculation(row, changedField) {
       if (row.adjustCalculateTimer) clearTimeout(row.adjustCalculateTimer);
       row.adjustCalculateVersion += 1;
       row.calculating = true;
       const version = row.adjustCalculateVersion;
       row.adjustCalculateTimer = setTimeout(() => {
         row.adjustCalculateTimer = null;
-        this.calculateAdjustRow(row, version);
+        this.calculateAdjustRow(row, version, changedField);
       }, 300);
     },
-    async calculateAdjustRow(row, version) {
+    async calculateAdjustRow(row, version, changedField) {
       try {
         const res = await api.calculateAdjustedFee({
           detailId: this.adjustDialog.row?.id,
           feeId: row.id,
           transportQuantity: Number(row.transportQuantity || 0),
           mileage: Number(row.mileage || 0),
+          unitPrice: row.unitPrice === null || row.unitPrice === '' ? null : Number(row.unitPrice),
+          changedField,
           freightAmount: Number(row.freightAmount || 0),
           feeItems: Object.fromEntries(
             Object.entries(row.feeItems || {}).map(([name, amount]) => [name, Number(amount || 0)])
@@ -1901,18 +2122,24 @@ export default {
         });
         if (version !== row.adjustCalculateVersion || !this.adjustDialog.visible) return;
         const data = res.data?.data || res.data || res || {};
-        row.freightAmount = Number(data.freightAmount || 0);
-        row.feeItems = Object.fromEntries(
-          Object.entries(data.feeItems || {}).map(([name, amount]) => [name, Number(amount || 0)])
-        );
-        row.adjustAmount = Number(data.adjustAmount || 0);
-        row.afterAmount = Number(data.afterAmount || 0);
+        this.applyCalculatedAdjustRow(row, data);
       } catch (error) {
         row.calculateError = error.message;
       } finally {
         if (version === row.adjustCalculateVersion) row.calculating = false;
       }
     },
+    applyCalculatedAdjustRow(row, data) {
+      row.freightAmount = Number(data.freightAmount || 0);
+      row.feeItems = Object.fromEntries(
+        Object.entries(data.feeItems || {}).map(([name, amount]) => [name, Number(amount || 0)])
+      );
+      if (!isTierUnitPrice(row) && data.unitPrice !== undefined && data.unitPrice !== null) {
+        row.unitPrice = Number(data.unitPrice);
+      }
+      row.adjustAmount = Number(data.adjustAmount || 0);
+      row.afterAmount = Number(data.afterAmount || 0);
+    },
     clearAdjustCalculations() {
       this.adjustRows.forEach(row => {
         if (row.adjustCalculateTimer) clearTimeout(row.adjustCalculateTimer);
@@ -1924,6 +2151,140 @@ export default {
     isFreightFeeItem(name) {
       return String(name || '').includes('运费') || String(name || '').includes('运输费');
     },
+    isChargeFeeColumn(column = {}) {
+      if (column.prop === 'priceUnit') return false;
+      if (column.prop === 'freightAmount') return true;
+      return String(column.prop || '').startsWith('feeItem');
+    },
+    chargeFeeName(column = {}) {
+      if (column.prop === 'freightAmount') return column.label || '运输费';
+      return column.label || '';
+    },
+    hasBillingRule(row) {
+      const rule = this.normalizeBillingRule(row);
+      return Boolean(
+        rule.feeItem ||
+          rule.billingElement ||
+          rule.billingType ||
+          rule.unitPrice ||
+          rule.rules?.length ||
+          rule.matchCondition?.origin ||
+          rule.matchCondition?.destination ||
+          rule.matchCondition?.cargoName ||
+          rule.matchCondition?.cargoType
+      );
+    },
+    openBillingRuleInfo(row, feeName = '') {
+      this.billingRuleDialog.rule = this.normalizeBillingRule(row, feeName);
+      this.billingRuleDialog.visible = true;
+    },
+    ruleFeeName(rule = {}) {
+      return String(rule.feeItem || rule.feeItemName || rule.name || '').trim();
+    },
+    feeNamesMatch(left, right) {
+      const source = String(left || '').trim();
+      const target = String(right || '').trim();
+      if (!source || !target) return false;
+      if (source === target) return true;
+      return this.isFreightFeeItem(source) && this.isFreightFeeItem(target);
+    },
+    normalizeBillingRule(row, feeName = '') {
+      const source = row || {};
+      const nested = [
+        source.billingRule,
+        source.billingRuleInfo,
+        source.billingRuleJson,
+        source.billingRulesJson,
+        source.billingRules,
+        source.billingPlanRule,
+        source.feeRule,
+        source.rule,
+      ].find(value => value !== undefined && value !== null && value !== '');
+      const parsedNested = this.parseJsonValue(nested);
+      const parsedRules = Array.isArray(parsedNested)
+        ? parsedNested.filter(item => item && typeof item === 'object')
+        : [];
+      const requestedFeeName = String(feeName || '').trim();
+      const matchedRules = requestedFeeName
+        ? parsedRules.filter(item => this.feeNamesMatch(this.ruleFeeName(item), requestedFeeName))
+        : parsedRules;
+      const sharedRule =
+        parsedRules.length === 1 && !this.ruleFeeName(parsedRules[0]) ? parsedRules[0] : null;
+      const ruleSource =
+        matchedRules[0] || sharedRule || (!requestedFeeName ? parsedNested || nested : null);
+      let rule = this.parseObject(ruleSource);
+      if (!Object.keys(rule).length && typeof nested === 'string' && !requestedFeeName) {
+        rule = { name: nested };
+      }
+      const matchCondition = this.parseObject(
+        requestedFeeName
+          ? (rule.matchCondition ?? source.matchCondition ?? source.billingMatchCondition)
+          : (source.matchCondition ?? source.billingMatchCondition ?? rule.matchCondition)
+      );
+      return {
+        ...rule,
+        feeItem: requestedFeeName || source.billingFeeItem || source.feeItem || rule.feeItem,
+        billingElement: requestedFeeName
+          ? rule.billingElement || rule.billingFactor || ''
+          : source.billingElement ||
+            source.billingFactor ||
+            rule.billingElement ||
+            rule.billingFactor,
+        billingType: requestedFeeName ? rule.billingType || '' : source.billingType || rule.billingType,
+        billingUnit: requestedFeeName
+          ? rule.billingUnit || rule.priceUnit || ''
+          : source.billingUnit || source.priceUnit || rule.billingUnit || rule.priceUnit,
+        unitPrice: requestedFeeName
+          ? (rule.unitPrice ?? '')
+          : (source.billingUnitPrice ?? source.unitPrice ?? rule.unitPrice),
+        minimumBillingWeight: requestedFeeName
+          ? (rule.minimumBillingWeight ?? rule.lowerLimit ?? '')
+          : (source.minimumBillingWeight ?? rule.minimumBillingWeight ?? rule.lowerLimit),
+        remark: requestedFeeName
+          ? rule.remark || ''
+          : source.billingRuleRemark || source.ruleRemark || rule.remark,
+        rules: matchedRules,
+        matchCondition: {
+          ...matchCondition,
+          origin: matchCondition.origin || matchCondition.originName,
+          destination: matchCondition.destination || matchCondition.destinationName,
+          cargoName:
+            matchCondition.cargoName ||
+            matchCondition.cargoNameLabel ||
+            source.cargoName ||
+            rule.cargoName,
+          cargoType: matchCondition.cargoType || matchCondition.cargoTypeName,
+        },
+      };
+    },
+    billingRuleRanges(rule) {
+      const ranges = Array.isArray(rule?.limitRanges) ? rule.limitRanges : [];
+      if (ranges.length) {
+        return ranges
+          .map(
+            item => `${item.lowerLimit ?? '-'}~${item.upperLimit ?? '-'}：${item.unitPrice ?? '-'}`
+          )
+          .join('；');
+      }
+      if (rule?.lowerLimit !== undefined || rule?.upperLimit !== undefined) {
+        return `${rule.lowerLimit ?? '-'}~${rule.upperLimit ?? '-'}`;
+      }
+      return '-';
+    },
+    parseJsonValue(value) {
+      if (value === undefined || value === null || value === '') return null;
+      if (typeof value === 'object') return value;
+      if (typeof value !== 'string') return value;
+      try {
+        return JSON.parse(value);
+      } catch (error) {
+        return value;
+      }
+    },
+    parseObject(value) {
+      const parsed = this.parseJsonValue(value);
+      return parsed && typeof parsed === 'object' && !Array.isArray(parsed) ? parsed : {};
+    },
     async saveAdjustFee() {
       if (!this.adjustRows.length || !this.adjustDialog.row) {
         this.$message.warning('没有可调整的费用明细');
@@ -2125,7 +2486,8 @@ export default {
         return;
       }
       const options = this.syncBillingPlanOptions(contractId);
-      const selected = options.find(item => item.defaultPlan) || options[0];
+      const defaultOptions = options.filter(item => item.defaultPlan);
+      const selected = defaultOptions[defaultOptions.length - 1] || options[options.length - 1];
       this.updateFeeForm.billingPlanId = selected?.id || '';
     },
     async confirmUpdateFee() {
@@ -2681,12 +3043,12 @@ export default {
       return `${Number(value).toFixed(2)} ${currency}`;
     },
     formatDetailCell(row, prop) {
+      if (prop === 'mileage' && Number(row?.[prop]) === -1) {
+        return '-';
+      }
       if (
         prop === 'mileage' &&
-        (row?.[prop] === null ||
-          row?.[prop] === undefined ||
-          row?.[prop] === '' ||
-          Number(row[prop]) === -1)
+        (row?.[prop] === null || row?.[prop] === undefined || row?.[prop] === '')
       ) {
         return '';
       }
@@ -2847,11 +3209,37 @@ export default {
     }
   }
 
+  :deep(.el-form-item__content) {
+    min-width: 0;
+  }
+
+  // 仅作用于外层 tooltip 触发器，排除 el-select 内部下拉用的 .el-select__wrapper
+  // （后者也带 el-tooltip__trigger；若设为 block 会打断 flex，导致「请选择」与箭头叠在左上角）
+  :deep(.el-tooltip__trigger:not(.el-select__wrapper)) {
+    display: block;
+    width: 100%;
+  }
+
   :deep(.el-select) {
     width: 100%;
   }
 }
 
+.settlement-detail-page__update-fee-field,
+.settlement-detail-page__update-fee-trigger {
+  display: block;
+  width: 100%;
+  min-width: 0;
+}
+
+.settlement-detail-page__update-fee-control {
+  width: 100%;
+
+  :deep(.el-input-group) {
+    width: 100%;
+  }
+}
+
 .settlement-detail-page__adjust-input {
   width: 100%;
   min-width: 0;
@@ -2999,6 +3387,29 @@ export default {
 
 .settlement-detail-page__adjust-panel-body {
   padding-top: 16px;
+  overflow: hidden;
+}
+
+.settlement-detail-page__billing-rule-cell {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  gap: 6px;
+  max-width: 100%;
+}
+
+.settlement-detail-page__billing-rule-icon {
+  flex: 0 0 auto;
+  color: var(--el-color-primary);
+  cursor: pointer;
+}
+
+.settlement-detail-page__billing-rule-detail {
+  margin-top: 12px;
+}
+
+.settlement-detail-page__billing-rule-match-title {
+  margin-top: 20px;
 }
 
 @media screen and (max-width: 992px) {
diff --git a/src/views/settlement/settlement-adjustment.vue b/src/views/settlement/settlement-adjustment.vue
index c4bacd4..629f8c1 100644
--- a/src/views/settlement/settlement-adjustment.vue
+++ b/src/views/settlement/settlement-adjustment.vue
@@ -88,16 +88,21 @@
             ><el-link
               v-if="column.link && row[column.prop]"
               type="primary"
-              @click="openView(row)"
+              @click="handleTableLink(row, column)"
               >{{ row[column.prop] }}</el-link
             ><el-tag v-else-if="column.status" :type="statusType(row.approvalStatus)" class="status-text">{{
               row[column.prop] || '-'
             }}</el-tag
+            ><el-tag
+              v-else-if="column.kingdee"
+              :type="kingdeeStatusType(row.kingdeeSyncStatus)"
+              class="status-text"
+              >{{ kingdeeSyncName(row.kingdeeSyncStatus) }}</el-tag
             ><span v-else-if="column.money">{{ formatMoney(row[column.prop]) }}</span
             ><span v-else>{{ displayValue(row[column.prop]) }}</span></template
           ></el-table-column
         >
-        <el-table-column label="操作" width="120" fixed="right" align="center"
+        <el-table-column label="操作" width="320" fixed="right" align="center"
           ><template #default="{ row }"
             ><div class="settlement-adjustment-page__links">
               <el-link
@@ -139,14 +144,10 @@
                 @click="handleReturn(row)"
                 >驳回</el-link
               ><el-link
-                v-if="
-                  hasPermission('settlement_adjustment_repush') &&
-                  row.approvalStatus === 'approved' &&
-                  row.kingdeeSyncStatus === 'synced'
-                "
-                type="danger"
-                @click="handleRepush(row)"
-                >重新推送（高危）</el-link
+                v-if="hasPermission('settlement_adjustment_repush') && row.approvalStatus === 'approved'"
+                :type="row.kingdeeSyncStatus === 'synced' ? 'danger' : 'primary'"
+                @click="handleKingdee(row)"
+                >{{ row.kingdeeSyncStatus === 'synced' ? '重新推送（高危）' : '推送金蝶' }}</el-link
               >
             </div></template
           ></el-table-column
@@ -180,6 +181,7 @@ import * as api from '@/api/settlement/settlementAdjustment';
 import { settlementAdjustmentSearchFields } from '@/option/settlement/settlementAdjustmentSearch';
 import organizationSearch from '@/mixins/organization-search';
 import { settlementAdjustmentTableColumns } from '@/option/settlement/settlementAdjustmentTable';
+import { kingdeeSyncStatusOptions } from '@/option/settlement/formalSettlementSearch';
 import SettlementAdjustmentEditor from './components/settlement-adjustment-editor.vue';
 import SettlementTableTools from './components/settlement-table-tools.vue';
 import { isAdministrator } from '@/utils/auth';
@@ -283,6 +285,21 @@ export default {
     openView(row) {
       this.editor = { visible: true, id: row.id, readonly: true };
     },
+    // 单据号→本单查看弹窗；结算单号→跳正式结算列表页并自动打开该单详情（页面支持 ?detailNo=）
+    handleTableLink(row, column) {
+      if (column.prop === 'formalSettlementNo') {
+        this.openSettlementDetail(row.formalSettlementNo);
+        return;
+      }
+      this.openView(row);
+    },
+    openSettlementDetail(detailNo) {
+      if (!detailNo) {
+        this.$message.info('当前记录未关联结算单详情');
+        return;
+      }
+      this.$router.push({ path: '/settlement/formal-settlement', query: { detailNo } });
+    },
     isEditable(row) {
       return ['draft', 'returned'].includes(row.approvalStatus);
     },
@@ -300,12 +317,10 @@ export default {
     },
     async handleApprove(row) {
       await this.$confirm('审批通过后将更新关联正式结算单，确认继续？', '提示');
-      await api.approve(row.id);
-      if (row.kingdeeSyncStatus === 'synced')
-        this.$message.warning(
-          '调整已生效，本地已更新；原结算单已推送金蝶，请财务先手工冲销旧应付单后再重新推送。'
-        );
-      else this.$message.success('审批通过');
+      const res = await api.approve(row.id);
+      // data=false：自动同步金蝶失败；data=true 且 msg 带已推送场景的手工冲销提示
+      if (res.data.data === true || res.data.data === false) this.$message.warning(res.data.msg);
+      else this.$message.success(res.data.msg || '审批通过');
       this.loadTable();
     },
     async handleReturn(row) {
@@ -317,14 +332,24 @@ export default {
       this.$message.success('已驳回');
       this.loadTable();
     },
+    // 单一入口按状态分流：未同步/失败→推送原结算单；已同步→冲销后重推新单（高危）
+    async handleKingdee(row) {
+      if (row.kingdeeSyncStatus === 'synced') return this.handleRepush(row);
+      return this.handleSyncKingdee(row);
+    },
+    async handleSyncKingdee(row) {
+      const res = await api.syncKingdee(row.id);
+      this.$message.success(`已推送金蝶：${res.data.data || '-'}`);
+      this.loadTable();
+    },
     async handleRepush(row) {
       await this.$confirm(
-        '请确认金蝶旧应付单已由财务手工冲销，继续将生成全新财务应付单。',
+        '请确认金蝶旧应付/应收单已由财务手工冲销，继续将生成全新财务应付/应收单。',
         '高危操作确认',
         { type: 'warning', confirmButtonText: '确认重新推送' }
       );
       const { data } = await api.repush(row.id);
-      this.$message.success(`已生成新金蝶应付单：${data?.data || data || '-'}`);
+      this.$message.success(`已生成新金蝶单据：${data?.data || data || '-'}`);
       this.loadTable();
     },
     statusType(status) {
@@ -333,6 +358,12 @@ export default {
         'info'
       );
     },
+    kingdeeStatusType(status) {
+      return { synced: 'success', failed: 'danger' }[status] || 'info';
+    },
+    kingdeeSyncName(value) {
+      return kingdeeSyncStatusOptions.find(item => item.value === value)?.label || value || '-';
+    },
     displayValue(value) {
       return value === null || value === undefined || value === '' ? '-' : value;
     },
diff --git a/src/views/settlement/settlement-import-form.vue b/src/views/settlement/settlement-import-form.vue
new file mode 100644
index 0000000..6d0799f
--- /dev/null
+++ b/src/views/settlement/settlement-import-form.vue
@@ -0,0 +1,52 @@
+<template>
+  <basic-container class="settlement-import-form-page">
+    <div class="settlement-import-form-page__title">{{ pageTitle }}</div>
+    <settlement-import-page />
+  </basic-container>
+</template>
+
+<script setup>
+import { computed } from 'vue';
+import { useRoute } from 'vue-router';
+import SettlementImportPage from './components/settlement-import-page.vue';
+
+const route = useRoute();
+const pageTitle = computed(() => {
+  if (route.query.mode === 'view') return '查看导入结算单';
+  return route.query.id ? '编辑导入结算单' : '新增导入结算单';
+});
+</script>
+
+<style scoped lang="scss">
+.settlement-import-form-page {
+  :deep(.basic-container__card) {
+    background: #fff;
+  }
+
+  :deep(.basic-container__card > .el-card__body) {
+    padding: 0;
+    background: #fff;
+  }
+}
+
+.settlement-import-form-page__title {
+  position: relative;
+  padding: 16px 24px 12px 36px;
+  border-bottom: 1px solid #eff1f7;
+  background: #fff;
+  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>
diff --git a/src/views/settlement/settlement-import.vue b/src/views/settlement/settlement-import.vue
new file mode 100644
index 0000000..74a7715
--- /dev/null
+++ b/src/views/settlement/settlement-import.vue
@@ -0,0 +1,312 @@
+<template>
+  <basic-container class="settlement-import-page">
+    <avue-crud
+      ref="crud"
+      :option="option"
+      :table-loading="loading"
+      :data="rows"
+      v-model:page="page"
+      @search-change="searchChange"
+      @search-reset="searchReset"
+      @current-change="currentChange"
+      @size-change="sizeChange"
+      @refresh-change="refreshChange"
+      @on-load="onLoad"
+    >
+      <template #menu-left>
+        <el-button
+          v-if="hasPermission('settlement_import_add')"
+          type="primary"
+          @click="openCreate"
+          >新增</el-button
+        >
+      </template>
+
+      <template #batchNo="{ row }">
+        <el-link type="primary" @click="openDetail(row)">{{ row.batchNo || '-' }}</el-link>
+      </template>
+
+      <template #importStatusName="{ row }">
+        <el-tag :type="statusTagType(row.importStatus)" effect="plain">{{
+          row.importStatusName || importStatusLabel(row.importStatus)
+        }}</el-tag>
+      </template>
+
+      <template #menu="{ row }">
+        <el-link type="primary" @click="openDetail(row)">查看</el-link>
+        <el-link v-if="row.importStatus === 'draft'" type="primary" @click="editDraft(row)"
+          >编辑</el-link
+        >
+        <el-link
+          v-if="row.importStatus === 'draft' && hasPermission('settlement_import_delete')"
+          type="danger"
+          @click="handleDelete(row)"
+          >删除</el-link
+        >
+        <el-link
+          v-if="row.importStatus === 'completed' && hasPermission('settlement_import_void')"
+          type="danger"
+          @click="openVoid(row)"
+          >作废</el-link
+        >
+      </template>
+    </avue-crud>
+
+    <el-dialog v-model="voidVisible" title="作废导入结算单" width="480px" append-to-body>
+      <el-form
+        ref="voidFormRef"
+        :model="voidForm"
+        :rules="voidRules"
+        label-position="right"
+        label-width="auto"
+      >
+        <el-form-item label="作废原因" prop="reason">
+          <el-input
+            v-model="voidForm.reason"
+            type="textarea"
+            :rows="4"
+            maxlength="200"
+            show-word-limit
+            placeholder="请输入作废原因"
+          />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <el-button @click="voidVisible = false">取消</el-button>
+        <el-button type="danger" :loading="voidLoading" @click="submitVoid">确认作废</el-button>
+      </template>
+    </el-dialog>
+  </basic-container>
+</template>
+
+<script>
+import { h } from 'vue';
+import { ElOption, ElSelect } from 'element-plus';
+import { mapGetters } from 'vuex';
+import * as api from '@/api/settlement/settlementImport';
+import { settlementImportOption, importStatusLabel } from '@/option/settlement/settlementImport';
+
+const SETTLEMENT_IMPORT_LIST_REFRESH_KEY = 'settlement-import-list-refresh';
+
+export default {
+  name: 'SettlementImport',
+  data() {
+    return {
+      rows: [],
+      loading: false,
+      query: {},
+      option: settlementImportOption(),
+      page: {
+        currentPage: 1,
+        pageSize: 10,
+        pageSizes: [10, 20, 50, 100],
+        total: 0,
+      },
+      batchNoOptions: [],
+      voidVisible: false,
+      voidLoading: false,
+      voidForm: { id: null, reason: '' },
+      voidRules: {
+        reason: [
+          { required: true, message: '请输入作废原因', trigger: 'blur' },
+          { max: 200, message: '作废原因不能超过200个字', trigger: 'blur' },
+        ],
+      },
+    };
+  },
+  computed: {
+    ...mapGetters(['permission', 'userInfo']),
+    isAdmin() {
+      const authority = this.userInfo?.authority || '';
+      return String(authority).includes('admin');
+    },
+  },
+  created() {
+    this.setBatchNoSearchRender();
+    this.loadOptions();
+  },
+  activated() {
+    this.consumeListRefresh();
+  },
+  watch: {
+    $route(to, from) {
+      if (
+        to.path === '/settlement/settlement-import' &&
+        from?.path === '/settlement/settlement-import/form'
+      ) {
+        this.consumeListRefresh();
+      }
+    },
+  },
+  methods: {
+    consumeListRefresh() {
+      if (sessionStorage.getItem(SETTLEMENT_IMPORT_LIST_REFRESH_KEY) !== '1') {
+        return;
+      }
+      sessionStorage.removeItem(SETTLEMENT_IMPORT_LIST_REFRESH_KEY);
+      this.page.currentPage = 1;
+      this.loadOptions();
+      this.onLoad(this.page);
+    },
+    hasPermission(code) {
+      return this.isAdmin || this.validData(this.permission?.[code], false);
+    },
+    importStatusLabel,
+    statusTagType(status) {
+      if (status === 'draft') return 'info';
+      if (status === 'completed') return 'success';
+      if (status === 'voided') return 'danger';
+      return '';
+    },
+    unwrapData(response) {
+      const body = response?.data || response || {};
+      return body?.data !== undefined ? body.data : body;
+    },
+    /** 批次号搜索控件：可搜索 + 可手输，选项来自已导入批次 */
+    setBatchNoSearchRender() {
+      const column = this.findColumn(this.option.column, 'batchNo');
+      if (!column) return;
+      column.renderSearch = scope =>
+        h(
+          ElSelect,
+          {
+            modelValue: scope.row?.batchNo ?? '',
+            'onUpdate:modelValue': value => {
+              if (scope.row) scope.row.batchNo = value ?? '';
+            },
+            clearable: true,
+            filterable: true,
+            allowCreate: true,
+            defaultFirstOption: true,
+            placeholder: '请选择',
+            style: 'width: 100%',
+          },
+          () =>
+            this.batchNoOptions.map(item =>
+              h(ElOption, { key: item.value, label: item.label, value: item.value })
+            )
+        );
+    },
+    async loadOptions() {
+      try {
+        const response = await api.getOptions();
+        const options = this.unwrapData(response) || {};
+        const batchNos = Array.isArray(options.batchNos) ? options.batchNos : [];
+        this.batchNoOptions = batchNos.map(item => {
+          if (typeof item === 'string') {
+            return { label: item, value: item };
+          }
+          const value = item.id ?? item.value ?? item.name ?? item.batchNo ?? '';
+          const label = item.name ?? item.label ?? item.batchNo ?? value;
+          return { label: String(label || ''), value: String(value || '') };
+        });
+      } catch (error) {
+        this.batchNoOptions = [];
+      }
+    },
+    onLoad(page) {
+      this.loading = true;
+      api
+        .getList(page.currentPage, page.pageSize, { ...this.query })
+        .then(response => {
+          const data = this.unwrapData(response) || {};
+          this.rows = data.records || [];
+          this.page.total = Number(data.total || 0);
+        })
+        .finally(() => {
+          this.loading = false;
+        });
+    },
+    searchChange(params, done) {
+      this.query = { ...params };
+      this.page.currentPage = 1;
+      this.onLoad(this.page);
+      done();
+    },
+    searchReset() {
+      this.query = {};
+      this.page.currentPage = 1;
+      this.onLoad(this.page);
+    },
+    currentChange(currentPage) {
+      this.page.currentPage = currentPage;
+    },
+    sizeChange(pageSize) {
+      this.page.pageSize = pageSize;
+    },
+    refreshChange() {
+      this.loadOptions();
+      this.onLoad(this.page);
+    },
+    openCreate() {
+      this.$router.push({ path: '/settlement/settlement-import/form' });
+    },
+    openDetail(row) {
+      if (!row?.id) return;
+      this.$router.push({
+        path: '/settlement/settlement-import/form',
+        query: { id: row.id, mode: 'view' },
+      });
+    },
+    editDraft(row) {
+      this.$router.push({
+        path: '/settlement/settlement-import/form',
+        query: { id: row.id },
+      });
+    },
+    async handleDelete(row) {
+      if (!row?.id) return;
+      try {
+        await this.$confirm('确认删除该草稿批次？删除后不可恢复。', '提示', {
+          type: 'warning',
+        });
+        await api.removeDraft(row.id);
+        this.$message.success('删除成功');
+        this.refreshChange();
+      } catch (error) {
+        if (error === 'cancel' || error === 'close') return;
+        this.$message.error(error?.message || '删除失败');
+      }
+    },
+    openVoid(row) {
+      this.voidForm = { id: row.id, reason: '' };
+      this.voidVisible = true;
+      this.$nextTick(() => this.$refs.voidFormRef?.clearValidate());
+    },
+    async submitVoid() {
+      await this.$refs.voidFormRef?.validate();
+      this.voidLoading = true;
+      try {
+        await api.voidBatch({
+          id: this.voidForm.id,
+          reason: String(this.voidForm.reason || '').trim(),
+        });
+        this.$message.success('作废成功');
+        this.voidVisible = false;
+        this.onLoad(this.page);
+        this.loadOptions();
+      } finally {
+        this.voidLoading = false;
+      }
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.settlement-import-page :deep(.el-table) {
+  --el-table-border-color: #eff1f7;
+}
+
+.settlement-import-page :deep(.el-table__body tr:nth-child(even) > td.el-table__cell),
+.settlement-import-page
+  :deep(.el-table__body tr:nth-child(even) > td.el-table-fixed-column--left),
+.settlement-import-page
+  :deep(.el-table__body tr:nth-child(even) > td.el-table-fixed-column--right) {
+  background: #fafafa;
+}
+
+:deep(.settlement-import-page.basic-container .basic-container__card > .el-card__body) {
+  padding: 0;
+}
+</style>
diff --git a/src/views/system/dept.vue b/src/views/system/dept.vue
index 4f67a20..157a1be 100644
--- a/src/views/system/dept.vue
+++ b/src/views/system/dept.vue
@@ -153,7 +153,12 @@
         />
         <div class="oa-sync-meta" v-if="oaSyncStage === 'clear'">当前阶段：{{ oaSyncStageLabel }}</div>
         <div class="oa-sync-meta" v-else>
-          当前阶段：{{ oaSyncStageLabel }}，第 {{ oaSyncProgress.current || 0 }} / {{ oaSyncTotalPage }} 页
+          当前阶段：{{ oaSyncStageLabel }}
+          <template v-if="oaSyncStage === 'department' && oaSyncProgress.companyTotal">
+            ，公司 {{ oaSyncProgress.companyIndex || 0 }} / {{ oaSyncProgress.companyTotal }}
+            <template v-if="oaSyncProgress.companyOaId">（oaId={{ oaSyncProgress.companyOaId }}）</template>
+          </template>
+          ，第 {{ oaSyncProgress.current || 0 }} / {{ oaSyncTotalPage }} 页
         </div>
         <div class="oa-sync-stats">
           <div class="oa-sync-stat">
@@ -165,6 +170,9 @@
             <span class="oa-sync-stat__value oa-sync-stat__value--skip">{{ oaSyncProgress.skipped }}</span>
           </div>
         </div>
+        <div v-if="oaSyncProgress.dumpFilePath" class="oa-sync-meta">
+          原始数据 JSON：{{ oaSyncProgress.dumpFilePath }}
+        </div>
       </div>
       <template #footer>
         <span class="dialog-footer">
@@ -253,6 +261,10 @@ export default {
         total: 0,
         synced: 0,
         skipped: 0,
+        dumpFilePath: '',
+        companyOaId: '',
+        companyIndex: 0,
+        companyTotal: 0,
       },
       parentId: 0,
       page: {
@@ -286,7 +298,9 @@ export default {
           {
             label: '组织名称',
             prop: 'deptName',
-            minWidth: 160,
+            minWidth: 320,
+            align: 'left',
+            headerAlign: 'left',
             order: 80,
             search: true,
             searchOrder: 2,
@@ -404,6 +418,43 @@ export default {
               },
             ],
           },
+          {
+            label: '合同初始流水号',
+            prop: 'contractInitialSerial',
+            type: 'input',
+            minWidth: 140,
+            order: 61,
+            placeholder: '如 1',
+            tip: '该部门当年首个合同时从此流水号起编，后续递增；范围1-999，不填默认从1开始',
+            rules: [
+              {
+                validator: (rule, value, callback) => {
+                  // -1 为空占位，不填时按空处理
+                  if (
+                    value === undefined ||
+                    value === null ||
+                    value === '' ||
+                    Number(value) === -1
+                  ) {
+                    callback();
+                    return;
+                  }
+                  const text = String(value).trim();
+                  if (!/^\d+$/.test(text)) {
+                    callback(new Error('合同初始流水号只能输入正整数'));
+                    return;
+                  }
+                  const serial = Number(text);
+                  if (serial < 1 || serial > 999) {
+                    callback(new Error('合同初始流水号范围为1到999'));
+                    return;
+                  }
+                  callback();
+                },
+                trigger: 'blur',
+              },
+            ],
+          },
           {
             label: '组织简称',
             prop: 'shortName',
@@ -638,12 +689,18 @@ export default {
       }
       const totalPage = this.oaSyncTotalPage;
       const current = Number(this.oaSyncProgress.current) || 0;
-      const stageBase = this.oaSyncStage === 'department' ? 50 : 0;
-      if (totalPage <= 0) {
-        return stageBase;
+      if (this.oaSyncStage === 'department') {
+        const companyTotal = Math.max(1, Number(this.oaSyncProgress.companyTotal) || 1);
+        const companyIndex = Math.max(1, Number(this.oaSyncProgress.companyIndex) || 1);
+        const companyBase = ((companyIndex - 1) / companyTotal) * 50;
+        const pageRatio = totalPage > 0 ? Math.min(1, current / totalPage) : 0;
+        const companyPagePercent = (pageRatio * 50) / companyTotal;
+        return Math.min(99, Math.round(50 + companyBase + companyPagePercent));
       }
-      const stagePercent = Math.min(50, Math.round((current / totalPage) * 50));
-      return Math.min(99, stageBase + stagePercent);
+      if (totalPage <= 0) {
+        return 0;
+      }
+      return Math.min(49, Math.round((current / totalPage) * 50));
     },
     oaSyncProgressStatus() {
       if (this.oaSyncStatus === 'done') {
@@ -657,25 +714,7 @@ export default {
   },
   methods: {
     handleOaOrgFullSync() {
-      this.$confirm(
-        '全量同步将拉取 OA 全部公司/部门；已存在且 OA 更新时间一致的记录会跳过。是否清除后同步？选择“是”将保留顶级「外部组织」与集团锚点(id=135/GWWL)，删除其余组织后再同步；选择“否”则直接全量同步。',
-        '全量同步',
-        {
-          confirmButtonText: '是',
-          cancelButtonText: '否',
-          distinguishCancelAndClose: true,
-          closeOnClickModal: false,
-          type: 'warning',
-        }
-      )
-        .then(() => {
-          this.startOaOrgSync({ clearNonTop: true, incremental: false });
-        })
-        .catch(action => {
-          if (action === 'cancel') {
-            this.startOaOrgSync({ clearNonTop: false, incremental: false });
-          }
-        });
+      this.startOaOrgSync({ clearNonTop: false, incremental: false });
     },
     handleOaOrgIncrementalSync() {
       this.$confirm(
@@ -709,6 +748,10 @@ export default {
         total: 0,
         synced: 0,
         skipped: 0,
+        dumpFilePath: '',
+        companyOaId: '',
+        companyIndex: 0,
+        companyTotal: 0,
       };
       this.runOaOrgSyncPages();
     },
@@ -720,6 +763,25 @@ export default {
         error?.name === 'AbortError'
       );
     },
+    applyOaOrgSyncPage(page, current, size) {
+      this.oaSyncProgress.current = page.current || current;
+      this.oaSyncProgress.size = page.size || size;
+      this.oaSyncProgress.total = page.total || 0;
+      this.oaSyncProgress.synced += page.syncedCount || 0;
+      this.oaSyncProgress.skipped += page.skippedCount || 0;
+      if (page.dumpFilePath) {
+        this.oaSyncProgress.dumpFilePath = page.dumpFilePath;
+      }
+      if (page.companyOaId != null) {
+        this.oaSyncProgress.companyOaId = page.companyOaId || '';
+      }
+      if (page.companyIndex != null) {
+        this.oaSyncProgress.companyIndex = page.companyIndex || 0;
+      }
+      if (page.companyTotal != null) {
+        this.oaSyncProgress.companyTotal = page.companyTotal || 0;
+      }
+    },
     async runOaOrgSyncStage(syncApi) {
       const size = 20;
       const incremental = this.oaSyncMode === 'incremental';
@@ -737,17 +799,57 @@ export default {
         if (!modifiedSince && page.modifiedSince) {
           modifiedSince = page.modifiedSince;
         }
-        this.oaSyncProgress.current = page.current || current;
-        this.oaSyncProgress.size = page.size || size;
-        this.oaSyncProgress.total = page.total || 0;
-        this.oaSyncProgress.synced += page.syncedCount || 0;
-        this.oaSyncProgress.skipped += page.skippedCount || 0;
+        this.applyOaOrgSyncPage(page, current, size);
         if (page.finished) {
           break;
         }
         current += 1;
       }
     },
+    /**
+     * 部门阶段：公司同步完成后，按公司 oaId 轮询；当前公司部门拉完后切换下一公司并重置页码
+     */
+    async runOaOrgDepartmentSyncStage() {
+      const size = 20;
+      const incremental = this.oaSyncMode === 'incremental';
+      let current = 1;
+      let modifiedSince = '';
+      let companyOaId = '';
+      while (!this.oaSyncCancelled) {
+        const res = await syncOaDepartment(
+          current,
+          size,
+          this.oaSyncController?.signal,
+          incremental,
+          modifiedSince,
+          companyOaId
+        );
+        const page = res?.data?.data || {};
+        if (!modifiedSince && page.modifiedSince) {
+          modifiedSince = page.modifiedSince;
+        }
+        if (page.companyOaId) {
+          companyOaId = page.companyOaId;
+        }
+        this.applyOaOrgSyncPage(page, current, size);
+        if (page.finished) {
+          break;
+        }
+        if (page.companyFinished && page.nextCompanyOaId) {
+          companyOaId = page.nextCompanyOaId;
+          current = 1;
+          this.oaSyncProgress.current = 0;
+          this.oaSyncProgress.total = 0;
+          // 单公司部门拉完并重建层级后刷新树，便于中途核对挂载结果
+          this.parentId = 0;
+          this.data = [];
+          this.$refs.crud?.refreshTable?.();
+          this.onLoad(this.page, this.query);
+          continue;
+        }
+        current += 1;
+      }
+    },
     async runOaOrgSyncPages() {
       try {
         if (this.oaSyncClearNonTop) {
@@ -767,7 +869,10 @@ export default {
         this.oaSyncStage = 'department';
         this.oaSyncProgress.current = 0;
         this.oaSyncProgress.total = 0;
-        await this.runOaOrgSyncStage(syncOaDepartment);
+        this.oaSyncProgress.companyOaId = '';
+        this.oaSyncProgress.companyIndex = 0;
+        this.oaSyncProgress.companyTotal = 0;
+        await this.runOaOrgDepartmentSyncStage();
         if (this.oaSyncCancelled) {
           this.oaSyncStatus = 'cancelled';
           return;
@@ -1088,6 +1193,29 @@ export default {
         row.parentId = 0;
       }
     },
+    normalizeContractInitialSerial(value) {
+      // -1 为空占位，不填时不落库、不回显
+      if (
+        value === undefined ||
+        value === null ||
+        value === '' ||
+        Number(value) === -1
+      ) {
+        return null;
+      }
+      const text = String(value).trim();
+      if (!text) {
+        return null;
+      }
+      const serial = Number(text);
+      return Number.isInteger(serial) ? serial : value;
+    },
+    clearEmptyContractInitialSerial(form = this.form) {
+      if (!form) return;
+      if (Number(form.contractInitialSerial) === -1) {
+        form.contractInitialSerial = '';
+      }
+    },
     isRootDept(row) {
       return row && (row.parentId === 0 || String(row.parentId) === '0');
     },
@@ -1234,6 +1362,7 @@ export default {
       row.deptCode = String(row.deptCode || '').trim();
       row.kingdeeDeptCode = String(row.kingdeeDeptCode || '').trim();
       row.contractCodePrefix = String(row.contractCodePrefix || '').trim();
+      row.contractInitialSerial = this.normalizeContractInitialSerial(row.contractInitialSerial);
       row.leaderId = func.join(row.leaderId);
       this.normalizeTopParent(row);
       if (!this.prepareDeptSubmitRow(row)) {
@@ -1281,6 +1410,7 @@ export default {
       row.deptCode = String(row.deptCode || '').trim();
       row.kingdeeDeptCode = String(row.kingdeeDeptCode || '').trim();
       row.contractCodePrefix = String(row.contractCodePrefix || '').trim();
+      row.contractInitialSerial = this.normalizeContractInitialSerial(row.contractInitialSerial);
       row.leaderId = func.join(row.leaderId);
       this.normalizeTopParent(row);
       if (!this.prepareDeptSubmitRow(row)) {
@@ -1390,6 +1520,7 @@ export default {
         if (this.form.isPlatformCompany === undefined || this.form.isPlatformCompany === null) {
           this.form.isPlatformCompany = 0;
         }
+        this.clearEmptyContractInitialSerial(this.form);
         this.initData(this.form.tenantId);
         this.loadParentDeptCode(this.form.parentId);
       }
@@ -1404,6 +1535,7 @@ export default {
           if (this.form.parentId === '0') {
             this.form.parentId = '';
           }
+          this.clearEmptyContractInitialSerial(this.form);
           this.loadParentDeptCode(this.form.parentId);
           if (this.form.hasOwnProperty('leaderId')) {
             const splitResult = func.split(this.form.leaderId);
@@ -1452,6 +1584,12 @@ export default {
 </script>
 
 <style scoped>
+/* 覆盖全站表格居中：树形组织名称需左对齐，展开后缩进才可读 */
+:deep(.el-table th.el-table__cell.is-left .cell),
+:deep(.el-table td.el-table__cell.is-left .cell) {
+  text-align: left;
+}
+
 .carrier-search-form {
   padding: 12px 12px 4px;
   box-shadow: 0 2px 8px rgba(0, 0, 0, 0.04);
diff --git a/src/views/system/user.vue b/src/views/system/user.vue
index 7aeee32..dcdc6e3 100644
--- a/src/views/system/user.vue
+++ b/src/views/system/user.vue
@@ -4,7 +4,7 @@
       <div class="box">
         <el-scrollbar>
           <basic-container>
-            <avue-tree :option="treeOption" :data="treeData" @node-click="nodeClick" />
+            <avue-tree ref="deptTree" :option="treeOption" :data="treeData" @node-click="nodeClick" />
           </basic-container>
         </el-scrollbar>
       </div>
@@ -172,6 +172,7 @@
                   </el-form-item>
                 </el-col>
                 <el-col :span="6"><el-form-item label="工号"><el-input v-model="form.code" :disabled="isUserViewMode" /></el-form-item></el-col>
+                <el-col :span="6"><el-form-item label="OA登录名"><el-input v-model="form.oaLoginId" :disabled="isUserViewMode" maxlength="128" placeholder="请输入OA登录名" /></el-form-item></el-col>
                 <el-col :span="6"><el-form-item label="人员类别"><el-select v-model="form.personCategory" :disabled="isUserViewMode"><el-option label="内部员工" :value="1" /><el-option label="承运商" :value="2" /></el-select></el-form-item></el-col>
                 <el-col :span="18"><el-form-item label="数据权限范围"><el-radio-group v-model="form.dataScopeRange" :disabled="isUserViewMode"><el-radio :value="1">仅所属组织</el-radio><el-radio :value="2">全部组织</el-radio><el-radio :value="3">自定义</el-radio></el-radio-group></el-form-item></el-col>
                 <el-col :span="18"><el-form-item label="数据层级范围"><el-radio-group v-model="form.dataLevelRange" :disabled="isUserViewMode"><el-radio :value="1">包含下级</el-radio><el-radio :value="2">仅本级</el-radio></el-radio-group></el-form-item></el-col>
@@ -363,6 +364,13 @@
                 <span class="oa-sync-stat__label">跳过</span>
                 <span class="oa-sync-stat__value oa-sync-stat__value--skip">{{ oaSyncProgress.skipped }}</span>
               </div>
+              <div class="oa-sync-stat">
+                <span class="oa-sync-stat__label">删除</span>
+                <span class="oa-sync-stat__value oa-sync-stat__value--remove">{{ oaSyncProgress.removed }}</span>
+              </div>
+            </div>
+            <div v-if="oaSyncProgress.dumpFilePath" class="oa-sync-meta">
+              原始数据 JSON：{{ oaSyncProgress.dumpFilePath }}
             </div>
           </div>
           <template #footer>
@@ -450,6 +458,8 @@ export default {
         total: 0,
         synced: 0,
         skipped: 0,
+        removed: 0,
+        dumpFilePath: '',
       },
       page: {
         pageSize: 10,
@@ -642,7 +652,17 @@ export default {
   },
   methods: {
     nodeClick(data) {
-      this.treeDeptId = data.id;
+      const deptId = data?.id;
+      if (deptId != null && String(this.treeDeptId) === String(deptId)) {
+        this.treeDeptId = '';
+        this.page.currentPage = 1;
+        this.$nextTick(() => {
+          this.$refs.deptTree?.setCurrentKey?.(null);
+        });
+        this.onLoad(this.page);
+        return;
+      }
+      this.treeDeptId = deptId;
       this.page.currentPage = 1;
       this.onLoad(this.page);
     },
@@ -677,17 +697,21 @@ export default {
         });
     },
     handleOaPersonFullSync() {
-      this.$confirm('全量同步将拉取 OA 全部人员及组织；已存在且 OA 更新时间一致的记录会跳过。是否继续？', '全量同步', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-      }).then(() => {
+      this.$confirm(
+        '全量同步将按 OA 对齐人员：有登录名的按登录名更新且不修改密码，没有登录名但有工号的也会入库且不回填登录名，部门按 OA 当前部门重绑，OA 中已不存在或已离职的删除。是否继续？',
+        '全量同步',
+        {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning',
+        }
+      ).then(() => {
         this.startOaSync(false);
       });
     },
     handleOaPersonIncrementalSync() {
       this.$confirm(
-        '增量同步仅拉取本地最大 OA 更新时间之后有变更的人员；不存在的新增，已存在且更新时间不一致的修改，一致的跳过。是否继续？',
+        '增量同步仅拉取本地最大 OA 更新时间之后有变更的人员：已有的更新且不修改密码，没有的新增，部门按 OA 当前部门重绑，离职人员直接删除。是否继续？',
         '增量同步',
         {
           confirmButtonText: '确定',
@@ -712,6 +736,8 @@ export default {
         total: 0,
         synced: 0,
         skipped: 0,
+        removed: 0,
+        dumpFilePath: '',
       };
       this.runOaSyncPages();
     },
@@ -746,6 +772,10 @@ export default {
           this.oaSyncProgress.total = page.total || 0;
           this.oaSyncProgress.synced += page.syncedCount || 0;
           this.oaSyncProgress.skipped += page.skippedCount || 0;
+          this.oaSyncProgress.removed += page.removedCount || 0;
+          if (page.dumpFilePath) {
+            this.oaSyncProgress.dumpFilePath = page.dumpFilePath;
+          }
           if (page.finished) {
             this.oaSyncStatus = 'done';
             break;
@@ -1066,6 +1096,9 @@ export default {
     searchReset() {
       this.query = {};
       this.treeDeptId = '';
+      this.$nextTick(() => {
+        this.$refs.deptTree?.setCurrentKey?.(null);
+      });
       this.onLoad(this.page);
     },
     searchChange(params, done) {
@@ -1470,6 +1503,10 @@ export default {
   color: #909399;
 }
 
+.oa-sync-stat__value--remove {
+  color: #f56c6c;
+}
+
 .user-edit-dialog .el-form-item {
   margin-bottom: 24px;
 }
diff --git a/src/views/vehicle/accident-record.vue b/src/views/vehicle/accident-record.vue
index c62761b..82d4283 100644
--- a/src/views/vehicle/accident-record.vue
+++ b/src/views/vehicle/accident-record.vue
@@ -158,7 +158,7 @@ import { exportBlob } from '@/api/common';
 import { downloadXls } from '@/utils/util';
 import { openImportDialog } from '@/utils/import-excel';
 import { getToken, isAdministrator } from '@/utils/auth';
-import { normalizeSearchRangeParams } from '@/utils/search-range';
+import { applyIncomingSearch, normalizeSearchRangeParams } from '@/utils/search-range';
 import VehicleAttachmentTable from '@/components/vehicle-attachment-table/main.vue';
 import { mapGetters } from 'vuex';
 import { excelOption, exportColumns, option } from '@/option/vehicle/accident-record';
@@ -550,7 +550,7 @@ export default {
       };
     },
     buildQuery(params = {}) {
-      return normalizeSearchRangeParams({ ...params, ...this.query }, createTimeRangeMap);
+      return normalizeSearchRangeParams(applyIncomingSearch(this.query, params), createTimeRangeMap);
     },
     handleTemplate() {
       exportBlob(
diff --git a/src/views/vehicle/credit-score-quantification.vue b/src/views/vehicle/credit-score-quantification.vue
index ec5d126..3a145b2 100644
--- a/src/views/vehicle/credit-score-quantification.vue
+++ b/src/views/vehicle/credit-score-quantification.vue
@@ -468,7 +468,11 @@ import {
   publish,
   changeStatus,
 } from '@/api/vehicle/credit-score-quantification';
-import { normalizeSearchRangeParams } from '@/utils/search-range';
+import {
+  applyIncomingSearch,
+  normalizeSearchRangeParams,
+  omitInvalidListStatus,
+} from '@/utils/search-range';
 import { mapGetters } from 'vuex';
 import { isAdministrator } from '@/utils/auth';
 
@@ -1324,7 +1328,9 @@ export default {
       });
     },
     buildQuery(params = {}) {
-      return normalizeSearchRangeParams({ ...params, ...this.query }, createTimeRangeMap);
+      return omitInvalidListStatus(
+        normalizeSearchRangeParams(applyIncomingSearch(this.query, params), createTimeRangeMap)
+      );
     },
   },
 };
diff --git a/src/views/vehicle/customer-archive.vue b/src/views/vehicle/customer-archive.vue
index 6805c42..36ea6f5 100644
--- a/src/views/vehicle/customer-archive.vue
+++ b/src/views/vehicle/customer-archive.vue
@@ -231,7 +231,7 @@
           v-if="
             hasPermission('customer_archive_sync') &&
             row.approvalStatus === 'approved' &&
-            row.kingdeeStatus === 'failed'
+            !['synced', 'exist'].includes(row.kingdeeStatus)
           "
           @click="handleSyncKingdee(row)"
         >
@@ -521,7 +521,7 @@
                   :options="deptTree"
                   :props="deptCascaderProps"
                   disabled
-                  placeholder="桂物物流集团"
+                  placeholder="广西现代物流集团有限公司"
                 />
               </el-form-item>
             </el-col>
@@ -1624,7 +1624,7 @@ const customerArchiveListRoute = '/vehicle/customer-archive';
 const customerArchiveFormRoute = '/vehicle/customer-archive/form';
 const customerArchiveListRefreshKey = 'customer-archive-list-refresh';
 /** 客商所属组织固定为顶层组织 */
-const FIXED_OWNER_DEPT_NAME = '桂物物流集团';
+const FIXED_OWNER_DEPT_NAME = '广西现代物流集团有限公司';
 
 const createTimeRangeMap = {
   createTimeRange: ['createTimeStart', 'createTimeEnd'],
@@ -1830,6 +1830,8 @@ export default {
       },
       /** 业务字典 mk_template「开启MK」=1 */
       mkEnabled: false,
+      /** 是否已完成 MK 开关加载，避免提交时误判 */
+      _mkEnabledResolved: false,
       formRules: {
         customerCode: [{ max: 20, message: '客商编号最多20个字符', trigger: 'blur' }],
         fullName: [{ required: true, message: '请输入客商名称', trigger: 'blur' }],
@@ -1910,7 +1912,7 @@ export default {
         editBtn: false,
         selection: true,
         dialogClickModal: false,
-        menuWidth: 320,
+        menuWidth: 400,
         column: [
           {
             label: '客商编号',
@@ -2086,7 +2088,6 @@ export default {
             search: true,
             searchOrder: 6,
             searchValue: '',
-            dataType: 'number',
             minWidth: 100,
             dicData: [
               { label: '全部', value: '' },
@@ -2385,7 +2386,13 @@ export default {
       sessionStorage.setItem(customerArchiveListRefreshKey, '1');
     },
     hasPermission(code) {
-      return this.isAdmin || this.validData(this.permission[code], false);
+      if (this.isAdmin) {
+        return true;
+      }
+      const permission = this.permission || {};
+      const value = permission[code];
+      // 不依赖 Avue validData，避免权限值为 true 以外的真值时被误判
+      return value === true || value === 'true' || value === 1 || value === '1';
     },
     mergeSelectOptions(target, values) {
       const list = Array.isArray(values) ? values : values ? [values] : [];
@@ -3146,12 +3153,15 @@ export default {
       });
     },
     initMkEnabled() {
+      this._mkEnabledResolved = false;
       loadMkEnabled()
         .then(enabled => {
           this.mkEnabled = !!enabled;
+          this._mkEnabledResolved = true;
         })
         .catch(() => {
           this.mkEnabled = false;
+          this._mkEnabledResolved = true;
         });
     },
     initScoreQuantificationOptions() {
@@ -3251,7 +3261,7 @@ export default {
       );
     },
     /**
-     * 客商所属组织固定为顶层「桂物物流集团」，表单不可编辑。
+     * 客商所属组织固定为顶层「广西现代物流集团有限公司」，表单不可编辑。
      */
     applyFixedOwnerDept() {
       if (!this.isArchivePage || this.readonly) {
@@ -4530,15 +4540,34 @@ export default {
       });
     },
     /**
-     * 列表 / 新增 / 编辑提交共用：开启 MK 时提交审核流，并更新客商审批状态
+     * 列表 / 新增 / 编辑提交共用：
+     * 未开启 MK 时仅走本地提交审批（与新增一致，不请求 MK 流程）；
+     * 开启 MK 时先提交审核流，再更新客商审批状态。
      */
     submitCustomerApproval(id, fullName = '', approvalStatus = '') {
-      return submitMkApprovalFlow({
-        bizType: 'customer-archive',
-        bizId: id,
-        subjectName: fullName,
-        approvalStatus,
-      }).then(() => submitApproval(id));
+      const submitLocal = () => submitApproval(id);
+      const run = enabled => {
+        this.mkEnabled = !!enabled;
+        this._mkEnabledResolved = true;
+        if (!this.mkEnabled) {
+          return submitLocal();
+        }
+        return submitMkApprovalFlow({
+          bizType: 'customer-archive',
+          bizId: id,
+          subjectName: fullName,
+          approvalStatus,
+          mkEnabled: true,
+        }).then(submitLocal);
+      };
+
+      // 与列表按钮一致：以页面 mkEnabled 为准，未开启时不请求 MK
+      if (this._mkEnabledResolved) {
+        return run(this.mkEnabled);
+      }
+      return loadMkEnabled()
+        .then(enabled => run(enabled))
+        .catch(() => run(false));
     },
     openReviewScore() {
       const scores = this.archiveForm.scores || [];
@@ -5316,19 +5345,9 @@ export default {
       this.onLoad(this.page);
     },
     searchChange(params, done) {
-      // 搜索区所属组织级联返回的是 ID 路径数组，取末级 ID 转成部门名称传给后端（与列表接口 deptName 字段一致）
-      if (Array.isArray(params.deptName)) {
-        const path = params.deptName.filter(
-          item => item !== undefined && item !== null && item !== ''
-        );
-        const deptId = path.length ? path[path.length - 1] : '';
-        params.deptName = deptId
-          ? this.deptOptions.find(item => String(item.value) === String(deptId))?.rawLabel || ''
-          : '';
-      }
       this.query = this.buildQuery(params);
       this.page.currentPage = 1;
-      this.onLoad(this.page);
+      this.onLoad(this.page, this.query);
       done();
     },
     selectionChange(list) {
@@ -5429,7 +5448,38 @@ export default {
       };
     },
     buildQuery(params = {}) {
-      return normalizeSearchRangeParams({ ...params, ...this.query }, createTimeRangeMap);
+      // 新条件覆盖旧条件；本次显式清空的字段必须从查询里去掉，避免第二次搜索仍带着上一次的客商名称。
+      const merged = { ...this.query, ...params };
+      Object.keys(params).forEach(key => {
+        const value = params[key];
+        if (
+          value === '' ||
+          value === null ||
+          value === undefined ||
+          (Array.isArray(value) && value.length === 0)
+        ) {
+          delete merged[key];
+        }
+      });
+      if (Array.isArray(merged.deptName)) {
+        const path = merged.deptName.filter(
+          item => item !== undefined && item !== null && item !== ''
+        );
+        const deptId = path.length ? path[path.length - 1] : '';
+        merged.deptName = deptId
+          ? this.deptOptions.find(item => String(item.value) === String(deptId))?.rawLabel || ''
+          : '';
+        if (!merged.deptName) {
+          delete merged.deptName;
+        }
+      }
+      const values = normalizeSearchRangeParams(merged, createTimeRangeMap);
+      // 状态下拉「全部」会被数字类型转成 0/-1，二次搜索会把列表滤空。
+      const status = values.status;
+      if (status === 0 || status === '0' || status === -1 || status === '-1') {
+        delete values.status;
+      }
+      return values;
     },
   },
 };
diff --git a/src/views/vehicle/insurance-record.vue b/src/views/vehicle/insurance-record.vue
index 5a6f1cc..ac574be 100644
--- a/src/views/vehicle/insurance-record.vue
+++ b/src/views/vehicle/insurance-record.vue
@@ -220,7 +220,7 @@ import { downloadXls } from '@/utils/util';
 import { handleImportExcel } from '@/utils/import-excel';
 import { getToken, isAdministrator } from '@/utils/auth';
 import { getUploadHeaders } from '@/utils/upload';
-import { normalizeSearchRangeParams } from '@/utils/search-range';
+import { applyIncomingSearch, normalizeSearchRangeParams } from '@/utils/search-range';
 import { mapGetters } from 'vuex';
 import { ElLoading } from 'element-plus';
 import { excelOption, exportColumns, option } from '@/option/vehicle/insurance-record';
@@ -409,7 +409,7 @@ export default {
         : integerPart;
     },
     buildQuery(params = {}) {
-      return normalizeSearchRangeParams({ ...params, ...this.query }, createTimeRangeMap);
+      return normalizeSearchRangeParams(applyIncomingSearch(this.query, params), createTimeRangeMap);
     },
     validateRow(row) {
       if (row.startDate && row.endDate && row.endDate < row.startDate) {
diff --git a/src/views/vehicle/maintenance-plan.vue b/src/views/vehicle/maintenance-plan.vue
index 2612cd1..89f4bf1 100644
--- a/src/views/vehicle/maintenance-plan.vue
+++ b/src/views/vehicle/maintenance-plan.vue
@@ -195,7 +195,7 @@ import { downloadXls } from '@/utils/util';
 import { openImportDialog } from '@/utils/import-excel';
 import { formatUpdateUserName } from '@/utils/audit';
 import { getToken, isAdministrator } from '@/utils/auth';
-import { normalizeSearchRangeParams } from '@/utils/search-range';
+import { applyIncomingSearch, normalizeSearchRangeParams } from '@/utils/search-range';
 import AddressMapPicker from '@/components/address-map-picker/main.vue';
 import VehicleAttachmentTable from '@/components/vehicle-attachment-table/main.vue';
 import { mapGetters } from 'vuex';
@@ -903,7 +903,7 @@ export default {
       };
     },
     buildQuery(params = {}) {
-      return normalizeSearchRangeParams({ ...params, ...this.query }, createTimeRangeMap);
+      return normalizeSearchRangeParams(applyIncomingSearch(this.query, params), createTimeRangeMap);
     },
     handleTemplate() {
       exportBlob(
diff --git a/src/views/vehicle/maintenance-record.vue b/src/views/vehicle/maintenance-record.vue
index 1c94ed5..886c483 100644
--- a/src/views/vehicle/maintenance-record.vue
+++ b/src/views/vehicle/maintenance-record.vue
@@ -168,7 +168,7 @@ import { downloadXls } from '@/utils/util';
 import { openImportDialog } from '@/utils/import-excel';
 import { formatUpdateUserName } from '@/utils/audit';
 import { getToken, isAdministrator } from '@/utils/auth';
-import { normalizeSearchRangeParams } from '@/utils/search-range';
+import { applyIncomingSearch, normalizeSearchRangeParams } from '@/utils/search-range';
 import AddressMapPicker from '@/components/address-map-picker/main.vue';
 import VehicleAttachmentTable from '@/components/vehicle-attachment-table/main.vue';
 import { mapGetters } from 'vuex';
@@ -371,9 +371,8 @@ export default {
             placeholder: '日期时间选择器',
           },
           {
-            label: '里程/航程数（公里）',
+            label: '里程/航程数',
             prop: 'mileage',
-            renderHeader: () => '里程/航程数',
             type: 'input',
             minWidth: 130,
             slot: true,
@@ -391,6 +390,7 @@ export default {
             ],
             value: '公里',
             hide: true,
+            display: false,
           },
           {
             label: '备注',
@@ -565,12 +565,10 @@ export default {
       const mileageUnit = vehicleType === '船舶' ? '海里' : '公里';
       const vehicleTypeColumn = this.findColumn(this.option.column, 'vehicleType');
       const vehicleNoColumn = this.findColumn(this.option.column, 'vehicleNo');
-      const mileageColumn = this.findColumn(this.option.column, 'mileage');
       const mileageUnitColumn = this.findColumn(this.option.column, 'mileageUnit');
       vehicleNoColumn.placeholder =
         vehicleType === '船舶' ? '请选择船号' : '请选择车牌号';
       vehicleTypeColumn.disabled = Boolean(this.form.id);
-      mileageColumn.label = `里程/航程数（${mileageUnit}）`;
       mileageUnitColumn.value = mileageUnit;
       this.form.mileageUnit = mileageUnit;
       if (!this.isDetailLoading && oldValue && vehicleType !== oldValue) {
@@ -833,7 +831,7 @@ export default {
       };
     },
     buildQuery(params = {}) {
-      return normalizeSearchRangeParams({ ...params, ...this.query }, createTimeRangeMap);
+      return normalizeSearchRangeParams(applyIncomingSearch(this.query, params), createTimeRangeMap);
     },
     handleTemplate() {
       exportBlob(
diff --git a/src/views/vehicle/mileage-record.vue b/src/views/vehicle/mileage-record.vue
index 0c9c5c4..a443be6 100644
--- a/src/views/vehicle/mileage-record.vue
+++ b/src/views/vehicle/mileage-record.vue
@@ -210,7 +210,7 @@ import { exportBlob } from '@/api/common';
 import { downloadXls } from '@/utils/util';
 import { openImportDialog } from '@/utils/import-excel';
 import { getToken, isAdministrator } from '@/utils/auth';
-import { normalizeSearchRangeParams } from '@/utils/search-range';
+import { applyIncomingSearch, normalizeSearchRangeParams } from '@/utils/search-range';
 import VehicleAttachmentTable from '@/components/vehicle-attachment-table/main.vue';
 import { mapGetters } from 'vuex';
 import { excelOption, exportColumns, option } from '@/option/vehicle/mileage-record';
@@ -607,7 +607,7 @@ export default {
     },
     buildQuery(params = {}) {
       return normalizeSearchRangeParams(
-        { ...params, ...this.query, vehicleType: '车辆' },
+        { ...applyIncomingSearch(this.query, params), vehicleType: '车辆' },
         createTimeRangeMap
       );
     },
diff --git a/src/views/vehicle/tire-replacement-record.vue b/src/views/vehicle/tire-replacement-record.vue
index 08fea1a..f5b457f 100644
--- a/src/views/vehicle/tire-replacement-record.vue
+++ b/src/views/vehicle/tire-replacement-record.vue
@@ -155,7 +155,7 @@ import { exportBlob } from '@/api/common';
 import { downloadXls } from '@/utils/util';
 import { openImportDialog } from '@/utils/import-excel';
 import { getToken, isAdministrator } from '@/utils/auth';
-import { normalizeSearchRangeParams } from '@/utils/search-range';
+import { applyIncomingSearch, normalizeSearchRangeParams } from '@/utils/search-range';
 import VehicleAttachmentTable from '@/components/vehicle-attachment-table/main.vue';
 import { mapGetters } from 'vuex';
 import { excelOption, exportColumns, option } from '@/option/vehicle/tire-replacement-record';
@@ -500,7 +500,7 @@ export default {
       };
     },
     buildQuery(params = {}) {
-      return normalizeSearchRangeParams({ ...params, ...this.query }, createTimeRangeMap);
+      return normalizeSearchRangeParams(applyIncomingSearch(this.query, params), createTimeRangeMap);
     },
     handleTemplate() {
       exportBlob(
diff --git a/src/views/vehicle/transport-change-record.vue b/src/views/vehicle/transport-change-record.vue
index 202bd0e..28839c3 100644
--- a/src/views/vehicle/transport-change-record.vue
+++ b/src/views/vehicle/transport-change-record.vue
@@ -130,7 +130,7 @@ import { exportBlob } from '@/api/common';
 import { downloadXls } from '@/utils/util';
 import { openImportDialog } from '@/utils/import-excel';
 import { getToken, isAdministrator } from '@/utils/auth';
-import { normalizeSearchRangeParams } from '@/utils/search-range';
+import { applyIncomingSearch, normalizeSearchRangeParams } from '@/utils/search-range';
 import VehicleAttachmentTable from '@/components/vehicle-attachment-table/main.vue';
 import { mapGetters } from 'vuex';
 import { excelOption, exportColumns, option } from '@/option/vehicle/transport-change-record';
@@ -478,7 +478,7 @@ export default {
       };
     },
     buildQuery(params = {}) {
-      return normalizeSearchRangeParams({ ...params, ...this.query }, createTimeRangeMap);
+      return normalizeSearchRangeParams(applyIncomingSearch(this.query, params), createTimeRangeMap);
     },
     handleTemplate() {
       exportBlob(
diff --git a/src/views/vehicle/violation-record.vue b/src/views/vehicle/violation-record.vue
index 0ee312d..79a4eef 100644
--- a/src/views/vehicle/violation-record.vue
+++ b/src/views/vehicle/violation-record.vue
@@ -197,7 +197,7 @@ import { exportBlob } from '@/api/common';
 import { downloadXls } from '@/utils/util';
 import { openImportDialog } from '@/utils/import-excel';
 import { getToken, isAdministrator } from '@/utils/auth';
-import { normalizeSearchRangeParams } from '@/utils/search-range';
+import { applyIncomingSearch, normalizeSearchRangeParams } from '@/utils/search-range';
 import AddressMapPicker from '@/components/address-map-picker/main.vue';
 import VehicleAttachmentTable from '@/components/vehicle-attachment-table/main.vue';
 import { mapGetters } from 'vuex';
@@ -673,7 +673,7 @@ export default {
       };
     },
     buildQuery(params = {}) {
-      return normalizeSearchRangeParams({ ...params, ...this.query }, createTimeRangeMap);
+      return normalizeSearchRangeParams(applyIncomingSearch(this.query, params), createTimeRangeMap);
     },
     handleTemplate() {
       exportBlob(
diff --git a/src/views/wel/components/rank-panel.vue b/src/views/wel/components/rank-panel.vue
index 1ffaa6e..982968a 100644
--- a/src/views/wel/components/rank-panel.vue
+++ b/src/views/wel/components/rank-panel.vue
@@ -42,5 +42,5 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import '../dashboard.scss';
+@use '../dashboard.scss';
 </style>
diff --git a/src/views/wel/components/section-business.vue b/src/views/wel/components/section-business.vue
index 9322f72..a0e3d8c 100644
--- a/src/views/wel/components/section-business.vue
+++ b/src/views/wel/components/section-business.vue
@@ -156,7 +156,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import '../dashboard.scss';
+@use '../dashboard.scss';
 
 .business-panel {
   margin-bottom: 16px;
diff --git a/src/views/wel/components/section-finance.vue b/src/views/wel/components/section-finance.vue
index 59a6dfd..7846a01 100644
--- a/src/views/wel/components/section-finance.vue
+++ b/src/views/wel/components/section-finance.vue
@@ -60,7 +60,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import '../dashboard.scss';
+@use '../dashboard.scss';
 
 .finance-panel {
   margin-bottom: 16px;
diff --git a/src/views/wel/components/section-fleet.vue b/src/views/wel/components/section-fleet.vue
index 19cc1c3..b209256 100644
--- a/src/views/wel/components/section-fleet.vue
+++ b/src/views/wel/components/section-fleet.vue
@@ -67,7 +67,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import '../dashboard.scss';
+@use '../dashboard.scss';
 
 .fleet-panel {
   margin-bottom: 16px;
diff --git a/src/views/wel/components/section-kpi.vue b/src/views/wel/components/section-kpi.vue
index 074fcd6..187bd4d 100644
--- a/src/views/wel/components/section-kpi.vue
+++ b/src/views/wel/components/section-kpi.vue
@@ -92,7 +92,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import '../dashboard.scss';
+@use '../dashboard.scss';
 
 .kpi-card {
   background: #ffffff;
diff --git a/src/views/wel/components/section-project.vue b/src/views/wel/components/section-project.vue
index a1ad6e2..ee30c53 100644
--- a/src/views/wel/components/section-project.vue
+++ b/src/views/wel/components/section-project.vue
@@ -62,7 +62,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import '../dashboard.scss';
+@use '../dashboard.scss';
 
 .project-panel {
   margin-bottom: 16px;
diff --git a/src/views/wel/components/section-structure.vue b/src/views/wel/components/section-structure.vue
index d8e3504..f46208a 100644
--- a/src/views/wel/components/section-structure.vue
+++ b/src/views/wel/components/section-structure.vue
@@ -102,7 +102,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import '../dashboard.scss';
+@use '../dashboard.scss';
 
 .structure-cards__item {
   margin-bottom: 16px;
diff --git a/src/views/wel/components/section-summary.vue b/src/views/wel/components/section-summary.vue
index 7891a0a..3204bcf 100644
--- a/src/views/wel/components/section-summary.vue
+++ b/src/views/wel/components/section-summary.vue
@@ -59,7 +59,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import '../dashboard.scss';
+@use '../dashboard.scss';
 
 .summary-panel {
   margin-bottom: 16px;
diff --git a/src/views/wel/components/section-vehicle.vue b/src/views/wel/components/section-vehicle.vue
index 528f6b3..61b44aa 100644
--- a/src/views/wel/components/section-vehicle.vue
+++ b/src/views/wel/components/section-vehicle.vue
@@ -68,7 +68,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import '../dashboard.scss';
+@use '../dashboard.scss';
 
 .vehicle-cards__item {
   margin-bottom: 16px;
diff --git a/src/views/wel/components/wel-filters.vue b/src/views/wel/components/wel-filters.vue
index 3af1636..214357c 100644
--- a/src/views/wel/components/wel-filters.vue
+++ b/src/views/wel/components/wel-filters.vue
@@ -41,7 +41,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import '../dashboard.scss';
+@use '../dashboard.scss';
 
 .wel-filter__range {
   width: 110px;
diff --git a/vite.config.mjs b/vite.config.mjs
index b59a8be..c2f339c 100644
--- a/vite.config.mjs
+++ b/vite.config.mjs
@@ -49,28 +49,28 @@ export default ({ mode, command }) => {
       __VUE_I18N_LEGACY_API__: true,
       __INTLIFY_PROD_DEVTOOLS__: false,
     },
-     server: {
-       port: 2888,
-       proxy: {
-         '/api': {
-           // 本地网关默认 80 端口（blade-gateway bootstrap.yml）；开发时需先启动网关及 blade-auth/blade-system 等服务
-           // 注意：本机 8080 一般是 Nacos，不是业务网关
-           target: 'http://localhost',
-           // target: 'http://172.16.203.228:8000', // 仅联调远程网关时启用（且不要 rewrite）
-           changeOrigin: true,
-           rewrite: path => path.replace(/^\/api/, ''),
-         },
-       },
-     },
-    //server: {
-    //  port: 2889,
-    //  proxy: {
-    //    '/api': {
-    //      target: 'http://172.16.203.221:8000',
-    //      changeOrigin: true,
-    //    },
-    //  },
-    //},
+    // server: {
+    //   port: 2888,
+    //   proxy: {
+    //     '/api': {
+    //       // 本地网关默认 80 端口（blade-gateway bootstrap.yml）；开发时需先启动网关及 blade-auth/blade-system 等服务
+    //       // 注意：本机 8080 一般是 Nacos，不是业务网关
+    //       target: 'http://localhost',
+    //       // target: 'http://172.16.203.228:8000', // 仅联调远程网关时启用（且不要 rewrite）
+    //       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, './'),