✨ 合同管理搜索表单新增客商筛选，合同名称移到最后，生效类型改为合同状态

Co-authored-by: Cursor <cursoragent@cursor.com>

.env.development

@@ -3,8 +3,9 @@
 VITE_APP_ENV = 'development'
 
 #接口地址
-# 开发环境建议填 [/api]：由下方 vite.config.mjs 的 proxy 同源转发到后端(172.16.203.228:8000)，避免跨域(CORS)被浏览器拦截
-# 如需直连线上绝对地址(如 http://172.16.203.228:8000/api)，必须让后端 CORS 把 Allow-Origin 改为具体前端域名，不能用 `*`(配合 credentials 会被浏览器拒绝)
+# 开发环境建议填 [/api]：由 vite.config.mjs 的 proxy 同源转发到本地网关 http://localhost（80）
+# 本地需先启动：Nacos + blade-gateway(80) + blade-auth + blade-system 等；8080 端口一般是 Nacos 控制台不是网关
+# 如需临时联调远程，把 vite proxy target 改为 http://172.16.203.228:8000 并去掉 rewrite
 VITE_APP_API=/api
 
 #调试参数

.gitignore

@@ -1,6 +1,8 @@
 .DS_Store
 node_modules
+pnpm-lock.yaml
 /dist
+/dist.zip
 
 /tests/e2e/videos/
 /tests/e2e/screenshots/

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

@@ -0,0 +1,11 @@
+# 2026-09-30
+
+## /wel/index 首页重构为运营数据看板（按蓝湖效果图）
+- 新增依赖：echarts ^6.1.0（corepack pnpm add echarts）。
+- 重构 `src/views/wel/index.vue`：改为「核心经营指标 / 运输结构 / 业务单元情况 / 项目情况 / 财务情况 / 车队与线路 / 车务管理 / 底部占比与趋势」8 大板块 + 版权页脚，删除原欢迎横幅/快捷入口。
+- 新增文件：
+  - `src/views/wel/chart-options.js`：排行条形/盈亏双向/环形/分组柱/面积折线/堆叠柱 6 类 option 生成器（fmt 千分位、红涨绿跌 rich label）。
+  - `src/views/wel/dashboard.scss`：看板公共样式，各组件 scoped `@import '../dashboard.scss'`（子目录注意路径）。
+  - `src/views/wel/components/`：wel-chart.vue（ECharts 封装：ResizeObserver + activated resize + dispose）、wel-filters.vue（统计时间/条件筛选 mock）、rank-panel.vue（排行/盈亏通用面板）、section-kpi / section-structure / section-business / section-project / section-finance / section-fleet / section-vehicle / section-summary.vue。
+- 数据全部为 Mock，组件内已注释标注对接点；蓝湖红字标注的指标口径未定，待后端统计接口（估 12~18 个）确定后替换。
+- 自检：dev server(2889) 下所有新文件及 `?vue&type=style&...&lang.scss` 均 200；`/node_modules/.vite/deps/echarts.js` 200。vite build 因 facelogin.vue 沙箱中断不可用，未跑。

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

@@ -0,0 +1,18 @@
+# 2026-10-13
+
+## 车辆调度弹窗：使用部门级联选择器宽度对齐
+
+- 现象：`/transportCapacity/vehicle-dispatch` 新增/编辑弹窗中，使用部门 `el-cascader` 明显窄于同行车牌号 `el-input`。
+- 根因：`el-cascader` 是 `display: inline-block` 宽度按内容收缩（不像 `el-autocomplete` / `el-input` 有 `--el-input-width: 100%` 兜底）；而页面里写的 `.vehicle-dispatch-page :deep(.vehicle-dispatch-form-control){width:100%}` 命中不到 —— avue-crud 弹窗默认 `append-to-body: true`（`append-to-body": validData(crud.tableOption.dialogAppendToBody, true)`），DOM Teleport 到 body，已不在 `.vehicle-dispatch-page` 之下。
+- 修法（走项目既有约定）：
+  1. `src/option/transportCapacity/vehicle-dispatch.js` 增加 `dialogCustomClass: 'vehicle-dispatch-dialog'`；
+  2. `src/styles/element-ui.scss` 增加全局规则 `.vehicle-dispatch-dialog .el-form-item__content > .el-cascader { width:100%; max-width:100% }`。
+- 自检：dev(2889) `curl /src/styles/element-ui.scss` 与 `/src/option/transportCapacity/vehicle-dispatch.js` 均 200，编译产物含新规则。
+- 遗留观察：同文件里 `.vehicle-dispatch-page :deep(.avue--detail ...)` 那一批查看态禁用样式，同样因 Teleport 属死规则（未改，待确认是否需要迁到 `.vehicle-dispatch-dialog` 作用域）。
+
+## 追加修正（同日 20:xx）：第一次改完用户反馈「还是没对齐」
+
+- 原因一：选择器写成了 `.el-form-item__content > .el-cascader`（直接子级）。**avue 表单项在 `el-form-item__content` 与控件之间还有两层包裹 div**（`packages/element-plus/form/index3.js`：content > div > [div|elTooltip] > 控件），必须用后代选择器。已改成 `.vehicle-dispatch-dialog .el-form-item__content .el-cascader`。
+- 原因二（更隐蔽）：option 用 `labelWidth: 'auto'`，**EP 的 auto 是逐项计算**（实测：3 字 54/64px、2 字 40px、4 字无星号 68px、4 字带星号 78px），label 越宽控件可用宽度越小 → 车牌号 input 486px、使用部门 cascader 472px，仍差 14px。已加 `.vehicle-dispatch-dialog .el-form-item__label { flex: 0 0 calc(4em + 24px) !important; width: calc(4em + 24px) !important }`（本弹窗左右两列最长 label 均为 4 汉字）。
+- 验证方式（可复用）：临时在项目根建 `cascader-width-check.html`，Vite 直接服务 → `import './src/option/...'` 用真实 option + `import './src/styles/element-ui.scss'`，挂 avue-crud 并 `mounted(){ this.$refs.crud.rowAdd() }` 弹出真实弹窗；用 agent-browser（`/Users/gxwebsoft/.workbuddy/binaries/node/workspace/node_modules/.bin/agent-browser`）`open` + `eval` 读 DOM 链路与 `getBoundingClientRect`。修完已删除该临时文件。
+- 结果：全部 label 80px，车牌号 input 与使用部门 cascader 均为 left=732 / width=470 / right=1202，完全一致。

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

@@ -0,0 +1,142 @@
+# 2026-10-14
+
+## 运单管理：草稿行「查看」改为与其它状态一致的「详情」
+- 现象：`/business/waybill-manage` 列表操作列，草稿行显示「查看」→ 走 avue 自带 `$refs.crud.rowView()` 表单弹窗；其它状态显示「详情」→ `openDetail()` 跳独立详情页 `/business/waybill-manage/detail?id=x`（新标签「运单管理详情」）。同一列两种弹窗形态。
+- 根因：`waybill-manage-page.vue` 的 `showDetailButton(row)` 显式 `return status !== 'draft'`，把草稿排除在详情按钮外，于是落到 `#menu` 里 `!showDetailButton(row)` 的「查看」分支。
+- 修法：`showDetailButton()` 去掉草稿判断，仅保留 `config.detailButton` + `_view` 权限判断；「查看」分支保留，仅在 `detailButton:false` 时兜底。
+- 备注：`business-crud-page.vue:7043`、`transport-plan-page.vue:4111` 有同款 `status !== 'draft'` 逻辑（运输计划另有 `showViewButton`）；两个 option 文件里的 `detailButtonIgnoreDraftStatus` 目前是死配置，组件未读取。
+
+## 收付款管理模块：列表页右上角统一为 4 键工具组（最终方案 = 改 avue-crud）
+- 现象：付款管理页右上角只有 1 个刷新按钮，与其它模块不一致；参考模块的 4 键工具组其实是 **avue-crud 内置头部**，不是可引用的公共组件。
+- 方案演进：
+  1. 过渡方案（已落地 7 页）：手写页引入标准件 `src/components/table-header-tools/main.vue`，改法为搜索区 `v-if="searchVisible"`、el-table 加 `:size="tableSize"`、列 `v-for="column in visibleColumns"`、data 加 `searchVisible/tableSize/visibleColumnKeys`；汇票两页表格在子组件，子组件透传 `update:searchVisible` + `refresh`。已接入 `invoice-application.vue`、`invoice-receipt.vue`、`receipt-flow.vue`、`receipt-claim-record.vue`、`bill-ledger.vue`+`bill-ledger-table.vue`、`bill-payment.vue`+`bill-payment-table.vue`。
+     但用户实测反馈：第 2 键（列设置）与第 4 键（表格尺寸）效果仍与参考模块不同 —— 参考模块第 2 键是 `el-drawer` 列设置抽屉（列名/隐藏/冻结/过滤/排序），第 4 键是「表格 ↔ 卡片」视图切换，两者都嵌在 avue 内部，**无法脱离 avue-crud 复用**。
+  2. 最终方案（用户选定，先做样板）：列表页改写成 `<avue-crud>`，4 键 = 刷新 / 列显隐抽屉 / 搜索显隐 / 网格切换，与其它模块 100% 一致。
+- 样板：`src/views/payment/payment-application.vue` + `src/option/payment/paymentApplication.js`（`paymentApplicationOption()` 工厂）。
+  - 搜索项与表格列 label 不一致的（表格列「收款方」vs 搜索项「客户名称」）用 `searchProp` 映射；属搜索专用列用 `searchOnlyColumn()` 统一生成（`hide + showColumn:false + add/edit/viewDisplay:false`）。
+  - ⚠️ **avue 的 searchOrder 是降序**（`header-search2.js`：`(b.searchOrder||0)-(a.searchOrder||0)`），值越大越靠前 —— 首次做反了，9 个搜索项 score 全部反转。
+  - ⚠️ **column 数组顺序即表格列顺序**，搜索项夹在中间会把该列挤到表格前面（`deptName` 踩过），搜索专用列必须紧跟在同位置或用 `hide` 隔离。
+  - `on-load` 在 created / currentChange / sizeChange 都会触发（`table-page2.js`），因此 `currentChange`/`sizeChange` 只改 page、**不要再调 onLoad**；`onLoad(page)` 也不能把 page 里的 total/pageSizes spread 进查询参数。
+- 顺带加固：`table-header-tools` 加 `deactivated()` 关闭列设置弹窗（keep-alive 切页防 Teleport 弹窗残留）；清理 invoice-application / invoice-receipt 里失效的 `__toolbar-right` 样式规则。
+- 验证：项目根建临时 html 挂真组件 + `app.use(Avue)`，`agent-browser` 实测 —— 4 个按钮均渲染图标、刷新触发、搜索区切换、表格尺寸 default→large、列设置弹窗勾选双向生效；avue-crud 样板另测：4 键数量=4、默认 4 项搜索 + 展开 9 项、18 列表格顺序与原页一致、列显隐抽屉表头 5 列 18 行、网格按钮切出卡片视图；临时文件用完即删。
+- 踩坑：`el-icon-*` 字符串图标靠 Avue 的全局映射，验证页不装 Avue 时 4 个按钮是空圆（差点误判）。
+- 待办：用户确认样板效果后，把其余 6 页（invoice-application / invoice-receipt / receipt-flow / receipt-claim-record / bill-ledger / bill-payment）也改成 avue-crud，并回退其 table-header-tools 改动。
+
+## 正式结算单表单：结算明细区按钮/筛选行对齐预结算单
+- 现象：`formal-settlement-editor.vue` 的「结算明细」区把 导出/选择结算明细 塞在筛选表单的 actions 里（`grid-column:1/-1` 换行右对齐，出现两个蓝实心），与 `pre-settlement-editor.vue` 不一致（后者把这两个按钮放 `<section-card #extra>`，筛选项与查询/重置同行）。
+- 改法（只动 formal 一个文件，72+/17-）：
+  1. 模板 `section-card#extra` 加 导出（`v-if="hasPermission('formal_settlement_export')" type=primary plain`）+ 选择结算明细（`v-if="editable" type=primary plain`），与「收起明细」并列；actions 里只留 查询/重置。
+  2. el-form 去掉 `inline`、`label-width` 88px→auto，4 个输入补 `placeholder="请输入"`。
+  3. 样式 `grid-template-columns: repeat(4, minmax(0,1fr)) auto` + `align-items:center`；actions 去掉 `grid-column:1/-1` 改 `width:auto;margin-left:0;white-space:nowrap;justify-self:end`；媒体查询 ≤1200px 同步补 `auto` 列。
+  4. 补 `hasPermission`：`...mapGetters(['permission','userInfo'])` + `isAdmin`（`isAdministrator` from `@/utils/auth`）+ methods `hasPermission(code){ return this.isAdmin || this.validData(this.permission?.[code], false) }`（`validData` 是项目全局属性，main.js 未显式挂载但全站通用）。
+- ⚠️ 关键坑：文件末尾 `.formal-editor :deep(.el-form-item){margin-bottom:24px}` 与筛选区 `:deep(.el-form-item){margin-bottom:0}` **特异性相同**，靠源序决定胜负 → 覆盖规则必须写在文件尾部（`@media` 之前）。pre 用的也是同索引结构。
+- 验证：`agent-browser` + mock 注入实测 —— grid 列 `188.25×4 + 132`、5 个 form-item 同一行 top 相同、form-item margin-bottom=0；正式单与预结算单**同视口截图逐像素一致**。
+
+## 「变更运输路线」弹窗 · 变更记录列表：变更前/后地址分行展示
+- 需求：变更内容原为单行 `YD-xxx：发货地 A → B；到货地 C → D`（多条以 `；` 拼接），地址太长挤成一坨，要求「变更前地址 / 变更后地址」换行。
+- 落地：新增 `src/utils/route-change.js` 导出 `formatRouteChangeContent(content, emptyText='-')` —— 仅**展示层**格式化（不动 taskInfoJson 里已存的 content，历史数据同样生效）：`\r\n` 归一 → `；` 转 `\n` → `→` 转 ` →\n`（箭头留上一行行尾）→ 压缩空行；空值返回 `-`。
+- 接入 3 处同一弹窗（都在 methods 里以 ES6 简写挂载 `formatRouteChangeContent`，与 `formatContractOptionLabel` 同款）：
+  - `views/business/loading-manage.vue`（表格列 `record-content`）
+  - `views/business/components/waybill-manage-page.vue`
+  - `views/business/components/business-crud-page.vue`
+- ⚠️ 关键坑：`white-space: pre-wrap` 下模板里插值前后的**换行+缩进空白会被渲染出来**（内容前面凭空多一行缩进）。所以要么把 `>{{ ... }}</div>` 写成紧贴一行（loading-manage），要么改用 `v-text="formatRouteChangeContent(row.content)"` 多行写法（另两处）——文本节点不存在才安全。CSS 里 `white-space:normal` 需改 `pre-wrap`（loading-manage 原为 normal），另两处补 `overflow-wrap:anywhere; word-break:break-word; line-height:22px`。
+- 效果：`YD-20260904-0022：发货地 广西…公司 →` / 换行 / `广东省…西瓜洲` / `到货地 山东…公司 →` / `山东省…公司`。
+- 验证：node 直跑函数（多条 / 单条 / 路线顺序 / 空值）输出正确；dev `localhost:2889` 三个 .vue 与 scoped style 块均 200，编译产物各含 3 处 `formatRouteChangeContent`。
+- 未做（如需再说）：存储格式与导出 Excel 仍是单行文本；`vehicle/transport-change-record.vue` 的 `changeContent` 是人工填写的自由文本，未改。
+
+
+## 发货模板"选择常用地址"改图标（对齐运输计划）
+- 需求：`/business/shipping-template/form` 收发货信息行，把文字「选择」按钮改成运输计划同款图标方式。
+- 改动（`src/views/business/components/shipping-template-page.vue`）：
+  1. `import { Location, OfficeBuilding } from '@element-plus/icons-vue'`，并把 `OfficeBuilding` 加进 `data()`；
+  2. departure/arrival 两个 form 插槽里，把 `<el-tooltip><el-button ...>选择</el-button></el-tooltip>` 从行尾移到第二个地址输入框之后，改成 `:icon="OfficeBuilding"` + `link` 图标按钮（class `shipping-template-page__address-pick-btn`）；
+  3. suffix 的 `<el-icon>` 补 class `shipping-template-page__map-suffix`（cursor/18px/#909399/hover #409eff），与运输计划同名同款；
+  4. `.shipping-template-page__route-row` grid 第 3 列插入 `40px` 图标列（原末尾的 `auto`），并把 `__address-pick-btn .el-icon { font-size: 22px }` 写进该行容器内。
+- 关键坑（差点误判成 bug）：Element Plus 图标两种用法机制不同 ——
+  - 标签形式 `<Location />` 靠 `main.js` 里 `app.component(key, ...)` **全局注册**解析，与 `data()` 无关；
+  - 表达式形式 `:icon="OfficeBuilding"` 编译成 `_ctx.OfficeBuilding`，**必须把组件对象放进 data()**（放 `components` 注册里模板取不到，会静默渲染不出图标）。
+  验证页漏了全局注册，曾误判 `<Location />` 不渲染。
+- 验证：临时验证页（项目根 html + 真 .vue，走 Vite + 真 element-plus + 全局图标注册）实测：地址框内 Location 18px、按钮 40px 内 svg 22px 居中、7 列 184/368/40/48/184/64/184 铺满 1120px；截图视觉与运输计划一致。用完已删临时文件。
+- dev 自检：`shipping-template-page.vue` 与 scoped style 均 200。
+
+## 多联总单：调度页顶部路线节点 / 详情页路线图 —— 省市区按「市 区县」分段展示
+- 现象：`/business/master-order?mode=dispatch&id=xxx` 顶部 `route-overview` 的起/终节点直接绑定 `route.departureName/arrivalName` 原始值 → 显示成「上海市浦东新区」「广西壮族自治区南宁市邕宁区」挤成一坨（同页段1~段3 的表头早已是「上海市 浦东新区 → 上海市 静安区」，用户截图圈出顶部这行说"怎么还没改"）。
+- 根因：顶部节点是唯一没走格式化方法的绑定（段头走 `dispatchLocationName`，详情页走 `segmentLocationName`），不是格式化逻辑有问题。
+- 落地：新增 `src/utils/region-address.js` 导出 `formatRegionAddress(value)` + `splitRegionTokens(value)`（按行政区划后缀切分，`州`+`市`、`县`+`区` 连写特例合并；**整串都是行政区划**才重排，站点名「南宁站」「广州南站」和含街道门牌的详细地址原样返回）→「市 区县」的空格展示，省/自治区不重复（与全站既有 `formatRoadLocation`/`formatRouteCityDistrict` 规则一致，`广西壮族自治区南宁市邕宁区` → `南宁市 邕宁区`）。
+- 接入 4 处：调度页 `route-overview` 起/终节点的强文本改用 `dispatchLocationName(route, 'departure'|'arrival')`、第二行地址改用 `formatRegionAddress(...)`，`addressText()` 名称+地址都格式化并去重（`南宁市 邕宁区` 不再重复两遍）；详情页 `route-map` 两处 `<small>` 地址改用 `formatRegionAddress(...)`。
+- 验证：项目根临时验证页（真组件 + `axios.defaults.adapter` 全量 mock 后端，复刻截图数据 `routes=[上海市静安区, 南宁站, 广西壮族自治区南宁市邕宁区]`）+ agent-browser 读 DOM —— 调度页顶部 4 节点 =「上海市 浦东新区 / 上海市 静安区 / 南宁站 / 南宁市 邕宁区」，与段1~段3 表头、详情页路线图**逐字一致**；终节点宽 101px 未被省略号截断（改前原始串超宽被截）；两页 innerText 再扫 `省|自治区` 已无未加空格的残留。用完已删临时文件。
+
+## 同事拉代码编译报错（漏提交新文件）→ 已修复
+- 现象：同事 pull 后 `[vite:load-fallback] Could not load .../src/utils/route-change (imported by src/views/business/loading-manage.vue): ENOENT`。
+- 根因：`src/utils/route-change.js`、`src/utils/region-address.js` 是**新增文件且一直 untracked**，本地能跑、远端没有。
+  提交时用了只带已跟踪文件的写法（`git commit -am` 之类），.vue 的引用被提交了、新 .js 没进去（12:44 的 6de87ed 就是这种情况）。region-address 是第二个雷：route-change 修好后会接着报它。
+- 修复：`git add src/utils/region-address.js src/utils/route-change.js` → commit `749b314 :bug: 补充提交遗漏的 region-address 与 route-change 工具文件` → push（期间远端有同事新提交 74780b8，先 `git pull --rebase` 无冲突）。三处 tree（本地 HEAD / origin/master / 远端真实 SHA）核对一致。
+- 复查：写脚本扫 `src/**` 所有 `@/`、相对路径引用（含 scss @use/@import），比对 `git ls-files`，**无其它"文件存在但未跟踪"的引用目标**，暂时不会再踩同类坑。
+- 教训：本仓库提交前建议 `git status` 扫一眼 `??`，新增文件必须显式 `git add`。
+
+## payment 模块 6 个手写列表页：搜索栏「展开/收起」统一（对齐 customer-archive / settlement）
+- 起因：`/payment/invoice-application`、`/payment/bill-payment` 的展开收起控件与别的模块不一致。排查发现 payment 模块 6 个手写搜索栏各写各的：5 个是 `el-tooltip`+`el-button text`+纯箭头图标（文案「折叠」，tooltip 才显示），`receipt-flow.vue` 更离谱 —— 裸 `el-button`（带边框）且排在**查询/重置左边**。
+- 统一标准（两处参照物写法完全一致）：
+  - `views/settlement/{formal-settlement,pre-settlement,transport-reconciliation,receivable-payable-detail,settlement-adjustment}.vue` 已有写法：
+    ```html
+    <el-button text :icon="searchExpanded ? ArrowUp : ArrowDown" @click="toggleSearch">
+      {{ searchExpanded ? '收起' : '展开' }}
+    </el-button>
+    ```
+    放在「查询 / 重置」之后（最右）。
+  - `views/vehicle/customer-archive.vue` 是 avue-crud 内建，`searchIcon: true` + `searchIndex: 4`，渲染出的也是同一形态。
+- avue 显示规则（`node_modules/@smallwei/avue/lib/packages/element-plus/crud/menu/header-search3.js` 的 `isSearchIcon`）：
+  `searchIcon === true && columnLen > searchIndex` → **搜索项不超过 4 项时根本不渲染展开/收起按钮**。故各页 data 加 `searchIndex: 4` + `searchItemCount: N`，computed `showSearchToggle = searchItemCount > searchIndex`。
+- 逐页落地：invoice-application(5项) / invoice-receipt(6项) / receipt-claim-record(11项) / receipt-flow(7项) / components/bill-ledger-search(6项) 均显示；**components/bill-payment-search 仅 4 项（后端 `BillPaymentServiceImpl.selectPage` 也只支持 paymentNo/deptName/paymentDate 区间/approvalStatus 这 4 个条件）→ showSearchToggle=false，不渲染按钮**，避免留一个"点了没反应"的假按钮。
+- `receipt-flow.vue`：补 `import { ArrowDown, ArrowUp }`、按钮从最左移到最右、文案「折叠」→「收起」。
+- gap 不动：`business/`、`settlement/` 手写页的 `__search-actions` 都写了 `gap: 8px`（与本次统一无关，别顺手删）。
+- 校验：6 个文件 `curl localhost:2889/src/...vue` 与 `?vue&type=style&index=0&scoped=true&lang.scss` 全 200；`grep 折叠|el-tooltip src/views/payment/` 已无残留。
+
+## 15:55 路线变更「变更内容」列排布问题（待用户确认方案，未动代码）
+- 位置：`变更运输路线` 弹窗 → `变更记录` tab → 表格 `变更内容` 列，共 **3 处同款**：`views/business/loading-manage.vue:1688`（`__record-content`）、`views/business/components/waybill-manage-page.vue:3027`、`views/business/components/business-crud-page.vue:2998`。
+- 存储格式为**单行文本**：`YD-xxx：发货地 A → B；到货地 C → D；YD-yyy：…`，展示层由 `src/utils/route-change.js` 的 `formatRouteChangeContent()` 切行（`；`→换行、`→`→` →\n`），再以 `white-space: pre-wrap` 平铺。
+- 病因：`：` 不带换行 → 运单号与「发货地 原地址」挤同一行；前/后无标签；多条记录无分隔。一个单元格可堆 3 条运单 × 2 字段 × 2 行 ≈ 12+ 行。
+- 已给 3 个方案（A 单元格内分组对齐：运单号独占行主色 + 字段标签列 + 前值/后值缩进对齐，改 formatter 返回结构 + 模板渲染；B 列只留「运单号 · N 项」摘要 + 查看详情弹窗，复用同类组件 `src/components/change-record-detail-dialog/main.vue`（变更字段/变更前/变更后三列 + 分页）；C 按「运单 × 字段」拆行 + `span-method` 合并时间/人）。**推荐 A，B 备选**。等用户确认后再改。
+
+## 16:20 已按方案 A 落地（变更内容列分组渲染）
+- **`src/utils/route-change.js` 重写**：删掉 `formatRouteChangeContent`，改为导出 `parseRouteChangeContent(content)`，返回分组数组 `[{ type, title, text, fields:[{label,before,after,single,changed,unchanged}] }]`。
+  - ⚠️ **关键坑：存储格式里「到货地」前面只有 `；`、没有冒号**（真实格式 `${waybillNo}：发货地 A → B；到货地 C → D`）。第一版按「冒号切 head/tail」写，导致「到货地」整段落进纯文本兜底 → 必须"先判断 segment 是否以字段名开头"，再把无标题字段行合并进上一条 waybill 分组。
+  - 字段名正则的**长标签必须排在短标签前**（`发货地址` 早于 `发货地`），否则被前缀吃掉。字段白名单：发货地址/到货地址/发货地/到货地/装货地/卸货地/收货地。
+  - 三种分组类型：`waybill`（`运单号：发货地…`）、`field`（`；到货地…`，合并进上一个非 text 分组）、`group`（`路线顺序：X 调整为 Y`，按「调整为」拆前后，不走箭头切分，因为路线文本本身含 `→`）、`text`（兜底原文）。
+  - 箭头正则 `/\s*(?:→|➔|➜|[\-–—]{1,2}\s*>)\s*/`；空值归一为 `-`。
+- **三处模板统一改为分组渲染**（运单号主色标题 + 左侧 2px 主色竖条；字段 label 列 54px；`changed` 两行「旧值(灰) / → 新值(主色)」，`unchanged` 单行 + 灰字「未变更」）：`loading-manage.vue`（`loading-route-change-dialog__change-*`）、`waybill-manage-page.vue`、`business-crud-page.vue`。样式块也同步替换（`__route-change-record-content` 从 `white-space: pre-wrap` 改为 flex column；箭头 `text-align: right`，grid item 会被 blockify 所以 span 上生效）。
+- 校验：node 跑 `parseRouteChangeContent` 7 组用例（真实截图数据 / 路线顺序 / 混合 / 半角箭头分号 / 无箭头单值 / 纯文本 / 空）全部符合预期；`@vue/compiler-sfc` 编译三个 .vue 的 template + scss 全过；SSR 渲染真实模板 + agent-browser 截图确认观感（临时文件已删）。
+- 已知代价：窄列（360px）下地址被 54px 标签列占位，单元格比原来高约一倍；换来的是一条运单/一个字段的分组边界一目了然。
+
+## 16:05 /base/measurement-unit 创建时间/更新时间列截断修复
+- 现象：表格里「创建时…」「更新时…」列被挤到 ~80px，`2026-0...` 截断；用户猜测要固定操作列。
+- 根因：`option/base/measurement-unit.js` 两列只写了 `type/format/sortable`，**没有 width/minWidth** → el-table 未设宽列按剩余空间均分，被压到低于内容宽度 → 省略号。与 `menuFixed` 无关。
+- 修法：`createTime`/`updateTime` 加 `width: 180`（与同模块 `option/base/common-address.js` 完全一致），`createUserName`/`updateUserName` 加 `minWidth: 110`。
+- 结论（重要经验）：**操作列不需要额外"固定"**，`menuFixed: 'right'` 早在 option 里（`main.js` 全局 `crudOption.menuWidth: 180`，avue 库默认 220）。不要为了"防截断"去加宽操作列，加宽只会增加横向滚动；时间列截断一律是缺 width。
+- 验证方式（可复用）：项目根建临时 html `__mu-check.html` → Vite 直接服务；`import { createOption } from '/src/option/base/measurement-unit.js'` + `app.use(Avue, { crudOption: { menuWidth: 180 } })`，用 `h(resolveComponent('avue-crud'), {...}, { menu: () => [...] })` 渲染（避免运行时模板编译）。
+  实测（容器 1200px）：td 宽 `[50,70,150,150,130,200,100,110,110,180,180,180]` 合计 1610 → 横向滚动 410px；`scrollWidth > clientWidth` 的单元格 **0 个**；`操作` th 为 `position: sticky`，滚到最右后右边缘 = 容器右边缘 → fixed 生效。用完删文件 + `agent-browser close`。
+
+## 16:25 变更内容列 hover 提示去除（分组改造的连带问题）
+- 用户反馈：改完分组后，变更内容单元格 hover 出现提示浮层，要求去掉。
+- 根因：`main.js:84` `app.use(ElementPlus, { table: { showOverflowTooltip: true } })` 全局开启 → EP 给每列 `.cell` 加 `.el-tooltip` 类（`white-space: nowrap`）。**我上一次改造把内层 `white-space: pre-wrap` 换成了 flex column、忘了补 white-space** → 继承 nowrap → 长地址横向溢出 → tooltip 激活。改动前靠 pre-wrap 自保所以没暴露。
+- 修法（三处，列级豁免、不动全局配置）：① 变更内容列显式 `:show-overflow-tooltip="false"`；② `__route-change-record-content` 补 `white-space: normal` 兜底。
+- ⚠️ 验证踩坑：用「项目根临时 html + `node_modules/element-plus/dist/index.full.min.js` 全局构建 + `app.use(ElementPlus, { table: { showOverflowTooltip: true } })`」复现时，**el-table 表头/列宽渲染错乱**（表头逐列堆叠、每行只渲染出 2 个 cell），该环境不可用于布局验证；但单元格内容渲染正常，足以确认分组结构无误。要验证真实表格布局还是得走 Vite 服务真实页面。
+  另：自定义组件接模板字符串时，切出的模板里 `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 次 ✓。
+

.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，等用户确认。

.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。

.workbuddy/memory/MEMORY.md

@@ -12,16 +12,84 @@
 
 **坑二：宿主 view 直绑全局 `$route.query.*` 给子组件 prop。** 缓存实例被灌入当前页 id → 拿错 id 查后端（批量弹「运单管理不存在」），live computed 还会误 push 标签。修法：`routePathLocked` 锁路径 + watcher / push 前判 `isOwnedRouteActive` + 宿主绑定加路径守卫。⚠️ `routePathLocked` **必须放 `data()`**（Options API 顺序 data → computed → watch(immediate) → created；放 created 会读到空值、挡掉首次加载）。已修 waybill-manage-page / transport-plan-page + 三个宿主 view。
 
+**坑四：avue-crud 弹窗 `append-to-body` 默认 true（`dialog-form3.js`：`validData(tableOption.dialogAppendToBody, true)`），DOM Teleport 到 body。** 于是页面里以页面容器为祖先的 scoped 选择器（`.xxx-page :deep(.yyy)`）**命中不到弹窗内容**，尤其 `el-cascader`（inline-block、宽度按内容收缩，不像 `el-input`/`el-autocomplete` 有 `--el-input-width:100%` 兜底）会明显比同行 input 窄。修法：option 里配 `dialogCustomClass: 'xxx-dialog'`，规则写到 `src/styles/element-ui.scss` 的 `.xxx-dialog ...`（项目既有约定，10+ 处同款）；或把基准类放在 **Teleport 内部元素**上（如 ship.vue 的 `.ship-form` 挂在 el-form 上，自身带 scope 属性，照样生效）。
+
+**坑五：avue 表单项控件不是 `.el-form-item__content` 的直接子级。** `form/index3.js` 渲染为 `content > div > [div|elTooltip] > 控件`，所以 `.el-form-item__content > .el-cascader` 这类**直接子级选择器对 avue 表单全部失效**（手写 `<el-form-item>` 才生效），一律用后代选择器。
+
+**坑六：`labelWidth: 'auto'` 在 Element Plus 里逐项计算，不是全表单共享。** 实测同一弹窗：3 字 54/64px、2 字 40px、4 字 68px、4 字带必填星号 78px；label 越宽 → 控件可用宽度越小，同级控件宽度就不一致（车牌号 input 486 vs 使用部门 cascader 472）。要让同一行控件等宽必须统一 label 宽度：`.xxx-dialog .el-form-item__label { flex: 0 0 calc(Nem + 24px) !important; width: calc(Nem + 24px) !important }`（N=本列最长汉字数，与 ship.vue、`.dialog-form--carded` 同款）。
+
+**验证 avue 弹窗 DOM/宽度的可复用办法：** 项目根建临时 html（Vite 直接服务）→ 引真实 option 与 `src/styles/element-ui.scss`，挂 avue-crud 并 `mounted(){ this.$refs.crud.rowAdd() }` 弹出真弹窗；用 `agent-browser`（`/Users/gxwebsoft/.workbuddy/binaries/node/workspace/node_modules/.bin/agent-browser`）`open` + `eval` 读 DOM 链路与 `getBoundingClientRect`，用完删文件。
+
 **坑三：路由表重复定义 → 内容区整页空白（2026-09-18）。** `/business/contract-manage/detail` 在 `router/views/index.js` 定义两次、子路由同名 `合同详情`。重名 `addRoute` 会 `removeRoute(name)` 移除旧子记录，但**不从父记录 children 里摘除**，第一条 Layout 壳记录留在 matcher 且靠前 → `resolve()` 命中它 → `$route.matched.length === 1` → 二级 router-view 无匹配 → 侧栏/标签正常但内容空白。修法：删重复定义。排查：扫「顶层 path + 首个子路由 name」重复项。
 
+## 列表页右上角按钮组（table-header-tools 标准件）
+⚠️ **2026-10-14 修正：最终方向是手写列表页改用 `avue-crud`**。用户要求与其它模块"完全一致"，而 avue 的列显隐抽屉（`el-drawer`+表格，隐藏/冻结/过滤/排序，行拖拽）是 avue-crud 内部子组件（`inject: ['crud']`），脱离 avue-crud 拿不出来；第 4 键也是 avue 的"表格↔卡片视图"切换。所以 `table-header-tools` 只是过渡仿制件，**新页面不要再接**，直接写 avue-crud。
+
+手写 `el-table` 列表页若暂时保留，右上角统一用 `src/components/table-header-tools/main.vue`，复刻 avue-crud 默认 4 键：刷新 `el-icon-refresh` / 列设置 `el-icon-operation` / 搜索显隐 `el-icon-search` / 表格尺寸 `el-icon-grid`（default→large→small 循环）。
+
+- 接入范式：`<table-header-tools :columns="columns" v-model:visible-column-keys="visibleColumnKeys" v-model:table-size="tableSize" v-model:search-visible="searchVisible" @refresh="loadTable" />`；配套：搜索区 `v-if="searchVisible"`、el-table `:size="tableSize"`、列用 computed `visibleColumns = columns.filter(c => visibleColumnKeys.includes(c.prop))`。⚠️ 不能 `v-for` + `v-if` 同元素（Vue3 v-if 优先级更高，取不到 column 变量）。
+- 表格在子组件时（如 `payment/components/bill-*-table.vue`）：子组件加 props `searchVisible` + emits `refresh`/`update:searchVisible`，父页面 `v-model:search-visible` + `@refresh`，搜索子组件加 `v-if="searchVisible"`。
+- `icon="el-icon-xxx"` 字符串**依赖 Avue 的全局 el-icon 映射**（`main.js` 只注册 EP 的 PascalCase 图标），临时验证页没 `app.use(Avue)` 会渲染成空圆按钮 —— 别误判成组件 bug。
+- 组件已加 `deactivated()` 关列设置弹窗（防 keep-alive 下 Teleport 弹窗残留）。
+- 已接入（过渡态，待逐页改 avue）：business/{master-order,loading-manage,voucher-manage}、settlement、payment 模块手写页。
+
+## avue-crud 列表页改造要点（payment 模块样板，2026-10-14）
+- **列显隐抽屉**：点第 2 键弹出，标题"列显隐"（语言包 `crud.showTitle`），表头 列名/隐藏/冻结/过滤/排序。直接读写 avue crud 的列配置，页面无需实现。
+- **第 4 键**：`handleGridShow()` = 表格 ↔ 卡片视图（`tableCard` 按列通用渲染），页面无需写卡片模板。
+- `searchOrder` 是**降序**排序（值越大越靠前）：`list.sort((a,b) => (b.searchOrder||0) - (a.searchOrder||0))`。首次改造踩过坑。
+- `searchIndex: 4` + `searchIcon: true` → 默认只显示前 4 个搜索项 + "展开/收起"（columnLen > searchIndex 时才出现该按钮）。
+- **搜索项 label 与表格列 label 不同**（列「收款方」/搜索「客户名称」）：单独定义 hide 列 + `searchProp` 指向后端字段（avue 在 search-change 里自动改名）。
+- 搜索专用列加 `hide: true` + `showColumn: false`，否则会混进列显隐抽屉。
+- ⚠️ **`createTime`/`updateTime` 必须显式给 `width: 180`**（全站统一，参考 `option/base/common-address.js`）。不写宽度的列参与"剩余空间均分"，容易被压到 80px 出现 `2026-0...` 截断 —— 这是**列缺 width**，不是操作列没固定；`menuFixed: 'right'` 各页早已配好（`main.js` 全局 `crudOption.menuWidth: 180`，avue 默认 220），别用"加宽操作列"来处理时间列截断。创建人/更新人给 `minWidth: 110`。
+- ⚠️ **column 数组顺序 = 表格列顺序**：搜索专用列别插在表格列中间（会把表格列顶到前面）；deptName 这种"既搜索又展示"的列要放回表格列的正确位置。
+- 分页：`page: { currentPage, pageSize, pageSizes, total }`；`on-load` 由 avue 内部（table-page）在 created / 翻页 / 改页容量时触发，`current-change`/`size-change` 里**只改 page 不要再调 onLoad**（否则双请求）。
+- `onLoad(page)` 只用 `this.query`（avue 传的 page 对象含 total/pageSizes 等分页字段，别 spread 进查询参数）。
+- 搜索参数转换放 `searchChange(params, done)`：日期区间数组拆成 `xxxStartDate/xxxEndDate`；所属组织级联用 `normalizeOrganizationSearch(params, 'deptName')`（见 `mixins/organization-search.js`，option 里该列加 `searchslot: true`）。
+- 单元格空值统一 `-`：列级 `formatter: (row, value) => ...`；金额 `Number(v||0).toFixed(2)`；状态/链接用 `slot: true` + `#prop` 插槽。
+- 操作列用 `#menu` 插槽（`menuWidth: 320`），`addBtn/viewBtn/delBtn/editBtn: false` 关掉 avue 自带按钮。
+
+## 地址/行政区划展示（全站既有规则）
+「省/市/区县」都要空格分段，但**省与自治区不重复展示**：`上海市浦东新区`→`上海市 浦东新区`，`广西壮族自治区南宁市邕宁区`→`南宁市 邕宁区`（同 `formatRoadLocation` / `formatRouteCityDistrict` / 总单列表 `formatRoadAddress` 一致）。
+- 统一入口：`src/utils/region-address.js` 的 `formatRegionAddress(value)`（按后缀切分行政区划，`州+市`、`县+区` 连写合并；**只有整串都是行政区划**才重排，站点名「南宁站/广州南站」与含门牌的详细地址原样返回）。v-for 列表里用它做展示时，直接把函数挂进 `methods` 用 ES6 简写（`formatRegionAddress,`）。
+- ⚠️ 路线节点的名称字段来自后端 `routeJson`：`routes[i].departureName` = 第 i 段**到货地/途经地**（不是本段发货地），末段 = 最终收货地；`master.departureName/arrivalName` 才是总发货/总收货。总单调度/详情都按「上一个节点的 departureName」拼分段起点。
+
 ## 样式硬规则
 - 底栏 `flex; justify-content:flex-end`，**不写 gap**（靠 EP 默认 `.el-button+.el-button{margin-left:12px}`）；浮动底栏必须 `position:fixed`（祖先 overflow:hidden 使 sticky 失效）+ `:global(.avue--collapse .x){left:60px}`、`:global(.avue-layout--horizontal .x){left:0}`，`:global()` 要包整个选择器。
 - 按钮层级：次要=无 type；中间步骤=`primary plain`；主操作=`primary`（禁绿、禁两个蓝实心）。顺序 `[辅助][取消][保存草稿][提交]`。
 - 独立页标题 `.archive-page-form__title`；分组用全局 `<section-card>`；上传证件区 `width:100%; max-width:240px` + `.el-upload{height:151px}`。
 - ⚠️ `<style scoped lang="scss">` 顶层禁 `//` 注释（Vite5 + sass `Unexpected '/'` → 500），顶层用 `/* */`。其余见 `src/styles/element-ui.scss` 与 `AGENTS.md` 4.4。
+- **搜索栏「展开/收起」唯一标准写法**（settlement 5 处已用、avue 页面同款）：
+  `<el-button text :icon="searchExpanded ? ArrowUp : ArrowDown" @click="toggleSearch">{{ searchExpanded ? '收起' : '展开' }}</el-button>`
+  放「查询/重置」**之后**（最右）；禁 `el-tooltip` 包图标按钮、禁文案「折叠」。`ArrowUp/ArrowDown` 要 import 并放 `data()`（`:icon` 是表达式）。
+  显示条件与 avue 一致（`header-search3.js` 的 `isSearchIcon = searchIcon===true && columnLen > searchIndex`）：搜索项 **≤4 项不渲染按钮** —— 故 data 里维护 `searchIndex: 4` + `searchItemCount: N`，用 computed `showSearchToggle` 控制。搜索栏操作区 `gap: 8px` 各模块一致，**不要去改**。
 
 ## 表单 / 自检 / 导出
 - 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: {}` 注册里模板取不到，会静默渲染不出图标（不报错，只是空白）。
+项目既有惯例：需要 `:icon` 的图标一律 `import` 后在 `data()` 里 `return { Xxx }`（transport-plan-page、waybill-manage-page、business-crud-page 都是这么写的）。
+注：标签形式（如 `<Location />`）不依赖 data，放不放 data 都能显示；仅 `:icon` 必须放 data。
+
+## 全局 `showOverflowTooltip: true` 与自定义多行单元格（2026-10-14 踩）
+`main.js` 的 `app.use(ElementPlus, { table: { showOverflowTooltip: true } })`（+ Avue `crudOption.showOverflowTooltip: true`）→ **全站所有表格列默认开启 hover 提示**，EP 会给该列 `.cell` 加 `.el-tooltip` 类（`white-space: nowrap` + 固定宽度 + 溢出省略）。
+后果：**列里放自定义多行 / 分组内容时，内层文本继承 nowrap → 横向溢出 → 单元格被裁切 + hover 弹提示**（极易被误判成"组件 bug"）。
+修法（列级豁免，不动全局）：① 列上显式 `:show-overflow-tooltip="false"`；② 内层容器补 `white-space: normal` 兜底。两处都写最稳。
+☑️ 已用于路线变更「变更内容」列（`loading-manage.vue` / `components/waybill-manage-page.vue` / `components/business-crud-page.vue` 三处）。
+另：`styles/element-ui.scss` 里已有两条基于 `.cell.el-tooltip` 的既有豁免规则（操作列 `:has(.el-link)`、`class-name="is-ellipsis-link"`），改表格列时先看这两条。

package.json

@@ -4,9 +4,11 @@
   "scripts": {
     "dev": "vite --host",
     "prod": "vite --mode production",
-    "build": "vite build",
-    "build:prod": "vite build --mode production",
-    "serve": "vite preview --host"
+    "build": "vite build && node scripts/zip-dist.mjs",
+    "build:prod": "vite build --mode production && node scripts/zip-dist.mjs",
+    "zip:dist": "node scripts/zip-dist.mjs",
+    "serve": "vite preview --host",
+    "typecheck": "vue-tsc -p jsconfig.json --noEmit"
   },
   "dependencies": {
     "@element-plus/icons-vue": "^2.3.1",
@@ -23,6 +25,7 @@
     "crypto-js": "^4.1.1",
     "dayjs": "^1.10.6",
     "disable-devtool": "^0.3.8",
+    "echarts": "^6.1.0",
     "element-plus": "^2.14.2",
     "exceljs": "^4.4.0",
     "highlight.js": "^11.9.0",
@@ -46,9 +49,11 @@
     "prettier": "^2.8.7",
     "sass": "^1.85.1",
     "terser": "^5.31.1",
+    "typescript": "5.9.3",
     "unplugin-auto-import": "^0.11.2",
     "vite": "^5.4.19",
     "vite-plugin-compression": "^0.5.1",
-    "vite-plugin-vue-setup-extend": "^0.4.0"
+    "vite-plugin-vue-setup-extend": "^0.4.0",
+    "vue-tsc": "^3.3.11"
   }
 }

pnpm-lock.yaml

@@ -5,9 +5,7 @@ settings:
   excludeLinksFromLockfile: false
 
 patchedDependencies:
-  '@smallwei/avue':
-    hash: 5ba15ad41b2c301250bf24adf39da2ed526b8375143da2c5a495361b29e862db
-    path: patches/@smallwei__avue.patch
+  '@smallwei/avue': 5ba15ad41b2c301250bf24adf39da2ed526b8375143da2c5a495361b29e862db
 
 importers:
 
@@ -15,34 +13,34 @@ 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@5.9.3))
       '@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@5.9.3))
       '@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@5.9.3))
       '@saber/nf-form-elp':
         specifier: ^1.6.3
         version: 1.7.0
       '@smallwei/avue':
         specifier: ~3.9.2
-        version: 3.9.2(patch_hash=5ba15ad41b2c301250bf24adf39da2ed526b8375143da2c5a495361b29e862db)(@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@5.9.3)))(debug@4.4.3(supports-color@7.2.0))(element-plus@2.14.2(vue@3.5.34(typescript@5.9.3)))(vue@3.5.34(typescript@5.9.3))
       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@5.9.3))
       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,21 +53,24 @@ importers:
       disable-devtool:
         specifier: ^0.3.8
         version: 0.3.9
+      echarts:
+        specifier: ^6.1.0
+        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@5.9.3))
       exceljs:
         specifier: ^4.4.0
         version: 4.4.0
       highlight.js:
         specifier: ^11.9.0
-        version: 11.11.1
+        version: 11.12.0
       js-base64:
         specifier: ^3.7.4
-        version: 3.7.8
+        version: 3.9.4
       js-cookie:
         specifier: ^3.0.0
-        version: 3.0.5
+        version: 3.0.8
       js-md5:
         specifier: ^0.7.3
         version: 0.7.3
@@ -84,29 +85,29 @@ importers:
         version: 0.4.0
       vue:
         specifier: ^3.5.13
-        version: 3.5.34
+        version: 3.5.34(typescript@5.9.3)
       vue-i18n:
         specifier: ^11.4.2
-        version: 11.4.2(vue@3.5.34)
+        version: 11.4.2(vue@3.5.34(typescript@5.9.3))
       vue-pdf-embed:
         specifier: ^2.1.6
-        version: 2.1.6(vue@3.5.34)
+        version: 2.1.6(vue@3.5.34(typescript@5.9.3))
       vue-router:
         specifier: ^4.3.2
-        version: 4.6.4(vue@3.5.34)
+        version: 4.6.4(vue@3.5.34(typescript@5.9.3))
       vue3-clipboard:
         specifier: ^1.0.0
-        version: 1.0.0(vue@3.5.34)
+        version: 1.0.0(vue@3.5.34(typescript@5.9.3))
       vuex:
         specifier: ^4.1.0
-        version: 4.1.0(vue@3.5.34)
+        version: 4.1.0(vue@3.5.34(typescript@5.9.3))
       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@5.9.3))
       '@vue/compiler-sfc':
         specifier: ^3.4.27
         version: 3.5.34
@@ -119,18 +120,24 @@ importers:
       terser:
         specifier: ^5.31.1
         version: 5.46.2
+      typescript:
+        specifier: 5.9.3
+        version: 5.9.3
       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@5.9.3)))(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@5.9.3)
 
 packages:
 
@@ -788,6 +795,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==}
 
@@ -803,6 +824,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==}
 
@@ -1016,6 +1040,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==}
 
@@ -1208,6 +1235,7 @@ packages:
 
   crypto-js@4.2.0:
     resolution: {integrity: sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q==}
+    deprecated: Active development of CryptoJS has been discontinued. This library is no longer maintained.
 
   csstype@3.2.3:
     resolution: {integrity: sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ==}
@@ -1453,8 +1481,8 @@ packages:
   heic2any@0.0.4:
     resolution: {integrity: sha512-3lLnZiDELfabVH87htnRolZ2iehX9zwpRyGNz22GKXIu0fznlblf0/ftppXKNqS26dqFSeqfIBhAmAj/uSp0cA==}
 
-  highlight.js@11.11.1:
-    resolution: {integrity: sha512-Xwwo44whKBVCYoliBQwaPvtd/2tYFkRQtXDWj1nackaV2JPXx3L0+Jvd8/qCJ2p+ML0/XVkJ2q+Mr+UVdpJK5w==}
+  highlight.js@11.12.0:
+    resolution: {integrity: sha512-nbfWpyRMcMrPMmDwJB+dhX/eiaPKtc2RB+0QZskqJ3WjRA/FDS0e9hZrx8EC/lbEv8gXy98FcDbNa/dspAaJMg==}
     engines: {node: '>=12.0.0'}
 
   hls.js@1.6.16:
@@ -1532,12 +1560,11 @@ packages:
   isarray@1.0.0:
     resolution: {integrity: sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==}
 
-  js-base64@3.7.8:
-    resolution: {integrity: sha512-hNngCeKxIUQiEUN3GPJOkz4wF/YvdUdbNL9hsBcMQTkKzboD7T/q3OYOuuPZLUE6dBxSGpwhk5mwuDud7JVAow==}
+  js-base64@3.9.4:
+    resolution: {integrity: sha512-PtOMXpEGuP0RRiRXsjzHzl44dMHxSu2CPvAhinupR1tBa88me+1DPqsobl7eupn5UukjLkln1ZnAOAOXOrYG0Q==}
 
-  js-cookie@3.0.5:
-    resolution: {integrity: sha512-cEiJEAEoIbWfCZYKWhVwFuvPX1gETRYPw6LlaTKoxD3s2AkXzkCjnp6h0V77ozyqj0jakteJ4YqDJT830+lVGw==}
-    engines: {node: '>=14'}
+  js-cookie@3.0.8:
+    resolution: {integrity: sha512-yeJd4aNAdYZQjaon2bpD/Gb0B/omw7HQOsynXXcOiWVCacbBcPlgn8S/d1X6blFSaHao7ozqtW7NZW19xpCtIw==}
 
   js-md5@0.7.3:
     resolution: {integrity: sha512-ZC41vPSTLKGwIRjqDh8DfXoCrdQIyBgspJVPXHBGu4nZlAEvG3nf+jO9avM9RmLiGakg7vz974ms99nEV0tmTQ==}
@@ -1727,6 +1754,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==}
 
@@ -1777,6 +1807,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==}
 
@@ -2041,6 +2074,11 @@ packages:
   typedarray@0.0.6:
     resolution: {integrity: sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==}
 
+  typescript@5.9.3:
+    resolution: {integrity: sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==}
+    engines: {node: '>=14.17'}
+    hasBin: true
+
   ufo@1.6.4:
     resolution: {integrity: sha512-JFNbkD1Svwe0KvGi8GOeLcP4kAWQ609twvCdcHxq1oSL8svv39ZuSvajcD8B+5D0eL4+s1Is2D/O6KN3qcTeRA==}
 
@@ -2121,6 +2159,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==}
 
@@ -2140,6 +2181,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:
@@ -2241,9 +2288,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@5.9.3))':
     dependencies:
-      vue: 3.5.34
+      vue: 3.5.34(typescript@5.9.3)
 
   '@esbuild/aix-ppc64@0.21.5':
     optional: true
@@ -2484,10 +2531,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@5.9.3))':
     dependencies:
       '@open-file-viewer/core': 0.1.27(pdfjs-dist@6.1.200)
-      vue: 3.5.34
+      vue: 3.5.34(typescript@5.9.3)
 
   '@parcel/watcher-android-arm64@2.5.6':
     optional: true
@@ -2639,9 +2686,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@5.9.3))':
     dependencies:
-      vuedraggable: 4.1.0(vue@3.5.34)
+      vuedraggable: 4.1.0(vue@3.5.34(typescript@5.9.3))
     transitivePeerDependencies:
       - vue
 
@@ -2653,16 +2700,16 @@ snapshots:
       countup.js: 2.10.0
       signature_pad: 5.1.3
 
-  '@smallwei/avue@3.9.2(patch_hash=5ba15ad41b2c301250bf24adf39da2ed526b8375143da2c5a495361b29e862db)(@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@5.9.3)))(debug@4.4.3(supports-color@7.2.0))(element-plus@2.14.2(vue@3.5.34(typescript@5.9.3)))(vue@3.5.34(typescript@5.9.3))':
     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@5.9.3))
+      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@5.9.3))
       lodash: 4.18.1
       lodash-es: 4.18.1
-      vue: 3.5.34
+      vue: 3.5.34(typescript@5.9.3)
     transitivePeerDependencies:
       - debug
 
@@ -2718,10 +2765,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@5.9.3))':
     dependencies:
       vite: 5.4.21(sass@1.99.0)(terser@5.46.2)
-      vue: 3.5.34
+      vue: 3.5.34(typescript@5.9.3)
+
+  '@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@5.9.3)':
+    dependencies:
+      '@volar/language-core': 2.4.28
+      path-browserify: 1.0.1
+      vscode-uri: 3.2.0
+    optionalDependencies:
+      typescript: 5.9.3
 
   '@vue/compiler-core@3.5.34':
     dependencies:
@@ -2755,6 +2816,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
@@ -2771,51 +2842,51 @@ 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@5.9.3))':
     dependencies:
       '@vue/compiler-ssr': 3.5.34
       '@vue/shared': 3.5.34
-      vue: 3.5.34
+      vue: 3.5.34(typescript@5.9.3)
 
   '@vue/shared@3.5.34': {}
 
-  '@vueuse/core@14.3.0(vue@3.5.34)':
+  '@vueuse/core@14.3.0(vue@3.5.34(typescript@5.9.3))':
     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@5.9.3))
+      vue: 3.5.34(typescript@5.9.3)
 
   '@vueuse/metadata@14.3.0': {}
 
-  '@vueuse/shared@14.3.0(vue@3.5.34)':
+  '@vueuse/shared@14.3.0(vue@3.5.34(typescript@5.9.3))':
     dependencies:
-      vue: 3.5.34
+      vue: 3.5.34(typescript@5.9.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@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@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)':
     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)
-      dom7: 3.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
       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)':
     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@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
       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@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)':
     dependencies:
       '@types/event-emitter': 0.3.5
       '@uppy/core': 2.3.4
       '@uppy/xhr-upload': 2.1.3(@uppy/core@2.3.4)
-      dom7: 3.0.0
+      dom7: 4.0.6
       event-emitter: 0.3.5
       html-void-elements: 3.0.0
       i18next: 23.16.8
@@ -2826,9 +2897,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
 
@@ -2836,9 +2907,9 @@ 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/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/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/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)
       '@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)
@@ -2857,14 +2928,14 @@ snapshots:
 
   '@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)':
     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@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)':
     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@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
@@ -2876,8 +2947,8 @@ 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/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@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
@@ -2887,7 +2958,7 @@ snapshots:
     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@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
@@ -2934,10 +3005,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@5.9.3))':
     dependencies:
       '@wangeditor/editor': 5.1.23
-      vue: 3.5.34
+      vue: 3.5.34(typescript@5.9.3)
 
   '@wangeditor/editor@5.1.23':
     dependencies:
@@ -3012,6 +3083,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:
@@ -3064,22 +3137,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@5.9.3)):
     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@5.9.3))
+      axios: 1.16.0(debug@4.4.3(supports-color@7.2.0))
+      vue: 3.5.34(typescript@5.9.3)
 
-  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:
@@ -3247,9 +3320,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: {}
 
@@ -3320,15 +3395,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@5.9.3)):
     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@5.9.3))
       '@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@5.9.3))
       async-validator: 4.2.5
       dayjs: 1.11.20
       lodash: 4.18.1
@@ -3336,7 +3411,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@5.9.3)
       vue-component-type-helpers: 3.3.6
 
   end-of-stream@1.4.5:
@@ -3457,7 +3532,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:
@@ -3546,7 +3623,7 @@ snapshots:
 
   heic2any@0.0.4: {}
 
-  highlight.js@11.11.1: {}
+  highlight.js@11.12.0: {}
 
   hls.js@1.6.16: {}
 
@@ -3605,9 +3682,9 @@ snapshots:
 
   isarray@1.0.0: {}
 
-  js-base64@3.7.8: {}
+  js-base64@3.9.4: {}
 
-  js-cookie@3.0.5: {}
+  js-cookie@3.0.8: {}
 
   js-md5@0.7.3: {}
 
@@ -3789,6 +3866,8 @@ snapshots:
 
   ms@2.1.3: {}
 
+  muggle-string@0.4.1: {}
+
   namespace-emitter@2.0.1: {}
 
   nanoid@3.3.12: {}
@@ -3822,6 +3901,8 @@ snapshots:
 
   parsedbf@2.0.0: {}
 
+  path-browserify@1.0.1: {}
+
   path-intersection@2.2.1: {}
 
   path-is-absolute@1.0.1: {}
@@ -4091,6 +4172,8 @@ snapshots:
 
   typedarray@0.0.6: {}
 
+  typescript@5.9.3: {}
+
   ufo@1.6.4: {}
 
   underscore@1.13.8: {}
@@ -4113,7 +4196,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@5.9.3)))(rollup@4.60.3):
     dependencies:
       '@antfu/utils': 0.7.10
       '@rollup/pluginutils': 5.3.0(rollup@4.60.3)
@@ -4122,7 +4205,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@5.9.3))
     transitivePeerDependencies:
       - rollup
 
@@ -4152,10 +4235,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:
@@ -4177,48 +4260,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@5.9.3)):
     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@5.9.3)
 
-  vue-pdf-embed@2.1.6(vue@3.5.34):
+  vue-pdf-embed@2.1.6(vue@3.5.34(typescript@5.9.3)):
     dependencies:
       pdfjs-dist: 6.2.108
-      vue: 3.5.34
+      vue: 3.5.34(typescript@5.9.3)
 
-  vue-router@4.6.4(vue@3.5.34):
+  vue-router@4.6.4(vue@3.5.34(typescript@5.9.3)):
     dependencies:
       '@vue/devtools-api': 6.6.4
-      vue: 3.5.34
+      vue: 3.5.34(typescript@5.9.3)
 
-  vue3-clipboard@1.0.0(vue@3.5.34):
+  vue-tsc@3.3.13(typescript@5.9.3):
+    dependencies:
+      '@volar/typescript': 2.4.28(typescript@5.9.3)
+      '@vue/language-core': 3.3.13
+      typescript: 5.9.3
+
+  vue3-clipboard@1.0.0(vue@3.5.34(typescript@5.9.3)):
     dependencies:
       clipboard: 2.0.11
-      vue: 3.5.34
+      vue: 3.5.34(typescript@5.9.3)
 
-  vue@3.5.34:
+  vue@3.5.34(typescript@5.9.3):
     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@5.9.3))
       '@vue/shared': 3.5.34
+    optionalDependencies:
+      typescript: 5.9.3
 
-  vuedraggable@4.1.0(vue@3.5.34):
+  vuedraggable@4.1.0(vue@3.5.34(typescript@5.9.3)):
     dependencies:
       sortablejs: 1.14.0
-      vue: 3.5.34
+      vue: 3.5.34(typescript@5.9.3)
 
-  vuex@4.1.0(vue@3.5.34):
+  vuex@4.1.0(vue@3.5.34(typescript@5.9.3)):
     dependencies:
       '@vue/devtools-api': 6.6.4
-      vue: 3.5.34
+      vue: 3.5.34(typescript@5.9.3)
 
   webpack-virtual-modules@0.6.2: {}
 

pnpm-workspace.yaml

@@ -1,5 +1,10 @@
 packages:
   - '.'
 
+allowBuilds:
+  '@parcel/watcher': true
+  es5-ext: true
+  esbuild: true
+
 patchedDependencies:
   '@smallwei/avue': patches/@smallwei__avue.patch

scripts/zip-dist.mjs

@@ -0,0 +1,25 @@
+import { execFileSync } from 'node:child_process';
+import { existsSync, rmSync, statSync } from 'node:fs';
+import { resolve } from 'node:path';
+
+const root = process.cwd();
+const distDir = resolve(root, 'dist');
+const zipPath = resolve(root, 'dist.zip');
+
+if (!existsSync(distDir) || !statSync(distDir).isDirectory()) {
+  console.error('[zip-dist] dist 目录不存在，请先完成构建');
+  process.exit(1);
+}
+
+if (existsSync(zipPath)) {
+  rmSync(zipPath);
+}
+
+// 压缩 dist 内文件到根级（解压即 index.html / assets，便于直接上传部署）
+execFileSync('zip', ['-qr', zipPath, '.', '-x', '*.DS_Store', '-x', '__MACOSX/*'], {
+  cwd: distDir,
+  stdio: 'inherit',
+});
+
+const sizeMb = (statSync(zipPath).size / (1024 * 1024)).toFixed(2);
+console.log(`[zip-dist] 已生成 ${zipPath}（${sizeMb} MB）`);

src/api/base/currency.js

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

src/api/business/contract-change.js

@@ -0,0 +1,61 @@
+import { createCrudApi } from './common';
+import request from '@/axios';
+
+const baseUrl = '/blade-transport/contract-change';
+const api = createCrudApi(baseUrl);
+
+export const getList = api.getList;
+export const getDetail = api.getDetail;
+export const submit = api.submit;
+export const remove = api.remove;
+
+export const createFromContract = (contractId, changeType) =>
+  request({
+    url: `${baseUrl}/create-from-contract`,
+    method: 'post',
+    params: { contractId, changeType },
+  });
+
+export const saveDraft = row =>
+  request({
+    url: `${baseUrl}/save-draft`,
+    method: 'post',
+    data: row,
+  });
+
+export const submitApproval = id =>
+  request({
+    url: `${baseUrl}/submit-approval`,
+    method: 'post',
+    params: { id },
+  });
+
+export const approve = id =>
+  request({
+    url: `${baseUrl}/approve`,
+    method: 'post',
+    params: { id },
+    // 审批通过后同步推送合规（附件转传可达 20s+），覆盖全局 10s 超时
+    timeout: 120000,
+  });
+
+export const reject = id =>
+  request({
+    url: `${baseUrl}/reject`,
+    method: 'post',
+    params: { id },
+  });
+
+export const withdraw = id =>
+  request({
+    url: `${baseUrl}/withdraw`,
+    method: 'post',
+    params: { id },
+  });
+
+export const markSyncStatus = (ids, syncStatus) =>
+  request({
+    url: `${baseUrl}/mark-sync-status`,
+    method: 'post',
+    params: { ids, syncStatus },
+  });

src/api/business/contract-manage.js

@@ -36,6 +36,8 @@ export const approve = id =>
     url: `${baseUrl}/approve`,
     method: 'post',
     params: { id },
+    // 审批通过后同步推送合规（附件转传可达 20s+），覆盖全局 10s 超时
+    timeout: 120000,
   });
 
 export const reject = id =>
@@ -90,3 +92,11 @@ export const expireStats = params =>
     method: 'get',
     params,
   });
+
+/** 按平台公司 + 业务部门预览下一合同编号 */
+export const nextContractNo = (organizationId, platformCompanyId) =>
+  request({
+    url: `${baseUrl}/next-contract-no`,
+    method: 'get',
+    params: { organizationId, platformCompanyId },
+  });

src/api/business/hcs.js

@@ -0,0 +1,133 @@
+import request from '@/axios';
+
+const baseUrl = '/blade-transport/hcs';
+
+/** 进程内缓存，避免列表页重复请求推送开关 */
+let immediateEnabledCache = null;
+let immediateEnabledPromise = null;
+
+/**
+ * 查询 HCS 即时推送开关（thirdParty.hcs.push.immediate-enabled）。
+ * 关闭时项目管理/合同管理隐藏「推送合规」「批量推送合规」。
+ */
+export const getPushConfig = () =>
+  request({
+    url: `${baseUrl}/push-config`,
+    method: 'get',
+  });
+
+export const loadHcsImmediateEnabled = () => {
+  if (immediateEnabledCache !== null) {
+    return Promise.resolve(immediateEnabledCache);
+  }
+  if (immediateEnabledPromise) {
+    return immediateEnabledPromise;
+  }
+  immediateEnabledPromise = getPushConfig()
+    .then(res => {
+      const data = res?.data?.data ?? res?.data ?? {};
+      immediateEnabledCache = data.immediateEnabled === true || data.immediateEnabled === 'true';
+      return immediateEnabledCache;
+    })
+    .catch(() => {
+      immediateEnabledCache = false;
+      return false;
+    })
+    .finally(() => {
+      immediateEnabledPromise = null;
+    });
+  return immediateEnabledPromise;
+};
+
+// 合规推送涉及 HCS 远程多次调用（风险校验+附件转传+起草），可达 20s+，覆盖全局 10s 超时
+export const repush = (bizType, id) =>
+  request({
+    url: `${baseUrl}/sync/${bizType}/${id}`,
+    method: 'post',
+    timeout: 60000,
+  });
+
+// 批量推送为逐条同步推送，耗时随勾选行数线性增长，进一步放宽超时
+export const repushBatch = (bizType, ids) =>
+  request({
+    url: `${baseUrl}/sync/${bizType}/batch`,
+    method: 'post',
+    data: ids,
+    timeout: 300000,
+  });
+
+export const getTemplates = () =>
+  request({
+    url: `${baseUrl}/master-data/template`,
+    method: 'get',
+  });
+
+export const refreshMasterData = () =>
+  request({
+    url: `${baseUrl}/master-data/refresh`,
+    method: 'post',
+    timeout: 60000,
+  });
+
+export const getRisk = customerCode =>
+  request({
+    url: `${baseUrl}/risk`,
+    method: 'get',
+    params: { customerCode },
+    timeout: 30000,
+  });
+
+// 客商风险批量查询（客商列表页展示用）：入参编号数组，后端逐个查 C101-1，单个失败跳过
+export const getRiskBatch = customerCodes =>
+  request({
+    url: `${baseUrl}/risk/batch`,
+    method: 'get',
+    params: { customerCodes: (customerCodes || []).join(',') },
+    timeout: 60000,
+  });
+
+// 客商风险按名称查询（客商档案表单展示用）：名称反查编号后口径同编号查询
+export const getRiskByName = customerName =>
+  request({
+    url: `${baseUrl}/risk/by-name`,
+    method: 'get',
+    params: { customerName },
+    timeout: 30000,
+  });
+
+export const uploadAttachment = formData =>
+  request({
+    url: `${baseUrl}/attachment/upload`,
+    method: 'post',
+    data: formData,
+    timeout: 60000,
+  });
+
+export const downloadAttachment = (fdId, name) =>
+  request({
+    url: `${baseUrl}/attachment/download`,
+    method: 'get',
+    params: { fdId, name },
+    responseType: 'blob',
+    timeout: 120000,
+  });
+
+export const applyContractSpec = data =>
+  request({
+    url: `${baseUrl}/contract/spec-apply`,
+    method: 'post',
+    data,
+    timeout: 60000,
+  });
+
+export const confirmContractSpec = (id, result) =>
+  request({
+    url: `${baseUrl}/contract/spec/confirm`,
+    method: 'post',
+    params: { id, result },
+  });
+
+export const unwrapData = response => {
+  const data = response?.data?.data ?? response?.data;
+  return data && typeof data === 'object' && 'data' in data ? data.data : data;
+};

src/api/business/loading-manage.js

@@ -24,11 +24,16 @@ export const getDetail = id =>
     },
   });
 
-export const getCarrierContracts = projectIds =>
+export const getCarrierContracts = (projectIds, waybillIds = []) =>
   request({
     url: `${baseUrl}/carrier-contracts`,
     method: 'get',
-    params: { projectIds: (projectIds || []).join(',') },
+    params: {
+      projectIds: (projectIds || []).join(','),
+      ...(waybillIds || []).filter(Boolean).length
+        ? { waybillIds: (waybillIds || []).filter(Boolean).join(',') }
+        : {},
+    },
   });
 
 export const saveDraft = row =>

src/api/business/process-config.js

@@ -22,6 +22,18 @@ export const getVoucherImages = (waybillId, params = {}) =>
       ...params,
     },
   });
+export const getVoucherFolders = waybillId =>
+  request({
+    url: '/blade-transport/process-config/voucher-folders',
+    method: 'get',
+    params: { waybillId },
+  });
+export const getVoucherFolderDetail = (voucherId, plateNo) =>
+  request({
+    url: '/blade-transport/process-config/voucher-folder-detail',
+    method: 'get',
+    params: { voucherId, plateNo },
+  });
 export const submit = api.submit;
 export const remove = api.remove;
 export const copy = api.copy;

src/api/business/project-apply.js

@@ -43,6 +43,8 @@ export const approve = id =>
     url: `${baseUrl}/approve`,
     method: 'post',
     params: { id },
+    // 审批通过后同步推送合规（远程多次调用），覆盖全局 10s 超时
+    timeout: 60000,
   });
 
 export const reject = id =>

src/api/business/project-change.js

@@ -0,0 +1,52 @@
+import { createCrudApi } from './common';
+import request from '@/axios';
+
+const baseUrl = '/blade-transport/project-change';
+const api = createCrudApi(baseUrl);
+
+export const getList = api.getList;
+export const getDetail = api.getDetail;
+export const submit = api.submit;
+export const remove = api.remove;
+
+export const createFromProject = (projectId, changeType) =>
+  request({
+    url: `${baseUrl}/create-from-project`,
+    method: 'post',
+    params: { projectId, changeType },
+  });
+
+export const saveDraft = row =>
+  request({
+    url: `${baseUrl}/save-draft`,
+    method: 'post',
+    data: row,
+  });
+
+export const submitApproval = id =>
+  request({
+    url: `${baseUrl}/submit-approval`,
+    method: 'post',
+    params: { id },
+  });
+
+export const approve = id =>
+  request({
+    url: `${baseUrl}/approve`,
+    method: 'post',
+    params: { id },
+  });
+
+export const reject = id =>
+  request({
+    url: `${baseUrl}/reject`,
+    method: 'post',
+    params: { id },
+  });
+
+export const withdraw = id =>
+  request({
+    url: `${baseUrl}/withdraw`,
+    method: 'post',
+    params: { id },
+  });

src/api/business/voucher-manage.js

@@ -52,6 +52,17 @@ export const createFileTask = data =>
   request({ url: `${fileTaskBaseUrl}/createFileTask`, method: 'post', data });
 export const getPartUploadUrl = (id, partNumber) =>
   request({ url: `${fileTaskBaseUrl}/getUploadUrl`, method: 'get', params: { id, partNumber } });
+export const uploadPartByProxy = (id, partNumber, partBlob) => {
+  const formData = new FormData();
+  formData.append('file', partBlob, `part-${partNumber}.bin`);
+  return request({
+    url: `${fileTaskBaseUrl}/uploadPart`,
+    method: 'post',
+    params: { id, partNumber },
+    data: formData,
+    timeout: 600000,
+  });
+};
 export const updateFileTask = data =>
   request({ url: `${fileTaskBaseUrl}/updateFileTask`, method: 'post', data });
 export const pauseFileTask = ids =>

src/api/business/waybill-manage.js

@@ -14,6 +14,13 @@ export const cancel = api.cancel;
 export const reassign = api.reassign;
 export const complete = api.complete;
 export const batchComplete = api.batchComplete;
+/** 确认回单：回单节点配成「需业务员确认」时用；后端校验司机打卡节点齐全且无未了结异常后才置完成 */
+export const confirmReturn = id =>
+  request({
+    url: `${baseUrl}/confirm-return`,
+    method: 'post',
+    params: { id },
+  });
 export const changeRoute = data =>
   request({
     url: `${baseUrl}/change-route`,
@@ -34,6 +41,14 @@ export const getPunchRecords = waybillId =>
     params: { waybillId },
   });
 
+/** 编辑打卡记录（含打卡状态；punched=false 表示取消打卡） */
+export const savePunchRecord = data =>
+  request({
+    url: `${baseUrl}/punch-record/save`,
+    method: 'post',
+    data,
+  });
+
 /** 运单车辆实时定位 */
 export const locateVehicle = id =>
   request({
@@ -67,6 +82,16 @@ export const getImportDetails = params => request({ url: `${baseUrl}/import-batc
 export const removeImportBatches = ids => request({ url: `${baseUrl}/import-batch/remove`, method: 'post', params: { ids } });
 export const getImportOptions = () => request({ url: `${baseUrl}/import-batch/options`, method: 'get' });
 export const exportImportTemplate = () => request({ url: `${baseUrl}/import-batch/export-template`, method: 'get', responseType: 'blob' });
-export const saveImportDraft = data => request({ url: `${baseUrl}/import-batch/draft`, method: 'post', data });
-export const validateImport = data => request({ url: `${baseUrl}/import-batch/validate`, method: 'post', data, responseType: 'blob' });
-export const confirmImport = data => request({ url: `${baseUrl}/import-batch/confirm`, method: 'post', data });
+export const saveImportDraft = data => request({ url: `${baseUrl}/import-batch/draft`, method: 'post', data, timeout: 120000 });
+export const validateImport = data =>
+  request({ url: `${baseUrl}/import-batch/validate`, method: 'post', data, timeout: 120000 });
+export const exportImportFailures = data =>
+  request({
+    url: `${baseUrl}/import-batch/export-failures`,
+    method: 'post',
+    data,
+    responseType: 'blob',
+    timeout: 120000,
+  });
+export const confirmImport = data =>
+  request({ url: `${baseUrl}/import-batch/confirm`, method: 'post', data, timeout: 120000 });

src/api/common.js

@@ -1,6 +1,9 @@
 import request from '@/axios';
 import { ElLoading, ElMessage } from 'element-plus';
 
+/** 审核按钮统一超时：审批通过后可能同步推送金蝶等耗时操作，覆盖全局 10s */
+export const APPROVE_TIMEOUT = 30000;
+
 /**
  * 文件流返回
  * @param url 接口地址

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 } });

src/api/payment/invoiceApplication.js

@@ -1,4 +1,5 @@
 import request from '@/axios';
+import { APPROVE_TIMEOUT } from '@/api/common';
 
 const baseUrl = '/blade-transport/invoice-application';
 
@@ -18,11 +19,12 @@ export const getReceiverInformation = settlementIds =>
 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 });
-export const approve = data => request({ url: `${baseUrl}/approve`, method: 'post', data });
+export const approve = data =>
+  request({ url: `${baseUrl}/approve`, method: 'post', data, timeout: APPROVE_TIMEOUT });
 export const returnBill = data => request({ url: `${baseUrl}/return`, method: 'post', data });
 export const voidBill = data => request({ url: `${baseUrl}/void`, method: 'post', data });
 export const syncKingdee = id =>
-  request({ url: `${baseUrl}/sync-kingdee`, method: 'post', params: { id } });
+  request({ url: `${baseUrl}/sync-kingdee`, method: 'post', timeout: 30000, params: { id } });
 
 export const invoiceTypeOptions = [
   { label: '电子专票', value: 'electronic_special' },

src/api/payment/invoiceReceipt.js

@@ -1,12 +1,22 @@
 import request from '@/axios';
+import { APPROVE_TIMEOUT } from '@/api/common';
 
 const baseUrl = '/blade-transport/invoice-receipt';
 
 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 getInvoicePool = keyword =>
-  request({ url: `${baseUrl}/invoice-pool`, method: 'get', params: { keyword } });
+export const queryInvoicePool = params =>
+  request({ url: `${baseUrl}/invoice-pool`, method: 'get', params });
+export const downloadInvoicePoolAttachment = invoiceNo =>
+  // 金蝶票池发票文件下载（后端代理 A801-2 流式回源），耗时较普通接口长，放宽到 120s
+  request({
+    url: `${baseUrl}/invoice-pool/attachment/download`,
+    method: 'get',
+    params: { invoiceNo },
+    responseType: 'blob',
+    timeout: 120000,
+  });
 export const getSettlementCandidates = (keyword, receiptId) =>
   request({
     url: `${baseUrl}/settlement-candidates`,
@@ -22,11 +32,12 @@ export const getReferenceInformation = settlementIds =>
 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 });
-export const approve = data => request({ url: `${baseUrl}/approve`, method: 'post', data });
+export const approve = data =>
+  request({ url: `${baseUrl}/approve`, method: 'post', data, timeout: APPROVE_TIMEOUT });
 export const returnBill = data => request({ url: `${baseUrl}/return`, method: 'post', data });
 export const voidBill = data => request({ url: `${baseUrl}/void`, method: 'post', data });
-export const syncKingdee = id =>
-  request({ url: `${baseUrl}/sync-kingdee`, method: 'post', params: { id } });
+export const pushKingdee = ids =>
+  request({ url: `${baseUrl}/push-kingdee`, method: 'post', timeout: 30000, data: ids });
 
 export const approvalStatusOptions = [
   { label: '草稿', value: 'draft' },
@@ -36,8 +47,9 @@ export const approvalStatusOptions = [
   { label: '已作废', value: 'voided' },
 ];
 
-export const kingdeeStatusOptions = [
-  { label: '未同步', value: 'unsynced' },
-  { label: '已同步', value: 'synced' },
-  { label: '同步失败', value: 'failed' },
+export const kingdeePushStatusOptions = [
+  { label: '未推送', value: 'unsynced' },
+  { label: '已保存收票单', value: 'pushed' },
+  { label: '已指定应付', value: 'assigned' },
+  { label: '推送失败', value: 'failed' },
 ];

src/api/payment/paymentApplication.js

@@ -1,4 +1,5 @@
 import request from '@/axios';
+import { APPROVE_TIMEOUT } from '@/api/common';
 
 const baseUrl = '/blade-transport/payment-application';
 export const getList = (current, size, params) =>
@@ -10,21 +11,34 @@ 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 });
-export const approve = data => request({ url: `${baseUrl}/approve`, method: 'post', data });
+export const approve = data =>
+  request({ url: `${baseUrl}/approve`, method: 'post', data, timeout: APPROVE_TIMEOUT });
 export const returnBill = data => request({ url: `${baseUrl}/return`, method: 'post', data });
 export const voidBill = data => request({ url: `${baseUrl}/void`, method: 'post', data });
+// 同步金蝶涉及多次金蝶远程接口调用（A103-2 预检 + A103-1/A103-3 推送），单笔可达 20s+，覆盖全局 10s 超时
 export const syncKingdee = id =>
-  request({ url: `${baseUrl}/sync-kingdee`, method: 'post', params: { id } });
+  request({ url: `${baseUrl}/sync-kingdee`, method: 'post', timeout: 30000, params: { id } });
+// 批量同步逐单单据级事务串行推送，耗时随单量线性增长
 export const syncKingdeeBatch = ids =>
-  request({ url: `${baseUrl}/sync-kingdee-batch`, method: 'post', data: ids });
+  request({ url: `${baseUrl}/sync-kingdee-batch`, method: 'post', timeout: 30000, data: ids });
+// 回写任务按 paymentNo 分批远程查询 A103-2/A103-4，同样可能超过全局超时
+export const syncKingdeeResult = () =>
+  request({ url: `${baseUrl}/sync-kingdee-result`, method: 'post', timeout: 30000 });
 
 export const paymentTypeOptions = [
   { label: '项目预付', value: 'project_advance' },
   { label: '进度预付', value: 'progress_advance' },
-  { label: '结算付款', value: 'settlement_payment' },
+  { label: '尾款付款', value: 'settlement_payment' },
 ];
 export const approvalStatusOptions = [
   { label: '草稿', value: 'draft' },
@@ -36,5 +50,8 @@ export const approvalStatusOptions = [
 export const kingdeeStatusOptions = [
   { label: '未生成', value: 'unsynced' },
   { label: '已生成', value: 'synced' },
+  { label: '付款中', value: 'paying' },
+  { label: '已付款', value: 'paid' },
+  { label: '已关闭', value: 'closed' },
   { label: '生成失败', value: 'failed' },
 ];

src/api/payment/receiptClaimRecord.js

@@ -8,14 +8,24 @@ export const getDetail = id => request({ url: `${baseUrl}/detail`, method: 'get'
 export const updateAttachments = data =>
   request({ url: `${baseUrl}/attachments`, method: 'post', data });
 export const voidClaim = id => request({ url: `${baseUrl}/void`, method: 'post', params: { id } });
+export const queryKingdeeResult = () =>
+  request({ url: `${baseUrl}/query-kingdee-result`, method: 'post' });
 
 export const claimStatusOptions = [
   { label: '已认领', value: 'claimed' },
   { label: '已作废', value: 'voided' },
 ];
 
+export const pushStatusOptions = [
+  { label: '未推送', value: 'none' },
+  { label: '已推送', value: 'pushed' },
+  { label: '推送失败', value: 'failed' },
+];
+
 export const kingdeeBillStatusOptions = [
   { label: '未生成', value: 'none' },
+  { label: '已推送', value: 'pushed' },
   { label: '审核通过', value: 'approved' },
+  { label: '已收款', value: 'received' },
   { label: '处理失败', value: 'failed' },
 ];

src/api/payment/receiptFlow.js

@@ -12,10 +12,25 @@ export const getSettlementCandidates = (keyword, flowId) =>
     params: { keyword, flowId },
   });
 export const claim = data => request({ url: `${baseUrl}/claim`, method: 'post', data });
-export const sync = data => request({ url: `${baseUrl}/sync`, method: 'post', data });
+export const sync = () => request({ url: `${baseUrl}/sync`, method: 'post' });
+export const pushKingdee = flowId =>
+  request({ url: `${baseUrl}/push-kingdee`, method: 'post', params: { flowId } });
 
 export const claimStatusOptions = [
   { label: '未认领', value: 'unclaimed' },
   { label: '部分认领', value: 'partial' },
   { label: '认领完成', value: 'claimed' },
 ];
+
+export const pushStatusOptions = [
+  { label: '未推送', value: 'none' },
+  { label: '已推送', value: 'pushed' },
+  { label: '推送失败', value: 'failed' },
+];
+
+export const kingdeeBillStatusOptions = [
+  { label: '已推送', value: 'pushed' },
+  { label: '审核通过', value: 'approved' },
+  { label: '已收款', value: 'received' },
+  { label: '处理失败', value: 'failed' },
+];

src/api/settlement/formalSettlement.js

@@ -1,4 +1,5 @@
 import request from '@/axios';
+import { APPROVE_TIMEOUT } from '@/api/common';
 
 const baseUrl = '/blade-transport/formal-settlement';
 
@@ -27,11 +28,20 @@ export const getCandidateDetails = (current, size, 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 });
-export const approve = data => request({ url: `${baseUrl}/approve`, method: 'post', data });
+export const approve = data =>
+  request({ url: `${baseUrl}/approve`, method: 'post', data, timeout: APPROVE_TIMEOUT });
 export const returnBill = data => request({ url: `${baseUrl}/return`, method: 'post', data });
 export const voidBill = data => request({ url: `${baseUrl}/void`, method: 'post', data });
-export const syncKingdee = id =>
-  request({ url: `${baseUrl}/sync-kingdee`, method: 'post', params: { id } });
+// 同步金蝶涉及多次金蝶远程接口调用（A102-4 预检 + A102-2 保存），可达 20s+，覆盖全局 10s 超时
+// 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 =>
@@ -48,3 +58,5 @@ export const applyPayments = data =>
   request({ url: `${baseUrl}/apply-payments`, method: 'post', data });
 export const claimInvoices = data =>
   request({ url: `${baseUrl}/claim-invoices`, method: 'post', data });
+export const queryInvoicePool = params =>
+  request({ url: `${baseUrl}/invoice-pool`, method: 'get', params });

src/api/settlement/preSettlement.js

@@ -1,4 +1,5 @@
 import request from '@/axios';
+import { APPROVE_TIMEOUT } from '@/api/common';
 
 const baseUrl = '/blade-transport/pre-settlement';
 
@@ -24,6 +25,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`,
@@ -40,7 +43,8 @@ export const removeDetail = (id, detailId) =>
 
 export const submit = data => request({ url: `${baseUrl}/submit`, method: 'post', data });
 
-export const approve = data => request({ url: `${baseUrl}/approve`, method: 'post', data });
+export const approve = data =>
+  request({ url: `${baseUrl}/approve`, method: 'post', data, timeout: APPROVE_TIMEOUT });
 
 export const returnBill = data => request({ url: `${baseUrl}/return`, method: 'post', data });
 

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' },

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,
+  });

src/api/system/business-dept-config.js

@@ -0,0 +1,42 @@
+import request from '@/axios';
+
+const baseUrl = '/blade-system/business-dept-config';
+
+export const getList = (current, size, params) =>
+  request({
+    url: `${baseUrl}/list`,
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    },
+  });
+
+export const getDetail = id =>
+  request({
+    url: `${baseUrl}/detail`,
+    method: 'get',
+    params: { id },
+  });
+
+export const submit = row =>
+  request({
+    url: `${baseUrl}/submit`,
+    method: 'post',
+    data: row,
+  });
+
+export const remove = ids =>
+  request({
+    url: `${baseUrl}/remove`,
+    method: 'post',
+    params: { ids },
+  });
+
+export const getByPlatformDept = (platformCompanyId, businessDeptId) =>
+  request({
+    url: `${baseUrl}/by-platform-dept`,
+    method: 'get',
+    params: { platformCompanyId, businessDeptId },
+  });

src/api/system/business-process.js

@@ -1,31 +1,65 @@
 import request from '@/axios';
 
+/** 提交审核流（MK）统一超时：客商/项目/合同/预结算/正式结算/付款/开票/收票/汇票付款 */
+export const MK_SUBMIT_TIMEOUT = 30000;
+
 /**
  * 调用 MK processSubmit 提交审核流
  * @param {Object} data
  * @param {string} data.templateCode 模板编码
  * @param {string} data.submitIdentity 提交人（手机号）
  * @param {string} data.loginName 登录账号（手机号）
- * @param {string} data.formInstanceId 业务表单实例 id
+ * @param {string} data.bizId 业务主键（后端生成/复用 formInstanceId）
  * @param {string} [data.subject] 流程标题
+ * @param {string} [data.bizType] 业务类型
+ * @param {Object} [data.tempVarData] MK 临时变量（如 { projectType }）
  */
 export const processSubmit = data => {
   return request({
     url: '/blade-system/businessProcess/processSubmit',
     method: 'post',
     data,
+    timeout: MK_SUBMIT_TIMEOUT,
   });
 };
 
 /**
  * 调用 MK processDelete 删除审核流（驳回后重新提交前使用）
  * @param {Object} data
- * @param {string} data.formInstanceId 业务表单实例 id
+ * @param {string} data.bizId 业务主键
  */
 export const processDelete = data => {
   return request({
     url: '/blade-system/businessProcess/processDelete',
     method: 'post',
     data,
+    timeout: MK_SUBMIT_TIMEOUT,
+  });
+};
+
+/**
+ * 查询 MK 流程实例是否仍存在（有数据则无需删除/重新提交）
+ * @param {Object} params
+ * @param {string} params.bizId 业务主键
+ */
+export const hasMkProcessInstance = params => {
+  return request({
+    url: '/blade-system/businessProcess/hasMkProcessInstance',
+    method: 'get',
+    params,
+  });
+};
+
+/**
+ * 获取 MK 审批页跳转链接（后端按 thirdParty.mk 配置拼接，含 SSO）
+ * @param {Object} params
+ * @param {string} [params.bizId] 业务 id（如客商 id）
+ * @param {string} [params.processInstanceId] 流程实例 id
+ */
+export const getMKApprovalUrl = params => {
+  return request({
+    url: '/blade-system/businessProcess/getMKApprovalUrl',
+    method: 'get',
+    params,
   });
 };

src/api/system/dept.js

@@ -48,26 +48,47 @@ export const syncIamOrganizations = () => {
   });
 };
 
-export const syncOaCompany = (current = 1, size = 20, signal) => {
+export const clearNonTopDept = signal => {
+  return request({
+    url: '/blade-system/dept/clear-non-top',
+    method: 'post',
+    timeout: 60000,
+    signal,
+  });
+};
+
+export const syncOaCompany = (current = 1, size = 20, signal, incremental = false, modifiedSince) => {
   return request({
     url: '/blade-system/dept/sync-oa-company',
     method: 'post',
     params: {
       current,
       size,
+      incremental: !!incremental,
+      modifiedSince: modifiedSince || undefined,
     },
     timeout: 60000,
     signal,
   });
 };
 
-export const syncOaDepartment = (current = 1, size = 20, signal) => {
+export const syncOaDepartment = (
+  current = 1,
+  size = 20,
+  signal,
+  incremental = false,
+  modifiedSince,
+  companyOaId
+) => {
   return request({
     url: '/blade-system/dept/sync-oa-department',
     method: 'post',
     params: {
       current,
       size,
+      incremental: !!incremental,
+      modifiedSince: modifiedSince || undefined,
+      companyOaId: companyOaId || undefined,
     },
     timeout: 60000,
     signal,
@@ -118,3 +139,10 @@ export const getPlatformCompanySelect = () => {
     method: 'get',
   });
 };
+
+export const getBusinessDeptSelect = () => {
+  return request({
+    url: '/blade-system/dept/business-dept-select',
+    method: 'get',
+  });
+};

src/api/system/mpUser.js

@@ -0,0 +1,62 @@
+import request from '@/axios';
+
+export const getList = (current, size, params) => {
+  return request({
+    url: '/blade-system/mp-user/list',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    },
+  });
+};
+
+export const getDetail = id => {
+  return request({
+    url: '/blade-system/mp-user/detail',
+    method: 'get',
+    params: {
+      id,
+    },
+  });
+};
+
+export const submit = row => {
+  return request({
+    url: '/blade-system/mp-user/submit',
+    method: 'post',
+    data: row,
+  });
+};
+
+export const remove = ids => {
+  return request({
+    url: '/blade-system/mp-user/remove',
+    method: 'post',
+    params: {
+      ids,
+    },
+  });
+};
+
+export const changeStatus = (id, status) => {
+  return request({
+    url: '/blade-system/mp-user/change-status',
+    method: 'post',
+    params: {
+      id,
+      status,
+    },
+  });
+};
+
+export const resetPassword = userIds => {
+  return request({
+    url: '/blade-system/mp-user/reset-password',
+    method: 'post',
+    params: {
+      userIds,
+    },
+  });
+};

src/api/system/roleDataScope.js

@@ -0,0 +1,19 @@
+import request from '@/axios';
+
+export const getRoleMenuDataScopeTree = roleId => {
+  return request({
+    url: '/blade-system/role-menu-data-scope/tree',
+    method: 'get',
+    params: {
+      roleId,
+    },
+  });
+};
+
+export const submitRoleMenuDataScope = data => {
+  return request({
+    url: '/blade-system/role-menu-data-scope/submit',
+    method: 'post',
+    data,
+  });
+};

src/api/system/user.js

@@ -31,13 +31,15 @@ export const add = row => {
   });
 };
 
-export const syncIamAccounts = (current = 1, size = 50, signal) => {
+export const syncIamAccounts = (current = 1, size = 50, signal, incremental = false, modifiedSince) => {
   return request({
     url: '/blade-system/user/sync-iam-accounts',
     method: 'post',
     params: {
       current,
       size,
+      incremental: !!incremental,
+      modifiedSince: modifiedSince || undefined,
     },
     timeout: 60000,
     signal,
@@ -52,6 +54,17 @@ export const update = row => {
   });
 };
 
+export const changeStatus = (id, status) => {
+  return request({
+    url: '/blade-system/user/change-status',
+    method: 'post',
+    params: {
+      id,
+      status,
+    },
+  });
+};
+
 export const updatePlatform = (userId, userType, userExt) => {
   return request({
     url: '/blade-system/user/update-platform',

src/api/transit/exception-disposal.js

@@ -9,6 +9,8 @@ export const getDetail = id => request({ url: `${baseUrl}/detail`, method: 'get'
 
 export const follow = data => request({ url: `${baseUrl}/follow`, method: 'post', data });
 
+export const update = data => request({ url: `${baseUrl}/update`, method: 'post', data });
+
 export const complete = data => request({ url: `${baseUrl}/complete`, method: 'post', data });
 
 export const batchComplete = ids =>

src/api/transportCapacity/certification-audit.js

@@ -0,0 +1,49 @@
+import request from '@/axios';
+
+/**
+ * 认证记录列表：按审核状态分页，按提交时间倒序
+ * 审核对象是**一条认证记录**，不是一辆车或一名司机，故必须带 bizType 区分
+ * status 为审核状态（0审核中 1已通过 2已驳回 3已作废）；不传时后端按 0 处理
+ */
+export const getPendingPage = (bizType, current, size, params) => {
+  return request({
+    url: '/blade-transport/certification-audit/pending-page',
+    method: 'get',
+    params: {
+      ...params,
+      bizType,
+      current,
+      size,
+    },
+  });
+};
+
+/**
+ * 审核详情：同时返回本次待审快照与该对象当前生效快照，供前端做字段级对比
+ * 从未认证通过时 effectiveSnapshotJson 为空串
+ */
+export const getAuditDetail = id => {
+  return request({
+    url: '/blade-transport/certification-audit/detail',
+    method: 'get',
+    params: {
+      id,
+    },
+  });
+};
+
+/**
+ * 审核一条认证记录
+ * 通过时不传驳回原因；驳回时必须传，且原因不超过 200 字
+ */
+export const auditCertification = (id, pass, rejectReason) => {
+  return request({
+    url: '/blade-transport/certification-audit/audit',
+    method: 'post',
+    params: {
+      id,
+      pass,
+      ...(rejectReason ? { rejectReason } : {}),
+    },
+  });
+};

src/api/transportCapacity/transport-vehicle.js

@@ -51,14 +51,6 @@ export const changeStatus = (id, status) => {
   });
 };
 
-export const auditCertification = (id, certificationStatus, rejectReason) => {
-  return request({
-    url: '/blade-transport/transport-vehicle/audit-certification',
-    method: 'post',
-    params: { id, certificationStatus, rejectReason },
-  });
-};
-
 export const getExpiryStat = params => {
   return request({
     url: '/blade-transport/transport-vehicle/expiry-stat',

src/api/vehicle/customer-archive.js

@@ -152,14 +152,35 @@ export const getScoreTemplate = quantificationId => {
   });
 };
 
+export const queryKingdeeCustomer = creditCode => {
+  return request({
+    url: '/blade-transport/bfi/customer/query-by-credit-code',
+    method: 'get',
+    timeout: 30000,
+    params: {
+      creditCode,
+    },
+  });
+};
+
+export const syncKingdee = id => {
+  return request({
+    url: '/blade-transport/customer-archive/sync-kingdee',
+    method: 'post',
+    timeout: 30000,
+    params: {
+      id,
+    },
+  });
+};
+
 export const recognizeBusinessLicenseOcr = imageUrl => {
   return request({
-    url: '/blade-transport/baidu-ocr/recognize-url',
+    url: '/blade-transport/baidu-ocr/business-license',
     method: 'post',
     timeout: 60000,
     params: {
       imageUrl,
-      type: 'business_license',
     },
   });
 };

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;
@@ -102,12 +105,27 @@ const isJsonContentType = res => {
   return contentType.includes('application/json') || contentType.includes('text/json');
 };
 
+/**
+ * 是否为可按文本读取的 Blob / Blob-like（含跨 realm）。
+ * 禁止对普通业务 JSON 对象调用 .text()。
+ */
+const isBlobLikeData = value =>
+  value != null &&
+  typeof value === 'object' &&
+  typeof value.size === 'number' &&
+  typeof value.type === 'string' &&
+  typeof value.text === 'function';
+
 /**
  * 判断响应体是否已是解析好的对象（无需再解析）。
  * 注意 Blob 也是 object，必须排除，否则会把待解析的文件流误判为已完成。
  */
 const isPlainObject = value =>
-  value !== null && typeof value === 'object' && !(value instanceof Blob);
+  value !== null &&
+  typeof value === 'object' &&
+  !(value instanceof Blob) &&
+  !isBlobLikeData(value) &&
+  !(value instanceof ArrayBuffer);
 //跨域请求，允许保存cookie
 axios.defaults.withCredentials = true;
 // NProgress Configuration
@@ -187,9 +205,21 @@ axios.interceptors.response.use(
     // 用户就会以为系统崩了——而后端其实返回了明确的业务提示（如「未读取到数据行…」）。
     // 这里按 Content-Type 判断：JSON 才解析回对象；真·文件流（Excel 等）保持原样不动。
     // 兼容 Blob（浏览器 responseType='blob'）与 string（非浏览器环境）两种形态。
+    // 仅对真正的 Blob/Blob-like 调 .text()，避免业务 JSON 已解析后出现
+    // 「e.data.text is not a function」。
     if (isJsonContentType(res) && !isPlainObject(res.data)) {
       try {
-        const text = res.data instanceof Blob ? await res.data.text() : res.data;
+        let text = '';
+        const raw = res.data;
+        if (isBlobLikeData(raw) || (typeof Blob !== 'undefined' && raw instanceof Blob)) {
+          text = await raw.text();
+        } else if (typeof raw === 'string') {
+          text = raw;
+        } else if (raw && typeof raw.arrayBuffer === 'function') {
+          text = new TextDecoder().decode(await raw.arrayBuffer());
+        } else if (raw instanceof ArrayBuffer) {
+          text = new TextDecoder().decode(raw);
+        }
         const parsed = typeof text === 'string' && text ? JSON.parse(text) : null;
         if (parsed && typeof parsed === 'object') {
           res.data = parsed;
@@ -198,10 +228,11 @@ axios.interceptors.response.use(
         // 声明是 JSON 却解析失败：保持原样，交给下游按文件处理
       }
     }
-    //获取状态信息
-    const status = res.data.error_code || res.data.code || res.status;
+    // 获取状态信息：文件流没有 code/msg，必须退回 HTTP status，禁止读 Blob 上的幽灵字段
+    const payload = isPlainObject(res.data) ? res.data : {};
+    const status = Number(payload.error_code || payload.code || res.status);
     const statusWhiteList = website.statusWhiteList || [];
-    const message = res.data.msg || res.data.error_description || '系统错误';
+    const message = payload.msg || payload.error_description || '系统错误';
     //如果在白名单里则自行catch逻辑处理
     if (statusWhiteList.includes(status)) return Promise.reject(res);
 
@@ -253,21 +284,33 @@ 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;
   },
   error => {
     NProgress.done();
+    // 网络级失败（HTTP 状态 >500、网关错误、超时、断网等 validateStatus 放行之外的响应）
+    // 原为静默 reject，接口报错页面无任何感知；统一补错误提示，取消请求与刷新令牌请求除外
+    if (
+      !axios.isCancel(error) &&
+      !isRefreshTokenRequest(error?.config) &&
+      error?.config?.meta?.suppressErrorMessage !== true
+    ) {
+      ElMessage({
+        message: error?.response?.data?.msg || '请求失败，请稍后重试',
+        type: 'error',
+      });
+    }
+    return Promise.reject(new Error(error));
     // 保留原始 axios 错误对象：下游（如导入失败明细解析）需要 error.response
     // 读取响应体。若包装成 new Error(error)，response 会丢失、message 退化成
     // "[object Object]"，用户只能看到无意义的通用提示。
-    return Promise.reject(error);
   }
 );
 

src/components/address-map-picker/main.vue

@@ -10,17 +10,17 @@
       <el-button type="primary" :loading="searching" @click="searchKeyword">搜索</el-button>
     </div>
     <div class="address-map-picker__content">
-      <map-search-results
-        v-if="searchResults.length"
-        :results="searchResults"
-        @select="selectSearchResult"
-      />
       <div ref="map" class="address-map-picker__map"></div>
+      <map-search-results :results="searchResults" @select="selectSearchResult" />
     </div>
     <div class="address-map-picker__info">{{ status }}</div>
     <template #footer>
       <el-button @click="visible = false">取消</el-button>
-      <el-button type="primary" :disabled="!selected.longitude || resolving" @click="confirm">
+      <el-button
+        type="primary"
+        :disabled="!hasCoordinateValue(selected.longitude) || !hasCoordinateValue(selected.latitude) || resolving"
+        @click="confirm"
+      >
         确定
       </el-button>
     </template>
@@ -28,8 +28,10 @@
 </template>
 
 <script>
-const AMAP_KEY = '653b7cf105ad7fb8ec9b2f5198ade315';
-const AMAP_SECURITY_CODE = '5aab65c632e48ebae0d0e28f5b28e21a';
+import { normalizeMapSearchResults, searchAmapPlaceText } from '@/utils/map-search';
+
+const AMAP_KEY = '13dcb15bc29bfe9c432d17ecd808b812';
+const AMAP_SECURITY_CODE = 'f9d036ef29e376e15d309e0de5c0f7ab';
 let amapLoader;
 
 export default {
@@ -42,6 +44,14 @@ export default {
       type: String,
       default: '',
     },
+    longitude: {
+      type: [String, Number],
+      default: '',
+    },
+    latitude: {
+      type: [String, Number],
+      default: '',
+    },
   },
   emits: ['update:modelValue', 'confirm'],
   data() {
@@ -66,9 +76,11 @@ export default {
         this.visible = value;
         if (value) {
           this.keyword = this.address || '';
-          this.selected = {};
-          this.status = '可搜索地址或点击地图选点';
           this.searchResults = [];
+          this.selected = this.buildInitialSelection();
+          this.status = this.selected.longitude
+            ? this.selected.address || '已选点，可确认回填'
+            : '可搜索地址或点击地图选点';
         }
       },
     },
@@ -82,6 +94,32 @@ export default {
     }
   },
   methods: {
+    hasCoordinateValue(value) {
+      return value !== '' && value !== null && value !== undefined;
+    },
+    buildInitialSelection() {
+      // Number('') === 0，空字符串不能当有效坐标，否则会落到 [0,0]（非洲附近）
+      if (!this.hasCoordinateValue(this.longitude) || !this.hasCoordinateValue(this.latitude)) {
+        return {};
+      }
+      const longitude = Number(this.longitude);
+      const latitude = Number(this.latitude);
+      if (
+        !Number.isFinite(longitude) ||
+        !Number.isFinite(latitude) ||
+        longitude < -180 ||
+        longitude > 180 ||
+        latitude < -90 ||
+        latitude > 90
+      ) {
+        return {};
+      }
+      return {
+        longitude,
+        latitude,
+        address: this.address || '',
+      };
+    },
     loadAmap() {
       if (window.AMap && window.AMap.Map) {
         return Promise.resolve();
@@ -110,15 +148,29 @@ export default {
           return new Promise(resolve => {
             this.$nextTick(() => {
               if (!this.$refs.map) return resolve(null);
+              const initial = this.buildInitialSelection();
+              const hasPoint =
+                Number.isFinite(initial.longitude) && Number.isFinite(initial.latitude);
+              const center = hasPoint
+                ? [initial.longitude, initial.latitude]
+                : [116.40769, 39.89945];
+              const zoom = hasPoint ? 14 : 11;
               if (!this.amap) {
                 this.amap = new window.AMap.Map(this.$refs.map, {
-                  center: [116.40769, 39.89945],
-                  zoom: 11,
+                  center,
+                  zoom,
                 });
                 this.amap.on('click', event => this.pickPoint(event.lnglat));
               } else {
                 this.amap.resize();
                 this.clearMarker();
+                this.amap.setZoomAndCenter(zoom, center);
+              }
+              if (hasPoint) {
+                const point = new window.AMap.LngLat(initial.longitude, initial.latitude);
+                this.renderMarker(point);
+                this.selected = { ...initial };
+                this.status = initial.address || '已选点，可确认回填';
               }
               resolve(this.amap);
             });
@@ -176,23 +228,17 @@ export default {
       this.searchResults = [];
       this.searching = true;
       this.initMap()
-        .then(map => (map ? this.runGeocode('location', keyword) : null))
-        .then(result => {
-          if (!result) return;
-          const geocodes = result.geocodes || (result.location ? [result] : []);
-          this.searchResults = geocodes.map((item, index) => ({
-            id: item.id || index,
-            name: item.formattedAddress || item.address || keyword,
-            address: item.formattedAddress || item.address || keyword,
-            location: item.location,
-          }));
-          const point = geocodes[0]?.location || result.location;
-          if (!point) {
+        .then(map => (map ? searchAmapPlaceText(keyword) : null))
+        .then(pois => {
+          if (!pois) return;
+          this.searchResults = normalizeMapSearchResults(pois, keyword);
+          const first = this.searchResults[0];
+          if (!first?.location) {
             throw new Error('未找到匹配地址');
           }
           return this.$nextTick().then(() => {
             this.amap?.resize();
-            this.pickPoint(point, geocodes[0]?.formattedAddress || keyword);
+            this.pickPoint(first.location, first.address || first.name || keyword);
           });
         })
         .catch(() => {
@@ -209,8 +255,10 @@ export default {
       }
     },
     pickPoint(point, fallbackAddress = '') {
-      const longitude = typeof point.getLng === 'function' ? point.getLng() : point.lng;
-      const latitude = typeof point.getLat === 'function' ? point.getLat() : point.lat;
+      const longitude =
+        typeof point.getLng === 'function' ? point.getLng() : point.lng ?? point.longitude;
+      const latitude =
+        typeof point.getLat === 'function' ? point.getLat() : point.lat ?? point.latitude;
       if (!Number.isFinite(Number(longitude)) || !Number.isFinite(Number(latitude))) {
         this.$message.warning('选点坐标无效');
         return;
@@ -227,7 +275,12 @@ export default {
       this.runGeocode('address', lnglat)
         .then(result => {
           const detailAddress = result.regeocode?.formattedAddress || fallbackAddress;
-          this.selected = { ...this.selected, address: detailAddress };
+          const region = this.resolveRegionFromGeocode(result);
+          this.selected = {
+            ...this.selected,
+            address: detailAddress,
+            ...region,
+          };
           this.keyword = detailAddress || this.keyword;
           this.status = detailAddress || '已选点，可确认回填';
         })
@@ -241,6 +294,26 @@ export default {
           this.resolving = false;
         });
     },
+    resolveRegionFromGeocode(result = {}) {
+      const component = result.regeocode?.addressComponent || {};
+      const city = Array.isArray(component.city) ? '' : String(component.city || '').trim();
+      const province = String(component.province || '').trim();
+      const district = String(component.district || '').trim();
+      const country = String(component.country || '').trim();
+      const adcode = String(component.adcode || '').trim();
+      return {
+        country,
+        province,
+        city: city || province,
+        district,
+        adcode,
+        regionCode: adcode,
+        provinceName: province,
+        cityName: city || province,
+        districtName: district,
+        countryName: country,
+      };
+    },
     renderMarker(point) {
       this.clearMarker();
       this.marker = new window.AMap.Marker({ position: point });
@@ -253,12 +326,53 @@ export default {
         this.marker = null;
       }
     },
+    syncSelectedFromMarker() {
+      // 确认时以当前标记点坐标为准，避免换地址后仍回填上一次经纬度
+      if (!this.marker || typeof this.marker.getPosition !== 'function') {
+        return;
+      }
+      const point = this.marker.getPosition();
+      if (!point) {
+        return;
+      }
+      const longitude =
+        typeof point.getLng === 'function' ? point.getLng() : point.lng ?? point.longitude;
+      const latitude =
+        typeof point.getLat === 'function' ? point.getLat() : point.lat ?? point.latitude;
+      if (!Number.isFinite(Number(longitude)) || !Number.isFinite(Number(latitude))) {
+        return;
+      }
+      this.selected = {
+        ...this.selected,
+        longitude: Number(longitude),
+        latitude: Number(latitude),
+      };
+    },
     confirm() {
+      this.syncSelectedFromMarker();
+      if (!this.hasCoordinateValue(this.selected.longitude) || !this.hasCoordinateValue(this.selected.latitude)) {
+        this.$message.warning('请先搜索或点击地图完成选点');
+        return;
+      }
       if (!this.selected.address) {
         this.$message.warning('请等待地址解析完成后再确认');
         return;
       }
-      this.$emit('confirm', this.selected.address);
+      this.$emit('confirm', {
+        address: this.selected.address,
+        longitude: Number(this.selected.longitude),
+        latitude: Number(this.selected.latitude),
+        country: this.selected.country || this.selected.countryName || '',
+        province: this.selected.province || this.selected.provinceName || '',
+        city: this.selected.city || this.selected.cityName || '',
+        district: this.selected.district || this.selected.districtName || '',
+        adcode: this.selected.adcode || this.selected.regionCode || '',
+        regionCode: this.selected.regionCode || this.selected.adcode || '',
+        countryName: this.selected.countryName || this.selected.country || '',
+        provinceName: this.selected.provinceName || this.selected.province || '',
+        cityName: this.selected.cityName || this.selected.city || '',
+        districtName: this.selected.districtName || this.selected.district || '',
+      });
       this.visible = false;
     },
   },
@@ -278,7 +392,6 @@ export default {
   }
 
   &__map {
-    flex: 1 1 auto;
     width: 100%;
     min-width: 0;
     height: 420px;
@@ -286,9 +399,19 @@ export default {
   }
 
   &__content {
-    display: flex;
-    gap: 12px;
+    position: relative;
+    display: block;
     min-width: 0;
+    overflow: visible;
+
+    .address-map-picker__map {
+      position: relative;
+      z-index: 1;
+    }
+
+    :deep(.map-search-results) {
+      z-index: 2000;
+    }
   }
 
   &__info {

src/components/change-record-detail-dialog/main.vue

@@ -0,0 +1,108 @@
+<template>
+  <el-dialog
+    :model-value="modelValue"
+    title="变更记录详情"
+    append-to-body
+    destroy-on-close
+    align-center
+    width="1100px"
+    class="change-record-detail-dialog"
+    @update:model-value="$emit('update:modelValue', $event)"
+    @open="resetPage"
+  >
+    <el-table
+      :data="pageRows"
+      border
+      max-height="60vh"
+      :show-overflow-tooltip="false"
+    >
+      <el-table-column prop="field" label="变更字段" min-width="180" />
+      <el-table-column
+        prop="before"
+        label="变更前"
+        min-width="360"
+        class-name="change-record-detail-value"
+      />
+      <el-table-column
+        prop="after"
+        label="变更后"
+        min-width="500"
+        class-name="change-record-detail-value"
+      />
+    </el-table>
+    <el-empty v-if="!total" description="暂无变更内容" :image-size="60" />
+    <div class="change-record-detail-dialog__pager">
+      <el-pagination
+        v-model:current-page="currentPage"
+        v-model:page-size="pageSize"
+        background
+        :total="total"
+        :page-sizes="[10, 20, 50, 100]"
+        layout="total, sizes, prev, pager, next, jumper"
+      />
+    </div>
+    <template #footer>
+      <el-button type="primary" @click="$emit('update:modelValue', false)">关闭</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+  name: 'ChangeRecordDetailDialog',
+  props: {
+    modelValue: {
+      type: Boolean,
+      default: false,
+    },
+    rows: {
+      type: Array,
+      default: () => [],
+    },
+  },
+  emits: ['update:modelValue'],
+  data() {
+    return {
+      currentPage: 1,
+      pageSize: 10,
+    };
+  },
+  computed: {
+    total() {
+      return this.rows.length;
+    },
+    pageRows() {
+      const start = (this.currentPage - 1) * this.pageSize;
+      return this.rows.slice(start, start + this.pageSize);
+    },
+  },
+  watch: {
+    rows() {
+      const maxPage = Math.max(1, Math.ceil(this.total / this.pageSize) || 1);
+      if (this.currentPage > maxPage) this.currentPage = 1;
+    },
+  },
+  methods: {
+    resetPage() {
+      this.currentPage = 1;
+      this.pageSize = 10;
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.change-record-detail-dialog__pager {
+  display: flex;
+  justify-content: flex-end;
+  margin-top: 12px;
+}
+
+:deep(.change-record-detail-value .cell) {
+  white-space: pre-wrap;
+  word-break: break-word;
+  overflow: visible;
+  text-overflow: clip;
+  line-height: 1.6;
+}
+</style>

src/components/cron-editor/main.vue

@@ -576,7 +576,7 @@ export default {
 }
 
 .mode-content :deep(.el-form-item) {
-  margin-bottom: 14px;
+  margin-bottom: 24px;
 }
 
 .mode-content :deep(.el-form-item:last-child) {

src/components/kingdee-invoice-pool-dialog/main.vue

@@ -0,0 +1,434 @@
+<template>
+  <el-dialog v-model="visible" :title="title" width="92%" append-to-body destroy-on-close @open="handleOpen">
+    <el-form :model="query" inline label-width="130px" @submit.prevent>
+      <el-form-item label="发票号码">
+        <el-input v-model="query.invoiceNo" clearable @keyup.enter="handleQuery" />
+      </el-form-item>
+      <el-form-item label="开票日期">
+        <el-date-picker
+          v-model="query.invoiceDateRange"
+          type="daterange"
+          value-format="YYYY-MM-DD"
+          format="YYYY-MM-DD"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        />
+      </el-form-item>
+      <el-form-item label="开票单位">
+        <el-input v-model="query.salerName" clearable @keyup.enter="handleQuery" />
+      </el-form-item>
+      <el-form-item label="受票单位">
+        <el-input v-model="query.buyerName" clearable @keyup.enter="handleQuery" />
+      </el-form-item>
+      <el-form-item label="开票单位（销方）">
+        <el-select
+          v-model="query.salerTaxNo"
+          clearable
+          filterable
+          remote
+          reserve-keyword
+          :remote-method="keyword => searchCustomers(keyword, 'saler')"
+          :loading="customerLoading.saler"
+          placeholder="输入名称搜索或直接粘贴税号"
+          style="width: 220px"
+          @keyup.enter="handleQuery"
+        >
+          <el-option
+            v-for="item in customerOptions.saler"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="受票单位（购方）">
+        <el-select
+          v-model="query.buyerTaxNo"
+          clearable
+          filterable
+          remote
+          reserve-keyword
+          :remote-method="keyword => searchCustomers(keyword, 'buyer')"
+          :loading="customerLoading.buyer"
+          placeholder="输入名称搜索或直接粘贴税号"
+          style="width: 220px"
+          @keyup.enter="handleQuery"
+        >
+          <el-option
+            v-for="item in customerOptions.buyer"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="发票类型">
+        <el-select
+          v-model="query.invoiceType"
+          clearable
+          filterable
+          placeholder="不限"
+          style="width: 230px"
+        >
+          <el-option
+            v-for="option in invoiceTypeOptions"
+            :key="option.value"
+            :label="option.label"
+            :value="option.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="认领状态">
+        <el-select v-model="query.claimed" clearable placeholder="不限" style="width: 120px">
+          <el-option label="未认领" :value="false" />
+          <el-option label="已认领" :value="true" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="登记状态">
+        <el-select v-model="query.registered" clearable placeholder="不限" style="width: 120px">
+          <el-option label="未登记" :value="false" />
+          <el-option label="已登记" :value="true" />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button :disabled="loading" @click="resetQuery">重置</el-button>
+        <el-button type="primary" :disabled="loading" @click="handleQuery">查询</el-button>
+      </el-form-item>
+    </el-form>
+    <el-table
+      ref="poolTable"
+      v-loading="loading"
+      :data="rows"
+      :row-key="rowKey"
+      border
+      height="520"
+      :highlight-current-row="!multiple"
+      @selection-change="selection => (selected = selection)"
+      @row-dblclick="handleRowDblclick"
+    >
+      <el-table-column v-if="multiple" type="selection" width="52" fixed="left" align="center" reserve-selection />
+      <el-table-column v-else width="52" align="center" fixed="left">
+        <template #default="{ row }">
+          <el-radio
+            :model-value="current && current.invoiceNo"
+            :value="row.invoiceNo"
+            @change="current = row"
+          >
+            <span></span>
+          </el-radio>
+        </template>
+      </el-table-column>
+      <el-table-column prop="invoiceNo" label="发票号码" min-width="180" />
+      <el-table-column prop="invoiceDate" label="开票日期" min-width="120" />
+      <el-table-column prop="invoiceType" label="发票类型" min-width="140" />
+      <el-table-column prop="issuerName" label="开票单位" min-width="180" show-overflow-tooltip />
+      <el-table-column prop="receiverName" label="受票单位" min-width="180" show-overflow-tooltip />
+      <el-table-column label="金额(含税)" min-width="130" align="right">
+        <template #default="{ row }">{{ formatMoney(row.invoiceAmount) }}</template>
+      </el-table-column>
+      <el-table-column label="税率" min-width="90" align="center">
+        <template #default="{ row }">{{ formatRate(row.taxRate) }}</template>
+      </el-table-column>
+      <el-table-column label="税额" min-width="120" align="right">
+        <template #default="{ row }">{{ formatMoney(row.taxAmount) }}</template>
+      </el-table-column>
+      <el-table-column label="剩余可用金额" min-width="130" align="right">
+        <template #default="{ row }">{{ formatMoney(row.availableTaxAmount) }}</template>
+      </el-table-column>
+      <!--<el-table-column prop="kingdeeBillNo" label="金蝶单据号" min-width="210" show-overflow-tooltip />-->
+      <el-table-column label="认领状态" min-width="100" align="center">
+        <template #default="{ row }">
+          <el-tag v-if="row.claimed" type="danger" size="small">已认领</el-tag>
+          <el-tag v-else type="info" size="small">未认领</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="登记状态" min-width="100" align="center">
+        <template #default="{ row }">
+          <el-tag v-if="row.registered" type="warning" size="small">已登记</el-tag>
+          <el-tag v-else type="info" size="small">未登记</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="附件" width="120" fixed="right" align="center">
+        <template #default="{ row }">
+          <el-link
+            type="primary"
+            :underline="false"
+            :disabled="attachmentBusy === row.invoiceNo"
+            @click.stop="viewAttachment(row)"
+            >查看</el-link
+          >
+          <el-link
+            type="primary"
+            :underline="false"
+            :disabled="attachmentBusy === row.invoiceNo"
+            @click.stop="downloadAttachment(row)"
+            >下载</el-link
+          >
+        </template>
+      </el-table-column>
+      <el-table-column v-if="!multiple" label="操作" width="90" fixed="right" align="center">
+        <template #default="{ row }">
+          <el-link type="primary" @click.stop="confirmRows([row])">选择</el-link>
+        </template>
+      </el-table-column>
+    </el-table>
+    <div class="kingdee-pool-dialog__pager">
+      <span class="kingdee-pool-dialog__pager-tip">按名称检索范围为已同步票，未找到请改用发票号码或税号精确查找</span>
+      <el-pagination
+        v-model:current-page="page.current"
+        v-model:page-size="page.size"
+        :total="page.total"
+        :page-sizes="[10, 20, 50, 100]"
+        layout="total, sizes, prev, pager, next, jumper"
+        :disabled="loading"
+        @current-change="load"
+        @size-change="handleSizeChange"
+      />
+    </div>
+    <template #footer>
+      <el-button @click="visible = false">取消</el-button>
+      <el-button type="primary" @click="handleConfirm">{{ confirmText }}</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import request from '@/axios';
+import { getList as getCustomerList } from '@/api/vehicle/customer-archive';
+import {
+  downloadKingdeeInvoiceFile,
+  isKingdeePathAttachment,
+  viewKingdeeInvoiceFile,
+} from '@/utils/kingdee-attachment';
+
+export default {
+  name: 'KingdeeInvoicePoolDialog',
+  props: {
+    modelValue: { type: Boolean, required: true },
+    title: { type: String, default: '查询金蝶票据池' },
+    confirmText: { type: String, default: '确定' },
+    multiple: { type: Boolean, default: false },
+    initialInvoiceNo: { type: String, default: '' },
+    queryApi: { type: Function, required: true },
+  },
+  emits: ['update:modelValue', 'confirm'],
+  data() {
+    return {
+      loading: false,
+      // 与后端 BfiConstant.INVOICE_TYPE_NAMES 对齐：value 为发票类型编码（镜像按 invoice_type_code 精确匹配）
+      // 选票场景只开放数电票（普票/专票）
+      invoiceTypeOptions: [
+        { value: '26', label: '数电发票（普通发票）' },
+        { value: '27', label: '数电发票（增值税专用发票）' },
+      ],
+      rows: [],
+      selected: [],
+      current: null,
+      page: { current: 1, size: 10, total: 0 },
+      // 正在查看/下载附件的发票号（行级 loading 守卫）
+      attachmentBusy: null,
+      // 销/购方客商下拉：远程按名称搜客商档案，选中带出税号查询；手动输入的裸税号直接作为值过滤
+      customerOptions: { saler: [], buyer: [] },
+      customerLoading: { saler: false, buyer: false },
+      query: this.emptyQuery(),
+    };
+  },
+  computed: {
+    visible: {
+      get() {
+        return this.modelValue;
+      },
+      set(value) {
+        this.$emit('update:modelValue', value);
+      },
+    },
+  },
+  methods: {
+    emptyQuery() {
+      return {
+        invoiceNo: '',
+        // 默认查近一个月，随请求传后端并在页面回显
+        invoiceDateRange: [this.$dayjs().subtract(1, 'month').format('YYYY-MM-DD'), this.$dayjs().format('YYYY-MM-DD')],
+        salerName: '',
+        buyerName: '',
+        salerTaxNo: '',
+        buyerTaxNo: '',
+        invoiceType: '',
+        claimed: null,
+        registered: null,
+      };
+    },
+    // 镜像行主键为 id，回源入库前的响应仍可能无 id，用发票号码兜底
+    rowKey(row) {
+      return row.id || row.invoiceNo;
+    },
+    // 票池行附件字段为复数 attachmentsJson，行内首项即发票文件（{source,path,name}）
+    rowAttachment(row = {}) {
+      const value = row.attachmentsJson;
+      if (!value) return null;
+      let parsed = value;
+      if (typeof value === 'string') {
+        try {
+          parsed = JSON.parse(value);
+        } catch {
+          return null;
+        }
+      }
+      return Array.isArray(parsed) ? parsed[0] || null : parsed || null;
+    },
+    attachmentName(row) {
+      const attachment = this.rowAttachment(row);
+      return attachment?.name || `${row.invoiceNo || '发票'}.pdf`;
+    },
+    async viewAttachment(row) {
+      const attachment = this.rowAttachment(row);
+      if (!isKingdeePathAttachment(attachment)) {
+        this.$message.warning('当前发票暂无可查看附件');
+        return;
+      }
+      this.attachmentBusy = row.invoiceNo;
+      try {
+        await viewKingdeeInvoiceFile(row.invoiceNo, this.attachmentName(row));
+      } finally {
+        this.attachmentBusy = null;
+      }
+    },
+    async downloadAttachment(row) {
+      const attachment = this.rowAttachment(row);
+      if (!isKingdeePathAttachment(attachment)) {
+        this.$message.warning('当前发票暂无可下载附件');
+        return;
+      }
+      this.attachmentBusy = row.invoiceNo;
+      try {
+        await downloadKingdeeInvoiceFile(row.invoiceNo, this.attachmentName(row));
+      } finally {
+        this.attachmentBusy = null;
+      }
+    },
+    handleOpen() {
+      this.query = this.emptyQuery();
+      this.query.invoiceNo = this.initialInvoiceNo || '';
+      this.current = null;
+      this.selected = [];
+      this.$refs.poolTable?.clearSelection();
+      this.page.current = 1;
+      this.load();
+    },
+    handleQuery() {
+      this.page.current = 1;
+      this.load();
+    },
+    handleSizeChange() {
+      this.page.current = 1;
+      this.load();
+    },
+    resetQuery() {
+      this.query = this.emptyQuery();
+      this.handleQuery();
+    },
+    // 客商名称远程搜索：含 18 位社会信用代码特征（数字+大写字母）时按裸税号直查；
+    // 否则搜客商档案，取客商发票信息（blade_customer_invoice_info）的抬头/税号作选项——票池税号是开票税号，非统一信用代码
+    async searchCustomers(keyword, side) {
+      const text = String(keyword || '').trim();
+      if (!text) return;
+      if (/^[0-9A-Z]{15,20}$/.test(text)) {
+        this.customerOptions[side] = [{ label: `${text}（手输税号）`, value: text }];
+        return;
+      }
+      this.customerLoading[side] = true;
+      try {
+        const data = this.unwrap(await getCustomerList(1, 20, { fullName: text }));
+        const customers = (data.records || []).filter(item => item.id);
+        if (!customers.length) {
+          this.customerOptions[side] = [];
+          return;
+        }
+        // 列表接口不带发票信息，逐户取 detail（detail 组装 invoices，每户一张发票信息）
+        const options = await Promise.all(
+          customers.map(async customer => {
+            const detail = this.unwrap(await request({ url: '/blade-transport/customer-archive/detail', method: 'get', params: { id: customer.id } }));
+            return (detail?.invoices || [])
+              .filter(invoice => invoice.taxNo)
+              .map(invoice => ({ label: `${invoice.invoiceTitle || customer.fullName}（${invoice.taxNo}）`, value: invoice.taxNo }));
+          })
+        );
+        this.customerOptions[side] = options.flat().filter(
+          (option, index, list) => list.findIndex(item => item.value === option.value) === index
+        );
+      } finally {
+        this.customerLoading[side] = false;
+      }
+    },
+    unwrap(response) {
+      const body = response?.data || response || {};
+      return body?.data || body;
+    },
+    async load() {
+      this.loading = true;
+      try {
+        const range = this.query.invoiceDateRange || [];
+        const data = this.unwrap(
+          await this.queryApi({
+            current: this.page.current,
+            size: this.page.size,
+            invoiceNo: this.query.invoiceNo || undefined,
+            invoiceDateStart: range[0] || undefined,
+            invoiceDateEnd: range[1] || undefined,
+            salerName: this.query.salerName || undefined,
+            buyerName: this.query.buyerName || undefined,
+            salerTaxNo: this.query.salerTaxNo || undefined,
+            buyerTaxNo: this.query.buyerTaxNo || undefined,
+            invoiceType: this.query.invoiceType || undefined,
+            claimed: this.query.claimed ?? undefined,
+            registered: this.query.registered ?? undefined,
+          })
+        );
+        this.rows = data.records || [];
+        this.page.total = Number(data.total || 0);
+      } finally {
+        this.loading = false;
+      }
+    },
+    handleRowDblclick(row) {
+      if (!this.multiple) {
+        this.confirmRows([row]);
+      }
+    },
+    handleConfirm() {
+      const picked = this.multiple ? this.selected : this.current ? [this.current] : [];
+      this.confirmRows(picked);
+    },
+    confirmRows(rows) {
+      if (!rows.length) {
+        this.$message.warning(this.multiple ? '请至少选择一条发票' : '请选择一张发票');
+        return;
+      }
+      this.$emit('confirm', rows);
+      this.visible = false;
+    },
+    formatMoney(value) {
+      const number = Number(value);
+      return Number.isFinite(number) ? number.toFixed(2) : '-';
+    },
+    formatRate(value) {
+      const number = Number(value);
+      return Number.isFinite(number) ? `${number}%` : '-';
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.kingdee-pool-dialog__pager {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin-top: 12px;
+  gap: 16px;
+}
+.kingdee-pool-dialog__pager-tip {
+  color: #909399;
+  font-size: 12px;
+}
+</style>

src/components/map-search-results/main.vue

@@ -1,20 +1,55 @@
 <template>
   <div v-if="results.length" class="map-search-results">
-    <div class="map-search-results__title">搜索结果</div>
-    <el-empty v-if="!results.length" description="暂无搜索结果" :image-size="60" />
-    <div
-      v-for="(item, index) in results"
-      :key="item.id || index"
-      class="map-search-results__item"
-      @click="$emit('select', item)"
-    >
-      <div class="map-search-results__name">{{ item.name || item.address || '未命名地址' }}</div>
-      <div class="map-search-results__address">{{ item.address || item.name || '-' }}</div>
+    <div class="map-search-results__list">
+      <div
+        v-for="(item, index) in pageResults"
+        :key="item.id || `${currentPage}-${index}`"
+        class="map-search-results__item"
+        :class="{ 'is-active': isActive(item, index) }"
+        @click="handleSelect(item, index)"
+      >
+        <img
+          v-if="item.photo || item.image"
+          class="map-search-results__thumb"
+          :src="item.photo || item.image"
+          alt=""
+        />
+        <div class="map-search-results__body">
+          <div class="map-search-results__name">
+            {{ item.name || item.address || '未命名地址' }}
+          </div>
+          <div class="map-search-results__address">
+            地址：{{ item.address || item.name || '-' }}
+          </div>
+        </div>
+      </div>
+    </div>
+    <div v-if="totalPages > 1" class="map-search-results__pager">
+      <button
+        v-for="page in visiblePages"
+        :key="page"
+        type="button"
+        class="map-search-results__page"
+        :class="{ 'is-active': page === currentPage }"
+        @click="currentPage = page"
+      >
+        {{ page }}
+      </button>
+      <button
+        type="button"
+        class="map-search-results__page map-search-results__page--next"
+        :disabled="currentPage >= totalPages"
+        @click="goNext"
+      >
+        下一页
+      </button>
     </div>
   </div>
 </template>
 
 <script>
+const PAGE_SIZE = 5;
+
 export default {
   props: {
     results: {
@@ -23,43 +58,167 @@ export default {
     },
   },
   emits: ['select'],
+  data() {
+    return {
+      currentPage: 1,
+      activeKey: '',
+    };
+  },
+  computed: {
+    totalPages() {
+      return Math.max(1, Math.ceil((this.results || []).length / PAGE_SIZE));
+    },
+    pageResults() {
+      const start = (this.currentPage - 1) * PAGE_SIZE;
+      return (this.results || []).slice(start, start + PAGE_SIZE);
+    },
+    visiblePages() {
+      const maxButtons = 3;
+      let start = Math.max(1, this.currentPage - 1);
+      let end = Math.min(this.totalPages, start + maxButtons - 1);
+      start = Math.max(1, end - maxButtons + 1);
+      const pages = [];
+      for (let page = start; page <= end; page += 1) {
+        pages.push(page);
+      }
+      return pages;
+    },
+  },
+  watch: {
+    results() {
+      this.currentPage = 1;
+      this.activeKey = '';
+    },
+  },
+  methods: {
+    resultKey(item, index) {
+      return item?.id ?? `${this.currentPage}-${index}`;
+    },
+    isActive(item, index) {
+      return this.activeKey === this.resultKey(item, index);
+    },
+    handleSelect(item, index) {
+      this.activeKey = this.resultKey(item, index);
+      this.$emit('select', item);
+    },
+    goNext() {
+      if (this.currentPage < this.totalPages) {
+        this.currentPage += 1;
+      }
+    },
+  },
 };
 </script>
 
 <style lang="scss" scoped>
 .map-search-results {
-  width: 260px;
-  height: 420px;
-  overflow-y: auto;
-  border: 1px solid #eff1f7;
+  position: absolute;
+  top: 0;
+  left: 0;
+  z-index: 2000;
+  display: flex;
+  flex-direction: column;
+  width: 360px;
+  max-height: 360px;
+  overflow: hidden;
   background: #fff;
-  flex: 0 0 260px;
+  border: 1px solid #dcdfe6;
+  box-shadow: 0 2px 12px rgba(0, 0, 0, 0.12);
+  pointer-events: auto;
 
-  &__title {
-    padding: 10px 12px;
-    border-bottom: 1px solid #eff1f7;
-    font-weight: 600;
+  &__list {
+    flex: 1 1 auto;
+    min-height: 0;
+    overflow-y: auto;
   }
 
   &__item {
+    display: flex;
+    gap: 10px;
+    align-items: flex-start;
     padding: 10px 12px;
     cursor: pointer;
-    border-bottom: 1px solid #f5f5f5;
+    border-bottom: 1px solid #ebeef5;
   }
 
-  &__item:hover {
-    background: #f5f9ff;
+  &__item:hover,
+  &__item.is-active {
+    background: #f5f5f5;
+  }
+
+  &__thumb {
+    flex: 0 0 48px;
+    width: 48px;
+    height: 48px;
+    object-fit: cover;
+    border: 1px solid #ebeef5;
+    background: #fafafa;
+  }
+
+  &__body {
+    flex: 1 1 auto;
+    min-width: 0;
   }
 
   &__name {
+    overflow: hidden;
     color: #303133;
     font-size: 14px;
+    font-weight: 600;
+    line-height: 1.4;
+    white-space: nowrap;
+    text-overflow: ellipsis;
   }
 
   &__address {
     margin-top: 4px;
     color: #909399;
     font-size: 12px;
+    line-height: 1.5;
+    word-break: break-all;
+  }
+
+  &__pager {
+    display: flex;
+    flex: 0 0 auto;
+    flex-wrap: wrap;
+    gap: 6px;
+    align-items: center;
+    padding: 8px 10px;
+    border-top: 1px solid #ebeef5;
+    background: #fff;
+  }
+
+  &__page {
+    min-width: 28px;
+    height: 28px;
+    padding: 0 8px;
+    color: #606266;
+    font-size: 13px;
+    line-height: 26px;
+    text-align: center;
+    background: #fff;
+    border: 1px solid #dcdfe6;
+    cursor: pointer;
+
+    &:hover:not(:disabled) {
+      color: #409eff;
+      border-color: #409eff;
+    }
+
+    &.is-active {
+      color: #409eff;
+      border-color: #409eff;
+    }
+
+    &:disabled {
+      color: #c0c4cc;
+      cursor: not-allowed;
+    }
+
+    &--next {
+      min-width: 56px;
+    }
   }
 }
 </style>

src/components/table-header-tools/main.vue

@@ -0,0 +1,117 @@
+<template>
+  <div class="avue-crud__right table-header-tools">
+    <el-button v-if="showRefresh" icon="el-icon-refresh" circle @click="$emit('refresh')" />
+    <el-button
+      v-if="showColumn"
+      icon="el-icon-operation"
+      circle
+      @click="columnSettingVisible = true"
+    />
+    <el-button
+      v-if="showSearch"
+      icon="el-icon-search"
+      circle
+      @click="$emit('update:searchVisible', !searchVisible)"
+    />
+    <el-button v-if="showGrid" icon="el-icon-grid" circle @click="toggleTableSize" />
+
+    <el-dialog
+      v-if="showColumn"
+      v-model="columnSettingVisible"
+      title="列设置"
+      width="360px"
+      append-to-body
+      destroy-on-close
+    >
+      <el-checkbox-group
+        class="table-header-tools__column-setting"
+        :model-value="visibleColumnKeys"
+        @update:model-value="$emit('update:visibleColumnKeys', $event)"
+      >
+        <el-checkbox v-for="item in columns" :key="item.prop" :label="item.prop">
+          {{ item.label }}
+        </el-checkbox>
+      </el-checkbox-group>
+      <template #footer>
+        <el-button @click="columnSettingVisible = false">关闭</el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+const TABLE_SIZE_OPTIONS = ['default', 'large', 'small'];
+
+export default {
+  name: 'TableHeaderTools',
+  props: {
+    columns: {
+      type: Array,
+      default: () => [],
+    },
+    visibleColumnKeys: {
+      type: Array,
+      default: () => [],
+    },
+    tableSize: {
+      type: String,
+      default: 'default',
+    },
+    searchVisible: {
+      type: Boolean,
+      default: true,
+    },
+    showRefresh: {
+      type: Boolean,
+      default: true,
+    },
+    showColumn: {
+      type: Boolean,
+      default: true,
+    },
+    showSearch: {
+      type: Boolean,
+      default: true,
+    },
+    showGrid: {
+      type: Boolean,
+      default: true,
+    },
+  },
+  emits: ['refresh', 'update:visibleColumnKeys', 'update:tableSize', 'update:searchVisible'],
+  data() {
+    return {
+      columnSettingVisible: false,
+    };
+  },
+  deactivated() {
+    // keep-alive 缓存页面时关闭列设置弹窗，避免 Teleport 到 body 的弹窗切页后残留
+    this.columnSettingVisible = false;
+  },
+  methods: {
+    toggleTableSize() {
+      const index = TABLE_SIZE_OPTIONS.indexOf(this.tableSize);
+      const next = TABLE_SIZE_OPTIONS[(index + 1) % TABLE_SIZE_OPTIONS.length];
+      this.$emit('update:tableSize', next);
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.table-header-tools.avue-crud__right {
+  width: auto;
+  margin: 0 0 0 auto;
+  flex: none;
+  white-space: nowrap;
+  text-align: right;
+}
+
+.table-header-tools__column-setting {
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+  max-height: 360px;
+  overflow: auto;
+}
+</style>

src/components/vehicle-attachment-table/main.vue

@@ -9,18 +9,21 @@
     <el-table :data="rows" border @selection-change="selectedRows = $event">
       <el-table-column v-if="!readonly" type="selection" width="55" align="center" />
       <el-table-column type="index" label="序号" width="70" align="center" />
-      <el-table-column label="文件名" min-width="240" show-overflow-tooltip>
+      <el-table-column
+        label="文件名"
+        min-width="240"
+        show-overflow-tooltip
+        class-name="is-ellipsis-link"
+      >
         <template #default="{ row }">
           <span
-            class="vehicle-attachment-table__file-name"
+            class="attachment-file-name"
             role="button"
             tabindex="0"
             @click="previewAttachment(row)"
             @keydown.enter="previewAttachment(row)"
             @keydown.space.prevent="previewAttachment(row)"
-          >
-            {{ attachmentName(row) }}
-          </span>
+          >{{ attachmentName(row) }}</span>
         </template>
       </el-table-column>
       <el-table-column label="附件描述" min-width="220">
@@ -40,9 +43,23 @@
       </el-table-column>
       <el-table-column prop="uploadUserName" label="上传人" width="140" align="center" />
       <el-table-column prop="uploadTime" label="上传时间" width="180" align="center" sortable />
-      <el-table-column v-if="!readonly" label="操作" width="100" align="center" fixed="right">
-        <template #default="{ $index }">
-          <el-link type="danger" @click="removeAttachment($index)">删除</el-link>
+      <el-table-column
+        v-if="!readonly || showViewActions"
+        label="操作"
+        :width="readonly ? 120 : 170"
+        align="center"
+        fixed="right"
+      >
+        <template #default="{ row, $index }">
+          <div class="vehicle-attachment-table__actions">
+            <el-link type="primary" :disabled="kingdeeBusy" @click="previewAttachment(row)"
+              >查看</el-link
+            >
+            <el-link type="primary" :disabled="kingdeeBusy" @click="downloadAttachment(row)"
+              >下载</el-link
+            >
+            <el-link v-if="!readonly" type="danger" @click="removeAttachment($index)">删除</el-link>
+          </div>
         </template>
       </el-table-column>
     </el-table>
@@ -68,6 +85,7 @@
       width="90%"
       top="4vh"
       class="vehicle-attachment-table__viewer-dialog"
+      @closed="handlePreviewClosed"
     >
       <pdf-preview
         v-if="documentPreviewVisible && previewFile.url && previewFile.isPdf"
@@ -108,6 +126,11 @@ import '@open-file-viewer/core/style.css';
 import pdfWorkerSrc from 'pdfjs-dist/build/pdf.worker.mjs?url';
 import PdfPreview from '@/components/pdf-preview/main.vue';
 import { downloadFileByUrl } from '@/utils/util';
+import {
+  downloadKingdeeInvoiceFile,
+  isKingdeePathAttachment,
+  requestKingdeeFile,
+} from '@/utils/kingdee-attachment';
 
 const attachmentFileTypes = [
   'pdf',
@@ -153,6 +176,16 @@ export default {
       type: Number,
       default: 500,
     },
+    // 金蝶侧附件（piaozone path 型）代理下载所依赖的发票号；行内自带 invoiceNo 时优先用行内值
+    kingdeeInvoiceNo: {
+      type: String,
+      default: '',
+    },
+    // 查看态也展示「查看/下载」操作列（编辑态始终展示，含删除）
+    showViewActions: {
+      type: Boolean,
+      default: false,
+    },
   },
   emits: ['update:modelValue'],
   data() {
@@ -164,6 +197,10 @@ export default {
       imagePreviewIndex: 0,
       documentPreviewVisible: false,
       previewFile: {},
+      // 金蝶侧附件代理请求进行中（行级按钮共享 loading 守卫，防重复触发）
+      kingdeeBusy: false,
+      // 金蝶附件预览用的 objectURL，弹窗关闭时回收
+      kingdeeObjectUrl: '',
       viewerPlugins,
       viewerToolbar: {
         download: true,
@@ -198,6 +235,12 @@ export default {
     attachmentUrl(row = {}) {
       return row.url || row.link || row.fileUrl || row.downloadUrl || row.domain || row.src || '';
     },
+    kingdeeInvoiceNoOf(row = {}) {
+      return row.invoiceNo || this.kingdeeInvoiceNo || '';
+    },
+    isKingdeeRow(row = {}) {
+      return isKingdeePathAttachment(row) && Boolean(this.kingdeeInvoiceNoOf(row));
+    },
     attachmentExtension(row = {}) {
       const source = String(this.attachmentName(row) || this.attachmentUrl(row)).split('?')[0];
       const index = source.lastIndexOf('.');
@@ -245,6 +288,10 @@ export default {
       return `${(value / 1024 / 1024).toFixed(1)}MB`;
     },
     downloadAttachment(row) {
+      // 金蝶侧附件（piaozone path 型）经后端代理 A801-2 下载，OSS 直链维持前端直连下载
+      if (this.isKingdeeRow(row)) {
+        return this.downloadKingdeeAttachment(row);
+      }
       const url = this.attachmentUrl(row);
       if (!url) {
         this.$message.warning('附件地址为空，无法下载');
@@ -252,20 +299,47 @@ export default {
       }
       downloadFileByUrl(url, this.attachmentName(row));
     },
+    async downloadKingdeeAttachment(row) {
+      if (this.kingdeeBusy) return;
+      this.kingdeeBusy = true;
+      try {
+        await downloadKingdeeInvoiceFile(this.kingdeeInvoiceNoOf(row), this.attachmentName(row));
+      } finally {
+        this.kingdeeBusy = false;
+      }
+    },
     batchDownload() {
       const rows = this.selectedRows.length ? this.selectedRows : this.rows;
-      const downloadableRows = rows.filter(row => this.attachmentUrl(row));
-      if (!downloadableRows.length) {
+      const kingdeeRows = rows.filter(row => this.isKingdeeRow(row));
+      const urlRows = rows.filter(row => !this.isKingdeeRow(row) && this.attachmentUrl(row));
+      if (!kingdeeRows.length && !urlRows.length) {
         this.$message.warning(
           this.selectedRows.length ? '所选附件暂无可下载地址' : '暂无可下载附件'
         );
         return;
       }
-      downloadableRows.forEach((row, index) => {
+      urlRows.forEach((row, index) => {
         window.setTimeout(() => this.downloadAttachment(row), index * 500);
       });
+      // 金蝶侧附件走代理接口，串行触发避免并发重复回源
+      this.downloadKingdeeRows(kingdeeRows);
+    },
+    async downloadKingdeeRows(rows) {
+      if (this.kingdeeBusy) return;
+      this.kingdeeBusy = true;
+      try {
+        for (const row of rows) {
+          await downloadKingdeeInvoiceFile(this.kingdeeInvoiceNoOf(row), this.attachmentName(row));
+        }
+      } finally {
+        this.kingdeeBusy = false;
+      }
     },
     previewAttachment(row) {
+      // 金蝶侧附件经 A801-2 代理取流后进弹窗预览，OSS 直链维持原逻辑
+      if (this.isKingdeeRow(row)) {
+        return this.previewKingdeeAttachment(row);
+      }
       const url = this.attachmentUrl(row);
       if (!url) {
         this.$message.warning('附件地址为空，无法预览');
@@ -288,6 +362,42 @@ export default {
       };
       this.documentPreviewVisible = true;
     },
+    async previewKingdeeAttachment(row) {
+      // OFD 版式文件浏览器无法在线渲染，直接提示下载，避免拉流后预览失败
+      if (this.attachmentExtension(row) === 'ofd') {
+        this.$message.warning('OFD 版式文件不支持在线预览，请使用下载获取后查看');
+        return;
+      }
+      if (this.kingdeeBusy) return;
+      this.kingdeeBusy = true;
+      try {
+        const blob = await requestKingdeeFile(this.kingdeeInvoiceNoOf(row));
+        this.releaseKingdeeObjectUrl();
+        const isPdf = this.isPdf(row) || String(blob.type || '').includes('application/pdf');
+        this.kingdeeObjectUrl = URL.createObjectURL(blob);
+        this.previewFile = {
+          name: this.attachmentName(row),
+          url: this.kingdeeObjectUrl,
+          mimeType: isPdf ? 'application/pdf' : blob.type || '',
+          isPdf,
+        };
+        this.documentPreviewVisible = true;
+      } catch (error) {
+        if (!error?.silent) this.$message.error(error?.message || '附件预览失败');
+      } finally {
+        this.kingdeeBusy = false;
+      }
+    },
+    handlePreviewClosed() {
+      this.releaseKingdeeObjectUrl();
+      this.previewFile = {};
+    },
+    releaseKingdeeObjectUrl() {
+      if (this.kingdeeObjectUrl) {
+        URL.revokeObjectURL(this.kingdeeObjectUrl);
+        this.kingdeeObjectUrl = '';
+      }
+    },
     handlePreviewUnsupported() {
       this.$message.warning('当前文件暂不支持在线预览');
     },
@@ -318,6 +428,17 @@ export default {
     text-decoration: underline;
   }
 
+  &__actions {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    gap: 12px;
+
+    :deep(.el-link) {
+      font-size: 13px;
+    }
+  }
+
   &__upload {
     display: flex;
     justify-content: flex-start;

src/components/vehicle-attachment-upload/main.vue

@@ -212,7 +212,14 @@ export default {
         .filter(Boolean);
     },
     acceptText() {
-      return this.acceptedList.join(',');
+      return this.acceptedList
+        .map(item => {
+          const value = String(item).trim();
+          if (!value || value.includes('/') || value.startsWith('.')) return value;
+          return `.${value}`;
+        })
+        .filter(Boolean)
+        .join(',');
     },
     tipText() {
       return this.tip || `${UNIFIED_ATTACHMENT_TIP_PREFIX}${this.maxSize}M`;
@@ -304,12 +311,22 @@ export default {
       });
     },
     handleSuccess(response, file, files) {
-      if (!response || response.success === false || (response.code && response.code !== 200)) {
+      const code = response?.code;
+      const codeInvalid = code !== undefined && code !== null && code !== '' && Number(code) !== 200;
+      if (!response || response.success === false || codeInvalid) {
         this.$message.error((response && response.msg) || '上传失败');
         return;
       }
-      this.emitUploadFiles(this.multiple ? files : [file]);
-      this.$emit('success', this.normalizeUploadFile(file));
+      if (file && !file.response) {
+        file.response = response;
+      }
+      const normalized = this.normalizeUploadFile(file, response);
+      if (!normalized.url) {
+        this.$message.error('上传成功但未返回文件地址');
+        return;
+      }
+      this.$emit('success', normalized);
+      this.emitUploadFiles(this.multiple ? files : [file], normalized);
       this.$message.success('上传成功');
     },
     handleChange(file, files) {
@@ -323,35 +340,89 @@ export default {
       this.emitUploadFiles(files);
       return true;
     },
-    emitUploadFiles(files) {
-      const list = files
-        .filter(file => file.status === 'success' || this.getFileUrl(file))
-        .map(this.normalizeUploadFile)
+    emitUploadFiles(files, preferredFile) {
+      const list = (files || [])
+        .filter(file => {
+          if (file?.status === 'fail') return false;
+          return (
+            file?.status === 'success' ||
+            this.getFileUrl(file) ||
+            file?.response?.data ||
+            file?.response?.link ||
+            file?.response
+          );
+        })
+        .map(file => this.normalizeUploadFile(file))
         .filter(item => item.url);
-      this.$emit('update:modelValue', list);
-      this.$emit('change', list);
+
+      if (preferredFile?.url) {
+        const exists = list.some(
+          item =>
+            (preferredFile.uid && item.uid && String(item.uid) === String(preferredFile.uid)) ||
+            item.url === preferredFile.url
+        );
+        if (!exists) list.push(preferredFile);
+      }
+
+      const current = this.parseValue(this.modelValue).map(item => ({
+        ...item,
+        url: this.getFileUrl(item),
+      }));
+      const merged = [...current];
+      list.forEach(file => {
+        const index = merged.findIndex(
+          item =>
+            (file.uid && item.uid && String(item.uid) === String(file.uid)) ||
+            (file.url && this.getFileUrl(item) === file.url)
+        );
+        if (index >= 0) merged.splice(index, 1, { ...merged[index], ...file });
+        else merged.push(file);
+      });
+
+      const result = merged.filter(item => this.getFileUrl(item));
+      this.$emit('update:modelValue', result);
+      this.$emit('change', result);
     },
-    normalizeUploadFile(file) {
-      const data = (file.response && file.response.data) || file.data || file;
-      const url = data.link || data.url || data.domain || file.url || '';
+    normalizeUploadFile(file, responseOverride) {
+      const response = responseOverride || file?.response;
+      let data = {};
+      if (response && typeof response === 'object') {
+        if (response.data && typeof response.data === 'object') {
+          data = response.data;
+        } else if (response.link || response.url || response.domain) {
+          data = response;
+        }
+      }
+      if (!data.link && !data.url && !data.domain) {
+        data = file?.data && typeof file.data === 'object' ? file.data : file || {};
+      }
+      const url =
+        data.link ||
+        data.url ||
+        data.domain ||
+        data.fileLink ||
+        data.fileUrl ||
+        file?.url ||
+        file?.link ||
+        '';
       const originalName =
         data.originalName ||
-        file.originalName ||
-        file.name ||
+        file?.originalName ||
+        file?.name ||
         data.name ||
         this.getFileName(url) ||
         '附件';
       const extension = this.getExtension({ name: originalName, url });
       return {
         ...data,
-        uid: file.uid || data.uid,
+        uid: file?.uid || data.uid,
         originalName,
         name: originalName,
         url,
         link: data.link || url,
-        size: data.size || data.attachSize || file.size || '',
+        size: data.size || data.attachSize || file?.size || '',
         extension,
-        mimeType: data.mimeType || data.contentType || file.raw?.type || MIME_MAP[extension] || '',
+        mimeType: data.mimeType || data.contentType || file?.raw?.type || MIME_MAP[extension] || '',
       };
     },
     handlePreview(file) {

src/mixins/organization-search.js

@@ -12,6 +12,8 @@ import { h } from 'vue';
  *   1. 混入本 mixin：mixins: [organizationSearch]
  *   2. option 中「所属组织」列加上 searchslot: true（prop 为 organizationName 或 deptName 均可）
  *   3. 在 created / 初始化时调用 this.loadOrganizationOptions()
+ *   4. 需要「未分配组织」筛选项的页面在 data 里置 enableUnassignedOrgFilter: true；
+ *      该项只追加进搜索树 organizationSearchTreeOptions，表单级联 organizationTreeOptions 不含哨兵
  *
  * 说明：
  *   - 自动识别 organizationName / deptName 两种 prop，并挂载 column.renderSearch
@@ -26,6 +28,12 @@ import { h } from 'vue';
  */
 const ORG_PROPS = ['organizationName', 'deptName'];
 
+// 「未分配组织」筛选项的哨兵值：不是真实组织名，选中后提交给后端的就是这串字面量。
+// 后端 TransportBusiConstant.UNASSIGNED_ORG_FILTER、DriverMapper.xml / TransportVehicleMapper.xml
+// 的 organizationName 分支以及司机、车辆导出查询都按它改判为 organization_name = ''；
+// 后端换成空串会让整段组织条件不生效，筛选静默失效。前端与后端这几处必须同步修改。
+const UNASSIGNED_ORG_FILTER = '__UNASSIGNED_ORG__';
+
 export default {
   data() {
     return {
@@ -34,9 +42,18 @@ export default {
       organizationTreeOptions: [],
       organizationTreeFlatOptions: [],
       organizationLoading: false,
+      // 组织筛选是否追加「未分配组织」一项；页面在 data 里覆盖为 true 才生效
+      enableUnassignedOrgFilter: false,
     };
   },
   computed: {
+    // 搜索栏级联的选项：开关打开时在真实组织最前面追加「未分配组织」。
+    // 不能直接改 organizationTreeOptions——司机/车辆页的编辑表单也用这棵树选组织。
+    organizationSearchTreeOptions() {
+      return this.enableUnassignedOrgFilter
+        ? [this.unassignedOrgOption(), ...this.organizationTreeOptions]
+        : this.organizationTreeOptions;
+    },
     // 所属组织级联配置：checkStrictly 允许选中任意层级，不必选到末级
     organizationCascaderProps() {
       return {
@@ -61,7 +78,7 @@ export default {
             ? this.excludeExternalOrganization(source)
             : source;
           this.organizationTreeOptions = this.normalizeOrgTree(tree);
-          this.organizationTreeFlatOptions = this.flattenOrgTree(this.organizationTreeOptions);
+          this.organizationTreeFlatOptions = this.flattenOrgTree(this.organizationSearchTreeOptions);
           const option = this.tableOption || this.option;
           if (!option) return;
           ORG_PROPS.forEach(prop => {
@@ -100,12 +117,20 @@ export default {
         };
       });
     },
+    // 哨兵节点的 id 与 rawLabel 都取哨兵值，resolveOrgName 取到的仍是哨兵而不是某个真实组织名
+    unassignedOrgOption() {
+      return { id: UNASSIGNED_ORG_FILTER, label: '未分配组织', rawLabel: UNASSIGNED_ORG_FILTER };
+    },
     flattenOrgTree(tree = []) {
       return (tree || []).flatMap(item => [
         { id: String(item.id), label: item.label, rawLabel: item.rawLabel },
         ...this.flattenOrgTree(item.children || []),
       ]);
     },
+    // 组织列渲染用：空串或纯空白即「未分配组织」（组织列 NOT NULL，无组织存空串）
+    isBlankOrganizationName(value) {
+      return String(value ?? '').trim() === '';
+    },
     // 兼容两种入参：级联路径数组（取末级）或单个部门 id
     findOrgById(id) {
       const value = Array.isArray(id) ? id.at(-1) : id;
@@ -155,7 +180,7 @@ export default {
           // 级联单选：modelValue 必须是 id 路径数组，否则控件内部状态会错乱导致无法再次选中
           if (scope.row) scope.row[prop] = Array.isArray(value) ? value : [];
         },
-        options: this.organizationTreeOptions,
+        options: this.organizationSearchTreeOptions,
         props: {
           label: 'label',
           value: 'id',

src/option/base/common-address.js

@@ -146,6 +146,13 @@ export const createOption = () => ({
       showWordLimit: true,
       rules: [{ max: 200, message: '备注不能超过200个字', trigger: 'blur' }],
     },
+    {
+      label: '创建人',
+      prop: 'createUserName',
+      minWidth: 120,
+      addDisplay: false,
+      editDisplay: false,
+    },
     {
       label: '更新时间',
       prop: 'updateTime',
@@ -298,6 +305,10 @@ export const createOption = () => ({
       searchOrder: 3,
       searchPlaceholder: '请选择',
       dicData: [],
+      props: {
+        label: 'label',
+        value: 'value',
+      },
       filterable: true,
       hide: true,
       display: false,

src/option/base/measurement-unit.js

@@ -2,6 +2,9 @@ const dimensionOptions = [
   { label: '重量', value: '重量' },
   { label: '体积', value: '体积' },
   { label: '数量', value: '数量' },
+  { label: '整车', value: '整车' },
+  { label: '里程', value: '里程' },
+  { label: '吨·公里', value: '吨·公里' },
 ];
 
 const statusOptions = [
@@ -35,13 +38,13 @@ export const createOption = () => ({
   delBtn: false,
   selection: true,
   dialogClickModal: false,
-  menuWidth: 240,
   menuFixed: 'right',
   column: [
     {
       label: '计量单位编码',
       prop: 'unitCode',
       minWidth: 150,
+      span: 24,
       search: true,
       searchOrder: 4,
       searchSpan: 6,
@@ -108,6 +111,7 @@ export const createOption = () => ({
     {
       label: '创建人',
       prop: 'createUserName',
+      minWidth: 110,
       addDisplay: false,
       editDisplay: false,
       viewDisplay: false,
@@ -116,6 +120,7 @@ export const createOption = () => ({
     {
       label: '更新人',
       prop: 'updateUserName',
+      minWidth: 110,
       addDisplay: false,
       editDisplay: false,
       viewDisplay: false,
@@ -127,6 +132,7 @@ export const createOption = () => ({
       type: 'datetime',
       format: 'YYYY-MM-DD HH:mm:ss',
       valueFormat: 'YYYY-MM-DD HH:mm:ss',
+      width: 180,
       sortable: true,
       addDisplay: false,
       editDisplay: false,
@@ -138,6 +144,7 @@ export const createOption = () => ({
       type: 'datetime',
       format: 'YYYY-MM-DD HH:mm:ss',
       valueFormat: 'YYYY-MM-DD HH:mm:ss',
+      width: 180,
       sortable: true,
       addDisplay: false,
       editDisplay: false,

src/option/business/common-cargo.js

@@ -35,26 +35,7 @@ export const formatCargoValue = value => {
 };
 
 export const option = createCrudOption([
-  {
-    label: '一级货物类型',
-    prop: 'firstCargoTypeName',
-    formslot: true,
-    order: 60,
-    span: 12,
-    minWidth: 150,
-    editDisabled: true,
-    rules: [{ required: true, message: '请选择一级货物类型', trigger: 'change' }],
-  },
-  {
-    label: '二级货物类型',
-    prop: 'secondCargoTypeName',
-    formslot: true,
-    order: 59,
-    span: 12,
-    minWidth: 150,
-    editDisabled: true,
-    rules: [{ required: true, message: '请选择二级货物类型', trigger: 'change' }],
-  },
+  // ---------- 列表字段（顺序即表格展示顺序） ----------
   {
     label: '货物名称',
     prop: 'cargoName',
@@ -79,12 +60,24 @@ export const option = createCrudOption([
     ],
   },
   {
-    label: '一级货物类型编码',
-    prop: 'firstCargoTypeCode',
-    hide: true,
-    display: false,
-    addDisplay: false,
+    label: '一级货物类型',
+    prop: 'firstCargoTypeName',
+    formslot: true,
+    order: 60,
+    span: 12,
+    minWidth: 150,
     editDisabled: true,
+    rules: [{ required: true, message: '请选择一级货物类型', trigger: 'change' }],
+  },
+  {
+    label: '二级货物类型',
+    prop: 'secondCargoTypeName',
+    formslot: true,
+    order: 59,
+    span: 12,
+    minWidth: 150,
+    editDisabled: true,
+    rules: [{ required: true, message: '请选择二级货物类型', trigger: 'change' }],
   },
   {
     label: '二级货物类型编码',
@@ -92,9 +85,132 @@ export const option = createCrudOption([
     display: false,
     addDisplay: false,
     editDisabled: true,
-    minWidth: 180,
+    minWidth: 160,
   },
-  // 搜索字段与表格、表单字段独立，避免筛选配置影响数据展示和编辑布局。
+  {
+    label: '包装',
+    prop: 'packageType',
+    type: 'select',
+    dicData: packageOptions,
+    order: 39,
+    span: 12,
+    minWidth: 100,
+  },
+  {
+    label: '品牌',
+    prop: 'brand',
+    search: false,
+    order: 40,
+    span: 12,
+    minWidth: 120,
+    placeholder: '请输入',
+    rules: textRule('品牌', 50),
+  },
+  {
+    label: '规格',
+    prop: 'specification',
+    order: 29,
+    span: 12,
+    minWidth: 120,
+    placeholder: '请输入',
+    rules: textRule('规格', 50),
+  },
+  {
+    label: '型号',
+    prop: 'model',
+    order: 19,
+    span: 12,
+    minWidth: 120,
+    placeholder: '请输入',
+    rules: textRule('型号', 50, true),
+  },
+  {
+    label: '单价',
+    prop: 'cargoValue',
+    formslot: true,
+    order: 30,
+    formatter: row => formatCargoValue(row.cargoValue),
+    minWidth: 120,
+    rules: [
+      {
+        validator: (rule, value, callback) => {
+          if (value === undefined || value === null || value === '') {
+            callback();
+            return;
+          }
+          if (!/^\d+(\.\d{1,2})?$/.test(String(value))) {
+            callback(new Error('单价只能输入数字，最多保留2位小数'));
+            return;
+          }
+          callback();
+        },
+        trigger: 'blur',
+      },
+    ],
+  },
+  {
+    label: '计价单位',
+    prop: 'priceUnit',
+    type: 'select',
+    dicData: [],
+    display: false,
+    minWidth: 120,
+  },
+  {
+    label: '尺寸',
+    prop: 'sizeText',
+    minWidth: 120,
+    addDisplay: false,
+    editDisplay: false,
+    rules: textRule('尺寸', 100),
+  },
+  {
+    label: '说明',
+    prop: 'descriptionOne',
+    order: 20,
+    span: 12,
+    minWidth: 160,
+    placeholder: '请输入',
+    rules: textRule('说明', 100),
+  },
+  {
+    label: '备注',
+    prop: 'remark',
+    type: 'textarea',
+    order: 10,
+    minRows: 2,
+    span: 24,
+    maxlength: 200,
+    showWordLimit: true,
+    placeholder: '请输入',
+    rules: textRule('备注', 200),
+  },
+  {
+    label: '组织',
+    prop: 'deptName',
+    minWidth: 150,
+    addDisplay: false,
+    editDisplay: false,
+  },
+  ...auditColumns
+    .filter(column => ['createUserName', 'createTime', 'updateTime'].includes(column.prop))
+    .sort(
+      (first, second) =>
+        ['createUserName', 'createTime', 'updateTime'].indexOf(first.prop) -
+        ['createUserName', 'createTime', 'updateTime'].indexOf(second.prop)
+    ),
+
+  // ---------- 表单隐藏字段 ----------
+  {
+    label: '一级货物类型编码',
+    prop: 'firstCargoTypeCode',
+    hide: true,
+    display: false,
+    addDisplay: false,
+    editDisabled: true,
+  },
+
+  // ---------- 搜索字段（与表格、表单独立） ----------
   {
     label: '货物名称',
     prop: 'searchCargoName',
@@ -186,118 +302,6 @@ export const option = createCrudOption([
     editDisplay: false,
     viewDisplay: false,
   },
-  {
-    label: '包装',
-    prop: 'packageType',
-    type: 'select',
-    dicData: packageOptions,
-    order: 39,
-    span: 12,
-    minWidth: 100,
-  },
-  {
-    label: '品牌',
-    prop: 'brand',
-    search: false,
-    order: 40,
-    span: 12,
-    minWidth: 120,
-    placeholder: '请输入',
-    rules: textRule('品牌', 50),
-  },
-  {
-    label: '规格',
-    prop: 'specification',
-    order: 29,
-    span: 12,
-    minWidth: 120,
-    placeholder: '请输入',
-    rules: textRule('规格', 50),
-  },
-  {
-    label: '货值',
-    prop: 'cargoValue',
-    formslot: true,
-    order: 30,
-    formatter: row => formatCargoValue(row.cargoValue),
-    minWidth: 120,
-    rules: [
-      {
-        validator: (rule, value, callback) => {
-          if (value === undefined || value === null || value === '') {
-            callback();
-            return;
-          }
-          if (!/^\d+(\.\d{1,2})?$/.test(String(value))) {
-            callback(new Error('货值只能输入数字，最多保留2位小数'));
-            return;
-          }
-          callback();
-        },
-        trigger: 'blur',
-      },
-    ],
-  },
-  {
-    label: '计价单位',
-    prop: 'priceUnit',
-    type: 'select',
-    dicData: [],
-    display: false,
-    minWidth: 120,
-  },
-  {
-    label: '型号',
-    prop: 'model',
-    order: 19,
-    span: 12,
-    minWidth: 120,
-    placeholder: '请输入',
-    rules: textRule('型号', 50, true),
-  },
-  {
-    label: '尺寸',
-    prop: 'sizeText',
-    minWidth: 120,
-    addDisplay: false,
-    editDisplay: false,
-    rules: textRule('尺寸', 100),
-  },
-  {
-    label: '说明',
-    prop: 'descriptionOne',
-    order: 20,
-    span: 12,
-    minWidth: 160,
-    placeholder: '请输入',
-    rules: textRule('说明', 100),
-  },
-  {
-    label: '备注',
-    prop: 'remark',
-    type: 'textarea',
-    order: 10,
-    minRows: 2,
-    span: 24,
-    maxlength: 200,
-    showWordLimit: true,
-    placeholder: '请输入',
-    rules: textRule('备注', 200),
-  },
-  {
-    label: '组织',
-    prop: 'deptName',
-    minWidth: 150,
-    addDisplay: false,
-    editDisplay: false,
-  },
-  ...auditColumns
-    .filter(column => ['updateTime', 'createTime'].includes(column.prop))
-    .sort(
-      (first, second) =>
-        ['updateTime', 'createTime'].indexOf(first.prop) -
-        ['updateTime', 'createTime'].indexOf(second.prop)
-    ),
 ]);
 
 // 搜索栏标签统一加宽，给较长的货物类型字段预留足够展示空间。

src/option/business/common-route.js

@@ -281,14 +281,13 @@ export const option = {
       filterable: true,
     },
     ...auditColumns
-      .filter(column => column.prop !== 'createUserName')
       .map(column =>
         ['createTime', 'updateTime'].includes(column.prop) ? { ...column, minWidth: 190 } : column
       )
       .sort(
         (first, second) =>
-          ['updateUserName', 'updateTime', 'createTime'].indexOf(first.prop) -
-          ['updateUserName', 'updateTime', 'createTime'].indexOf(second.prop)
+          ['createUserName', 'updateUserName', 'createTime', 'updateTime'].indexOf(first.prop) -
+          ['createUserName', 'updateUserName', 'createTime', 'updateTime'].indexOf(second.prop)
       ),
   ]),
   dialogCustomClass: 'avue-dialog--common-route',

src/option/business/common.js

@@ -1,4 +1,4 @@
-export const transportTypeOptions = [
+export const transportTypeOptions = [
   { label: '公路运输', value: '公路运输' },
   { label: '铁路运输', value: '铁路运输' },
   { label: '水路运输', value: '水路运输' },
@@ -42,6 +42,7 @@ export const waybillStatusOptions = [
   { label: '草稿', value: 'draft' },
   { label: '待执行', value: 'pending' },
   { label: '进行中', value: 'running' },
+  { label: '待回单确认', value: 'pending_return_confirm' },
   { label: '已完成', value: 'completed' },
   { label: '已取消', value: 'cancelled' },
 ];
@@ -117,6 +118,7 @@ export const contractCategoryOptions = [
 export const signTypeOptions = [
   { label: '新签', value: '新签' },
   { label: '续签', value: '续签' },
+  { label: '补充协议', value: '补充协议' },
 ];
 
 export const contractStageOptions = [
@@ -142,6 +144,17 @@ export const contractArchiveStatusOptions = [
   { label: '已归档', value: '已归档' },
 ];
 
+export const hcsSyncStatusOptions = [
+  { label: '待推送', value: 'unsynced' },
+  { label: '已推送', value: 'synced' },
+  { label: '推送失败', value: 'failed' },
+];
+
+export const yesNoOptions = [
+  { label: '是', value: true },
+  { label: '否', value: false },
+];
+
 export const nodeOptions = [
   { label: '接单', value: '接单' },
   { label: '到场', value: '到场' },

src/option/business/contract-change.js

@@ -0,0 +1,221 @@
+import {
+  approvalStatusOptions,
+  contractCategoryOptions,
+  createCrudOption,
+  hcsSyncStatusOptions,
+  signTypeOptions,
+} from './common';
+
+const listDicFormatter = res => {
+  const data = res?.data || res;
+  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 projectNameDicFormatter = res => {
+  const list = listDicFormatter(res);
+  return list.filter(item => item && item.projectName && String(item.projectName).trim());
+};
+
+export const changeTypeOptions = [
+  { label: '合同信息变更', value: '合同信息变更' },
+  { label: '结算规则变更', value: '结算规则变更' },
+];
+
+export const config = {
+  title: '合同变更',
+  permission: 'contract_change',
+  statusProp: 'approvalStatus',
+  statusTextProp: 'approvalStatusName',
+  deleteStatus: ['draft', 'withdrawn', 'rejected'],
+  editStatus: ['draft', 'withdrawn', 'rejected'],
+  viewStatus: ['approved'],
+  operations: [
+    {
+      action: 'submitApproval',
+      label: '提交',
+      statusProp: 'approvalStatus',
+      status: ['draft'],
+      permission: 'contract_change_submit',
+    },
+    {
+      action: 'withdraw',
+      label: '撤回',
+      statusProp: 'approvalStatus',
+      status: ['reviewing'],
+      permission: 'contract_change_withdraw',
+    },
+    {
+      action: 'mkAudit',
+      label: '流程',
+      statusProp: 'approvalStatus',
+      status: ['reviewing', 'rejected', 'approved'],
+      permission: 'contract_change_approve',
+      mkOnly: true,
+    },
+    {
+      action: 'approve',
+      label: '通过',
+      type: 'success',
+      statusProp: 'approvalStatus',
+      status: ['reviewing'],
+      permission: 'contract_change_approve',
+      localOnly: true,
+    },
+    {
+      action: 'reject',
+      label: '驳回',
+      type: 'warning',
+      statusProp: 'approvalStatus',
+      status: ['reviewing'],
+      permission: 'contract_change_reject',
+      localOnly: true,
+    },
+  ],
+};
+
+export const option = createCrudOption([
+  {
+    label: '合同编号',
+    prop: 'contractNo',
+    search: true,
+    searchPlaceholder: '请输入',
+    searchOrder: 20,
+    minWidth: 160,
+  },
+  {
+    label: '合同名称',
+    prop: 'contractName',
+    search: true,
+    searchPlaceholder: '请输入',
+    searchOrder: 30,
+    minWidth: 180,
+  },
+  {
+    label: '所属项目',
+    prop: 'projectName',
+    search: true,
+    searchType: 'select',
+    searchPlaceholder: '请选择',
+    searchOrder: 60,
+    dicUrl: '/blade-transport/project-apply/list?current=1&size=9999&contractSelectable=true',
+    dicFormatter: projectNameDicFormatter,
+    props: {
+      label: 'projectName',
+      value: 'projectName',
+    },
+    filterable: true,
+    minWidth: 160,
+  },
+  {
+    label: '所属组织',
+    prop: 'organizationName',
+    search: true,
+    searchPlaceholder: '请输入',
+    searchOrder: 10,
+    minWidth: 150,
+  },
+  {
+    label: '合同类别',
+    prop: 'contractCategory',
+    type: 'select',
+    search: true,
+    searchPlaceholder: '请选择',
+    searchOrder: 70,
+    dicData: contractCategoryOptions,
+    minWidth: 130,
+  },
+  {
+    label: '签约类型',
+    prop: 'signType',
+    type: 'select',
+    search: true,
+    searchPlaceholder: '请选择',
+    searchOrder: 50,
+    dicData: signTypeOptions,
+    minWidth: 120,
+  },
+  {
+    label: '甲方',
+    prop: 'partyA',
+    minWidth: 160,
+  },
+  {
+    label: '乙方',
+    prop: 'partyB',
+    minWidth: 160,
+  },
+  {
+    label: '开始日期',
+    prop: 'startDate',
+    type: 'date',
+    format: 'YYYY-MM-DD',
+    valueFormat: 'YYYY-MM-DD',
+    minWidth: 130,
+  },
+  {
+    label: '结束日期',
+    prop: 'endDate',
+    type: 'date',
+    format: 'YYYY-MM-DD',
+    valueFormat: 'YYYY-MM-DD',
+    minWidth: 130,
+  },
+  {
+    label: '临时效力起',
+    prop: 'temporaryStartDate',
+    type: 'date',
+    format: 'YYYY-MM-DD',
+    valueFormat: 'YYYY-MM-DD',
+    minWidth: 130,
+  },
+  {
+    label: '临时效力止',
+    prop: 'temporaryEndDate',
+    type: 'date',
+    format: 'YYYY-MM-DD',
+    valueFormat: 'YYYY-MM-DD',
+    minWidth: 130,
+  },
+  {
+    label: '经办人',
+    prop: 'handlerUserName',
+    minWidth: 120,
+  },
+  {
+    label: '创建时间',
+    prop: 'createTime',
+    type: 'datetime',
+    minWidth: 170,
+  },
+  {
+    label: '审核状态',
+    prop: 'approvalStatus',
+    type: 'select',
+    search: true,
+    searchPlaceholder: '请选择',
+    searchOrder: 40,
+    dicData: approvalStatusOptions,
+    minWidth: 110,
+  },
+  {
+    label: '当前节点',
+    prop: 'currentNode',
+    minWidth: 120,
+  },
+  {
+    label: '当前处理人',
+    prop: 'currentProcessor',
+    minWidth: 120,
+  },
+  {
+    label: '同步状态',
+    prop: 'syncStatus',
+    type: 'select',
+    dicData: hcsSyncStatusOptions,
+    minWidth: 110,
+  },
+]);

src/option/business/contract-manage.js

@@ -6,9 +6,12 @@ import {
   contractStageOptions,
   createCrudOption,
   effectiveTypeOptions,
+  nonNegativeRule,
+  hcsSyncStatusOptions,
   selectRule,
   signTypeOptions,
   textRule,
+  yesNoOptions,
 } from './common';
 
 const contractSettlementModeOptions = [
@@ -61,13 +64,16 @@ export const config = {
         ['contractNo', '合同编号'],
         ['contractName', '合同名称'],
         ['projectName', '所属项目'],
-        ['organizationName', '所属组织'],
+        ['organizationName', '合同负责部门'],
+        ['platformCompanyName', '平台公司'],
         ['contractCategory', '合同类别'],
         ['signType', '签约类型'],
         ['partyA', '甲方'],
         ['partyB', '乙方'],
+        ['partyC', '丙方'],
         ['handlerUserName', '经办人'],
         ['signDate', '签订日期'],
+        ['applyDate', '申请日期'],
         ['contractFormat', '合同格式'],
         ['legalSealFlag', '是否需要加盖法人章'],
         ['copyCount', '一式（份）'],
@@ -76,7 +82,8 @@ export const config = {
         ['templateFlag', '是否范本'],
         ['originalContractNo', '原件合同编号'],
         ['electronicSealFlag', '是否电子章'],
-        ['remark', '备注', 2],
+        ['mainContent', '合同主要内容', 2],
+        ['remark', '其他事项说明', 2],
       ],
     },
     {
@@ -114,7 +121,7 @@ export const config = {
   operations: [
     {
       action: 'flow',
-      label: '查看流程',
+      label: '流程',
       statusProp: 'approvalStatus',
       status: ['reviewing', 'change_reviewing'],
       stage: ['temporary', 'formal'],
@@ -206,10 +213,10 @@ export const config = {
     },
     {
       action: 'flow',
-      label: '查看流程',
+      label: '流程',
       statusProp: 'approvalStatus',
       status: ['approved', 'change_approved'],
-      stage: ['formal', 'terminated'],
+      stage: ['temporary', 'formal', 'terminated'],
       permission: 'contract_manage_view',
     },
     {
@@ -242,15 +249,26 @@ export const option = createCrudOption([
     hide: true,
     labelWidth: 0,
   },
+  {
+    label: '客商',
+    prop: 'partyName',
+    search: true,
+    searchOrder: 14,
+    searchPlaceholder: '请输入甲/乙方名称',
+    hide: true,
+    display: false,
+    addDisplay: false,
+    editDisplay: false,
+  },
   {
     label: '合同编号',
     prop: 'contractNo',
     search: true,
-    searchOrder: 6,
+    searchOrder: 8,
     searchPlaceholder: '请输入',
     order: 185,
-    disabled: true,
-    placeholder: '不填写，则系统自动生成',
+    maxlength: 100,
+    placeholder: '不填写则按部门规则自动生成',
     minWidth: 200,
   },
   {
@@ -259,7 +277,7 @@ export const option = createCrudOption([
     align: 'left',
     headerAlign: 'left',
     search: true,
-    searchOrder: 7,
+    searchOrder: 1,
     searchPlaceholder: '请输入',
     order: 180,
     slot: true,
@@ -271,7 +289,7 @@ export const option = createCrudOption([
     label: '所属项目',
     prop: 'projectName',
     search: true,
-    searchOrder: 8,
+    searchOrder: 11,
     searchType: 'select',
     searchPlaceholder: '请选择',
     formslot: true,
@@ -294,24 +312,31 @@ export const option = createCrudOption([
     display: false,
   },
   {
-    label: '所属组织',
+    label: '合同负责部门',
     prop: 'organizationName',
     search: true,
     searchOrder: 3,
     searchslot: true,
-    searchPlaceholder: '请选择 所属组织',
+    searchPlaceholder: '请选择 合同负责部门',
     formslot: true,
     order: 120,
     dicData: [],
     minWidth: 150,
-    rules: selectRule('所属组织'),
+    rules: selectRule('合同负责部门'),
+  },
+  {
+    label: '平台公司',
+    prop: 'platformCompanyName',
+    minWidth: 180,
+    order: 115,
+    display: false,
   },
   {
     label: '合同类别',
     prop: 'contractCategory',
     type: 'select',
     search: true,
-    searchOrder: 9,
+    searchOrder: 12,
     searchPlaceholder: '请选择',
     order: 170,
     dicData: contractCategoryOptions,
@@ -323,7 +348,7 @@ export const option = createCrudOption([
     prop: 'signType',
     type: 'select',
     search: true,
-    searchOrder: 10,
+    searchOrder: 13,
     searchPlaceholder: '请选择',
     span: 8,
     order: 190,
@@ -332,11 +357,11 @@ export const option = createCrudOption([
     rules: selectRule('签约类型'),
   },
   {
-    label: '生效类型',
+    label: '合同状态',
     prop: 'effectiveType',
     type: 'select',
     search: true,
-    searchOrder: 5,
+    searchOrder: 6,
     searchPlaceholder: '请选择',
     dicData: effectiveTypeOptions,
     hide: true,
@@ -345,24 +370,23 @@ export const option = createCrudOption([
   {
     label: '甲方',
     prop: 'partyA',
-    type: 'select',
-    formslot: true,
-    disabled: true,
-    order: 160,
-    filterable: true,
     minWidth: 160,
-    rules: selectRule('甲方'),
+    addDisplay: false,
+    editDisplay: false,
   },
   {
     label: '乙方',
     prop: 'partyB',
-    type: 'select',
-    formslot: true,
-    disabled: true,
-    order: 150,
-    filterable: true,
     minWidth: 160,
-    rules: selectRule('乙方'),
+    addDisplay: false,
+    editDisplay: false,
+  },
+  {
+    label: '丙方',
+    prop: 'partyC',
+    minWidth: 160,
+    addDisplay: false,
+    editDisplay: false,
   },
   {
     label: '合同期限',
@@ -435,6 +459,17 @@ export const option = createCrudOption([
     minWidth: 130,
     rules: [{ required: true, message: '请选择签订日期', trigger: 'change' }],
   },
+  {
+    label: '申请日期',
+    prop: 'applyDate',
+    type: 'date',
+    format: 'YYYY-MM-DD',
+    valueFormat: 'YYYY-MM-DD',
+    sortable: true,
+    minWidth: 130,
+    addDisplay: false,
+    editDisplay: false,
+  },
   {
     label: '结算类型',
     prop: 'settlementMode',
@@ -468,11 +503,10 @@ export const option = createCrudOption([
       { label: '否', value: 0 },
       { label: '是', value: 1 },
     ],
-    value: 0,
+    clearable: true,
     hide: true,
     order: 70,
     minWidth: 100,
-    rules: selectRule('是否需要加盖法人章'),
   },
   {
     label: '一式（份）',
@@ -500,6 +534,10 @@ export const option = createCrudOption([
     hide: true,
     order: 45,
     minWidth: 130,
+    rules: [
+      { required: true, message: '请输入合同金额', trigger: 'blur' },
+      nonNegativeRule('合同金额'),
+    ],
   },
   {
     label: '是否范本',
@@ -532,6 +570,13 @@ export const option = createCrudOption([
     order: 30,
     minWidth: 110,
   },
+  {
+    label: '创建人',
+    prop: 'createUserName',
+    minWidth: 120,
+    addDisplay: false,
+    editDisplay: false,
+  },
   {
     label: '创建时间',
     prop: 'createTime',
@@ -582,6 +627,50 @@ export const option = createCrudOption([
     addDisplay: false,
     editDisplay: false,
   },
+  {
+    label: '合规状态',
+    prop: 'hcsSyncStatus',
+    type: 'select',
+    search: true,
+    searchOrder: 7,
+    searchPlaceholder: '请选择',
+    slot: true,
+    dicData: hcsSyncStatusOptions,
+    minWidth: 110,
+    addDisplay: false,
+    editDisplay: false,
+  },
+  {
+    label: '金蝶合同ID',
+    prop: 'kingdeeId',
+    minWidth: 130,
+    addDisplay: false,
+    editDisplay: false,
+  },
+  {
+    label: '是否同步金蝶',
+    prop: 'kingdeeSynced',
+    type: 'select',
+    search: true,
+    searchPlaceholder: '请选择',
+    searchOrder: 9,
+    dicData: yesNoOptions,
+    hide: true,
+    addDisplay: false,
+    editDisplay: false,
+  },
+  {
+    label: '是否同步合规',
+    prop: 'hcsSynced',
+    type: 'select',
+    search: true,
+    searchPlaceholder: '请选择',
+    searchOrder: 10,
+    dicData: yesNoOptions,
+    hide: true,
+    addDisplay: false,
+    editDisplay: false,
+  },
   {
     label: '当前节点',
     prop: 'currentNode',
@@ -610,7 +699,19 @@ export const option = createCrudOption([
     minWidth: 110,
   },
   {
-    label: '备注',
+    label: '合同主要内容',
+    prop: 'mainContent',
+    type: 'textarea',
+    span: 24,
+    minRows: 4,
+    hide: true,
+    order: 41,
+    maxlength: 1000,
+    showWordLimit: true,
+    rules: textRule('合同主要内容', 1000),
+  },
+  {
+    label: '其他事项说明',
     prop: 'remark',
     type: 'textarea',
     span: 24,
@@ -619,7 +720,7 @@ export const option = createCrudOption([
     order: 40,
     maxlength: 2000,
     showWordLimit: true,
-    rules: textRule('备注', 2000),
+    rules: textRule('其他事项说明', 2000),
   },
   {
     label: '',
@@ -730,7 +831,7 @@ export const option = createCrudOption([
     labelWidth: 0,
   },
   ...auditColumns
-    .filter(column => column.prop !== 'createTime')
+    .filter(column => !['createTime', 'createUserName'].includes(column.prop))
     .map(column => ({ ...column, hide: true })),
 ]);
 

src/option/business/loading-manage.js

@@ -31,7 +31,7 @@ export const loadingManageConfig = {
   exportColumns: [
     { prop: 'loadingNo', label: '配载单号' },
     { prop: 'loadingSubNos', label: '配载子单号' },
-    { prop: 'vehicleNo', label: '车牌号/航班号/船号/班列号' },
+    { prop: 'vehicleNo', label: '车牌号/船班号/船次号/班次号' },
     { prop: 'driverName', label: '司机' },
     { prop: 'driverPhone', label: '联系电话' },
     { prop: 'carrierType', label: '承运类型' },
@@ -41,6 +41,7 @@ export const loadingManageConfig = {
     { prop: 'carrierName', label: '承运商' },
     { prop: 'transportType', label: '运输方式' },
     { prop: 'dataSource', label: '数据来源' },
+    { prop: 'createUserName', label: '创建人' },
     { prop: 'createTime', label: '创建时间' },
     { prop: 'updateTime', label: '更新时间' },
     { prop: 'currentProcessNode', label: '过程节点' },

src/option/business/process-config.js

@@ -112,12 +112,12 @@ export const option = {
       editDisplay: false,
     },
     ...auditColumns
-      .filter(column => ['updateTime', 'createTime'].includes(column.prop))
+      .filter(column => ['createUserName', 'createTime', 'updateTime'].includes(column.prop))
       .map(column => ({ ...column, minWidth: 190 }))
       .sort(
         (first, second) =>
-          ['updateTime', 'createTime'].indexOf(first.prop) -
-          ['updateTime', 'createTime'].indexOf(second.prop)
+          ['createUserName', 'createTime', 'updateTime'].indexOf(first.prop) -
+          ['createUserName', 'createTime', 'updateTime'].indexOf(second.prop)
       ),
     {
       label: '项目ID集合',

src/option/business/project-apply.js

@@ -3,6 +3,7 @@ import {
   businessModeOptions,
   businessTypeOptions,
   createCrudOption,
+  hcsSyncStatusOptions,
   nonNegativeRule,
   projectApprovalStatusOptions,
   projectSourceOptions,
@@ -10,6 +11,7 @@ import {
   selectRule,
   settlementModeOptions,
   textRule,
+  yesNoOptions,
 } from './common';
 
 const projectEffectiveTypeOptions = [
@@ -57,16 +59,24 @@ export const config = {
       action: 'submitApproval',
       label: '提交',
       statusProp: 'approvalStatus',
-      status: ['draft'],
+      status: ['draft', 'rejected', 'withdrawn'],
       permission: 'project_apply_submit',
     },
     {
       action: 'withdraw',
       label: '撤回',
       statusProp: 'approvalStatus',
-      status: ['reviewing'],
+      status: ['draft', 'reviewing'],
       permission: 'project_apply_withdraw',
     },
+    {
+      action: 'mkAudit',
+      label: '流程',
+      statusProp: 'approvalStatus',
+      status: ['reviewing', 'change_reviewing', 'approved', 'change_approved'],
+      permission: 'project_apply_approve',
+      mkOnly: true,
+    },
     {
       action: 'approve',
       label: '通过',
@@ -74,6 +84,7 @@ export const config = {
       statusProp: 'approvalStatus',
       status: ['reviewing', 'change_reviewing'],
       permission: 'project_apply_approve',
+      localOnly: true,
     },
     {
       action: 'reject',
@@ -82,12 +93,14 @@ export const config = {
       statusProp: 'approvalStatus',
       status: ['reviewing', 'change_reviewing'],
       permission: 'project_apply_reject',
+      localOnly: true,
     },
     {
       action: 'startChange',
       label: '变更',
       statusProp: 'approvalStatus',
-      status: ['approved'],
+      // 立项通过、变更通过后均可再次发起变更
+      status: ['approved', 'change_approved'],
       permission: 'project_apply_change',
     },
   ],
@@ -175,7 +188,7 @@ export const option = createCrudOption([
     searchPlaceholder: '请输入',
     searchOrder: 8,
     minWidth: 150,
-    rules: textRule('平台公司', 50, true),
+    rules: textRule('平台公司', 500, true),
   },
   {
     label: '平台公司ID',
@@ -395,6 +408,57 @@ export const option = createCrudOption([
     addDisplay: false,
     editDisplay: false,
   },
+  {
+    label: '合规状态',
+    prop: 'hcsSyncStatus',
+    type: 'select',
+    search: true,
+    searchPlaceholder: '请选择',
+    searchOrder: 1,
+    slot: true,
+    dicData: hcsSyncStatusOptions,
+    minWidth: 110,
+    addDisplay: false,
+    editDisplay: false,
+  },
+  {
+    label: '金蝶项目ID',
+    prop: 'kingdeeId',
+    minWidth: 130,
+    addDisplay: false,
+    editDisplay: false,
+  },
+  {
+    label: '金蝶项目编号',
+    prop: 'kingdeeNumber',
+    minWidth: 130,
+    addDisplay: false,
+    editDisplay: false,
+  },
+  {
+    label: '是否同步金蝶',
+    prop: 'kingdeeSynced',
+    type: 'select',
+    search: true,
+    searchPlaceholder: '请选择',
+    searchOrder: 2,
+    dicData: yesNoOptions,
+    hide: true,
+    addDisplay: false,
+    editDisplay: false,
+  },
+  {
+    label: '是否同步合规',
+    prop: 'hcsSynced',
+    type: 'select',
+    search: true,
+    searchPlaceholder: '请选择',
+    searchOrder: 3,
+    dicData: yesNoOptions,
+    hide: true,
+    addDisplay: false,
+    editDisplay: false,
+  },
   {
     label: '生效类型',
     prop: 'effectiveType',
@@ -442,5 +506,9 @@ export const option = createCrudOption([
     span: 24,
     hide: true,
   },
-  ...auditColumns.map(column => ({ ...column, hide: true })),
+  ...auditColumns.map(column =>
+    ['createUserName', 'createTime'].includes(column.prop)
+      ? column
+      : { ...column, hide: true }
+  ),
 ]);

src/option/business/project-change.js

@@ -0,0 +1,161 @@
+import {
+  approvalStatusOptions,
+  createCrudOption,
+  hcsSyncStatusOptions,
+  projectTypeOptions,
+} from './common';
+
+export const changeTypeOptions = [
+  { label: '项目变更', value: '项目变更' },
+  { label: '项目备案调整', value: '项目备案调整' },
+];
+
+export const config = {
+  title: '项目变更',
+  permission: 'project_change',
+  statusProp: 'approvalStatus',
+  statusTextProp: 'approvalStatusName',
+  deleteStatus: ['draft', 'withdrawn', 'rejected'],
+  editStatus: ['draft', 'withdrawn', 'rejected'],
+  viewStatus: ['approved', 'rejected', 'withdrawn'],
+  operations: [
+    {
+      action: 'submitApproval',
+      label: '提交',
+      statusProp: 'approvalStatus',
+      status: ['draft'],
+      permission: 'project_change_submit',
+    },
+    {
+      action: 'withdraw',
+      label: '撤回',
+      statusProp: 'approvalStatus',
+      status: ['reviewing'],
+      permission: 'project_change_withdraw',
+    },
+    {
+      action: 'mkAudit',
+      label: '流程',
+      statusProp: 'approvalStatus',
+      status: ['reviewing'],
+      permission: 'project_change_approve',
+      mkOnly: true,
+    },
+    {
+      action: 'approve',
+      label: '通过',
+      type: 'success',
+      statusProp: 'approvalStatus',
+      status: ['reviewing'],
+      permission: 'project_change_approve',
+      localOnly: true,
+    },
+    {
+      action: 'reject',
+      label: '驳回',
+      type: 'warning',
+      statusProp: 'approvalStatus',
+      status: ['reviewing'],
+      permission: 'project_change_reject',
+      localOnly: true,
+    },
+  ],
+};
+
+export const option = createCrudOption([
+  {
+    label: '项目编号',
+    prop: 'projectCode',
+    search: true,
+    searchPlaceholder: '请输入',
+    searchOrder: 70,
+    minWidth: 160,
+  },
+  {
+    label: '项目名称',
+    prop: 'projectName',
+    search: true,
+    searchPlaceholder: '请输入',
+    searchOrder: 60,
+    minWidth: 180,
+  },
+  {
+    label: '变更类型',
+    prop: 'changeType',
+    type: 'select',
+    search: true,
+    searchPlaceholder: '请选择',
+    searchOrder: 10,
+    dicData: changeTypeOptions,
+    minWidth: 130,
+  },
+  {
+    label: '项目类型',
+    prop: 'projectType',
+    type: 'select',
+    search: true,
+    searchPlaceholder: '请选择',
+    searchOrder: 20,
+    dicData: projectTypeOptions,
+    minWidth: 110,
+  },
+  {
+    label: '客户名称',
+    prop: 'customerNames',
+    minWidth: 160,
+  },
+  {
+    label: '下游承运商',
+    prop: 'carrierNames',
+    minWidth: 160,
+  },
+  {
+    label: '承办部门',
+    prop: 'undertakeDeptName',
+    search: true,
+    searchPlaceholder: '请输入',
+    searchOrder: 50,
+    minWidth: 140,
+  },
+  {
+    label: '项目负责人',
+    prop: 'principalUserName',
+    search: true,
+    searchPlaceholder: '请输入',
+    searchOrder: 40,
+    minWidth: 120,
+  },
+  {
+    label: '审批状态',
+    prop: 'approvalStatus',
+    type: 'select',
+    search: true,
+    searchPlaceholder: '请选择',
+    searchOrder: 30,
+    dicData: approvalStatusOptions,
+    minWidth: 110,
+  },
+  {
+    label: '当前节点',
+    prop: 'currentNode',
+    minWidth: 120,
+  },
+  {
+    label: '当前处理人',
+    prop: 'currentProcessor',
+    minWidth: 120,
+  },
+  {
+    label: '审核通过时间',
+    prop: 'approvedTime',
+    type: 'datetime',
+    minWidth: 170,
+  },
+  {
+    label: '同步状态',
+    prop: 'syncStatus',
+    type: 'select',
+    dicData: hcsSyncStatusOptions,
+    minWidth: 110,
+  },
+]);

src/option/business/temporary-credit-limit.js

@@ -332,9 +332,13 @@ export const option = {
       addDisplay: false,
       editDisplay: false,
     },
-    ...auditColumns.map(column => ({ ...column, hide: true })),
+    ...auditColumns.map(column =>
+      ['createUserName', 'createTime'].includes(column.prop)
+        ? column
+        : { ...column, hide: true }
+    ),
   ])),
-  dialogWidth: '96%',
+  dialogWidth: 1100,
   menuFixed: 'right',
   menuWidth: 320,
   index: false,

src/option/business/transport-plan.js

@@ -124,7 +124,8 @@ const formatGoodsInfo = row => {
   const text = Object.entries(groups)
     .map(([unit, group]) => {
       const quantity = formatGoodsQuantity(group.quantity);
-      return `${group.typeName}等${group.count}种货物 | ${quantity}${unit ? ` ${unit}` : ''}`;
+      const typeName = group.count > 1 ? `${group.typeName}等${group.count}种货物` : group.typeName;
+      return `${typeName} | ${quantity}${unit ? ` ${unit}` : ''}`;
     })
     .join('； ');
 
@@ -249,9 +250,10 @@ export const config = {
       title: '其它信息',
       fields: [
         ['remark', '备注'],
+        ['createUserName', '创建人'],
+        ['createTime', '创建时间'],
         ['updateUserName', '更新人'],
         ['updateTime', '更新时间'],
-        ['createTime', '创建时间'],
       ],
     },
   ],
@@ -399,7 +401,6 @@ export const option = {
         span: 6,
         order: 350,
         minWidth: 150,
-        rules: [{ required: true, message: '请选择计划开始日期', trigger: 'change' }],
       },
       {
         label: '计划结束日期',
@@ -410,7 +411,6 @@ export const option = {
         span: 6,
         order: 340,
         minWidth: 150,
-        rules: [{ required: true, message: '请选择计划结束日期', trigger: 'change' }],
       },
       {
         label: '数据来源',
@@ -457,6 +457,9 @@ export const option = {
         showWordLimit: true,
         rules: textRule('备注', 200),
       },
+      {
+        ...auditColumn('createUserName'),
+      },
       {
         ...auditColumn('updateUserName'),
       },

src/option/business/waybill-manage.js

@@ -98,6 +98,24 @@ const getProcessConfigNodes = row => {
 
 const isAcceptProcessNode = node => node.key === 'accept' || node.name === '接单';
 
+/**
+ * 过程节点列显示文案。
+ *
+ * 该列在库里存的是「原始值」，且历史上写入了两种格式：司机打卡推进写的是配置的
+ * key（unload / dispatch / load …），配载单新建默认值写的是中文名（接单）。
+ * 故这里按两种格式都认一次，认不出就原样显示，不把值吞掉。
+ *
+ * 运单创建后、司机首次打卡前该字段为空，属正常——显示「-」，避免留白看不出是没值还是没渲染。
+ */
+const formatCurrentProcessNode = row => {
+  const value = String(getFirstValue(row, ['currentProcessNode', 'currentNode']) || '').trim();
+  if (!value) return '-';
+  const node = getProcessConfigNodes(row).find(
+    item => item.key === value || item.name === value
+  );
+  return node?.name || node?.key || value;
+};
+
 const isTruthyFlag = value => {
   if (value === true || value === 1) return true;
   if (value === false || value === 0 || value === null || value === undefined || value === '') {
@@ -453,7 +471,7 @@ export const config = {
     endDateRange: ['endDateStart', 'endDateEnd'],
     createTimeRange: ['createTimeStart', 'createTimeEnd'],
   },
-  actions: ['copy', 'cancel', 'reassign', 'complete', 'batchComplete'],
+  actions: ['copy', 'cancel', 'reassign', 'complete', 'batchComplete', 'confirmReturn'],
   detailButton: true,
   statusProp: 'businessStatus',
   statusTextProp: 'businessStatusName',
@@ -465,6 +483,8 @@ export const config = {
       row.requireAccept === true ||
       row.requireAccept === 1 ||
       requiresDriverAcceptConfirmation(row);
+    // 待回单确认由末位打卡产生，司机必然已接单
+    if (status === 'pending_return_confirm') return '待回单确认';
     // 需司机接单且尚未接单 → 待执行（含库中仍为 running 的历史数据展示校正）
     if (needAccept && !hasDriverAcceptRecord(row) && !terminalStatuses.includes(status)) {
       return '待执行';
@@ -486,7 +506,7 @@ export const config = {
     return !isDriverRejectedWaybill(row);
   },
   canCancel(row) {
-    // 进行中的运单不允许取消
+    // 进行中的运单不允许取消；待回单确认仍可取消（与页面 canCancel 一致）
     return !isInProgressStatus(row, row.businessStatusName);
   },
   deleteStatus: ['draft'],
@@ -543,7 +563,8 @@ export const option = {
         prop: 'projectName',
         formslot: true,
         search: true,
-        searchLabel: '项目',
+        searchLabel: '项目名称',
+        searchPlaceholder: '请选择或输入',
         searchOrder: 22,
         span: 6,
         order: 890,
@@ -555,6 +576,7 @@ export const option = {
         prop: 'customerName',
         search: true,
         searchLabel: '客户名称',
+        searchPlaceholder: '请选择或输入',
         searchOrder: 21,
         minWidth: 150,
         addDisplay: false,
@@ -563,10 +585,10 @@ export const option = {
         display: false,
       },
       {
-        label: '车牌号/航班号/船号/班列号',
+        label: '车牌号/船班号/船次号/班次号',
         prop: 'vehicleNo',
         search: true,
-        searchLabel: '车/船/航班/班列',
+        searchLabel: '车牌号/船班号/船次号/班次号',
         searchOrder: 13,
         minWidth: 210,
         display: false,
@@ -576,6 +598,7 @@ export const option = {
         prop: 'driverName',
         search: true,
         searchLabel: '司机名称',
+        searchPlaceholder: '请选择或输入',
         searchOrder: 14,
         minWidth: 120,
         display: false,
@@ -605,6 +628,7 @@ export const option = {
       {
         label: '过程节点',
         prop: 'currentProcessNode',
+        formatter: row => formatCurrentProcessNode(row),
         minWidth: 140,
         addDisplay: false,
         editDisplay: false,
@@ -626,6 +650,7 @@ export const option = {
         prop: 'carrierName',
         search: true,
         searchLabel: '承运商名称',
+        searchPlaceholder: '请选择或输入',
         searchOrder: 15,
         minWidth: 150,
         display: false,
@@ -729,15 +754,30 @@ export const option = {
         prop: 'planName',
         formslot: true,
         search: true,
+        searchPlaceholder: '请选择或输入',
         searchOrder: 7,
         span: 6,
         order: 870,
         minWidth: 150,
+        formatter: row => {
+          const value = row?.planName;
+          if (
+            value === undefined ||
+            value === null ||
+            value === '' ||
+            String(value) === '-1' ||
+            Number(value) === -1
+          ) {
+            return '';
+          }
+          return value;
+        },
       },
       {
         label: '货物类型',
         prop: 'cargoType',
         search: true,
+        searchPlaceholder: '请选择或输入',
         searchOrder: 18,
         formatter: row => formatGoodsField(row, ['cargoType', 'goodsType', 'typeName']),
         minWidth: 130,
@@ -864,6 +904,9 @@ export const option = {
         viewDisplay: false,
         display: false,
       },
+      {
+        ...auditColumn('createUserName'),
+      },
       {
         ...auditColumn('createTime'),
       },

src/option/payment/invoiceApplication.js

@@ -13,6 +13,8 @@ export const invoiceApplicationTableColumns = [
   { prop: 'currentProcessor', label: '当前处理人', minWidth: 130 },
   { prop: 'kingdeeBillNo', label: '金蝶单据号', minWidth: 150 },
   { prop: 'kingdeeStatusName', label: '金蝶单据状态', minWidth: 140 },
+  { prop: 'kingdeeLockStatus', label: '金蝶锁状态', minWidth: 150 },
+  { prop: 'attachmentSyncStatusName', label: '附件同步', minWidth: 100 },
 ];
 
 export const invoiceApplicationDetailColumns = [

src/option/payment/invoiceReceipt.js

@@ -11,6 +11,8 @@ export const invoiceReceiptTableColumns = [
   { prop: 'currentProcessor', label: '当前处理人', minWidth: 130 },
   { prop: 'createUserName', label: '创建人', minWidth: 110 },
   { prop: 'createTime', label: '创建时间', minWidth: 170 },
-  { prop: 'kingdeeBillNo', label: '金蝶单据号', minWidth: 150 },
-  { prop: 'kingdeeStatusName', label: '金蝶单据状态', minWidth: 140 },
+  { prop: 'kingdeeReceivedInvoiceNo', label: '金蝶单据号', minWidth: 150 },
+  { prop: 'kingdeePushStatusName', label: '金蝶状态', minWidth: 130 },
+  { prop: 'kingdeePushMsg', label: '失败原因', minWidth: 160 },
+  { prop: 'attachmentSyncStatusName', label: '附件同步', minWidth: 100 },
 ];

src/option/payment/paymentApplication.js

@@ -1,20 +1,176 @@
-export const paymentApplicationTableColumns = [
-  { prop: 'paymentNo', label: '单据号', minWidth: 140, link: true },
-  { prop: 'paymentTypeName', label: '付款类型', minWidth: 110 },
-  { prop: 'projectName', label: '所属项目', minWidth: 140 },
-  { prop: 'deptName', label: '所属组织', minWidth: 120 },
-  { prop: 'contractNo', label: '合同编号', minWidth: 130 },
-  { prop: 'contractName', label: '合同名称', minWidth: 140 },
-  { prop: 'payerName', label: '付款方', minWidth: 130 },
-  { prop: 'payeeName', label: '收款方', minWidth: 130 },
-  { prop: 'appliedAmount', label: '申请付款金额', minWidth: 140, money: true },
-  { prop: 'paidAmount', label: '已付款金额', minWidth: 130, money: true },
-  { prop: 'matchedInvoiceAmount', label: '匹配发票金额', minWidth: 130, money: true },
-  { prop: 'applicantName', label: '申请人', minWidth: 100 },
-  { prop: 'applyDate', label: '申请日期', minWidth: 120 },
-  { prop: 'approvalStatusName', label: '审核状态', minWidth: 110, status: true },
-  { prop: 'currentNode', label: '当前节点', minWidth: 120 },
-  { prop: 'currentProcessor', label: '当前处理人', minWidth: 120 },
-  { prop: 'kingdeeBillNo', label: '金蝶单据号', minWidth: 130 },
-  { prop: 'kingdeeStatusName', label: '金蝶单据状态', minWidth: 130 },
-];
+/**
+ * 付款申请列表（avue-crud）配置
+ * ------------------------------------------------------------------
+ * 列表页与其它模块统一使用 avue-crud，头部 4 个按钮（刷新 / 列显隐 / 搜索显隐 /
+ * 表格卡片切换）由 avue-crud 自带，不做二次封装。
+ *
+ * 搜索项与表格列 label 不一致的（如表格列「收款方」/ 搜索项「客户名称」），
+ * 单独定义一个 hide 的搜索列，并用 searchProp 映射到后端字段。
+ *
+ * ⚠️ avue 的 searchOrder 为降序排序，值越大越靠前（见 header-search2.js：
+ * `list.sort((a, b) => (b.searchOrder || 0) - (a.searchOrder || 0))`）。
+ */
+
+const textFormatter = (row, value) =>
+  value === null || value === undefined || value === '' ? '-' : value;
+
+const moneyFormatter = (row, value) => Number(value || 0).toFixed(2);
+
+// 仅用于搜索、不在表格中出现的列
+const searchOnlyColumn = ({ label, prop, searchOrder, searchProp, dicData }) => {
+  const column = {
+    label,
+    prop,
+    search: true,
+    searchOrder,
+    searchPlaceholder: '请输入',
+    hide: true,
+    showColumn: false,
+    addDisplay: false,
+    editDisplay: false,
+    viewDisplay: false,
+  };
+  if (searchProp) column.searchProp = searchProp;
+  if (dicData) {
+    column.type = 'select';
+    column.searchPlaceholder = '请选择';
+    column.dicData = dicData;
+  }
+  return column;
+};
+
+export const paymentApplicationOption = ({
+  paymentTypeOptions = [],
+  approvalStatusOptions = [],
+  kingdeeStatusOptions = [],
+} = {}) => ({
+  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: 70,
+  indexFixed: 'left',
+  selection: true,
+  selectionWidth: 52,
+  selectionFixed: 'left',
+  addBtn: false,
+  viewBtn: false,
+  delBtn: false,
+  editBtn: false,
+  copyBtn: false,
+  menuWidth: 320,
+  menuFixed: 'right',
+  dialogClickModal: false,
+  column: [
+    // ---------- 搜索项（前 4 项默认展示，其余折叠；searchOrder 越大越靠前） ----------
+    {
+      label: '单据号',
+      prop: 'paymentNo',
+      slot: true,
+      search: true,
+      searchSpan: 5,
+      searchOrder: 9,
+      searchPlaceholder: '请输入',
+      minWidth: 150,
+    },
+    {
+      label: '日期',
+      prop: 'applyDateRange',
+      type: 'daterange',
+      searchType: 'daterange',
+      search: true,
+      searchSpan: 5,
+      searchOrder: 8,
+      hide: true,
+      showColumn: false,
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+    },
+    {
+      ...searchOnlyColumn({
+        label: '客户名称',
+        prop: 'payeeNameSearch',
+        searchOrder: 7,
+        searchProp: 'payeeName',
+      }),
+      searchSpan: 5,
+    },
+    {
+      ...searchOnlyColumn({
+        label: '项目名称',
+        prop: 'projectNameSearch',
+        searchOrder: 6,
+        searchProp: 'projectName',
+      }),
+      searchSpan: 5,
+    },
+    searchOnlyColumn({
+      label: '关联结算单',
+      prop: 'settlementNo',
+      searchOrder: 4,
+    }),
+    searchOnlyColumn({
+      label: '付款类型',
+      prop: 'paymentType',
+      searchOrder: 3,
+      dicData: paymentTypeOptions,
+    }),
+    searchOnlyColumn({
+      label: '审核状态',
+      prop: 'approvalStatus',
+      searchOrder: 2,
+      dicData: approvalStatusOptions,
+    }),
+    searchOnlyColumn({
+      label: '金蝶单据状态',
+      prop: 'kingdeeStatus',
+      searchOrder: 1,
+      dicData: kingdeeStatusOptions,
+    }),
+    // ---------- 表格列 ----------
+    { label: '付款类型', prop: 'paymentTypeName', minWidth: 110, formatter: textFormatter },
+    { label: '所属项目', prop: 'projectName', minWidth: 140, formatter: textFormatter },
+    {
+      label: '所属组织',
+      prop: 'deptName',
+      search: true,
+      searchOrder: 5,
+      searchslot: true,
+      minWidth: 120,
+      formatter: textFormatter,
+    },
+    { label: '合同编号', prop: 'contractNo', minWidth: 130, formatter: textFormatter },
+    { label: '合同名称', prop: 'contractName', minWidth: 140, formatter: textFormatter },
+    { label: '付款方', prop: 'payerName', minWidth: 130, formatter: textFormatter },
+    { label: '收款方', prop: 'payeeName', minWidth: 130, formatter: textFormatter },
+    { label: '申请付款金额', prop: 'appliedAmount', minWidth: 140, formatter: moneyFormatter },
+    { label: '已付款金额', prop: 'paidAmount', minWidth: 130, formatter: moneyFormatter },
+    {
+      label: '匹配发票金额',
+      prop: 'matchedInvoiceAmount',
+      minWidth: 130,
+      formatter: moneyFormatter,
+    },
+    { label: '申请人', prop: 'applicantName', minWidth: 100, formatter: textFormatter },
+    { label: '申请日期', prop: 'applyDate', minWidth: 120, formatter: textFormatter },
+    { label: '审核状态', prop: 'approvalStatusName', slot: true, minWidth: 110 },
+    { label: '当前节点', prop: 'currentNode', minWidth: 120, formatter: textFormatter },
+    { label: '当前处理人', prop: 'currentProcessor', minWidth: 120, formatter: textFormatter },
+    { label: '金蝶单据号', prop: 'kingdeeBillNo', minWidth: 130, formatter: textFormatter },
+    { label: '金蝶单据状态', prop: 'kingdeeStatusName', minWidth: 130, formatter: textFormatter },
+    { label: '金蝶锁状态', prop: 'kingdeeLockStatus', slot: true, minWidth: 150 },
+    { label: '附件同步', prop: 'attachmentSyncStatusName', minWidth: 100, formatter: textFormatter },
+  ],
+});

src/option/payment/receiptFlow.js

@@ -8,5 +8,11 @@ export const receiptFlowTableColumns = [
   { prop: 'summary', label: '摘要', minWidth: 160 },
   { prop: 'transactionTime', label: '交易时间', minWidth: 170 },
   { prop: 'claimStatusName', label: '认领状态', minWidth: 110, status: true },
+  { prop: 'kingdeeClaimStatusName', label: '公告状态', minWidth: 110 },
   { prop: 'claimedAmount', label: '已认领金额', minWidth: 130, money: true },
+  { prop: 'unclaimedAmount', label: '金蝶未认领金额', minWidth: 140, money: true },
+  { prop: 'pushStatusName', label: '推送状态', minWidth: 110, status: true },
+  { prop: 'pushFailReason', label: '推送失败原因', minWidth: 160 },
+  { prop: 'kingdeeBillNo', label: '金蝶收款单号', minWidth: 150 },
+  { prop: 'kingdeeBillStatusName', label: '金蝶状态', minWidth: 110 },
 ];

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);

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: '',

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' },

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,22 +21,26 @@ 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 },
+  { label: '附件同步', prop: 'attachmentSyncStatusName', minWidth: 100 },
   { label: '创建人', prop: 'createUserName', minWidth: 110 },
   { label: '创建时间', prop: 'createTime', minWidth: 170 },
 ];
 
 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 },
@@ -46,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 },
 ];
 
@@ -64,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 },
@@ -84,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 },
@@ -92,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 },
 ];

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: '',

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' },

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 },
 ];

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 },
@@ -88,6 +88,8 @@ export const updateFeeFormFields = [
 ];
 
 export const transferSearchFields = [
+  { label: '单据号', prop: 'documentNo', type: 'input' },
+  { label: '合同编码', prop: 'contractNo', type: 'input' },
   { label: '合同名称', prop: 'contractName', type: 'input' },
   { label: '批次号', prop: 'batchNo', type: 'input' },
   { label: '生成日期', prop: 'generateDateRange', type: 'daterange' },
@@ -104,7 +106,7 @@ export const generateWaybillColumns = [
   { label: '运单号', prop: 'waybillNo', minWidth: 160, link: true },
   { label: '项目名称', prop: 'projectName', minWidth: 160 },
   { label: '客户/委托方', prop: 'customerName', minWidth: 160 },
-  { label: '车牌号/航班号/船号/班列号', prop: 'vehicleNo', minWidth: 190 },
+  { label: '车牌号/船班号/船次号/班次号', prop: 'vehicleNo', minWidth: 190 },
   { label: '司机', prop: 'driverName', minWidth: 120 },
   { label: '承运商', prop: 'carrierName', minWidth: 160 },
   { label: '运输类型', prop: 'transportType', minWidth: 130 },

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 },

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 },
+  ],
+});

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' },

src/option/system/authlog.js

@@ -5,6 +5,7 @@ export const GRANT_TYPE_DIC = [
   { label: '社交登录', value: 'social' },
   { label: '客户端凭证', value: 'client_credentials' },
   { label: '刷新令牌', value: 'refresh_token' },
+  { label: '退出登录', value: 'logout' },
 ];
 
 export const authLogOption = {
@@ -38,7 +39,7 @@ export const authLogOption = {
       prop: 'realName',
     },
     {
-      label: '授权类型',
+      label: '操作类型',
       prop: 'grantType',
       type: 'select',
       search: true,
@@ -80,7 +81,7 @@ export const authLogOption = {
       width: 120,
     },
     {
-      label: '登录时间',
+      label: '操作时间',
       prop: 'loginTime',
       sortable: true,
       span: 24,

src/option/system/mpUser.js

@@ -0,0 +1,265 @@
+const identityDic = [
+  { label: '司机', value: 'driver' },
+  { label: '管理员', value: 'admin' },
+];
+
+const statusDic = [
+  { label: '启用', value: 1 },
+  { label: '停用', value: 0 },
+];
+
+const validatePhone = (rule, value, callback) => {
+  const phone = String(value || '').trim();
+  if (!phone) {
+    callback(new Error('请输入手机号'));
+    return;
+  }
+  // 详情回显为脱敏手机号（含 *）时放行，未修改则提交时剔除该字段
+  if (phone.includes('*')) {
+    callback();
+    return;
+  }
+  if (!/^1\d{10}$/.test(phone)) {
+    callback(new Error('请输入正确的手机号'));
+    return;
+  }
+  callback();
+};
+
+const validateRemark = (rule, value, callback) => {
+  if (String(value || '').length > 200) {
+    callback(new Error('备注不能超过200字'));
+  } else {
+    callback();
+  }
+};
+
+export default {
+  height: 'auto',
+  calcHeight: 22,
+  dialogWidth: 760,
+  labelPosition: 'right',
+  labelWidth: 'auto',
+  tip: false,
+  searchBtnText: '查询',
+  emptyBtnText: '重置',
+  saveBtnText: '提交',
+  updateBtnText: '提交',
+  searchShow: true,
+  searchIcon: true,
+  searchLabelWidth: 160,
+  searchMenuSpan: 24,
+  searchIndex: 4,
+  searchMenuPosition: 'right',
+  border: true,
+  index: true,
+  indexLabel: '序号',
+  indexWidth: 70,
+  viewBtn: false,
+  delBtn: false,
+  editBtn: false,
+  addBtn: false,
+  selection: true,
+  dialogClickModal: false,
+  menuWidth: 320,
+  column: [
+    {
+      label: '手机号',
+      prop: 'phone',
+      minWidth: 130,
+      search: true,
+      searchOrder: 4,
+      searchSpan: 6,
+      searchPlaceholder: '请输入',
+      maxlength: 11,
+      showWordLimit: true,
+      order: 100,
+      rules: [
+        { required: true, message: '请输入手机号', trigger: 'blur' },
+        { validator: validatePhone, trigger: 'blur' },
+      ],
+    },
+    {
+      label: '账号',
+      prop: 'account',
+      minWidth: 130,
+      search: true,
+      searchOrder: 3,
+      searchSpan: 6,
+      searchPlaceholder: '请输入',
+      maxlength: 45,
+      order: 90,
+      placeholder: '默认与手机号相同',
+    },
+    {
+      label: '姓名',
+      prop: 'realName',
+      minWidth: 100,
+      search: true,
+      searchOrder: 2,
+      searchSpan: 6,
+      searchPlaceholder: '请输入',
+      maxlength: 10,
+      showWordLimit: true,
+      order: 80,
+    },
+    {
+      label: '昵称',
+      prop: 'name',
+      minWidth: 100,
+      maxlength: 20,
+      showWordLimit: true,
+      order: 70,
+    },
+    {
+      label: '小程序身份',
+      prop: 'identities',
+      type: 'select',
+      multiple: true,
+      dataType: 'string',
+      dicData: identityDic,
+      minWidth: 140,
+      search: true,
+      searchOrder: 1,
+      searchSpan: 6,
+      searchPlaceholder: '请选择',
+      order: 60,
+      rules: [{ required: true, message: '请选择小程序身份', trigger: 'change' }],
+    },
+    {
+      label: '所属组织',
+      prop: 'deptId',
+      formslot: true,
+      hide: true,
+      span: 24,
+      order: 55,
+      // 所属组织可为空：为空表示未分配组织，账号的数据权限为空集
+    },
+    {
+      label: '所属组织',
+      prop: 'deptName',
+      minWidth: 180,
+      overHidden: true,
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+      order: 54,
+    },
+    {
+      label: '数据权限范围',
+      prop: 'dataScopeRange',
+      type: 'radio',
+      span: 24,
+      hide: true,
+      order: 53,
+      value: 1,
+      dicData: [
+        { label: '仅所属组织', value: 1 },
+        { label: '全部组织', value: 2 },
+        { label: '自定义', value: 3 },
+      ],
+      rules: [{ required: true, message: '请选择数据权限范围', trigger: 'change' }],
+    },
+    {
+      label: '数据层级范围',
+      prop: 'dataLevelRange',
+      type: 'radio',
+      span: 24,
+      hide: true,
+      order: 52,
+      value: 1,
+      dicData: [
+        { label: '包含下级', value: 1 },
+        { label: '仅本级', value: 2 },
+      ],
+      rules: [{ required: true, message: '请选择数据层级范围', trigger: 'change' }],
+    },
+    {
+      label: '数据权限',
+      prop: 'dataScopeDeptIds',
+      formslot: true,
+      span: 24,
+      hide: true,
+      order: 51,
+    },
+    {
+      label: '性别',
+      prop: 'sex',
+      type: 'select',
+      dicUrl: '/blade-system/dict/dictionary?code=sex',
+      props: {
+        label: 'dictValue',
+        value: 'dictKey',
+      },
+      dataType: 'number',
+      minWidth: 80,
+      hide: true,
+      order: 50,
+    },
+    {
+      label: 'openid',
+      prop: 'openid',
+      minWidth: 180,
+      overHidden: true,
+      hide: true,
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: true,
+      order: 40,
+    },
+    {
+      label: '状态',
+      prop: 'status',
+      type: 'select',
+      dicData: statusDic,
+      dataType: 'number',
+      minWidth: 90,
+      search: true,
+      searchOrder: 0,
+      searchSpan: 6,
+      addDisplay: false,
+      editDisplay: false,
+      value: 1,
+      order: 30,
+    },
+    {
+      label: '备注',
+      prop: 'remark',
+      type: 'textarea',
+      span: 24,
+      minRows: 2,
+      maxlength: 200,
+      showWordLimit: true,
+      hide: true,
+      order: 20,
+      rules: [{ validator: validateRemark, trigger: 'blur' }],
+    },
+    {
+      label: '创建时间',
+      prop: 'createTime',
+      minWidth: 170,
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: true,
+      order: 10,
+    },
+    {
+      label: '更新人',
+      prop: 'updateUserName',
+      minWidth: 100,
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: true,
+      order: 5,
+    },
+    {
+      label: '更新时间',
+      prop: 'updateTime',
+      minWidth: 170,
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: true,
+      order: 1,
+    },
+  ],
+};

src/option/system/user.js

@@ -1,12 +1,9 @@
 import { getDeptLazyTree } from '@/api/system/dept';
+import { validateLoginPassword } from '@/utils/validate';
 
 export const userOption = safe => {
   const validatePass = (rule, value, callback) => {
-    if (value === '') {
-      callback(new Error('请输入密码'));
-    } else {
-      callback();
-    }
+    validateLoginPassword(rule, value, callback);
   };
   const validatePass2 = (rule, value, callback) => {
     if (value === '') {
@@ -30,7 +27,8 @@ export const userOption = safe => {
     index: true,
     selection: true,
     addBtn: false,
-    viewBtn: true,
+    viewBtn: false,
+    menuWidth: 160,
     dialogType: 'dialog',
     dialogWidth: '90%',
     labelPosition: 'right',
@@ -40,8 +38,11 @@ export const userOption = safe => {
       {
         label: '账号名',
         prop: 'account',
+        slot: true,
+        minWidth: 180,
         search: true,
         searchOrder: 2,
+        searchPlaceholder: '支持模糊搜索',
         display: false,
       },
       {
@@ -49,6 +50,7 @@ export const userOption = safe => {
         prop: 'realName',
         search: true,
         searchOrder: 4,
+        searchPlaceholder: '支持模糊搜索',
         display: false,
       },
       {
@@ -56,6 +58,7 @@ export const userOption = safe => {
         prop: 'phone',
         search: true,
         searchOrder: 3,
+        searchPlaceholder: '支持模糊搜索',
         display: false,
       },
       { label: '工号', prop: 'code', display: false },
@@ -63,11 +66,13 @@ export const userOption = safe => {
         label: '所属部门',
         prop: 'deptName',
         slot: true,
-        overHidden: true,
+        minWidth: 200,
+        overHidden: false,
         display: false,
       },
       { 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 },
       {
@@ -310,29 +315,6 @@ export const userOption = safe => {
               { label: '承运商', value: 2 },
             ],
           },
-          {
-            label: '数据权限范围',
-            prop: 'dataScopeRange',
-            type: 'radio',
-            span: 24,
-            value: 1,
-            dicData: [
-              { label: '仅所属组织', value: 1 },
-              { label: '全部组织', value: 2 },
-              { label: '自定义', value: 3 },
-            ],
-          },
-          {
-            label: '数据层级范围',
-            prop: 'dataLevelRange',
-            type: 'radio',
-            span: 24,
-            value: 1,
-            dicData: [
-              { label: '包含下级', value: 1 },
-              { label: '仅本级', value: 2 },
-            ],
-          },
           {
             label: '备注',
             prop: 'remark',

src/option/transit/exception-disposal.js

@@ -1,7 +1,10 @@
+// 一级 value 与二级 value 都用中文原文：库里 exception_type 存的是大类中文名、
+// exception_reason 存子类中文名（小程序上报即如此），此处必须与之一致，
+// 否则按异常类型做精确匹配的查询会一行都查不到。
 export const exceptionCategoryOptions = [
   {
     label: '交通异常',
-    value: 'traffic',
+    value: '交通异常',
     children: [
       { label: '道路拥堵', value: '道路拥堵' },
       { label: '交通事故', value: '交通事故' },
@@ -12,7 +15,7 @@ export const exceptionCategoryOptions = [
   },
   {
     label: '车辆异常',
-    value: 'vehicle',
+    value: '车辆异常',
     children: [
       { label: '车辆故障维修', value: '车辆故障维修' },
       { label: '车辆事故', value: '车辆事故' },
@@ -24,7 +27,7 @@ export const exceptionCategoryOptions = [
   },
   {
     label: '货物异常',
-    value: 'cargo',
+    value: '货物异常',
     children: [
       { label: '货损', value: '货损' },
       { label: '货差', value: '货差' },
@@ -35,7 +38,7 @@ export const exceptionCategoryOptions = [
   },
   {
     label: '其他异常',
-    value: 'other',
+    value: '其他异常',
     children: [
       { label: '变更路线地址', value: '变更路线地址' },
       { label: '其他', value: '其他异常-其他' },
@@ -43,6 +46,16 @@ export const exceptionCategoryOptions = [
   },
 ];
 
+/** 一级类型的中文名列表，供编辑表单的级联选择使用 */
+export const exceptionTypeOptions = exceptionCategoryOptions.map(item => ({
+  label: item.label,
+  value: item.value,
+}));
+
+/** 按一级类型取二级选项 */
+export const exceptionReasonOptions = typeValue =>
+  exceptionCategoryOptions.find(item => item.value === typeValue)?.children || [];
+
 export const disposalStatusOptions = [
   { label: '待处理', value: 'pending' },
   { label: '处理中', value: 'processing' },
@@ -65,20 +78,30 @@ export const tableColumns = [
   { label: '项目', prop: 'projectName', minWidth: 160 },
   { label: '车辆', prop: 'vehicleNo', minWidth: 150, link: true },
   { label: '上报人', prop: 'reporterName', minWidth: 120 },
+  { label: '上报时间', prop: 'reportTime', minWidth: 170 },
   { label: '异常类型', prop: 'exceptionTypeName', minWidth: 160 },
   { label: '上报说明', prop: 'reportDescription', minWidth: 180 },
+  { label: '异常节点', prop: 'nodeName', minWidth: 120 },
   { label: '承运商', prop: 'carrierName', minWidth: 160 },
   { label: '最新跟进说明', prop: 'latestFollowContent', minWidth: 200 },
   { label: '状态', prop: 'disposalStatusName', minWidth: 120 },
 ];
 
-export const detailFields = [
-  { label: '配载单号/总单号', prop: 'loadingOrMasterNo', link: true },
-  { label: '运单号', prop: 'waybillNo', link: true },
-  { label: '项目', prop: 'projectName', link: true },
-  { label: '车牌号', prop: 'vehicleNo', link: true },
-  { label: '上报人', prop: 'reporterName' },
+// 详情/跟进弹窗的只读信息，按来源分两块：
+// 「运单信息」是上报时从运单复制的字段，「异常信息」是司机上报的内容。
+// 与编辑弹窗的分区口径一致，改动时两处要一起改。
+export const detailWaybillFields = [
+  { label: '运单号', prop: 'waybillNo' },
+  { label: '配载单号/总单号', prop: 'loadingOrMasterNo' },
+  { label: '车牌号', prop: 'vehicleNo' },
+  { label: '项目', prop: 'projectName' },
   { label: '承运商', prop: 'carrierName' },
+];
+
+export const detailExceptionFields = [
+  { label: '上报人', prop: 'reporterName' },
+  { label: '上报时间', prop: 'reportTime' },
+  { label: '异常节点', prop: 'nodeName' },
   { label: '异常类型', prop: 'exceptionTypeName' },
   { label: '异常原因', prop: 'exceptionReason' },
   { label: '上报说明', prop: 'reportDescription', span: 2 },
@@ -89,3 +112,21 @@ export const followColumns = [
   { label: '跟进人', prop: 'followUserName', minWidth: 130 },
   { label: '跟进时间', prop: 'followTime', minWidth: 170 },
 ];
+
+// 编辑表单只开放上报四件套。车牌、项目、承运商、配载单号由上报时从运单回填，
+// 允许手改会让记录与运单脱钩；处置状态由跟进与完成流转，不在此处。
+export const editFormFields = [
+  { label: '异常类型', prop: 'exceptionType', type: 'select', required: true },
+  { label: '异常原因', prop: 'exceptionReason', type: 'select' },
+  { label: '上报说明', prop: 'reportDescription', type: 'textarea', required: true, span: 2 },
+];
+
+// 编辑弹窗顶部的运单信息，只读展示，帮助运管员确认改的是哪一单。
+// 上报人与上报时间属上报行为，放在「异常信息」里，不在此处重复。
+export const editWaybillFields = [
+  { label: '运单号', prop: 'waybillNo' },
+  { label: '配载单号/总单号', prop: 'loadingOrMasterNo' },
+  { label: '车牌号', prop: 'vehicleNo' },
+  { label: '项目', prop: 'projectName' },
+  { label: '承运商', prop: 'carrierName' },
+];

src/option/transportCapacity/cert-audit-driver.js

@@ -0,0 +1,51 @@
+export const option = {
+  height: 'auto',
+  calcHeight: 32,
+  tip: false,
+  searchShow: true,
+  searchMenuSpan: 24,
+  searchIcon: true,
+  searchIndex: 4,
+  searchMenuPosition: 'right',
+  border: true,
+  index: true,
+  indexLabel: '序号',
+  indexWidth: 70,
+  selection: false,
+  addBtn: false,
+  editBtn: false,
+  delBtn: false,
+  viewBtn: false,
+  columnBtn: false,
+  menuWidth: 110,
+  column: [
+    {
+      label: '司机姓名',
+      prop: 'driverName',
+      search: true,
+      searchOrder: 3,
+      minWidth: 120,
+    },
+    {
+      label: '司机手机号',
+      prop: 'driverMobile',
+      search: true,
+      searchOrder: 2,
+      minWidth: 130,
+    },
+    {
+      label: '审核状态',
+      prop: 'statusText',
+      slot: true,
+      width: 110,
+      align: 'center',
+    },
+    {
+      label: '提交时间',
+      prop: 'submitTime',
+      slot: true,
+      minWidth: 170,
+      align: 'center',
+    },
+  ],
+};

src/option/transportCapacity/cert-audit-vehicle.js

@@ -0,0 +1,58 @@
+export const option = {
+  height: 'auto',
+  calcHeight: 32,
+  tip: false,
+  searchShow: true,
+  searchMenuSpan: 24,
+  searchIcon: true,
+  searchIndex: 4,
+  searchMenuPosition: 'right',
+  border: true,
+  index: true,
+  indexLabel: '序号',
+  indexWidth: 70,
+  selection: false,
+  addBtn: false,
+  editBtn: false,
+  delBtn: false,
+  viewBtn: false,
+  columnBtn: false,
+  menuWidth: 110,
+  column: [
+    {
+      label: '车牌号',
+      prop: 'bizKey',
+      search: true,
+      searchOrder: 3,
+      minWidth: 140,
+    },
+    {
+      label: '司机姓名',
+      prop: 'driverName',
+      search: true,
+      searchOrder: 2,
+      minWidth: 120,
+    },
+    {
+      label: '司机手机号',
+      prop: 'driverMobile',
+      search: true,
+      searchOrder: 1,
+      minWidth: 130,
+    },
+    {
+      label: '审核状态',
+      prop: 'statusText',
+      slot: true,
+      width: 110,
+      align: 'center',
+    },
+    {
+      label: '提交时间',
+      prop: 'submitTime',
+      slot: true,
+      minWidth: 170,
+      align: 'center',
+    },
+  ],
+};

src/option/transportCapacity/driver.js

@@ -125,6 +125,23 @@ export const option = {
       slot: true,
       minWidth: 160,
     },
+    {
+      label: '创建人',
+      prop: 'createUserName',
+      minWidth: 120,
+      addDisplay: false,
+      editDisplay: false,
+    },
+    {
+      label: '创建时间',
+      prop: 'createTime',
+      type: 'datetime',
+      format: 'YYYY-MM-DD HH:mm:ss',
+      valueFormat: 'YYYY-MM-DD HH:mm:ss',
+      minWidth: 170,
+      addDisplay: false,
+      editDisplay: false,
+    },
     {
       label: '准驾车型',
       prop: 'drivingType',

src/option/transportCapacity/transport-ship.js

@@ -91,6 +91,23 @@ export const option = {
       minWidth: 140,
       align: 'center',
     },
+    {
+      label: '创建人',
+      prop: 'createUserName',
+      minWidth: 120,
+      addDisplay: false,
+      editDisplay: false,
+    },
+    {
+      label: '创建时间',
+      prop: 'createTime',
+      type: 'datetime',
+      format: 'YYYY-MM-DD HH:mm:ss',
+      valueFormat: 'YYYY-MM-DD HH:mm:ss',
+      minWidth: 170,
+      addDisplay: false,
+      editDisplay: false,
+    },
     {
       label: '',
       prop: 'expireStatus',

src/option/transportCapacity/transport-vehicle.js

@@ -48,6 +48,7 @@ export const option = {
       searchOrder: 1,
       searchslot: true,
       slot: true,
+      overHidden: true,
       minWidth: 150,
     },
     {
@@ -55,6 +56,8 @@ export const option = {
       prop: 'useDepartment',
       search: true,
       searchOrder: 3,
+      slot: true,
+      overHidden: true,
       minWidth: 140,
     },
     {
@@ -95,6 +98,8 @@ export const option = {
       align: 'center',
     },
     {
+      // 这里是「最新一次提交的状态」缓存，不等于该车当前是否已认证：
+      // 已认证由生效快照指针决定，曾审核通过即永久保持，重新提交不会让它退回审核中
       label: '认证状态',
       prop: 'certificationStatus',
       slot: true,
@@ -104,9 +109,10 @@ export const option = {
       type: 'select',
       dicData: [
         { label: '全部', value: '' },
-        { label: '认证中', value: 0 },
-        { label: '已认证', value: 1 },
+        { label: '审核中', value: 0 },
+        { label: '已通过', value: 1 },
         { label: '已驳回', value: 2 },
+        { label: '已作废', value: 3 },
       ],
       minWidth: 110,
       align: 'center',
@@ -151,6 +157,23 @@ export const option = {
       minWidth: 130,
       align: 'center',
     },
+    {
+      label: '创建人',
+      prop: 'createUserName',
+      minWidth: 120,
+      addDisplay: false,
+      editDisplay: false,
+    },
+    {
+      label: '创建时间',
+      prop: 'createTime',
+      type: 'datetime',
+      format: 'YYYY-MM-DD HH:mm:ss',
+      valueFormat: 'YYYY-MM-DD HH:mm:ss',
+      minWidth: 170,
+      addDisplay: false,
+      editDisplay: false,
+    },
     {
       label: '',
       prop: 'expireStatus',

src/option/transportCapacity/vehicle-dispatch.js

@@ -12,6 +12,9 @@ export const option = {
   height: 'auto',
   calcHeight: 32,
   dialogWidth: 1200,
+  // 弹窗根节点 class：avue-crud 弹窗默认 append-to-body 到 body，
+  // 页面内 scoped 样式命中不到弹窗内容，故用该 class 在全局样式里做兜底（见 styles/element-ui.scss）
+  dialogCustomClass: 'vehicle-dispatch-dialog',
   labelPosition: 'right',
   labelWidth: 'auto',
   tip: false,
@@ -101,6 +104,7 @@ export const option = {
       minWidth: 120,
       addDisplay: false,
       editDisplay: false,
+      viewDisplay: false,
     },
     {
       label: '当前节点',
@@ -108,6 +112,7 @@ export const option = {
       minWidth: 120,
       addDisplay: false,
       editDisplay: false,
+      viewDisplay: false,
     },
     {
       label: '当前处理人',
@@ -115,6 +120,7 @@ export const option = {
       minWidth: 130,
       addDisplay: false,
       editDisplay: false,
+      viewDisplay: false,
     },
     {
       label: '创建人',
@@ -122,6 +128,7 @@ export const option = {
       minWidth: 120,
       addDisplay: false,
       editDisplay: false,
+      viewDisplay: false,
     },
     {
       label: '创建时间',
@@ -132,6 +139,7 @@ export const option = {
       minWidth: 170,
       addDisplay: false,
       editDisplay: false,
+      viewDisplay: false,
     },
     // ========== 新增/编辑表单专用（不进表格）==========
     {
@@ -165,6 +173,7 @@ export const option = {
       type: 'textarea',
       hide: true,
       span: 24,
+      minRows: 2,
       maxlength: 200,
       showWordLimit: true,
       rules: [{ max: 200, message: '备注不能超过200个字', trigger: 'blur' }],

src/option/vehicle/accident-record.js

@@ -1,7 +1,7 @@
 import { formatUpdateUserName } from '@/utils/audit';
 
 const validateNonNegative = (rule, value, callback) => {
-  if (value === undefined || value === null || value === '') {
+  if (value === undefined || value === null || value === '' || Number(value) === -1) {
     callback();
   } else if (Number(value) < 0) {
     callback(new Error('不能小于 0'));
@@ -10,6 +10,9 @@ const validateNonNegative = (rule, value, callback) => {
   }
 };
 
+const formatEmptySentinel = (row, value) =>
+  value === undefined || value === null || value === '' || Number(value) === -1 ? '' : value;
+
 export const vehicleTypeDic = [
   { label: '车辆', value: '车辆' },
   { label: '船舶', value: '船舶' },
@@ -135,6 +138,7 @@ export const option = {
       minWidth: 140,
       span: 12,
       placeholder: '请输入',
+      formatter: formatEmptySentinel,
       rules: [{ validator: validateNonNegative, trigger: 'blur' }],
     },
     {
@@ -146,6 +150,7 @@ export const option = {
       minWidth: 140,
       span: 12,
       placeholder: '请输入',
+      formatter: formatEmptySentinel,
       rules: [{ validator: validateNonNegative, trigger: 'blur' }],
     },
     {
@@ -204,6 +209,14 @@ export const option = {
       editDisplay: false,
       viewDisplay: false,
     },
+    {
+      label: '创建人',
+      prop: 'createUserName',
+      addDisplay: false,
+      editDisplay: false,
+      display: false,
+      minWidth: 120,
+    },
     {
       label: '创建时间',
       prop: 'createTime',
@@ -281,6 +294,8 @@ export const exportColumns = [
   { prop: 'insuranceClaimAmount', label: '保险理赔金额' },
   { prop: 'accidentReasonDamage', label: '事故原因及损坏情况' },
   { prop: 'remark', label: '备注' },
+  { prop: 'createUserName', label: '创建人' },
+  { prop: 'createTime', label: '创建时间' },
 ];
 
 export const excelOption = {

src/option/vehicle/annual-inspection-record.js

@@ -1,7 +1,7 @@
 import { formatUpdateUserName } from '@/utils/audit';
 
 const validateNonNegative = (rule, value, callback) => {
-  if (value === undefined || value === null || value === '') {
+  if (value === undefined || value === null || value === '' || Number(value) === -1) {
     callback();
   } else if (Number(value) < 0) {
     callback(new Error('不能小于 0'));
@@ -10,6 +10,9 @@ const validateNonNegative = (rule, value, callback) => {
   }
 };
 
+const formatEmptySentinel = (row, value) =>
+  value === undefined || value === null || value === '' || Number(value) === -1 ? '' : value;
+
 export const vehicleTypeDic = [
   { label: '车辆', value: '车辆' },
   { label: '船舶', value: '船舶' },
@@ -159,6 +162,7 @@ export const option = {
       minWidth: 100,
       span: 12,
       placeholder: '请输入',
+      formatter: formatEmptySentinel,
       rules: [
         { required: true, message: '请输入费用', trigger: 'blur' },
         { validator: validateNonNegative, trigger: 'blur' },
@@ -206,6 +210,14 @@ export const option = {
       editDisplay: false,
       viewDisplay: false,
     },
+    {
+      label: '创建人',
+      prop: 'createUserName',
+      addDisplay: false,
+      editDisplay: false,
+      display: false,
+      minWidth: 120,
+    },
     {
       label: '创建时间',
       prop: 'createTime',
@@ -282,6 +294,8 @@ export const exportColumns = [
   { prop: 'fee', label: '费用（元）' },
   { prop: 'assessmentUnit', label: '评定（复核）单位' },
   { prop: 'remark', label: '备注' },
+  { prop: 'createUserName', label: '创建人' },
+  { prop: 'createTime', label: '创建时间' },
 ];
 
 export const excelOption = {

src/option/vehicle/equipment-ledger.js

@@ -147,6 +147,15 @@ export const option = {
       viewDisplay: false,
       minWidth: 170,
     },
+    {
+      label: '创建人',
+      prop: 'createUserName',
+      display: false,
+      addDisplay: false,
+      editDisplay: false,
+      viewDisplay: false,
+      minWidth: 120,
+    },
     {
       label: '创建时间',
       prop: 'createTime',
@@ -224,6 +233,8 @@ export const exportColumns = [
   { prop: 'specificationModel', label: '规格型号' },
   { prop: 'remark', label: '备注' },
   { prop: 'originalEquipmentNo', label: '原厂设备号' },
+  { prop: 'createUserName', label: '创建人' },
+  { prop: 'createTime', label: '创建时间' },
 ];
 
 export const excelOption = {

src/option/vehicle/etc-record.js

@@ -172,6 +172,14 @@ export const option = {
       editDisplay: false,
       viewDisplay: false,
     },
+    {
+      label: '创建人',
+      prop: 'createUserName',
+      addDisplay: false,
+      editDisplay: false,
+      display: false,
+      minWidth: 120,
+    },
     {
       label: '创建时间',
       prop: 'createTime',
@@ -218,6 +226,8 @@ export const exportColumns = [
   { prop: 'exitStation', label: '出口站' },
   { prop: 'dataSource', label: '数据来源' },
   { prop: 'remark', label: '备注' },
+  { prop: 'createUserName', label: '创建人' },
+  { prop: 'createTime', label: '创建时间' },
 ];
 
 export const excelOption = {

src/option/vehicle/insurance-record.js

@@ -1,7 +1,7 @@
 import { formatUpdateUserName } from '@/utils/audit';
 
 const validateNonNegative = (rule, value, callback) => {
-  if (value === undefined || value === null || value === '') {
+  if (value === undefined || value === null || value === '' || Number(value) === -1) {
     callback();
   } else if (Number(value) < 0) {
     callback(new Error('不能小于 0'));
@@ -141,6 +141,7 @@ export const option = {
       formslot: true,
       append: '元',
       minWidth: 120,
+      formatter: (row, value) => (value === undefined || value === null || value === '' || Number(value) === -1 ? '' : value),
       rules: [{ validator: validateNonNegative, trigger: 'blur' }],
     },
     {
@@ -150,6 +151,7 @@ export const option = {
       formslot: true,
       append: '元',
       minWidth: 120,
+      formatter: (row, value) => (value === undefined || value === null || value === '' || Number(value) === -1 ? '' : value),
       rules: [
         { required: true, message: '请输入保费', trigger: 'blur' },
         { validator: validateNonNegative, trigger: 'blur' },
@@ -159,6 +161,7 @@ export const option = {
       label: '发票号',
       prop: 'invoiceNo',
       minWidth: 150,
+      formatter: (row, value) => (value === undefined || value === null || value === '' || String(value) === '-1' ? '' : value),
       rules: [{ max: 80, message: '最多 80 个字符', trigger: 'blur' }],
     },
     {
@@ -168,6 +171,7 @@ export const option = {
       format: 'YYYY-MM-DD',
       valueFormat: 'YYYY-MM-DD',
       minWidth: 120,
+      formatter: (row, value) => (value === undefined || value === null || value === '' || String(value) === '-1' ? '' : value),
     },
     {
       label: '备注',
@@ -178,6 +182,14 @@ export const option = {
       hide: true,
       rules: [{ max: 200, message: '备注最多 200 个字', trigger: 'blur' }],
     },
+    {
+      label: '创建人',
+      prop: 'createUserName',
+      addDisplay: false,
+      editDisplay: false,
+      display: false,
+      minWidth: 120,
+    },
     {
       label: '创建时间',
       prop: 'createTime',
@@ -256,6 +268,8 @@ export const exportColumns = [
   { prop: 'invoiceNo', label: '发票号' },
   { prop: 'invoiceDate', label: '开票日期' },
   { prop: 'remark', label: '备注' },
+  { prop: 'createUserName', label: '创建人' },
+  { prop: 'createTime', label: '创建时间' },
 ];
 
 export const excelOption = {

src/option/vehicle/mileage-record.js

@@ -1,6 +1,7 @@
 import { formatUpdateUserName } from '@/utils/audit';
 
-const isEmpty = value => value === undefined || value === null || value === '';
+const isEmpty = value =>
+  value === undefined || value === null || value === '' || Number(value) === -1;
 
 const validateNonNegative = (rule, value, callback) => {
   if (isEmpty(value)) {
@@ -12,6 +13,8 @@ const validateNonNegative = (rule, value, callback) => {
   }
 };
 
+const formatEmptySentinel = (row, value) => (isEmpty(value) ? '' : value);
+
 export const option = {
   height: 'auto',
   calcHeight: 32,
@@ -60,6 +63,7 @@ export const option = {
       append: 'km',
       minWidth: 210,
       slot: true,
+      formatter: formatEmptySentinel,
       rules: [{ validator: validateNonNegative, trigger: 'blur' }],
     },
     {
@@ -70,6 +74,7 @@ export const option = {
       append: 'km',
       minWidth: 210,
       slot: true,
+      formatter: formatEmptySentinel,
       rules: [{ validator: validateNonNegative, trigger: 'blur' }],
     },
     {
@@ -80,6 +85,7 @@ export const option = {
       append: 'km',
       minWidth: 170,
       slot: true,
+      formatter: formatEmptySentinel,
       rules: [{ validator: validateNonNegative, trigger: 'blur' }],
     },
     {
@@ -90,6 +96,7 @@ export const option = {
       append: 'km',
       minWidth: 170,
       slot: true,
+      formatter: formatEmptySentinel,
       rules: [{ validator: validateNonNegative, trigger: 'blur' }],
     },
     {
@@ -133,6 +140,14 @@ export const option = {
       editDisplay: false,
       viewDisplay: false,
     },
+    {
+      label: '创建人',
+      prop: 'createUserName',
+      addDisplay: false,
+      editDisplay: false,
+      display: false,
+      minWidth: 120,
+    },
     {
       label: '创建时间',
       prop: 'createTime',
@@ -208,6 +223,8 @@ export const exportColumns = [
   { prop: 'monthlyMileage', label: '本月行驶里程数' },
   { prop: 'totalMileage', label: '累计行驶里程数' },
   { prop: 'remark', label: '备注' },
+  { prop: 'createUserName', label: '创建人' },
+  { prop: 'createTime', label: '创建时间' },
 ];
 
 export const excelOption = {

src/option/vehicle/oil-electric-record.js

@@ -1,6 +1,7 @@
 import { formatUpdateUserName } from '@/utils/audit';
 
-const isEmpty = value => value === undefined || value === null || value === '';
+const isEmpty = value =>
+  value === undefined || value === null || value === '' || Number(value) === -1;
 
 const validateNonNegative = (rule, value, callback) => {
   if (isEmpty(value)) {
@@ -12,6 +13,8 @@ const validateNonNegative = (rule, value, callback) => {
   }
 };
 
+const formatEmptySentinel = (row, value) => (isEmpty(value) ? '' : value);
+
 export const vehicleTypeDic = [
   { label: '车辆', value: '车辆' },
   { label: '船舶', value: '船舶' },
@@ -124,6 +127,7 @@ export const option = {
       type: 'input',
       formslot: true,
       minWidth: 110,
+      formatter: formatEmptySentinel,
       rules: [{ validator: validateNonNegative, trigger: 'blur' }],
     },
     {
@@ -133,6 +137,7 @@ export const option = {
       formslot: true,
       append: '元/升',
       minWidth: 120,
+      formatter: formatEmptySentinel,
       rules: [{ validator: validateNonNegative, trigger: 'blur' }],
     },
     {
@@ -141,6 +146,7 @@ export const option = {
       type: 'input',
       formslot: true,
       minWidth: 130,
+      formatter: formatEmptySentinel,
       rules: [
         { required: true, message: '请输入交易金额', trigger: 'blur' },
         { validator: validateNonNegative, trigger: 'blur' },
@@ -152,6 +158,7 @@ export const option = {
       type: 'input',
       formslot: true,
       minWidth: 110,
+      formatter: formatEmptySentinel,
       rules: [{ validator: validateNonNegative, trigger: 'blur' }],
     },
     {
@@ -225,6 +232,14 @@ export const option = {
       editDisplay: false,
       viewDisplay: false,
     },
+    {
+      label: '创建人',
+      prop: 'createUserName',
+      addDisplay: false,
+      editDisplay: false,
+      display: false,
+      minWidth: 120,
+    },
     {
       label: '创建时间',
       prop: 'createTime',
@@ -304,6 +319,8 @@ export const exportColumns = [
   { prop: 'balance', label: '余额' },
   { prop: 'station', label: '站点' },
   { prop: 'remark', label: '备注' },
+  { prop: 'createUserName', label: '创建人' },
+  { prop: 'createTime', label: '创建时间' },
 ];
 
 export const excelOption = {

src/option/vehicle/other-expense-record.js

@@ -165,6 +165,14 @@ export const option = {
       editDisplay: false,
       viewDisplay: false,
     },
+    {
+      label: '创建人',
+      prop: 'createUserName',
+      addDisplay: false,
+      editDisplay: false,
+      display: false,
+      minWidth: 120,
+    },
     {
       label: '创建时间',
       prop: 'createTime',
@@ -209,6 +217,8 @@ export const exportColumns = [
   { prop: 'amount', label: '金额' },
   { prop: 'dataSource', label: '数据来源' },
   { prop: 'remark', label: '备注' },
+  { prop: 'createUserName', label: '创建人' },
+  { prop: 'createTime', label: '创建时间' },
 ];
 
 export const excelOption = {